fix chagenlog

Author: mohnjiles

CHANGELOG.md

@@ -8,32 +8,12 @@ and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2
 ## v2.14.3
 ### Changed
 - The main sidebar now remembers whether it was collapsed or expanded between restarts.
-### Fixed
-- Fixed missing .NET 8 dependency for SwarmUI installs in certain cases
-
-<<<<<<< HEAD
-=======
-## v2.15.0-dev.1
-### Added
-- Added Python Version selector for all new package installs
-- Added the ability to rename packages
-### Changed
-- Updated all Python version management, virtual environment creation, and pip installs to use `uv` for improved reliability, compatibility, and speed
-- The Civitai model browser Download Location selector will now remember the last location used based on the model type
-- New installs of ComfyUI, SD.Next, and InvokeAI will now use Python 3.12.10, unless otherwise specified in the Advanced Options during installation
-- New installs of all other packages will now use Python 3.10.17, unless otherwise specified in the Advanced Options during installation
-### Supporters
-#### 🌟 Visionaries
-A massive thank you to our esteemed Visionary-tier Patrons: **Waterclouds**, **bluepopsicle**, **Bob S**, **Ibixat**, and **Corey T**! Your exceptional commitment propels Stability Matrix to new heights and allows us to push the boundaries of innovation. We're incredibly grateful for your foundational support! 🚀
-
-## v2.14.3
-### Changed
 - Inference is now able to load image metadata from Civitai generated images via drag & drop
 - Updated process tracking for ComfyUI to help mitigate restart issues when using Comfy Manager
 ### Fixed
+- Fixed missing .NET 8 dependency for SwarmUI installs in certain cases
 - Fixed ComfyUI-Zluda not being recognized as a valid Comfy install for the workflow browser
 
->>>>>>> b012947a (Merge pull request #1099 from ionite34/civit-image-metadata-and-fixes)
 ## v2.14.2
 ### Changed
 - Changed Nvidia GPU detection to use compute capability level instead of the GPU name for certain feature gates / torch indexes