diff --git a/packages/utils/crypto/src/index.ts b/packages/utils/crypto/src/index.ts
index 6e15b2f5c..22389dee4 100644
--- a/packages/utils/crypto/src/index.ts
+++ b/packages/utils/crypto/src/index.ts
@@ -10,11 +10,7 @@ export * from "./hash.js";
 export * from "./random.js";
 export * from "./prehash.js";
 export * from "./signer.js";
-<<<<<<< Updated upstream
-=======
-export * from "./keychain.js";
 export * from "./xsalsa20poly1305.js";
->>>>>>> Stashed changes
 import libsodium from "libsodium-wrappers";
 const ready = libsodium.ready; // TODO  can we export ready directly ?
 export { ready };