fixed incomplete merge header