Update index.html
fixed conflicts