fix: conflicts

Author: biwasxyz

package-lock.json

@@ -35,6 +35,7 @@
     "@radix-ui/react-tabs": "^1.1.11",
     "@radix-ui/react-toast": "^1.2.13",
     "@radix-ui/react-tooltip": "^1.2.6",
+    "@scure/btc-signer": "^1.8.0",
     "@stacks/connect": "^7.10.2",
     "@stacks/connect-react": "^22.6.2",
     "@stacks/connect-ui": "^6.6.0",
@@ -63,6 +64,7 @@
     "react-markdown": "^9.1.0",
     "recharts": "^2.15.3",
     "remark-gfm": "^4.0.1",
+    "sats-connect": "^3.5.0",
     "tailwind-merge": "^2.6.0",
     "tailwindcss-animate": "^1.0.7",
     "zustand": "^5.0.4"