The problem with conflict

delays effective management. I have a graph I can share here.
Merge pull request #12 from dwald/patch-4

The problem with conflict