diff --git a/terahz/templates/index.html b/terahz/templates/index.html
index 827277f..b2f9adb 100644
--- a/terahz/templates/index.html
+++ b/terahz/templates/index.html
@@ -4,11 +4,7 @@
 <head>
   <meta charset="utf8">
   <link rel="stylesheet" href="static/bootstrap.min.css">
-<<<<<<< HEAD
   <link rel="stylesheet" href="static/stylesheet.css">
-=======
-  <link rel="stylesheet" href="stylesheet.css">
->>>>>>> 229719cc5c78474bce0ff1caf98075b97941a6df
   <title>TeraHz</title>
   <!-- script imports -->
   <script src="static/bootstrap.bundle.min.js"></script>
