preparing to move to git flow