Undo merge error