diff --git a/changelog.md b/changelog.md
index 80c04472..1247f89d 100644
--- a/changelog.md
+++ b/changelog.md
@@ -6,7 +6,6 @@
 
 ## Fixes
 
->>>>>>> 208d1b82 (Show BARCAP commit ranges by default.)
 # 2.5.0
 
 Saves from 2.4 are not compatible with 2.5.