Update README.md
Resolved merge conflicts