update README.md
fix conflict