diff --git a/doc-src/content/CHANGELOG.markdown b/doc-src/content/CHANGELOG.markdown
index fcf9414a..7afa47cf 100644
--- a/doc-src/content/CHANGELOG.markdown
+++ b/doc-src/content/CHANGELOG.markdown
@@ -7,7 +7,6 @@ layout: article
 COMPASS CHANGELOG
 =================
 
-<<<<<<< HEAD:doc-src/content/CHANGELOG.markdown
 0.11.alpha.1
 ------------