Removed merge conflict artifacts from various HTML files