Update README.md

updated instructions to resolve conflict.
Merge remote-tracking branch 'upstream/master'

merging changes from upstream including changes to README.md