Update index.html

to create a conflict
update to create conflict
creating conflict
resolving conflict
merging files