Update index.html

Updated to remove all conflicts