updates index.html
resolves merge conflict