Fix git commit and simplify git flow