diff --git a/airflow/www/templates/airflow/dags.html b/airflow/www/templates/airflow/dags.html
index eaa41aecb914..67802023d6e9 100644
--- a/airflow/www/templates/airflow/dags.html
+++ b/airflow/www/templates/airflow/dags.html
@@ -72,7 +72,6 @@ <h2>DAGs</h2>
           </form>
         </div>
       </div>
-<<<<<<< HEAD
       <div class="dags-table-body">
         <table class="table table-striped table-bordered table-hover">
           <thead>