change to index.html
Error branch
fixing index_master
Resolve merge conflict
Complete de version2