diff --git a/apple/OmnivoreKit/Sources/Models/CoreData/CoreDataModel.xcdatamodeld/CoreDataModel.xcdatamodel/contents b/apple/OmnivoreKit/Sources/Models/CoreData/CoreDataModel.xcdatamodeld/CoreDataModel.xcdatamodel/contents index b23b0e8d3..46296fa01 100644 --- a/apple/OmnivoreKit/Sources/Models/CoreData/CoreDataModel.xcdatamodeld/CoreDataModel.xcdatamodel/contents +++ b/apple/OmnivoreKit/Sources/Models/CoreData/CoreDataModel.xcdatamodeld/CoreDataModel.xcdatamodel/contents @@ -13,6 +13,7 @@ + @@ -36,7 +37,7 @@ - + @@ -87,7 +88,7 @@ - + diff --git a/apple/OmnivoreKit/Sources/Models/CoreData/StorageProvider.swift b/apple/OmnivoreKit/Sources/Models/CoreData/StorageProvider.swift index 8641865ef..7a0445e1f 100644 --- a/apple/OmnivoreKit/Sources/Models/CoreData/StorageProvider.swift +++ b/apple/OmnivoreKit/Sources/Models/CoreData/StorageProvider.swift @@ -11,7 +11,7 @@ public class PersistentContainer: NSPersistentContainer { container.viewContext.automaticallyMergesChangesFromParent = false container.viewContext.name = "viewContext" - container.viewContext.mergePolicy = NSMergeByPropertyObjectTrumpMergePolicy + container.viewContext.mergePolicy = NSMergePolicy.mergeByPropertyObjectTrump container.viewContext.undoManager = nil container.viewContext.shouldDeleteInaccessibleFaults = true