I think we’re running across the same issue : CBL 2.x auto conflict resolution results in unresolved conflicts