diff --git a/docs/Overview/queries/understand-query-performance-hbs.md b/docs/Overview/queries/understand-query-performance-hbs.md
index 46040f7a..a4e482de 100644
--- a/docs/Overview/queries/understand-query-performance-hbs.md
+++ b/docs/Overview/queries/understand-query-performance-hbs.md
@@ -8,14 +8,7 @@ has_toc: false
 has_children: false
 ---
 
-<<<<<<< HEAD
-# Understanding History-based Optimization
-
-## Overview
-
-=======
 # Understanding history-based optimization
->>>>>>> gh-pages
 Firebolt's query plans adapt and evolve with your workload over time.
 Through a feedback loop, Firebolt's query optimizer learns from previous queries and progressively generates more efficient plans, steadily improving query performance towards optimal runtimes.