diff --git a/ibm_ace/CHANGELOG.md b/ibm_ace/CHANGELOG.md
index bbc75b05781a9..2801b62feed1b 100644
--- a/ibm_ace/CHANGELOG.md
+++ b/ibm_ace/CHANGELOG.md
@@ -1,8 +1,11 @@
 # CHANGELOG - IBM ACE
 
-<<<<<<< HEAD
 ## Unreleased
 
+***Added***:
+
+* Add hostname as part of the subscription substring ([#15189](https://github.com/DataDog/integrations-core/pull/15189))
+
 ## 2.0.0 / 2023-08-10
 
 ***Changed***:
@@ -22,9 +25,6 @@
 ***Fixed***:
 
 * Bump the minimum datadog-checks-base version ([#15217](https://github.com/DataDog/integrations-core/pull/15217))
-=======
-## 1.2.1-beta.1 / 2023-07-10
->>>>>>> 96583accec ([Release] Bumped ibm_ace version to 1.2.1-beta.1)
 
 ## 1.2.0 / 2023-07-10