Update README.md
fix conflict
Merge branch 'aszxqw-patch-1'