Update README.md
Solve conflicts