diff --git a/views/admin.html b/views/admin.html
index 5d3dd56..a51fb85 100644
--- a/views/admin.html
+++ b/views/admin.html
@@ -60,11 +60,7 @@
                style="margin: 1rem;"
             ></div>
          </div>
-<<<<<<< HEAD
          <div style="position: relative;">
-=======
-         <div style="position:relative;">
->>>>>>> 0bfdbce908484560108e20cede6f9e7c46710818
             <iframe id="content"></iframe>
          </div>
       </div>