Back to regular git-flow