Change how to set the data of the exception MergeConflictError (using out field)
Merge pull request #12 from mrodm/master

Change how to set the data of the exception MergeConflictError