replaced some hatchet repos removed during rebase