Change done exclusively to generate a merge conflict
Fixed one merge conflict in index.html