merge conflict index.html