From 475f9faeea1e577a2f8e25d38f3f7759b4c80489 Mon Sep 17 00:00:00 2001
From: Raj Gupta <150777419+Raj-G07@users.noreply.github.com>
Date: Fri, 5 Dec 2025 02:36:19 +0530
Subject: [PATCH] Testing...

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8e1d59983..88699d100 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,9 +30,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Improved the country weightings in the _Financial Modeling Prep_ service
 - Improved the search functionality by name in the _Financial Modeling Prep_ service
-  <<<<<<< HEAD
-- # Resolved an issue in the user endpoint where the list was returning empty in the admin control panel’s users section
-  > > > > > > > b731e050 (Bugfix/improve search by name in FMP service (#6012))
+- Resolved an issue in the user endpoint where the list was returning empty in the admin control panel’s users section
 
 ## 2.220.0 - 2025-11-29