diff --git a/pubspec.lock b/pubspec.lock
index 9f828c5d3..7b30b070b 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -70,6 +70,7 @@ packages:
     dependency: "direct main"
     description:
       name: archethic_dapp_framework_flutter
+<<<<<<< HEAD
 <<<<<<< HEAD
       sha256: "3b43ef8a3d65199edd5090f29ed642edcb0aee9d88f1166ee48b22e7862a7e53"
       url: "https://pub.dev"
@@ -81,10 +82,17 @@ packages:
     source: hosted
     version: "1.1.8"
 >>>>>>> 598e0208 (⬆️ Update Archethic Dart SDK version 3.3.14)
+=======
+      sha256: fb95a351f28850cd8b9ca34ebbdbadfce211a4e4a420d7871c284198fb88b99f
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.11"
+>>>>>>> 4bd5faf4 (⬆️ Update Archethic Dart SDK version 3.3.15)
   archethic_lib_dart:
     dependency: "direct main"
     description:
       name: archethic_lib_dart
+<<<<<<< HEAD
 <<<<<<< HEAD
       sha256: "9644035fd44b68d6558d906b62bbd74800068e71367e929a1a73d60d2a54e054"
       url: "https://pub.dev"
@@ -96,6 +104,12 @@ packages:
     source: hosted
     version: "3.3.14"
 >>>>>>> 598e0208 (⬆️ Update Archethic Dart SDK version 3.3.14)
+=======
+      sha256: bcfaef5b204c396270c2241c89149a86b02a6bdbc0f64260288bace4536dd502
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.3.15"
+>>>>>>> 4bd5faf4 (⬆️ Update Archethic Dart SDK version 3.3.15)
   archethic_messaging_lib_dart:
     dependency: "direct main"
     description:
@@ -108,6 +122,7 @@ packages:
     dependency: transitive
     description:
       name: archethic_wallet_client
+<<<<<<< HEAD
 <<<<<<< HEAD
       sha256: b26e2e7a2805c6f3b18c50007f165b79521ea5303745f8ac798acd6c25e9cb33
       url: "https://pub.dev"
@@ -119,6 +134,12 @@ packages:
     source: hosted
     version: "1.2.4"
 >>>>>>> 598e0208 (⬆️ Update Archethic Dart SDK version 3.3.14)
+=======
+      sha256: "7f8b8a0843f565a622c821edfd8f6cca0d7359e054316cc07c01d97f0819f939"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.2.5"
+>>>>>>> 4bd5faf4 (⬆️ Update Archethic Dart SDK version 3.3.15)
   archive:
     dependency: transitive
     description: