Removed merge conflict artifacts from various HTML files
Merge pull request #4348 from pjackson28/removemergeconflictartifacts

Removed merge conflict artifacts from various HTML files