Undo the merge