diff --git a/index.html b/index.html
index ba2adf18..36ef2e52 100644
--- a/index.html
+++ b/index.html
@@ -8126,9 +8126,6 @@
     <script defer src="modules/io/save.js?v=1.100.00"></script>
     <script defer src="modules/io/load.js?v=1.104.12"></script>
     <script defer src="modules/io/cloud.js?v=1.99.00"></script>
-<<<<<<< HEAD
-    <script defer src="modules/io/export.js?v=1.99.14"></script>
-=======
     <script defer src="modules/io/export.js?v=1.100.00"></script>
 
     <script defer src="modules/renderers/draw-features.js?v=1.104.15"></script>
@@ -8142,6 +8139,5 @@
     <script defer src="modules/renderers/draw-state-labels.js?v=1.104.0"></script>
     <script defer src="modules/renderers/draw-burg-labels.js?v=1.104.0"></script>
     <script defer src="modules/renderers/draw-burg-icons.js?v=1.104.0"></script>
->>>>>>> 97e504d2aaa3575761ffebbb10698bdbc831576b
   </body>
 </html>