Final version of gitflow