restarting the whole thing, with branching in git flow