Fixed up merge conflict in index.html

Merge this pleaaaaase!!!!