Update README.md
Solve README.md conflict