Changes to the index with bug fixes
Changes to index.html file added some lines
resolve merge conflicts
Line was added after the merge