rebase-pr

Rebase a PR on its base branch, fix conflicts, and verify build