make sure we check for conflicted_unresolved as well as conflicted when
merging. Also add a fail safe such that if we fail to commit, a revert
occurs.