new rebase question