Update README.md
resolve conflict
conflict resolved