WIP

Author: Domica

StabilityMatrix.Core/Models/Api/Comfy/Nodes/ComfyNodeBuilder.cs

@@ -1519,13 +1519,6 @@ public ImageNodeConnection GetPrimaryAsImage()
     /// <summary>
     /// Get or convert latest primary connection to image
     /// </summary>
-<<<<<<< HEAD
-    public ImageNodeConnection GetPrimaryAsImage(PrimaryNodeConnection primary, VAENodeConnection vae)
-    {
-        return primary.Match(latent => Lambda_LatentToImage(latent, vae), image => image);
-    }
-
-=======
     public ImageNodeConnection GetPrimaryAsImage(
     PrimaryNodeConnection primary, 
     VAENodeConnection vae,
@@ -1540,7 +1533,6 @@ public ImageNodeConnection GetPrimaryAsImage(
         image => image
     );
     }
->>>>>>> 27accf16 (Update ComfyNodeBuilder.cs)
     /// <summary>
     /// Get or convert latest primary connection to image
     /// </summary>

StabilityMatrix.Core/Models/Settings/Settings.cs

@@ -100,7 +100,7 @@ public InstalledPackage? PreferredWorkflowPackage
     /// </summary>
     public bool IsCompletionRemoveUnderscoresEnabled { get; set; } = true;
 
-    /// COPILOT
+    /// NEW UI
     public bool EnableTiledVae { get; set; } = false;
 
     /// <summary>