fixup! Describe git flow in more detail in CONTRIBUTING