From 69ede0b7dfd198a0ddae9f208b19a991f10e4a99 Mon Sep 17 00:00:00 2001
From: Ivan Folgueira Bande <ivansete@status.im>
Date: Fri, 13 Mar 2026 12:41:03 +0100
Subject: [PATCH] rm leftovrs in CHANGELOG.md

---
 CHANGELOG.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b80e6bd30..edc4a705c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,3 @@
-<<<<<<< update-changelog-v0.37.1-master
 ## v0.37.1 (2026-03-12)
 
 ### Bug Fixes
@@ -6,10 +5,7 @@
 - Avoid IndexDefect if DB error message is short ([#3725](https://github.com/logos-messaging/logos-delivery/pull/3725))
 - Remove ENR cache from peer exchange ([#3652](https://github.com/logos-messaging/logos-messaging-nim/pull/3652)) ([7920368a](https://github.com/logos-messaging/logos-messaging-nim/commit/7920368a36687cd5f12afa52d59866792d8457ca))
 
-## v0.37.0-beta (2025-10-01)
-=======
 ## v0.37.0 (2025-10-01)
->>>>>>> master
 
 ### Notes