Remove merge conflicts on index.html