updateObject should handle CRDT conflict
When there is conflict while updating a CRDT, merge the updated version with the written one.
Depends on c-crdtlib#89 (closed) c-crdtlib#90 (closed) c-crdtlib#87 (closed) #36 (closed)
Edited by Ludovic Le Frioux