updated readme to be more precise
resolved merge conflicts