diff --git a/docs/changelog.rst b/docs/changelog.rst
index 73624b253..e6f326403 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -84,7 +84,6 @@ consumption to do the same tasks.
 Detailed list of changes
 -------------------------------------
 
-<<<<<<< HEAD
 0.38.1 [future]
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~