diff --git a/frontend/libs/tauri-api/src/index.ts b/frontend/libs/tauri-api/src/index.ts
index 09db7720b1..6780b44df2 100644
--- a/frontend/libs/tauri-api/src/index.ts
+++ b/frontend/libs/tauri-api/src/index.ts
@@ -35,7 +35,4 @@ export * from "./lib/sora/useSoraLoginListener.js";
 export * from "./lib/sora/waitForSoraLogin.js";
 export * from "./lib/system/GetAppInfo.js";
 export * from "./lib/util/LoadWithoutCors.js";
-<<<<<<< HEAD
-=======
 export * from "./lib/worldlabs/WorldLabsGetCredentialInfo.js";
->>>>>>> e213d3349 (frontend components, remove profiling, open login modal)