Changed README.md
Resolved Conflict