Few wording tweaks to the readme
Conflict resolution