diff --git a/changelog.md b/changelog.md
index 66caaeba3a4e449dc47bbe24c8262bb93f33ab7e..6ef8de8f6d7323bf022e8f5501ea98028a994ef5 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # Changelog for [`unix` package](http://hackage.haskell.org/package/unix)
 
 ## 2.7.0.2  *TBA*