Updating conduit and resourcet upper bounds
Merge pull request #2 from brendanhay/master

Updating conduit and resourcet upper bounds