diff --git a/docs/content/taxonomies/displaying.md b/docs/content/taxonomies/displaying.md
index ba27d6ef3..43dd48ba8 100644
--- a/docs/content/taxonomies/displaying.md
+++ b/docs/content/taxonomies/displaying.md
@@ -110,7 +110,6 @@ The following example displays all tag keys:
 
     <ul id="all-tags">
       {{ range $name, $taxonomy := .Site.Taxonomies.tags }}
-<<<<<<< HEAD
         <li><a href="{{ "/tags/" | relLangURL }}{{ $name | urlize }}">{{ $name }}</a></li>
       {{ end }}
     </ul>