fixed merge conflict in index.html