my changes to index.html
remove conflict
index file change
resolving conflicts