update readme
conflict resolved