fix conflict in index.html