A conflicting pull request.