fix chagenlog

Author: mohnjiles

CHANGELOG.md

@@ -5,24 +5,12 @@ 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.14.3
-### Changed
-- The main sidebar now remembers whether it was collapsed or expanded between restarts.
-=======
-## v2.15.0-dev.2
 ### Added
-- Added new package - [FramePack](https://github.com/lllyasviel/FramePack)
-- Added new package - [FramePack Studio](https://github.com/colinurbs/FramePack-Studio)
-- Added support for authenticated model downloads in the HuggingFace model browser. Visit Settings → Accounts to add your HuggingFace token.
-- Added support for dragging-and-dropping Civitai-generated images into Inference to load metadata
 - Added the ability to search by pasting an entire Civitai model URL into the search bar in the Civitai model browser (when the Civitai API gets fixed)
 ### Changed
-- Civitai model browser image loading now uses dynamic resizing for better performance and a smoother scrolling experience
-- Detailed notifications for Civitai model browser api errors
 - The main sidebar now remembers whether it was collapsed or expanded between restarts
 - Updated pre-selected download locations for certain model types in the Civitai model browser
->>>>>>> 8a35e055 (Merge pull request #1101 from ionite34/moar-fixes-n-stuff)
 ### Fixed
 - Fixed missing .NET 8 dependency for SwarmUI installs in certain cases
 - Fixed [#1291](https://github.com/LykosAI/StabilityMatrix/issues/1291) - Certain GPUs not being detected on Linux