Always rebase