diff --git a/yarn.lock b/yarn.lock
index 0e73658b..ae407b35 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1202,15 +1202,9 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-<<<<<<< HEAD
-"@cashu/cashu-ts@KraXen72/cashu-ts-minibits#8345e93ee408e1aa8fde79b7c35badc07ba60694":
-  version "1.0.0-minibits"
-  resolved "https://codeload.github.com/KraXen72/cashu-ts-minibits/tar.gz/8345e93ee408e1aa8fde79b7c35badc07ba60694"
-=======
 "@cashu/cashu-ts@minibits-cash/cashu-ts#1.0.0-minibits":
   version "1.0.0-minibits"
   resolved "https://codeload.github.com/minibits-cash/cashu-ts/tar.gz/95cd37801f54700bed1b84113a774bd23f36aecb"
->>>>>>> origin/main
   dependencies:
     "@cashu/crypto" "^0.2.6"
     "@noble/curves" "^1.3.0"