merge index.html from master