rebase nestor pkg