> While I hesitate to say “Worrying about merge conflicts” is a valid reason not to pursue a branching strategy like gitflow

Being worried about merge conflicts might be a sign that your continuous integration might not be continuous enough.