Changing graphics in 03-conflict.md
Merge pull request #3 from drlabratory/doug_hg

Changing graphics referenced in 03-conflict.md