Moving branching towards gitflow