diff --git a/CHANGELOG.md b/CHANGELOG.md
index f4bade6634b18e06b75e4bf29e891a9685196a4d..83da5399be8b18ad4cd42bfd755c400b431a98cf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,7 +10,6 @@ that users understand how the changes affect the new version.
 
 version 5.0.0-dev
 ---------------------------
-<<<<<<< HEAD
 + Fix output files in ccs.wdl.
 + Update biowdl-input-converter to version 0.3.
 + Update minimap2 to version 2.20.