Undo revert from merge