From 3ba441ac3ce8931cce90bafd72526046eda7204e Mon Sep 17 00:00:00 2001
From: adeatcu-ionos <andrei-cristian.deatcu@ionos.com>
Date: Mon, 13 Jan 2025 16:03:49 +0200
Subject: [PATCH] doc: Fix CHANGELOG.md

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f26609daf..4088b2b65 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,8 @@
 ## 6.6.9 -- upcoming release
 ### Features
-<<<<<<< HEAD
 - Add support for Monitoring Service: `ionoscloud_monitoring_pipeline` resource and data source.
-=======
 - Add `expose_serial` attribute for image data source
->>>>>>> 5a0f846c (feat: Add 'expose_serial' attribute for image DS)
+
 ### Docs
 - Replace < and > with " in the docs
 - Remove { and } from terraform imports