update readme
resolved conflict