modified index.html
fixed merge conflict