Pull from upstream with rebase