edit index.html
add README.md
solve the conflict