Update index.html

Simulate conflict