fixup botched rebase