re-add gitflow thingy