Update README.md

[fix] fixed the merge conflicts