Update README.md
Solved conflict