diff --git a/index.html b/index.html
index c18befd..bd7c3e5 100644
--- a/index.html
+++ b/index.html
@@ -379,11 +379,7 @@
 
 		<!-- Content -->
 		<script src="js/prompt.js?v=7a1c68c" type="text/javascript"></script>
-<<<<<<< HEAD
 		<script src="js/index.js?v=f6a7238" type="text/javascript"></script>
-=======
-		<script src="js/index.js?v=4c9e978" type="text/javascript"></script>
->>>>>>> main
 
 		<script
 			src="js/ui/floating/history.js?v=fc92d14"