Add conflicts_with

git-flow-avh and git-flow conflict with each other. This adds the
conflicts_with line to both Formulas