Pull request with conflict