removed remaining merge diff flag after last closing html tag