Fix merge conflict in README
Merge pull request #1 from feifanzhou/patch-1

Fix merge conflict in README