diff --git a/index.html b/index.html
index b4019b28..06fac251 100644
--- a/index.html
+++ b/index.html
@@ -138,11 +138,7 @@
       }
     </style>
 
-<<<<<<< HEAD
-    <link rel="preload" href="index.css?v=1.102.00" as="style" onload="this.onload=null; this.rel='stylesheet'" />
-=======
     <link rel="preload" href="index.css?v=1.104.0" as="style" onload="this.onload=null; this.rel='stylesheet'" />
->>>>>>> 97e504d2aaa3575761ffebbb10698bdbc831576b
     <link rel="preload" href="icons.css" as="style" onload="this.onload=null; this.rel='stylesheet'" />
     <link rel="preload" href="libs/jquery-ui.css" as="style" onload="this.onload=null; this.rel='stylesheet'" />
   </head>