Fixed merge header