tweaked conflict algorithm to make sure src files are set to detached if there is a conflict
tweaked conflict algorithm to make sure src files are set to detached if there is a conflict

MiguelCastillo/bundler-reactor,MiguelCastillo/bundler-reactor