update index.html
fix conflicts