diff --git a/search.html b/search.html
index 152bb03..3edf950 100644
--- a/search.html
+++ b/search.html
@@ -75,18 +75,11 @@
     <script>
         document.onreadystatechange = function () {
 		if(document.readyState == "interactive") {
-<<<<<<< HEAD
 		    var addr = decodeURIComponent(document.cookie).split(";")[0].split("=")[1];
 		    console.log("loading from "+addr);
 		    load_titles("https://"+addr+"/manga/search"+window.location.search);
 		    document.querySelector("#title_list").style.visibility = "visible";
 		    document.querySelector("#label").textContent = "Result";
-=======
-			console.log("on load");
-			load_titles("https://amangathing.ddns.net/instance/manga/search"+window.location.search);
-			document.querySelector("#title_list").style.visibility = "visible";
-			document.querySelector("#label").textContent = "Result";
->>>>>>> b91c43f186414c87cd93ead9d8111707b3ac9565
 		}
         }
     </script>