Updated README
Fixed merge conflict