Updated index.html
Resolved conflicts