Updated README
Merge conflict fix