modified conflict detection, fixed fubar'd v0.1.3 - failed to commit all files