Update README.md
Update README.md
fixed merge conficts