Fix merge conflict in index.html