diff --git a/CHANGELOG.md b/CHANGELOG.md
index ff05d2a6..e988405f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,24 +5,14 @@ All notable changes to Stability Matrix will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2.0.0.html).
 
-<<<<<<< HEAD
-=======
-## v2.13.0-dev.1
-### Added
-- Added the ability to change the Models directory separately from the rest of the Data directory. This can be set in `Settings > Select new Models Folder`
-- Added "Copy" menu to the Inference gallery context menu, allowing you to copy the image or the seed (other params coming soon™️)
-- Added InvokeAI model sharing option
-### Supporters
-#### Visionaries
-- A heartfelt thank you to our incredible Visionary-tier Patreon supporter, **Waterclouds**! Your ongoing support means a lot to us, and we’re grateful to have you with us on this journey!
-
 ## v2.12.2
 ### Added
 - Added Beta scheduler to the scheduler selector in Inference
 ### Fixed
 - Fixed ComfyUI NF4 extension not installing properly when prompted in Inference
+- Fixed [#932](https://github.com/LykosAI/StabilityMatrix/issues/932), [#935](https://github.com/LykosAI/StabilityMatrix/issues/935), [#939](https://github.com/LykosAI/StabilityMatrix/issues/939) - InvokeAI failing to update
+- Fixed repeated nested folders being created in `Models/StableDiffusion` when using Forge in Symlink mode in certain conditions. Existing folders will be repaired to their original structure on launch.
 
->>>>>>> 8c9b456c (Merge pull request #851 from ionite34/fix-nf4-sorta)
 ## v2.12.1
 ### Fixed
 - Fixed [#916](https://github.com/LykosAI/StabilityMatrix/issues/916) - InvokeAI failing to install/update on macOS
diff --git a/StabilityMatrix.Core/Models/Packages/BaseGitPackage.cs b/StabilityMatrix.Core/Models/Packages/BaseGitPackage.cs
index 65fbc454..585c658f 100644
--- a/StabilityMatrix.Core/Models/Packages/BaseGitPackage.cs
+++ b/StabilityMatrix.Core/Models/Packages/BaseGitPackage.cs
@@ -568,6 +568,7 @@ SharedFolderMethod sharedFolderMethod
 
         // fix infinity controlnet folders
         await FixInfinityFolders(modelsDir.JoinDir("ControlNet"), "ControlNet").ConfigureAwait(false);
+        await FixInfinityFolders(modelsDir.JoinDir("StableDiffusion"), "sd").ConfigureAwait(false);
 
         // fix duplicate links in models dir
         // see https://github.com/LykosAI/StabilityMatrix/issues/338
diff --git a/StabilityMatrix.Core/Models/Packages/InvokeAI.cs b/StabilityMatrix.Core/Models/Packages/InvokeAI.cs
index 3290c5ae..bcc1be51 100644
--- a/StabilityMatrix.Core/Models/Packages/InvokeAI.cs
+++ b/StabilityMatrix.Core/Models/Packages/InvokeAI.cs
@@ -183,14 +183,14 @@ await SetupAndBuildInvokeFrontend(
         {
             case TorchIndex.Cuda:
                 torchInstallArgs = torchInstallArgs
-                    .WithTorch("==2.2.2")
-                    .WithTorchVision("==0.17.2")
-                    .WithXFormers("==0.0.25.post1")
-                    .WithTorchExtraIndex("cu121");
+                    .WithTorch("==2.4.1")
+                    .WithTorchVision("==0.19.1")
+                    .WithXFormers("==0.0.28.post1")
+                    .WithTorchExtraIndex("cu124");
 
                 Logger.Info("Starting InvokeAI install (CUDA)...");
                 pipCommandArgs =
-                    "-e .[xformers] --use-pep517 --extra-index-url https://download.pytorch.org/whl/cu121";
+                    "-e .[xformers] --use-pep517 --extra-index-url https://download.pytorch.org/whl/cu124";
                 break;
 
             case TorchIndex.Rocm: