added guzzle/guzzle as a conflicting package
Merge pull request #1 from slbmeh/master

Adds guzzle/guzzle as a conflicting package