some changes to index.html
resolving merge conflicts