Removed legacy exception ConflictedObjectException.
Merge pull request #31 from guilhermeblanco/conflictedobjectexception_removal

Removed legacy exception ConflictedObjectException.
Merge remote-tracking branch 'origin/master' into null_check