Updated Readme
Fixed conflict