rebase during update