fixed merge conflict on index.html home