diff --git a/pubspec.lock b/pubspec.lock
index 198164495..9f828c5d3 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -70,18 +70,32 @@ packages:
     dependency: "direct main"
     description:
       name: archethic_dapp_framework_flutter
+<<<<<<< HEAD
       sha256: "3b43ef8a3d65199edd5090f29ed642edcb0aee9d88f1166ee48b22e7862a7e53"
       url: "https://pub.dev"
     source: hosted
     version: "1.1.23"
+=======
+      sha256: "5de868e946e8404c8d8f4b1592c565301855d548a700313e95a905916e194207"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.8"
+>>>>>>> 598e0208 (⬆️ Update Archethic Dart SDK version 3.3.14)
   archethic_lib_dart:
     dependency: "direct main"
     description:
       name: archethic_lib_dart
+<<<<<<< HEAD
       sha256: "9644035fd44b68d6558d906b62bbd74800068e71367e929a1a73d60d2a54e054"
       url: "https://pub.dev"
     source: hosted
     version: "3.3.16"
+=======
+      sha256: e67fc0f4201afec9b0d4ac373251613be55c4ce41f6d88ab4f9054681f7dc3b2
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.3.14"
+>>>>>>> 598e0208 (⬆️ Update Archethic Dart SDK version 3.3.14)
   archethic_messaging_lib_dart:
     dependency: "direct main"
     description:
@@ -94,10 +108,17 @@ packages:
     dependency: transitive
     description:
       name: archethic_wallet_client
+<<<<<<< HEAD
       sha256: b26e2e7a2805c6f3b18c50007f165b79521ea5303745f8ac798acd6c25e9cb33
       url: "https://pub.dev"
     source: hosted
     version: "1.2.7"
+=======
+      sha256: cc659035492078fa49a1cc1f5c8a82aacec7e7004042a18617bf2c2763edf036
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.2.4"
+>>>>>>> 598e0208 (⬆️ Update Archethic Dart SDK version 3.3.14)
   archive:
     dependency: transitive
     description: