fixes for git flow