removed Header tag from merge conflict