updated README
resolved merge conflicts