Fixed typo in README
Fixing merge conflict