resolved README
resolved merge