Fixed merge conflict generating HTML errors