Fixed merge conflict in index.html