Update README.md
fix merge conflict
Merge branch 'dfguo-master'