update readme
resolved merge conflicts