reapply change lost in merge