Changed Readme

Deleted conflict messages from readme