diff --git a/templates/index.html b/templates/index.html
index 97187db..f681f1d 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -1,11 +1,10 @@
 <!doctype html>
-<html lang="en">
-  <head>
-  <!-- Required meta tags -->
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+        <html lang="en">
+                <head>  
+                        <!-- Required meta tags -->
+                        <meta charset="utf-8">
+                        <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 
-<<<<<<< HEAD
                         <!-- Bootstrap CSS -->
                         <link rel="stylesheet" href="https://benjamyn.love/css/bootstrap.min.css">
                 	<link rel="stylesheet" href="static/css/custom.css">
@@ -38,39 +37,5 @@
                 <script src="https://benjamyn.love/js/popper.min.js"></script>
                 <script src="https://benjamyn.love/js/bootstrap.min.js"></script>
         </body>
-=======
-    <!-- Bootstrap CSS -->
-    <link rel="stylesheet" href="https://benjamyn.love/css/bootstrap.min.css">
-    <link rel="stylesheet" href="static/css/custom.css">
-  </head>
-
-  <body>
-    <div class="navbar h-100 d-flex justify-content-center" style="margin-bottom: 10px;">
-      <div>
-      <h3>WhoIWatch</h3>
-      </div>
-    </div>
-
-    <div class="container">
-      <div class="wrapper">
-        {% for x in livestreamdata %}
-        <div class="card" >
-          <img class="card-img-top" src="https://static-cdn.jtvnw.net/previews-ttv/live_user_{{ x["channel"]["name"] }}-300x200.jpg" alt="Card image cap">
-          <div class="card-body">
-            <h5 class="card-title"><a href="{{ x["channel"]["url"] }}">{{ x["channel"]["display_name"] }}</a> <img src="{{ x["channel"]["logo"]}}" height="16" width="16" style="vertical-align: unset" ></h5>
-            <p class="card-text">{{ x["channel"]["game"] }}</p>
-            <p class="card-text tbottom"><small class="text-muted">{{ x["viewers"] }} Viewers</small></p>
-          </div>
-        </div>
-      {% endfor %}
-      </div>
-    </div>
-    <!-- Optional JavaScript -->
-    <!-- jQuery first, then Popper.js, then Bootstrap JS -->
-    <script src="https://benjamyn.love/js/jquery-3.3.1.slim.min.js"></script>
-    <script src="https://benjamyn.love/js/popper.min.js"></script>
-    <script src="https://benjamyn.love/js/bootstrap.min.js"></script>
-  </body>
->>>>>>> 1501a4a0ddf737b23850267c6f3a84354a3a6d75
 </html>
 
