Reapply changes lost in merge