Modified index.html
Conflict resolved