Update README.md
resolved merge