Update README.md
Update index.html
fix unmerged files
fix merge conflict