Update index.html

removed conflicts