Update index.html
merged conflicts