* Removed merge header