pull request with conflict