Rebase on upstream changes