Update index.html and remove conflicts