diff --git a/CHANGELOG.md b/CHANGELOG.md
index f48a82bbfe..f7ab23ca01 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # librdkafka v2.3.0
 
 librdkafka v2.3.0 is a feature release: