diff --git a/docs/content/toc.textile b/docs/content/toc.textile
index 0deb2d27bed..6af23d2ce50 100644
--- a/docs/content/toc.textile
+++ b/docs/content/toc.textile
@@ -39,7 +39,6 @@ h2. Operations
 * "Performance FAQ":./Performance-FAQ.html
 * "Extending Druid":./Modules.html
 * "Booting a Production Cluster":./Booting-a-production-cluster.html
-<<<<<<< HEAD
 * "Performance FAQ":./Performance-FAQ.html
 * "Logging":./Logging.html