updated index.html
index.html conflict resolved