>     MergingObjectStore .merge(v1, v2, resolve=false, atomic=false) should fail on conflict, if resolve === false or omitted
>   ․ MergingObjectStore .merge(v1, v2, resolve=false, atomic=false) should fail on conflict, if resolve === false or omitted
>     MergingObjectStore .merge(v1, v2, resolve=false, atomic=false) should pass if resolve === true, preferring v1
>   ․ MergingObjectStore .merge(v1, v2, resolve=false, atomic=false) should pass if resolve === true, preferring v1
>     MergingObjectStore .merge(v1, v2, resolve=false, atomic=false) should record the merge in such a way that will preserve the resolution decisions
>   ․ MergingObjectStore .merge(v1, v2, resolve=false, atomic=false) should record the merge in such a way that will preserve the resolution decisions
193c199
<   95 passing (146ms)
---
>   98 passing (154ms)