diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4f2fd8a6..1bc6d699 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,55 +5,6 @@ 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.3
-### Added
-- Added support for SD3.5 in Inference
-- Added CLIP_G to HuggingFace model browser
-### Changed
-- Text Encoder / CLIP selection in Inference is now enabled via the cogwheel ⚙️ button next to the model selector 
-- Added more base model types to the CivitAI Model Browser & Checkpoint Manager
-- Updated Russian translations thanks to @vanja-san
-- Updated Simplified Chinese translations thanks to @QL-boy
-### Fixed
-- Fixed some instances of Civitai model browser not loading new results
-- Fixed "Unsupported Torch Version: Cuda" errors when installing a1111
-
-## v2.13.0-dev.2
-### Added
-- Added new package - [SimpleSDXL](https://github.com/metercai/SimpleSDXL) - many thanks to @NullDev for the contribution!
-- Added new package - [FluxGym](https://github.com/cocktailpeanut/fluxgym) - many thanks to @NullDev for the contribution!
-- Added a new "Extension Packs" section to the extension manager, allowing you to create packs for easier installation of multiple extensions at once
-- Added "Search by Creator" command to Civitai browser context menu
-- Added Beta scheduler to the scheduler selector in Inference
-- Added zipping of log files and "Show Log in Explorer" button on exceptions dialog for easier support
-- Added max concurrent downloads option & download queueing for most downloads
-### Changed
-- (Internal) Updated to Avalonia 11.1.4
-- Adjusted the Branch/Release toggle during package install flow to be a little more obvious
-- Updated the Dock library used for Inference - fixes some weirdness with resizing / rearranging panels
-### 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.
-- Fixed minimize button not working on macOS
-- Fixed InvokeAI model sharing spamming the console with "This may take awhile" in certain conditions
-- Fixed text alignment issues in the Downloads tab for certain long names / progress infos
-### Supporters
-#### Visionaries
-- A big thank you to our amazing Visionary-tier Patreon supporter, **Waterclouds**! Your continued support is invaluable!
-
-## 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!
-
->>>>>>> f5113af0 (Merge pull request #879 from ionite34/updated-translation-chagenlog)
 ## v2.12.3
 ### Added
 - Added new package - [SimpleSDXL](https://github.com/metercai/SimpleSDXL) - many thanks to @NullDev for the contribution!