diff --git a/src/routes/api.ts b/src/routes/api.ts
index ac666f8c..25feb312 100644
--- a/src/routes/api.ts
+++ b/src/routes/api.ts
@@ -25,11 +25,7 @@ import { getVendorInfoController } from "@/src/controllers/api/getVendorInfoCont
 import { giveKeyChainTriggeredItemsController } from "@/src/controllers/api/giveKeyChainTriggeredItemsController";
 import { giveKeyChainTriggeredMessageController } from "@/src/controllers/api/giveKeyChainTriggeredMessageController";
 import { gildWeaponController } from "@/src/controllers/api/gildWeaponController";
-<<<<<<< HEAD
-import { guildTechController } from "@/src/controllers/api/guildTechController";
-=======
 import { guildTechController } from "../controllers/api/guildTechController";
->>>>>>> 11fd4c060f0c0db7a9eb43d42cb3e58e384be332
 import { hostSessionController } from "@/src/controllers/api/hostSessionController";
 import { hubController } from "@/src/controllers/api/hubController";
 import { hubInstancesController } from "@/src/controllers/api/hubInstancesController";