Test pull request with conflicts