updated readme
resolved readme conflict