rebase chocolate dir