Change done exclusively to generate a merge conflict
Arreglado el merge conflict en index.html