diff --git a/CHANGELOG.md b/CHANGELOG.md
index b538415..79d15b7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,7 +21,6 @@
 
 * Add 128 bit number support behind a feature flag (#209).
 * Implement `IntoBuf` for `&mut [u8]`
->>>>>>> v0.4.x
 
 # 0.4.8 (May 25, 2018)