Changes to README.md
The short description exceeded the 150 character limit, so remove the first sentence
Fix merge conflict