undo bad merge conflict resolution