Undo bad conflict resolution