actually resolved conflict in index.html