fix merge conflict

LightlessSync/PlayerData/Pairs/PairHandlerAdapter.cs

@@ -537,6 +537,20 @@ internal sealed class PairHandlerAdapter : DisposableMediatorSubscriberBase, IPa
         });
     }
 
+        _ = Task.Run(async () =>
+        {
+            try
+            {
+                Logger.LogTrace("[{applicationId}] Removing temp collection {CollectionId} for {handler} ({reason})", applicationId, toRelease, GetLogIdentifier(), reason ?? "Cleanup");
+                await _ipcManager.Penumbra.RemoveTemporaryCollectionAsync(Logger, applicationId, toRelease).ConfigureAwait(false);
+            }
+            catch (Exception ex)
+            {
+                Logger.LogDebug(ex, "Failed to remove temporary Penumbra collection for {handler}", GetLogIdentifier());
+            }
+        });
+    }
+
     private bool AnyPair(Func<PairConnection, bool> predicate)
     {
         return GetCurrentPairs().Any(predicate);
@@ -567,6 +581,26 @@ internal sealed class PairHandlerAdapter : DisposableMediatorSubscriberBase, IPa
         return IsPreferredDirectPair();
     }
 
+    private bool ShouldSkipDownscale()
+    {
+        if (!_playerPerformanceConfigService.Current.SkipTextureDownscaleForPreferredPairs)
+        {
+            return false;
+        }
+
+        return IsPreferredDirectPair();
+    }
+
+    private bool ShouldSkipDecimation()
+    {
+        if (!_playerPerformanceConfigService.Current.SkipModelDecimationForPreferredPairs)
+        {
+            return false;
+        }
+
+        return IsPreferredDirectPair();
+    }
+
     private bool IsPaused()
     {
         var pairs = GetCurrentPairs();
@@ -665,6 +699,20 @@ internal sealed class PairHandlerAdapter : DisposableMediatorSubscriberBase, IPa
         forceApplyCustomization = forced || needsApply;
         var suppressForcedModRedraw = !forced && hasMissingCachedFiles && dataApplied;
 
+        var sanitized = CloneAndSanitizeLastReceived(out var dataHash);
+        if (sanitized is null)
+        {
+            Logger.LogTrace("Sanitized data null for {Ident}", Ident);
+            return;
+        }
+        var dataApplied = !string.IsNullOrEmpty(dataHash)
+            && string.Equals(dataHash, _lastSuccessfulDataHash ?? string.Empty, StringComparison.Ordinal);
+        var needsApply = !dataApplied;
+        var modFilesChanged = PlayerModFilesChanged(sanitized, _cachedData);
+        var shouldForceMods = shouldForce || modFilesChanged;
+        forceApplyCustomization = forced || needsApply;
+        var suppressForcedModRedraw = !forced && hasMissingCachedFiles && dataApplied;
+
         if (shouldForceMods)
         {
             _forceApplyMods = true;