dev update readme
conflict resolved