diff --git a/Delta/Database/Model/Human/Cheat.swift b/Delta/Database/Model/Human/Cheat.swift
index edc63c7..432922b 100644
--- a/Delta/Database/Model/Human/Cheat.swift
+++ b/Delta/Database/Model/Human/Cheat.swift
@@ -53,4 +53,9 @@ extension Cheat: Syncable
     public var syncableLocalizedName: String? {
         return self.name
     }
+    
+    public func resolveConflict(_ record: AnyRecord) -> ConflictResolution
+    {
+        return .newest
+    }
 }
diff --git a/Delta/Database/Model/Human/ControllerSkin.swift b/Delta/Database/Model/Human/ControllerSkin.swift
index ea09c99..3d9c030 100644
--- a/Delta/Database/Model/Human/ControllerSkin.swift
+++ b/Delta/Database/Model/Human/ControllerSkin.swift
@@ -129,4 +129,9 @@ extension ControllerSkin: Syncable
     public var syncableLocalizedName: String? {
         return self.name
     }
+    
+    public func resolveConflict(_ record: AnyRecord) -> ConflictResolution
+    {
+        return .newest
+    }
 }