Update README.md

Added recipe to merge conflicting pull requests.