diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1d52487e..7c77a8b6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -154,7 +154,6 @@ eive-tmtc: v2.12.2
 
 - First version of a TCS controller heater control loop, but
   the loop is disabled for now.
->>>>>>> origin/develop
 
 ## Changed