Re: gitflow and branch naming conventions