updated readme
resolved conflict