2nd undo merge