merge header back in