Fixing merge conflict on index.html
Revert "Fixing merge conflict on index.html"

This reverts commit 8c7ecdf8316b6a69c96d8d51128843b1c7a71b7d.
Revert "Revert "Fixing merge conflict on index.html""

This reverts commit 507a58393a0a56ee4cd90e26d8941e3dcdeeed30.