From 5313acd5371a1c3d2e051f7269d8d236ee8fcda8 Mon Sep 17 00:00:00 2001
From: Merve <111695676+merve64@users.noreply.github.com>
Date: Tue, 10 Feb 2026 14:10:03 +0300
Subject: [PATCH] Update CHANGELOG.md

---
 CHANGELOG.md | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a328b90d66..2b9198223b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,9 +2,6 @@
 
 Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
-<<<<<<< Local Changes
-
 ## [2026.3-parmigiano] (2026-02-11)
 
 - chore: disable LP on parmigiano branch ([#6422])
@@ -166,7 +163,6 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://
 [#6238]: https://github.com/nymtech/nym/pull/6238
 [#6237]: https://github.com/nymtech/nym/pull/6237
 [#6172]: https://github.com/nymtech/nym/pull/6172
-||||||| Old File
 
 ## [2026.2-oscypek] (2026-01-27)
 
@@ -329,8 +325,7 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://
 [#5957]: https://github.com/nymtech/nym/pull/5957
 
 ## [2025.20-leerdammer] (2025-11-12)
-=======
->>>>>>> External Changes
+
 ## [2026.3-parmigiano] (2026-02-11)
 
 - chore: disable LP on parmigiano branch ([#6422])