Update README.md
Update README.md
Update README.md
Resolved conflict.