Update README
resolved merge conflicts