Resolved conflict in index.html