diff --git a/docs/changelog.rst b/docs/changelog.rst
index 1bd932d6..efd2e0f6 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -2,7 +2,6 @@
 Changelog
 =========
 
-<<<<<<< HEAD
 dev
 ===
 -  Subfield resolve error in generic_emdedded_document query #1651 #1652