Updating README
Resolving conflicts in README