switching to gitflow