Update to be more like rebase