Merge all upstream PRs except conditional requests