fix conflict again.
fix index.html