Make changes to index.html to raise conflict on merging
merged branches and resolved conflict