re-fix merge header