Conflict is mis-spelled

[TestingPhil123]

Hi there - I can help fix that :-)

[egawiser]

Looks like this wasn't ever fixed - I still see "konflict" (throughout) and "phollows" (at least once) in this helpful guide!

[drphilmarshall]

Gah! I just hope this repo finds some new git/GitHub users soon.