Manual merge index.html
Manual merge index.html