changed readme
resolved conflict for readme