Undo merge problems