Resolve merge conflicts

lib/utilities/constants.dart

@@ -34,7 +34,6 @@ abstract class Constants {
   // just use enable exchange flag
   // static bool enableBuy = enableExchange;
   // // true; // true for development,
-
   static final BigInt _satsPerCoinECash = BigInt.from(100);
   static final BigInt _satsPerCoinEthereum = BigInt.from(1000000000000000000);
   static final BigInt _satsPerCoinMonero = BigInt.from(1000000000000);

pubspec.lock

@@ -306,10 +306,10 @@ packages:
     dependency: "direct main"
     description:
       name: crypto
-      sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab
+      sha256: aa274aa7774f8964e4f4f38cc994db7b6158dd36e9187aaceaddc994b35c6c67
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.3"
+    version: "3.0.2"
   cryptography:
     dependency: transitive
     description:

pubspec.yaml

@@ -197,9 +197,9 @@ dependency_overrides:
   bip39:
     git:
       url: https://github.com/cypherstack/stack-bip39.git
-
       ref: 0cd6d54e2860bea68fc50c801cb9db2a760192fb
-  crypto: ^3.0.2
+
+  crypto: 3.0.2
   analyzer: ^5.2.0
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec