more gitflow tweaks