updated readme
conflict merge