Update index.html
index.html conflict resolution