Modified Readme
fixed the conflict