update README.md
resolve conflict