diff --git a/dashboard_static/index.html b/dashboard_static/index.html
index f9b2b58..1269f40 100644
--- a/dashboard_static/index.html
+++ b/dashboard_static/index.html
@@ -68,7 +68,6 @@
                 <div class="popchart column">
                     <h1 class="colheader chartheader">SPORTS POPULARITY CHART</h1>
                 </div>
-<<<<<<< HEAD
             </div>
             -->
             <div class = "maintable">
@@ -82,8 +81,6 @@
                 <div class = "popchart">
                     <h1 class = 'colheader'>SPORTS POPULARITY CHART</h1>
                 </div>
-=======
->>>>>>> 552191335378d5d4fcc19eee637d115ec515d385
             </div>
         </div> 
     </div>