Reapply change lost while merging