removed merge header weirdness