update index.html
fix conflict