Update index.html to fix merge conflicts