diff --git a/CHANGELOG.md b/CHANGELOG.md
index 691ba2b..656ec33 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 Version 4.0.0-dev
 -----------------
 
@@ -491,4 +490,4 @@ A more detailed description of backwards incompatible changes can be found in th
 
 **This changelog only includes changes from the 2.0 series. For older changes see the
 [1.x series changelog](https://github.com/nikic/PHP-Parser/blob/1.x/CHANGELOG.md) and the
-[0.9 series changelog](https://github.com/nikic/PHP-Parser/blob/0.9/CHANGELOG.md).**
\ No newline at end of file
+[0.9 series changelog](https://github.com/nikic/PHP-Parser/blob/0.9/CHANGELOG.md).**