Update index.html

fixing merge conflicts