Fix branches to pull and rebase against