undo merge bork