Capture the Conflict reponse status and throw as a ConflictError
Merge pull request #232 from jsternberg/feature/confict-error

Capture the Conflict reponse status and throw as a ConflictError