diff --git a/web/dist/index.html b/web/dist/index.html
index 83c7592..0c112e9 100644
--- a/web/dist/index.html
+++ b/web/dist/index.html
@@ -5,13 +5,8 @@
     <link rel="icon" type="image/svg+xml" href="/assets/favicon-d3efd231.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Vite App</title>
-<<<<<<< HEAD
     <script type="module" crossorigin src="/assets/index-b010f7f1.js"></script>
     <link rel="stylesheet" href="/assets/index-6fda301f.css">
-=======
-    <script type="module" crossorigin src="/assets/index-0293581f.js"></script>
-    <link rel="stylesheet" href="/assets/index-5f4db677.css">
->>>>>>> main
   </head>
   <body>
     <div id="root"></div>
