Fixed bugs in index.html
Fixed merge conflixt index.html