modify README.md
conflict merged