small change to index.html
fixed conflicts in index.html
fixed merge conflicts in index.html again