diff --git a/Cargo.lock b/Cargo.lock
index bef893ef95e35..a9529b3ee95b9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -173,11 +173,7 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2 1.0.86",
  "quote 1.0.37",
-<<<<<<< HEAD
  "syn 2.0.77",
-=======
- "syn 2.0.82",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "syn-solidity",
  "tiny-keccak",
 ]
@@ -305,11 +301,7 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2 1.0.86",
  "quote 1.0.37",
-<<<<<<< HEAD
  "syn 2.0.77",
-=======
- "syn 2.0.82",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
@@ -691,17 +683,7 @@ dependencies = [
 
 [[package]]
 name = "arrayvec"
-<<<<<<< HEAD
 version = "0.7.6"
-=======
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
-
-[[package]]
-name = "arrayvec"
-version = "0.7.4"
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
@@ -757,11 +739,7 @@ checksum = "965c2d33e53cb6b267e148a4cb0760bc01f4904c1cd4bb4002a085bb016d1490"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
-<<<<<<< HEAD
  "syn 2.0.77",
-=======
- "syn 2.0.82",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "synstructure 0.13.1",
 ]
 
@@ -784,11 +762,7 @@ checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
-<<<<<<< HEAD
  "syn 2.0.77",
-=======
- "syn 2.0.82",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
@@ -915,11 +889,7 @@ dependencies = [
  "parity-scale-codec",
  "polkadot-parachain-primitives",
  "polkadot-runtime-common",
-<<<<<<< HEAD
  "primitive-types 0.12.2",
-=======
- "primitive-types 0.13.1",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "rococo-runtime-constants",
  "scale-info",
  "serde_json",
@@ -1054,11 +1024,7 @@ dependencies = [
  "parity-scale-codec",
  "polkadot-parachain-primitives",
  "polkadot-runtime-common",
-<<<<<<< HEAD
  "primitive-types 0.12.2",
-=======
- "primitive-types 0.13.1",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "scale-info",
  "serde_json",
  "snowbridge-router-primitives",
@@ -1160,24 +1126,7 @@ dependencies = [
 
 [[package]]
 name = "async-channel"
-<<<<<<< HEAD
 version = "2.3.1"
-=======
-version = "2.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f2776ead772134d55b62dd45e59a79e21612d85d0af729b8b7d3967d601a62a"
-dependencies = [
- "concurrent-queue",
- "event-listener 5.2.0",
- "event-listener-strategy",
- "futures-core",
- "pin-project-lite",
-]
-
-[[package]]
-name = "async-executor"
-version = "1.5.1"
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a"
 dependencies = [
@@ -1229,11 +1178,7 @@ version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c"
 dependencies = [
-<<<<<<< HEAD
  "async-channel 2.3.1",
-=======
- "async-channel 1.9.0",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "async-executor",
  "async-io 2.3.4",
  "async-lock 3.4.0",
@@ -1274,13 +1219,8 @@ dependencies = [
  "futures-io",
  "futures-lite 2.3.0",
  "parking",
-<<<<<<< HEAD
  "polling 3.7.3",
  "rustix 0.38.37",
-=======
- "polling 3.4.0",
- "rustix 0.38.25",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "slab",
  "tracing",
  "windows-sys 0.59.0",
@@ -1346,50 +1286,8 @@ dependencies = [
 ]
 
 [[package]]
-<<<<<<< HEAD
 name = "async-signal"
 version = "0.2.10"
-=======
-name = "async-process"
-version = "2.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63255f1dc2381611000436537bbedfe83183faa303a5a0edaf191edef06526bb"
-dependencies = [
- "async-channel 2.3.0",
- "async-io 2.3.3",
- "async-lock 3.4.0",
- "async-signal",
- "async-task",
- "blocking",
- "cfg-if",
- "event-listener 5.2.0",
- "futures-lite 2.3.0",
- "rustix 0.38.25",
- "tracing",
-]
-
-[[package]]
-name = "async-signal"
-version = "0.2.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfb3634b73397aa844481f814fad23bbf07fdb0eabec10f2eb95e58944b1ec32"
-dependencies = [
- "async-io 2.3.3",
- "async-lock 3.4.0",
- "atomic-waker",
- "cfg-if",
- "futures-core",
- "futures-io",
- "rustix 0.38.25",
- "signal-hook-registry",
- "slab",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "async-std"
-version = "1.12.0"
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "637e00349800c0bdf8bfc21ebbc0b6524abea702b0da4168ac00d070d0c0b9f3"
 dependencies = [
@@ -1451,11 +1349,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
-<<<<<<< HEAD
  "syn 2.0.77",
-=======
- "syn 2.0.82",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
@@ -1472,11 +1366,7 @@ checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
-<<<<<<< HEAD
  "syn 2.0.77",
-=======
- "syn 2.0.82",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
@@ -1633,27 +1523,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
 
 [[package]]
-<<<<<<< HEAD
-=======
-name = "basic-toml"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2db21524cad41c5591204d22d75e1970a2d1f71060214ca931dc7d5afe2c14e5"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "beef"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a8241f3ebb85c056b509d4327ad0358fbbba6ffb340bf388f26350aeda225b1"
-dependencies = [
- "serde",
-]
-
-[[package]]
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 name = "binary-merkle-tree"
 version = "13.0.0"
 dependencies = [
@@ -1693,27 +1562,7 @@ dependencies = [
  "regex",
  "rustc-hash 1.1.0",
  "shlex",
-<<<<<<< HEAD
  "syn 2.0.77",
-=======
- "syn 2.0.82",
-]
-
-[[package]]
-name = "bip32"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa13fae8b6255872fd86f7faf4b41168661d7d78609f7bfe6771b85c6739a15b"
-dependencies = [
- "bs58",
- "hmac 0.12.1",
- "k256",
- "rand_core 0.6.4",
- "ripemd",
- "sha2 0.10.8",
- "subtle 2.5.0",
- "zeroize",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
@@ -1844,22 +1693,7 @@ dependencies = [
 
 [[package]]
 name = "blake2s_simd"
-<<<<<<< HEAD
 version = "1.0.2"
-=======
-version = "0.5.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e461a7034e85b211a4acb57ee2e6730b32912b06c08cc242243c39fc21ae6a2"
-dependencies = [
- "arrayref",
- "arrayvec 0.5.2",
- "constant_time_eq 0.1.5",
-]
-
-[[package]]
-name = "blake2s_simd"
-version = "1.0.1"
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94230421e395b9920d23df13ea5d77a20e1725331f90fbbf6df6040b33f756ae"
 dependencies = [
@@ -1912,12 +1746,7 @@ version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea"
 dependencies = [
-<<<<<<< HEAD
  "async-channel 2.3.1",
-=======
- "async-channel 1.9.0",
- "async-lock 2.8.0",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "async-task",
  "futures-io",
  "futures-lite 2.3.0",
@@ -2821,15 +2650,9 @@ checksum = "a2698f953def977c68f935bb0dfa959375ad4638570e969e2f1e9f433cbf1af6"
 
 [[package]]
 name = "cc"
-<<<<<<< HEAD
 version = "1.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b62ac837cdb5cb22e10a256099b4fc502b1dfe560cb282963a974d7abd80e476"
-=======
-version = "1.1.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "812acba72f0a070b003d3697490d2b55b837230ae7c6c6497f05cc2ddbb8d938"
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 dependencies = [
  "jobserver",
  "libc",
@@ -3091,15 +2914,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-<<<<<<< HEAD
 version = "4.5.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3e5a21b8495e732f1b3c364c9949b201ca7bae518c502c80256c96ad79eaf6ac"
-=======
-version = "4.5.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fbb260a053428790f3de475e304ff84cdbc4face759ea7a3e64c1edd938a7fc"
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 dependencies = [
  "clap_builder",
  "clap_derive 4.5.13",
@@ -3116,7 +2933,6 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-<<<<<<< HEAD
 version = "4.5.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8cf2dd12af7a047ad9d6da2b6b249759a22a7abc0f474c1dae1777afa4b21a73"
@@ -3124,15 +2940,6 @@ dependencies = [
  "anstream",
  "anstyle",
  "clap_lex 0.7.2",
-=======
-version = "4.5.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64b17d7ea74e9f833c7dbf2cbe4fb12ff26783eda4782a8975b72f895c9b4d99"
-dependencies = [
- "anstream",
- "anstyle",
- "clap_lex 0.7.0",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "strsim 0.11.1",
  "terminal_size",
 ]
@@ -3143,11 +2950,7 @@ version = "4.5.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "205d5ef6d485fa47606b98b0ddc4ead26eb850aaa86abfb562a94fb3280ecba0"
 dependencies = [
-<<<<<<< HEAD
  "clap 4.5.17",
-=======
- "clap 4.5.13",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
@@ -3172,11 +2975,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2 1.0.86",
  "quote 1.0.37",
-<<<<<<< HEAD
  "syn 2.0.77",
-=======
- "syn 2.0.82",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
@@ -4015,11 +3814,7 @@ dependencies = [
  "anes",
  "cast",
  "ciborium",
-<<<<<<< HEAD
  "clap 4.5.17",
-=======
- "clap 4.5.13",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "criterion-plot",
  "futures",
  "is-terminal",
@@ -4095,13 +3890,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76"
 dependencies = [
  "generic-array 0.14.7",
-<<<<<<< HEAD
  "rand_core",
  "subtle 2.6.1",
-=======
- "rand_core 0.6.4",
- "subtle 2.5.0",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "zeroize",
 ]
 
@@ -4149,11 +3939,7 @@ dependencies = [
 name = "cumulus-client-cli"
 version = "0.7.0"
 dependencies = [
-<<<<<<< HEAD
  "clap 4.5.17",
-=======
- "clap 4.5.13",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "parity-scale-codec",
  "sc-chain-spec",
  "sc-cli",
@@ -4528,11 +4314,7 @@ dependencies = [
  "proc-macro-crate 3.2.0",
  "proc-macro2 1.0.86",
  "quote 1.0.37",
-<<<<<<< HEAD
  "syn 2.0.77",
-=======
- "syn 2.0.82",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
@@ -4620,11 +4402,7 @@ name = "cumulus-pov-validator"
 version = "0.1.0"
 dependencies = [
  "anyhow",
-<<<<<<< HEAD
  "clap 4.5.17",
-=======
- "clap 4.5.13",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "parity-scale-codec",
  "polkadot-node-primitives",
  "polkadot-parachain-primitives",
@@ -4945,11 +4723,7 @@ name = "cumulus-test-service"
 version = "0.1.0"
 dependencies = [
  "async-trait",
-<<<<<<< HEAD
  "clap 4.5.17",
-=======
- "clap 4.5.13",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "criterion",
  "cumulus-client-cli",
  "cumulus-client-collator",
@@ -5093,11 +4867,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
-<<<<<<< HEAD
  "syn 2.0.77",
-=======
- "syn 2.0.82",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
@@ -5137,11 +4907,7 @@ dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
  "scratch",
-<<<<<<< HEAD
  "syn 2.0.77",
-=======
- "syn 2.0.82",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
@@ -5158,81 +4924,7 @@ checksum = "98532a60dedaebc4848cb2cba5023337cc9ea3af16a5b062633fabfd9f18fb60"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
-<<<<<<< HEAD
  "syn 2.0.77",
-=======
- "syn 2.0.82",
-]
-
-[[package]]
-name = "darling"
-version = "0.14.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850"
-dependencies = [
- "darling_core 0.14.4",
- "darling_macro 0.14.4",
-]
-
-[[package]]
-name = "darling"
-version = "0.20.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989"
-dependencies = [
- "darling_core 0.20.10",
- "darling_macro 0.20.10",
-]
-
-[[package]]
-name = "darling_core"
-version = "0.14.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0"
-dependencies = [
- "fnv",
- "ident_case",
- "proc-macro2 1.0.86",
- "quote 1.0.37",
- "strsim 0.10.0",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "darling_core"
-version = "0.20.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5"
-dependencies = [
- "fnv",
- "ident_case",
- "proc-macro2 1.0.86",
- "quote 1.0.37",
- "strsim 0.11.1",
- "syn 2.0.82",
-]
-
-[[package]]
-name = "darling_macro"
-version = "0.14.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e"
-dependencies = [
- "darling_core 0.14.4",
- "quote 1.0.37",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "darling_macro"
-version = "0.20.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
-dependencies = [
- "darling_core 0.20.10",
- "quote 1.0.37",
- "syn 2.0.82",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
@@ -5349,22 +5041,7 @@ checksum = "d65d7ce8132b7c0e54497a4d9a55a1c2a0912a0d786cf894472ba818fba45762"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
-<<<<<<< HEAD
  "syn 2.0.77",
-=======
- "syn 2.0.82",
-]
-
-[[package]]
-name = "derive-where"
-version = "1.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62d671cc41a825ebabc75757b62d3d168c577f9149b2d49ece1dad1f72119d25"
-dependencies = [
- "proc-macro2 1.0.86",
- "quote 1.0.37",
- "syn 2.0.82",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
@@ -5375,11 +5052,7 @@ checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
-<<<<<<< HEAD
  "syn 2.0.77",
-=======
- "syn 2.0.82",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
@@ -5487,11 +5160,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
-<<<<<<< HEAD
  "syn 2.0.77",
-=======
- "syn 2.0.82",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
@@ -5554,11 +5223,7 @@ dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
  "regex",
-<<<<<<< HEAD
  "syn 2.0.77",
-=======
- "syn 2.0.82",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "termcolor",
  "toml 0.8.19",
  "walkdir",
@@ -5790,11 +5455,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2 1.0.86",
  "quote 1.0.37",
-<<<<<<< HEAD
  "syn 2.0.77",
-=======
- "syn 2.0.82",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
@@ -5814,11 +5475,7 @@ checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
-<<<<<<< HEAD
  "syn 2.0.77",
-=======
- "syn 2.0.82",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
@@ -5829,11 +5486,7 @@ checksum = "2f9ed6b3789237c8a0c1c505af1c7eb2c560df6186f01b098c3a1064ea532f38"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
-<<<<<<< HEAD
  "syn 2.0.77",
-=======
- "syn 2.0.82",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
@@ -5957,11 +5610,7 @@ checksum = "8c321610643004cf908ec0f5f2aa0d8f1f8e14b540562a2887a1111ff1ecbf7b"
 dependencies = [
  "crunchy",
  "fixed-hash",
-<<<<<<< HEAD
  "impl-codec 0.6.0",
-=======
- "impl-codec 0.7.0",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "impl-rlp",
  "impl-serde 0.5.0",
  "scale-info",
@@ -5987,7 +5636,6 @@ checksum = "1ab15ed80916029f878e0267c3a9f92b67df55e79af370bf66199059ae2b4ee3"
 dependencies = [
  "ethbloom 0.13.0",
  "fixed-hash",
-<<<<<<< HEAD
  "impl-codec 0.6.0",
  "impl-rlp",
  "impl-serde",
@@ -6005,13 +5653,6 @@ dependencies = [
  "ethbloom 0.14.1",
  "fixed-hash",
  "primitive-types 0.13.1",
-=======
- "impl-codec 0.7.0",
- "impl-rlp",
- "impl-serde 0.5.0",
- "primitive-types 0.13.1",
- "scale-info",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "uint 0.10.0",
 ]
 
@@ -6023,21 +5664,7 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
 
 [[package]]
 name = "event-listener"
-<<<<<<< HEAD
 version = "3.1.0"
-=======
-version = "4.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e"
-dependencies = [
- "concurrent-queue",
- "pin-project-lite",
-]
-
-[[package]]
-name = "event-listener"
-version = "5.2.0"
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2"
 dependencies = [
@@ -6088,11 +5715,7 @@ dependencies = [
  "prettyplease",
  "proc-macro2 1.0.86",
  "quote 1.0.37",
-<<<<<<< HEAD
  "syn 2.0.77",
-=======
- "syn 2.0.82",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
@@ -6164,11 +5787,7 @@ dependencies = [
  "proc-macro-crate 3.2.0",
  "proc-macro2 1.0.86",
  "quote 1.0.37",
-<<<<<<< HEAD
  "syn 2.0.77",
-=======
- "syn 2.0.82",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
@@ -6203,13 +5822,8 @@ version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449"
 dependencies = [
-<<<<<<< HEAD
  "rand_core",
  "subtle 2.6.1",
-=======
- "rand_core 0.6.4",
- "subtle 2.5.0",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
@@ -6450,11 +6064,7 @@ dependencies = [
  "Inflector",
  "array-bytes",
  "chrono",
-<<<<<<< HEAD
  "clap 4.5.17",
-=======
- "clap 4.5.13",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "comfy-table",
  "frame-benchmarking",
  "frame-support",
@@ -6519,13 +6129,8 @@ dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
  "scale-info",
-<<<<<<< HEAD
  "sp-arithmetic",
  "syn 2.0.77",
-=======
- "sp-arithmetic 23.0.0",
- "syn 2.0.82",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "trybuild",
 ]
 
@@ -6550,11 +6155,7 @@ dependencies = [
 name = "frame-election-solution-type-fuzzer"
 version = "2.0.0-alpha.5"
 dependencies = [
-<<<<<<< HEAD
  "clap 4.5.17",
-=======
- "clap 4.5.13",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "frame-election-provider-solution-type",
  "frame-election-provider-support",
  "frame-support",
@@ -6638,11 +6239,7 @@ dependencies = [
 name = "frame-omni-bencher"
 version = "0.1.0"
 dependencies = [
-<<<<<<< HEAD
  "clap 4.5.17",
-=======
- "clap 4.5.13",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "cumulus-primitives-proof-size-hostfunction",
  "frame-benchmarking-cli",
  "log",
@@ -6749,11 +6346,7 @@ dependencies = [
  "sp-metadata-ir 0.6.0",
  "sp-runtime 31.0.1",
  "static_assertions",
-<<<<<<< HEAD
  "syn 2.0.77",
-=======
- "syn 2.0.82",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
@@ -6764,11 +6357,7 @@ dependencies = [
  "proc-macro-crate 3.2.0",
  "proc-macro2 1.0.86",
  "quote 1.0.37",
-<<<<<<< HEAD
  "syn 2.0.77",
-=======
- "syn 2.0.82",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
@@ -6777,11 +6366,7 @@ version = "11.0.0"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
-<<<<<<< HEAD
  "syn 2.0.77",
-=======
- "syn 2.0.82",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
@@ -6927,11 +6512,7 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "29f9df8a11882c4e3335eb2d18a0137c505d9ca927470b0cac9c6f0ae07d28f7"
 dependencies = [
-<<<<<<< HEAD
  "rustix 0.38.37",
-=======
- "rustix 0.38.25",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "windows-sys 0.48.0",
 ]
 
@@ -7027,11 +6608,7 @@ version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5"
 dependencies = [
-<<<<<<< HEAD
  "fastrand 2.1.1",
-=======
- "fastrand 2.1.0",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "futures-core",
  "futures-io",
  "parking",
@@ -7046,11 +6623,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
-<<<<<<< HEAD
  "syn 2.0.77",
-=======
- "syn 2.0.82",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
@@ -7337,13 +6910,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63"
 dependencies = [
  "ff",
-<<<<<<< HEAD
  "rand_core",
  "subtle 2.6.1",
-=======
- "rand_core 0.6.4",
- "subtle 2.5.0",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
@@ -7496,15 +7064,12 @@ name = "hermit-abi"
 version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
-<<<<<<< HEAD
 
 [[package]]
 name = "hermit-abi"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc"
-=======
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 
 [[package]]
 name = "hex"
@@ -7792,12 +7357,7 @@ dependencies = [
  "hyper 1.4.1",
  "hyper-util",
  "log",
-<<<<<<< HEAD
  "rustls 0.23.13",
-=======
- "rustls 0.23.14",
- "rustls-native-certs 0.8.0",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "rustls-pki-types",
  "tokio",
  "tokio-rustls 0.26.0",
@@ -7985,20 +7545,6 @@ dependencies = [
  "integer-sqrt",
  "num-traits",
  "uint 0.9.5",
-<<<<<<< HEAD
-=======
-]
-
-[[package]]
-name = "impl-num-traits"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "803d15461ab0dcc56706adf266158acbc44ccf719bf7d0af30705f58b90a4b8c"
-dependencies = [
- "integer-sqrt",
- "num-traits",
- "uint 0.10.0",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
@@ -8195,15 +7741,9 @@ version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b"
 dependencies = [
-<<<<<<< HEAD
  "hermit-abi 0.4.0",
  "libc",
  "windows-sys 0.52.0",
-=======
- "hermit-abi 0.3.9",
- "rustix 0.38.25",
- "windows-sys 0.48.0",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
@@ -8269,18 +7809,6 @@ dependencies = [
 [[package]]
 name = "itertools"
 version = "0.12.1"
-<<<<<<< HEAD
-=======
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
-dependencies = [
- "either",
-]
-
-[[package]]
-name = "itoa"
-version = "1.0.9"
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
 dependencies = [
@@ -8400,34 +7928,7 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee"
-<<<<<<< HEAD
 version = "0.24.4"
-=======
-version = "0.22.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfdb12a2381ea5b2e68c3469ec604a007b367778cdb14d09612c8069ebd616ad"
-dependencies = [
- "jsonrpsee-client-transport 0.22.5",
- "jsonrpsee-core 0.22.5",
- "jsonrpsee-http-client 0.22.5",
- "jsonrpsee-types 0.22.5",
-]
-
-[[package]]
-name = "jsonrpsee"
-version = "0.23.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62b089779ad7f80768693755a031cc14a7766aba707cbe886674e3f79e9b7e47"
-dependencies = [
- "jsonrpsee-core 0.23.2",
- "jsonrpsee-types 0.23.2",
- "jsonrpsee-ws-client 0.23.2",
-]
-
-[[package]]
-name = "jsonrpsee"
-version = "0.24.3"
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8fd1ead9fb95614e8dc5556d12a8681c2f6d352d0c1d3efc8708c7ccbba47bc6"
 dependencies = [
@@ -8445,47 +7946,16 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-client-transport"
-<<<<<<< HEAD
 version = "0.24.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "89841d4f03a14c055eb41d4f41901819573ef948e8ee0d5c86466fd286b2ce7f"
-=======
-version = "0.22.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4978087a58c3ab02efc5b07c5e5e2803024536106fd5506f558db172c889b3aa"
 dependencies = [
- "futures-util",
- "http 0.2.9",
- "jsonrpsee-core 0.22.5",
- "pin-project",
- "rustls-native-certs 0.7.0",
- "rustls-pki-types",
- "soketto 0.7.1",
- "thiserror",
- "tokio",
- "tokio-rustls 0.25.0",
- "tokio-util",
- "tracing",
- "url",
-]
-
-[[package]]
-name = "jsonrpsee-client-transport"
-version = "0.23.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08163edd8bcc466c33d79e10f695cdc98c00d1e6ddfb95cec41b6b0279dd5432"
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
-dependencies = [
- "base64 0.22.1",
+ "base64 0.22.1",
  "futures-util",
  "http 1.1.0",
  "jsonrpsee-core 0.23.2",
  "pin-project",
-<<<<<<< HEAD
  "rustls 0.23.13",
-=======
- "rustls 0.23.14",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "rustls-pki-types",
  "rustls-platform-verifier",
  "soketto 0.8.0",
@@ -8622,7 +8092,6 @@ checksum = "68ed8b301b19f4dad8ddc66ed956a70fc227def5c19b3898e0a29ce8f0edee06"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
-<<<<<<< HEAD
  "http-body 1.0.1",
  "hyper 1.4.1",
  "hyper-rustls 0.27.3",
@@ -8630,15 +8099,6 @@ dependencies = [
  "jsonrpsee-core",
  "jsonrpsee-types",
  "rustls 0.23.13",
-=======
- "http-body 1.0.0",
- "hyper 1.3.1",
- "hyper-rustls 0.27.3",
- "hyper-util",
- "jsonrpsee-core 0.24.3",
- "jsonrpsee-types 0.24.3",
- "rustls 0.23.14",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "rustls-platform-verifier",
  "serde",
  "serde_json",
@@ -8659,11 +8119,7 @@ dependencies = [
  "proc-macro-crate 3.2.0",
  "proc-macro2 1.0.86",
  "quote 1.0.37",
-<<<<<<< HEAD
  "syn 2.0.77",
-=======
- "syn 2.0.82",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
@@ -8695,37 +8151,7 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-types"
-<<<<<<< HEAD
 version = "0.24.4"
-=======
-version = "0.22.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "150d6168405890a7a3231a3c74843f58b8959471f6df76078db2619ddee1d07d"
-dependencies = [
- "anyhow",
- "beef",
- "serde",
- "serde_json",
- "thiserror",
-]
-
-[[package]]
-name = "jsonrpsee-types"
-version = "0.23.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9c465fbe385238e861fdc4d1c85e04ada6c1fd246161d26385c1b311724d2af"
-dependencies = [
- "beef",
- "http 1.1.0",
- "serde",
- "serde_json",
- "thiserror",
-]
-
-[[package]]
-name = "jsonrpsee-types"
-version = "0.24.3"
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "531e386460425e49679587871a056f2895a47dade21457324ad1262cd78ef6d9"
 dependencies = [
@@ -8846,11 +8272,7 @@ dependencies = [
  "pallet-example-tasks",
  "parity-scale-codec",
  "polkadot-sdk",
-<<<<<<< HEAD
  "primitive-types 0.12.2",
-=======
- "primitive-types 0.13.1",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "scale-info",
  "serde_json",
  "sp-debug-derive 14.0.0",
@@ -9214,13 +8636,8 @@ dependencies = [
  "libp2p-identity",
  "libp2p-swarm",
  "log",
-<<<<<<< HEAD
  "lru 0.12.4",
  "quick-protobuf",
-=======
- "lru 0.12.3",
- "quick-protobuf 0.8.1",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "quick-protobuf-codec",
  "smallvec",
  "thiserror",
@@ -9430,11 +8847,7 @@ dependencies = [
  "proc-macro-warning 0.4.2",
  "proc-macro2 1.0.86",
  "quote 1.0.37",
-<<<<<<< HEAD
  "syn 2.0.77",
-=======
- "syn 2.0.82",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
@@ -9670,15 +9083,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
 
 [[package]]
 name = "linux-raw-sys"
-<<<<<<< HEAD
 version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
-=======
-version = "0.4.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829"
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 
 [[package]]
 name = "lioness"
@@ -9790,7 +9197,6 @@ dependencies = [
 
 [[package]]
 name = "lru"
-<<<<<<< HEAD
 version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6e8aaa3f231bb4bd57b84b2d5dc3ae7f350265df8aa96492e0bc394a1571909"
@@ -9801,9 +9207,6 @@ dependencies = [
 [[package]]
 name = "lru"
 version = "0.11.1"
-=======
-version = "0.11.0"
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a4a83fb7698b3643a0e34f9ae6f2e8f0178c0fd42f8b59d493aa271ff3a5bf21"
 
@@ -9862,11 +9265,7 @@ dependencies = [
  "macro_magic_core",
  "macro_magic_macros",
  "quote 1.0.37",
-<<<<<<< HEAD
  "syn 2.0.77",
-=======
- "syn 2.0.82",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
@@ -9880,11 +9279,7 @@ dependencies = [
  "macro_magic_core_macros",
  "proc-macro2 1.0.86",
  "quote 1.0.37",
-<<<<<<< HEAD
  "syn 2.0.77",
-=======
- "syn 2.0.82",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
@@ -9895,11 +9290,7 @@ checksum = "b02abfe41815b5bd98dbd4260173db2c116dda171dc0fe7838cb206333b83308"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
-<<<<<<< HEAD
  "syn 2.0.77",
-=======
- "syn 2.0.82",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
@@ -9910,11 +9301,7 @@ checksum = "73ea28ee64b88876bf45277ed9a5817c1817df061a74f2b988971a12570e5869"
 dependencies = [
  "macro_magic_core",
  "quote 1.0.37",
-<<<<<<< HEAD
  "syn 2.0.77",
-=======
- "syn 2.0.82",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
@@ -10088,11 +9475,7 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 name = "minimal-template-node"
 version = "0.0.0"
 dependencies = [
-<<<<<<< HEAD
  "clap 4.5.17",
-=======
- "clap 4.5.13",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "docify",
  "futures",
  "futures-timer",
@@ -10123,7 +9506,6 @@ dependencies = [
 ]
 
 [[package]]
-<<<<<<< HEAD
 name = "miniz_oxide"
 version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -10138,13 +9520,6 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
 dependencies = [
-=======
-name = "mio"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
-dependencies = [
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "hermit-abi 0.3.9",
  "libc",
  "wasi",
@@ -10264,11 +9639,7 @@ dependencies = [
  "cfg-if",
  "proc-macro2 1.0.86",
  "quote 1.0.37",
-<<<<<<< HEAD
  "syn 2.0.77",
-=======
- "syn 2.0.82",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
@@ -10630,11 +10001,7 @@ name = "node-bench"
 version = "0.9.0-dev"
 dependencies = [
  "array-bytes",
-<<<<<<< HEAD
  "clap 4.5.17",
-=======
- "clap 4.5.13",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "derive_more",
  "fs_extra",
  "futures",
@@ -10710,11 +10077,7 @@ dependencies = [
 name = "node-runtime-generate-bags"
 version = "3.0.0"
 dependencies = [
-<<<<<<< HEAD
  "clap 4.5.17",
-=======
- "clap 4.5.13",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "generate-bags",
  "kitchensink-runtime",
 ]
@@ -10723,11 +10086,7 @@ dependencies = [
 name = "node-template-release"
 version = "3.0.0"
 dependencies = [
-<<<<<<< HEAD
  "clap 4.5.17",
-=======
- "clap 4.5.13",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "flate2",
  "fs_extra",
  "glob",
@@ -10883,11 +10242,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
-<<<<<<< HEAD
  "syn 2.0.77",
-=======
- "syn 2.0.82",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
@@ -11179,11 +10534,7 @@ dependencies = [
  "pallet-assets",
  "pallet-balances",
  "parity-scale-codec",
-<<<<<<< HEAD
  "primitive-types 0.12.2",
-=======
- "primitive-types 0.13.1",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "scale-info",
  "sp-api 26.0.0",
  "sp-arithmetic 23.0.0",
@@ -11204,11 +10555,7 @@ dependencies = [
  "pallet-assets",
  "pallet-balances",
  "parity-scale-codec",
-<<<<<<< HEAD
  "primitive-types 0.12.2",
-=======
- "primitive-types 0.13.1",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "scale-info",
  "sp-arithmetic 23.0.0",
  "sp-core 28.0.0",
@@ -11841,11 +11188,7 @@ version = "18.0.0"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
-<<<<<<< HEAD
  "syn 2.0.77",
-=======
- "syn 2.0.82",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
@@ -13033,11 +12376,7 @@ version = "0.1.0"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
-<<<<<<< HEAD
  "syn 2.0.77",
-=======
- "syn 2.0.82",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
@@ -13281,13 +12620,8 @@ dependencies = [
  "proc-macro-crate 3.2.0",
  "proc-macro2 1.0.86",
  "quote 1.0.37",
-<<<<<<< HEAD
  "sp-runtime",
  "syn 2.0.77",
-=======
- "sp-runtime 31.0.1",
- "syn 2.0.82",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
@@ -13700,11 +13034,7 @@ dependencies = [
 name = "parachain-template-node"
 version = "0.0.0"
 dependencies = [
-<<<<<<< HEAD
  "clap 4.5.17",
-=======
- "clap 4.5.13",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "color-print",
  "docify",
  "futures",
@@ -13786,7 +13116,6 @@ dependencies = [
  "docify",
  "hex-literal",
  "log",
-<<<<<<< HEAD
  "pallet-aura",
  "pallet-authorship",
  "pallet-balances",
@@ -13802,9 +13131,6 @@ dependencies = [
  "pallet-transaction-payment-rpc-runtime-api",
  "pallet-xcm",
  "parachains-common",
-=======
- "pallet-parachain-template",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "parity-scale-codec",
  "polkadot-sdk",
  "scale-info",
@@ -14018,7 +13344,6 @@ dependencies = [
 ]
 
 [[package]]
-<<<<<<< HEAD
 name = "parity-util-mem"
 version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -14048,8 +13373,6 @@ dependencies = [
 ]
 
 [[package]]
-=======
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 name = "parity-wasm"
 version = "0.45.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -14122,13 +13445,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166"
 dependencies = [
  "base64ct",
-<<<<<<< HEAD
  "rand_core",
  "subtle 2.6.1",
-=======
- "rand_core 0.6.4",
- "subtle 2.5.0",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
@@ -14485,11 +13803,7 @@ dependencies = [
  "pest_meta",
  "proc-macro2 1.0.86",
  "quote 1.0.37",
-<<<<<<< HEAD
  "syn 2.0.77",
-=======
- "syn 2.0.82",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
@@ -14530,11 +13844,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
-<<<<<<< HEAD
  "syn 2.0.77",
-=======
- "syn 2.0.82",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
@@ -14766,11 +14076,7 @@ name = "polkadot-cli"
 version = "7.0.0"
 dependencies = [
  "cfg-if",
-<<<<<<< HEAD
  "clap 4.5.17",
-=======
- "clap 4.5.13",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "frame-benchmarking-cli",
  "futures",
  "log",
@@ -14846,12 +14152,8 @@ dependencies = [
  "fatality",
  "futures",
  "futures-timer",
-<<<<<<< HEAD
  "indexmap 2.5.0",
  "lazy_static",
-=======
- "indexmap 2.2.3",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "parity-scale-codec",
  "polkadot-erasure-coding",
  "polkadot-node-network-protocol",
@@ -15485,11 +14787,7 @@ dependencies = [
  "sc-authority-discovery",
  "sc-network",
  "sc-network-types",
-<<<<<<< HEAD
  "sp-runtime",
-=======
- "sp-runtime 31.0.1",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "strum 0.26.3",
  "thiserror",
  "tracing-gum",
@@ -15762,7 +15060,6 @@ dependencies = [
  "sp-keyring",
  "staging-xcm",
  "substrate-build-script-utils",
-<<<<<<< HEAD
  "testnet-parachains-constants",
 ]
 
@@ -15836,8 +15133,6 @@ dependencies = [
  "substrate-state-trie-migration-rpc",
  "tokio",
  "wait-timeout",
-=======
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
@@ -16768,11 +16063,7 @@ dependencies = [
  "async-trait",
  "bincode",
  "bitvec",
-<<<<<<< HEAD
  "clap 4.5.17",
-=======
- "clap 4.5.13",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "clap-num",
  "color-eyre",
  "colored",
@@ -16874,11 +16165,7 @@ version = "1.0.0"
 dependencies = [
  "assert_matches",
  "async-trait",
-<<<<<<< HEAD
  "clap 4.5.17",
-=======
- "clap 4.5.13",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "color-eyre",
  "futures",
  "futures-timer",
@@ -17020,11 +16307,7 @@ dependencies = [
 name = "polkadot-voter-bags"
 version = "7.0.0"
 dependencies = [
-<<<<<<< HEAD
  "clap 4.5.17",
-=======
- "clap 4.5.13",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "generate-bags",
  "sp-io 30.0.0",
  "westend-runtime",
@@ -17166,11 +16449,7 @@ dependencies = [
  "polkavm-common 0.9.0",
  "proc-macro2 1.0.86",
  "quote 1.0.37",
-<<<<<<< HEAD
  "syn 2.0.77",
-=======
- "syn 2.0.82",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
@@ -17182,21 +16461,7 @@ dependencies = [
  "polkavm-common 0.13.0",
  "proc-macro2 1.0.86",
  "quote 1.0.37",
-<<<<<<< HEAD
  "syn 2.0.77",
-=======
- "syn 2.0.82",
-]
-
-[[package]]
-name = "polkavm-derive-impl-macro"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15e85319a0d5129dc9f021c62607e0804f5fb777a05cdda44d750ac0732def66"
-dependencies = [
- "polkavm-derive-impl 0.8.0",
- "syn 2.0.82",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
@@ -17206,11 +16471,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8ba81f7b5faac81e528eb6158a6f3c9e0bb1008e0ffa19653bc8dea925ecb429"
 dependencies = [
  "polkavm-derive-impl 0.9.0",
-<<<<<<< HEAD
  "syn 2.0.77",
-=======
- "syn 2.0.82",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
@@ -17219,13 +16480,8 @@ version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e6f3ad876ca1855038c21d48cbe35164552208a54b21f8295a7d76bc33ef1e38"
 dependencies = [
-<<<<<<< HEAD
  "polkavm-derive-impl 0.10.0",
  "syn 2.0.77",
-=======
- "polkavm-derive-impl 0.13.0",
- "syn 2.0.82",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
@@ -17234,11 +16490,7 @@ version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c7be503e60cf56c0eb785f90aaba4b583b36bff00e93997d93fef97f9553c39"
 dependencies = [
-<<<<<<< HEAD
  "gimli 0.28.1",
-=======
- "gimli 0.28.0",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "hashbrown 0.14.5",
  "log",
  "object 0.32.2",
@@ -17253,19 +16505,11 @@ version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4aa6e5a396abf195289d6d63d70182e59a7c27b9b06d0b7361317df05c07c8a8"
 dependencies = [
-<<<<<<< HEAD
  "gimli 0.28.1",
  "hashbrown 0.14.5",
  "log",
  "object 0.36.4",
  "polkavm-common 0.10.0",
-=======
- "gimli 0.28.0",
- "hashbrown 0.14.5",
- "log",
- "object 0.36.1",
- "polkavm-common 0.13.0",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "regalloc2 0.9.3",
  "rustc-demangle",
 ]
@@ -17308,11 +16552,7 @@ dependencies = [
  "concurrent-queue",
  "hermit-abi 0.4.0",
  "pin-project-lite",
-<<<<<<< HEAD
  "rustix 0.38.37",
-=======
- "rustix 0.38.25",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "tracing",
  "windows-sys 0.59.0",
 ]
@@ -17461,11 +16701,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba"
 dependencies = [
  "proc-macro2 1.0.86",
-<<<<<<< HEAD
  "syn 2.0.77",
-=======
- "syn 2.0.82",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
@@ -17476,14 +16712,9 @@ checksum = "0b34d9fd68ae0b74a41b21c03c2f62847aa0ffea044eee893b4c140b37e244e2"
 dependencies = [
  "fixed-hash",
  "impl-codec 0.6.0",
-<<<<<<< HEAD
  "impl-num-traits",
  "impl-rlp",
  "impl-serde",
-=======
- "impl-num-traits 0.1.2",
- "impl-serde 0.4.0",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "scale-info",
  "uint 0.9.5",
 ]
@@ -17496,13 +16727,6 @@ checksum = "d15600a7d856470b7d278b3fe0e311fe28c2526348549f8ef2ff7db3299c87f5"
 dependencies = [
  "fixed-hash",
  "impl-codec 0.7.0",
-<<<<<<< HEAD
-=======
- "impl-num-traits 0.2.0",
- "impl-rlp",
- "impl-serde 0.5.0",
- "scale-info",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "uint 0.10.0",
 ]
 
@@ -17573,11 +16797,7 @@ checksum = "3d1eaa7fa0aa1929ffdf7eeb6eac234dde6268914a14ad44d23521ab6a9b258e"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
-<<<<<<< HEAD
  "syn 2.0.77",
-=======
- "syn 2.0.82",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
@@ -17588,11 +16808,7 @@ checksum = "834da187cfe638ae8abb0203f0b33e5ccdb02a28e7199f2f47b3e2754f50edca"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
-<<<<<<< HEAD
  "syn 2.0.77",
-=======
- "syn 2.0.82",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
@@ -17625,11 +16841,7 @@ dependencies = [
  "hex",
  "lazy_static",
  "procfs-core",
-<<<<<<< HEAD
  "rustix 0.38.37",
-=======
- "rustix 0.38.25",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
@@ -17677,11 +16889,7 @@ checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
-<<<<<<< HEAD
  "syn 2.0.77",
-=======
- "syn 2.0.82",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
@@ -17748,7 +16956,6 @@ dependencies = [
 
 [[package]]
 name = "prost-build"
-<<<<<<< HEAD
 version = "0.12.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4"
@@ -17770,20 +16977,13 @@ dependencies = [
 
 [[package]]
 name = "prost-build"
-=======
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8650aabb6c35b860610e9cff5dc1af886c9e25073b7b1712a68972af4281302"
 dependencies = [
  "bytes",
-<<<<<<< HEAD
  "heck 0.5.0",
  "itertools 0.13.0",
-=======
- "heck 0.4.1",
- "itertools 0.10.5",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "log",
  "multimap",
  "once_cell",
@@ -17792,11 +16992,7 @@ dependencies = [
  "prost 0.13.2",
  "prost-types",
  "regex",
-<<<<<<< HEAD
  "syn 2.0.77",
-=======
- "syn 2.0.82",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "tempfile",
 ]
 
@@ -17820,17 +17016,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1"
 dependencies = [
  "anyhow",
-<<<<<<< HEAD
  "itertools 0.12.1",
  "proc-macro2 1.0.86",
  "quote 1.0.37",
  "syn 2.0.77",
-=======
- "itertools 0.10.5",
- "proc-macro2 1.0.86",
- "quote 1.0.37",
- "syn 2.0.82",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
@@ -17840,7 +17029,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "acf0c195eebb4af52c752bec4f52f645da98b6e92077a04110c7f349477ae5ac"
 dependencies = [
  "anyhow",
-<<<<<<< HEAD
  "itertools 0.13.0",
  "proc-macro2 1.0.86",
  "quote 1.0.37",
@@ -17854,12 +17042,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0"
 dependencies = [
  "prost 0.12.6",
-=======
- "itertools 0.10.5",
- "proc-macro2 1.0.86",
- "quote 1.0.37",
- "syn 2.0.82",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
@@ -18309,11 +17491,7 @@ checksum = "bcc303e793d3734489387d205e9b186fac9c6cfacedd98cbb2e8a5943595f3e6"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
-<<<<<<< HEAD
  "syn 2.0.77",
-=======
- "syn 2.0.82",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
@@ -18350,11 +17528,7 @@ dependencies = [
  "aho-corasick",
  "memchr",
  "regex-automata 0.4.7",
-<<<<<<< HEAD
  "regex-syntax 0.8.4",
-=======
- "regex-syntax 0.8.2",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
@@ -18370,15 +17544,6 @@ dependencies = [
 name = "regex-automata"
 version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-<<<<<<< HEAD
-=======
-checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69"
-
-[[package]]
-name = "regex-automata"
-version = "0.4.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
 dependencies = [
  "aho-corasick",
@@ -18474,11 +17639,7 @@ dependencies = [
 name = "remote-ext-tests-bags-list"
 version = "1.0.0"
 dependencies = [
-<<<<<<< HEAD
  "clap 4.5.17",
-=======
- "clap 4.5.13",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "frame-system",
  "log",
  "pallet-bags-list-remote-tests",
@@ -18529,56 +17690,8 @@ dependencies = [
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
-<<<<<<< HEAD
  "webpki-roots 0.25.4",
  "winreg",
-=======
- "webpki-roots 0.25.2",
- "winreg 0.50.0",
-]
-
-[[package]]
-name = "reqwest"
-version = "0.12.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37"
-dependencies = [
- "base64 0.22.1",
- "bytes",
- "futures-channel",
- "futures-core",
- "futures-util",
- "http 1.1.0",
- "http-body 1.0.0",
- "http-body-util",
- "hyper 1.3.1",
- "hyper-rustls 0.27.3",
- "hyper-util",
- "ipnet",
- "js-sys",
- "log",
- "mime",
- "once_cell",
- "percent-encoding",
- "pin-project-lite",
- "quinn 0.11.5",
- "rustls 0.23.14",
- "rustls-pemfile 2.0.0",
- "rustls-pki-types",
- "serde",
- "serde_json",
- "serde_urlencoded",
- "sync_wrapper",
- "tokio",
- "tokio-rustls 0.26.0",
- "tower-service",
- "url",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
- "webpki-roots 0.26.3",
- "winreg 0.52.0",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
@@ -18950,13 +18063,8 @@ dependencies = [
  "quote 1.0.37",
  "regex",
  "relative-path",
-<<<<<<< HEAD
  "rustc_version 0.4.1",
  "syn 2.0.77",
-=======
- "rustc_version 0.4.0",
- "syn 2.0.82",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "unicode-ident",
 ]
 
@@ -19105,26 +18213,15 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-<<<<<<< HEAD
 version = "0.38.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811"
-=======
-version = "0.38.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc99bc2d4f1fed22595588a013687477aedf3cdcfb26558c559edb67b4d9b22e"
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 dependencies = [
  "bitflags 2.6.0",
  "errno",
  "libc",
-<<<<<<< HEAD
  "linux-raw-sys 0.4.14",
  "windows-sys 0.52.0",
-=======
- "linux-raw-sys 0.4.11",
- "windows-sys 0.48.0",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
@@ -19152,40 +18249,16 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-<<<<<<< HEAD
 version = "0.23.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8"
-=======
-version = "0.22.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432"
-dependencies = [
- "log",
- "ring 0.17.7",
- "rustls-pki-types",
- "rustls-webpki 0.102.8",
- "subtle 2.5.0",
- "zeroize",
-]
-
-[[package]]
-name = "rustls"
-version = "0.23.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "415d9944693cb90382053259f89fbb077ea730ad7273047ec63b19bc9b160ba8"
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 dependencies = [
  "log",
  "once_cell",
  "ring 0.17.8",
  "rustls-pki-types",
  "rustls-webpki 0.102.8",
-<<<<<<< HEAD
  "subtle 2.6.1",
-=======
- "subtle 2.5.0",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "zeroize",
 ]
 
@@ -19242,25 +18315,15 @@ version = "2.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425"
 dependencies = [
-<<<<<<< HEAD
  "base64 0.22.1",
-=======
- "base64 0.21.7",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "rustls-pki-types",
 ]
 
 [[package]]
 name = "rustls-pki-types"
-<<<<<<< HEAD
 version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0"
-=======
-version = "1.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e696e35370c65c9c541198af4543ccd580cf17fc25d8e05c5a242b202488c55"
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 
 [[package]]
 name = "rustls-platform-verifier"
@@ -19273,13 +18336,8 @@ dependencies = [
  "jni",
  "log",
  "once_cell",
-<<<<<<< HEAD
  "rustls 0.23.13",
  "rustls-native-certs 0.7.3",
-=======
- "rustls 0.23.14",
- "rustls-native-certs 0.7.0",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "rustls-platform-verifier-android",
  "rustls-webpki 0.102.8",
  "security-framework",
@@ -19435,11 +18493,7 @@ dependencies = [
  "multihash 0.19.1",
  "parity-scale-codec",
  "prost 0.12.6",
-<<<<<<< HEAD
  "prost-build 0.12.6",
-=======
- "prost-build",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "quickcheck",
  "rand",
  "sc-client-api",
@@ -19503,11 +18557,7 @@ name = "sc-chain-spec"
 version = "28.0.0"
 dependencies = [
  "array-bytes",
-<<<<<<< HEAD
  "clap 4.5.17",
-=======
- "clap 4.5.13",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "docify",
  "log",
  "memmap2 0.9.5",
@@ -19541,11 +18591,7 @@ dependencies = [
  "proc-macro-crate 3.2.0",
  "proc-macro2 1.0.86",
  "quote 1.0.37",
-<<<<<<< HEAD
  "syn 2.0.77",
-=======
- "syn 2.0.82",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
@@ -19554,11 +18600,7 @@ version = "0.36.0"
 dependencies = [
  "array-bytes",
  "chrono",
-<<<<<<< HEAD
  "clap 4.5.17",
-=======
- "clap 4.5.13",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "fdlimit",
  "futures",
  "futures-timer",
@@ -20150,15 +19192,9 @@ dependencies = [
  "parity-scale-codec",
  "parking_lot 0.12.3",
  "paste",
-<<<<<<< HEAD
  "rustix 0.36.17",
  "sc-allocator",
  "sc-executor-common",
-=======
- "rustix 0.36.15",
- "sc-allocator 23.0.0",
- "sc-executor-common 0.29.0",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "sc-runtime-test",
  "sp-io 30.0.0",
  "sp-runtime-interface 24.0.0",
@@ -20273,11 +19309,7 @@ dependencies = [
  "partial_sort",
  "pin-project",
  "prost 0.12.6",
-<<<<<<< HEAD
  "prost-build 0.12.6",
-=======
- "prost-build",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "rand",
  "sc-block-builder",
  "sc-client-api",
@@ -20322,11 +19354,7 @@ dependencies = [
  "futures",
  "libp2p-identity",
  "parity-scale-codec",
-<<<<<<< HEAD
  "prost-build 0.12.6",
-=======
- "prost-build",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "sc-consensus",
  "sc-network-types",
  "sp-consensus",
@@ -20368,11 +19396,7 @@ dependencies = [
  "log",
  "parity-scale-codec",
  "prost 0.12.6",
-<<<<<<< HEAD
  "prost-build 0.12.6",
-=======
- "prost-build",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "sc-client-api",
  "sc-network",
  "sc-network-types",
@@ -20415,11 +19439,7 @@ dependencies = [
  "mockall 0.11.4",
  "parity-scale-codec",
  "prost 0.12.6",
-<<<<<<< HEAD
  "prost-build 0.12.6",
-=======
- "prost-build",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "quickcheck",
  "sc-block-builder",
  "sc-client-api",
@@ -20521,16 +19541,9 @@ dependencies = [
  "fnv",
  "futures",
  "futures-timer",
-<<<<<<< HEAD
  "hyper 0.14.30",
  "hyper-rustls 0.24.2",
  "lazy_static",
-=======
- "http-body-util",
- "hyper 1.3.1",
- "hyper-rustls 0.27.3",
- "hyper-util",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "log",
  "num_cpus",
  "once_cell",
@@ -20840,11 +19853,7 @@ dependencies = [
 name = "sc-storage-monitor"
 version = "0.16.0"
 dependencies = [
-<<<<<<< HEAD
  "clap 4.5.17",
-=======
- "clap 4.5.13",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "fs4",
  "log",
  "sp-core 28.0.0",
@@ -20946,11 +19955,7 @@ dependencies = [
  "proc-macro-crate 3.2.0",
  "proc-macro2 1.0.86",
  "quote 1.0.37",
-<<<<<<< HEAD
  "syn 2.0.77",
-=======
- "syn 2.0.82",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
@@ -21226,13 +20231,8 @@ checksum = "8de18f6d8ba0aad7045f5feae07ec29899c1112584a38509a84ad7b04451eaa0"
 dependencies = [
  "aead",
  "arrayref",
-<<<<<<< HEAD
  "arrayvec 0.7.6",
  "curve25519-dalek",
-=======
- "arrayvec 0.7.4",
- "curve25519-dalek 4.1.3",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "getrandom_or_panic",
  "merlin",
  "rand_core 0.6.4",
@@ -21460,11 +20460,7 @@ checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
-<<<<<<< HEAD
  "syn 2.0.77",
-=======
- "syn 2.0.82",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
@@ -21566,11 +20562,7 @@ checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
-<<<<<<< HEAD
  "syn 2.0.77",
-=======
- "syn 2.0.82",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
@@ -21791,35 +20783,6 @@ dependencies = [
 ]
 
 [[package]]
-<<<<<<< HEAD
-=======
-name = "smol"
-version = "2.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a33bd3e260892199c3ccfc487c88b2da2265080acb316cd920da72fdfd7c599f"
-dependencies = [
- "async-channel 2.3.0",
- "async-executor",
- "async-fs 2.1.2",
- "async-io 2.3.3",
- "async-lock 3.4.0",
- "async-net 2.0.0",
- "async-process 2.3.0",
- "blocking",
- "futures-lite 2.3.0",
-]
-
-[[package]]
-name = "smol_str"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74212e6bbe9a4352329b2f68ba3130c15a3f26fe88ff22dbdc6cdd58fa85e99c"
-dependencies = [
- "serde",
-]
-
-[[package]]
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 name = "smoldot"
 version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -22015,17 +20978,10 @@ dependencies = [
  "aes-gcm",
  "blake2 0.10.6",
  "chacha20poly1305",
-<<<<<<< HEAD
  "curve25519-dalek",
  "rand_core",
  "ring 0.17.8",
  "rustc_version 0.4.1",
-=======
- "curve25519-dalek 4.1.3",
- "rand_core 0.6.4",
- "ring 0.17.7",
- "rustc_version 0.4.0",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "sha2 0.10.8",
  "subtle 2.6.1",
 ]
@@ -22406,11 +21362,7 @@ dependencies = [
 name = "solochain-template-node"
 version = "0.0.0"
 dependencies = [
-<<<<<<< HEAD
  "clap 4.5.17",
-=======
- "clap 4.5.13",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "frame-benchmarking-cli",
  "frame-metadata-hash-extension",
  "frame-system",
@@ -22545,26 +21497,7 @@ dependencies = [
  "proc-macro-crate 3.2.0",
  "proc-macro2 1.0.86",
  "quote 1.0.37",
-<<<<<<< HEAD
  "syn 2.0.77",
-=======
- "syn 2.0.82",
-]
-
-[[package]]
-name = "sp-api-proc-macro"
-version = "19.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "213a4bec1b18bd0750e7b81d11d8276c24f68b53cde83950b00b178ecc9ab24a"
-dependencies = [
- "Inflector",
- "blake2 0.10.6",
- "expander",
- "proc-macro-crate 3.1.0",
- "proc-macro2 1.0.86",
- "quote 1.0.37",
- "syn 2.0.82",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
@@ -22663,11 +21596,7 @@ dependencies = [
  "integer-sqrt",
  "num-traits",
  "parity-scale-codec",
-<<<<<<< HEAD
  "primitive-types 0.12.2",
-=======
- "primitive-types 0.13.1",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "rand",
  "scale-info",
  "serde",
@@ -22835,13 +21764,8 @@ dependencies = [
  "sp-io 30.0.0",
  "sp-keystore 0.34.0",
  "sp-mmr-primitives",
-<<<<<<< HEAD
  "sp-runtime",
  "sp-weights",
-=======
- "sp-runtime 31.0.1",
- "sp-weights 27.0.0",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "strum 0.26.3",
  "w3f-bls",
 ]
@@ -22922,11 +21846,7 @@ dependencies = [
  "parity-scale-codec",
  "parking_lot 0.12.3",
  "paste",
-<<<<<<< HEAD
  "primitive-types 0.12.2",
-=======
- "primitive-types 0.13.1",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "rand",
  "regex",
  "scale-info",
@@ -23115,31 +22035,7 @@ dependencies = [
 
 [[package]]
 name = "sp-crypto-ec-utils"
-<<<<<<< HEAD
-=======
-version = "0.4.1"
-source = "git+https://github.com/paritytech/polkadot-sdk#838a534da874cf6071fba1df07643c6c5b033ae0"
-dependencies = [
- "ark-bls12-377",
- "ark-bls12-377-ext",
- "ark-bls12-381",
- "ark-bls12-381-ext",
- "ark-bw6-761",
- "ark-bw6-761-ext",
- "ark-ec",
- "ark-ed-on-bls12-377",
- "ark-ed-on-bls12-377-ext",
- "ark-ed-on-bls12-381-bandersnatch",
- "ark-ed-on-bls12-381-bandersnatch-ext",
- "ark-scale 0.0.11",
- "sp-runtime-interface 17.0.0",
- "sp-std 8.0.0",
-]
-
-[[package]]
-name = "sp-crypto-ec-utils"
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
-version = "0.10.0"
+version = "0.10.0"
 dependencies = [
  "ark-bls12-377",
  "ark-bls12-377-ext",
@@ -23209,24 +22105,8 @@ name = "sp-crypto-hashing-proc-macro"
 version = "0.1.0"
 dependencies = [
  "quote 1.0.37",
-<<<<<<< HEAD
  "sp-crypto-hashing",
  "syn 2.0.77",
-=======
- "sp-crypto-hashing 0.1.0",
- "syn 2.0.82",
-]
-
-[[package]]
-name = "sp-crypto-hashing-proc-macro"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b85d0f1f1e44bd8617eb2a48203ee854981229e3e79e6f468c7175d5fd37489b"
-dependencies = [
- "quote 1.0.37",
- "sp-crypto-hashing 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 2.0.82",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
@@ -23243,11 +22123,7 @@ version = "14.0.0"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
-<<<<<<< HEAD
  "syn 2.0.77",
-=======
- "syn 2.0.82",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
@@ -23257,33 +22133,7 @@ source = "git+https://github.com/paritytech/polkadot-sdk#51f336711a0391987db69d6
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
-<<<<<<< HEAD
  "syn 2.0.77",
-=======
- "syn 2.0.82",
-]
-
-[[package]]
-name = "sp-debug-derive"
-version = "14.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48d09fa0a5f7299fb81ee25ae3853d26200f7a348148aed6de76be905c007dbe"
-dependencies = [
- "proc-macro2 1.0.86",
- "quote 1.0.37",
- "syn 2.0.82",
-]
-
-[[package]]
-name = "sp-externalities"
-version = "0.19.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#82912acb33a9030c0ef3bf590a34fca09b72dc5f"
-dependencies = [
- "environmental",
- "parity-scale-codec",
- "sp-std 8.0.0",
- "sp-storage 13.0.0",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
@@ -23297,34 +22147,12 @@ dependencies = [
 
 [[package]]
 name = "sp-externalities"
-<<<<<<< HEAD
 version = "0.25.0"
 source = "git+https://github.com/paritytech/polkadot-sdk#51f336711a0391987db69d6281c9b57bfe49d925"
 dependencies = [
  "environmental",
  "parity-scale-codec",
  "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk)",
-=======
-version = "0.27.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1d6a4572eadd4a63cff92509a210bf425501a0c5e76574b30a366ac77653787"
-dependencies = [
- "environmental",
- "parity-scale-codec",
- "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-storage 20.0.0",
-]
-
-[[package]]
-name = "sp-externalities"
-version = "0.28.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33abaec4be69b1613796bbf430decbbcaaf978756379e2016e683a4d6379cd02"
-dependencies = [
- "environmental",
- "parity-scale-codec",
- "sp-storage 21.0.0",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
@@ -23461,13 +22289,8 @@ dependencies = [
 name = "sp-keyring"
 version = "31.0.0"
 dependencies = [
-<<<<<<< HEAD
  "sp-core",
  "sp-runtime",
-=======
- "sp-core 28.0.0",
- "sp-runtime 31.0.1",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "strum 0.26.3",
 ]
 
@@ -23602,11 +22425,7 @@ dependencies = [
 name = "sp-npos-elections-fuzzer"
 version = "2.0.0-alpha.5"
 dependencies = [
-<<<<<<< HEAD
  "clap 4.5.17",
-=======
- "clap 4.5.13",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "honggfuzz",
  "rand",
  "sp-npos-elections",
@@ -23763,38 +22582,13 @@ dependencies = [
 
 [[package]]
 name = "sp-runtime-interface"
-<<<<<<< HEAD
-=======
-version = "17.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#82912acb33a9030c0ef3bf590a34fca09b72dc5f"
-dependencies = [
- "bytes",
- "impl-trait-for-tuples",
- "parity-scale-codec",
- "primitive-types 0.12.2",
- "sp-externalities 0.19.0",
- "sp-runtime-interface-proc-macro 11.0.0",
- "sp-std 8.0.0",
- "sp-storage 13.0.0",
- "sp-tracing 10.0.0",
- "sp-wasm-interface 14.0.0",
- "static_assertions",
-]
-
-[[package]]
-name = "sp-runtime-interface"
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 version = "24.0.0"
 dependencies = [
  "bytes",
  "impl-trait-for-tuples",
  "parity-scale-codec",
  "polkavm-derive 0.9.1",
-<<<<<<< HEAD
  "primitive-types 0.12.2",
-=======
- "primitive-types 0.13.1",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "rustversion",
  "sp-core 28.0.0",
  "sp-externalities 0.25.0",
@@ -23812,7 +22606,6 @@ dependencies = [
 
 [[package]]
 name = "sp-runtime-interface"
-<<<<<<< HEAD
 version = "24.0.0"
 source = "git+https://github.com/paritytech/polkadot-sdk#51f336711a0391987db69d6281c9b57bfe49d925"
 dependencies = [
@@ -23828,56 +22621,6 @@ dependencies = [
  "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk)",
  "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk)",
  "static_assertions",
-=======
-version = "26.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e48a675ea4858333d4d755899ed5ed780174aa34fec15953428d516af5452295"
-dependencies = [
- "bytes",
- "impl-trait-for-tuples",
- "parity-scale-codec",
- "polkavm-derive 0.8.0",
- "primitive-types 0.12.2",
- "sp-externalities 0.27.0",
- "sp-runtime-interface-proc-macro 18.0.0",
- "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-storage 20.0.0",
- "sp-tracing 16.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-wasm-interface 20.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "static_assertions",
-]
-
-[[package]]
-name = "sp-runtime-interface"
-version = "27.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "647db5e1dc481686628b41554e832df6ab400c4b43a6a54e54d3b0a71ca404aa"
-dependencies = [
- "bytes",
- "impl-trait-for-tuples",
- "parity-scale-codec",
- "polkavm-derive 0.9.1",
- "primitive-types 0.12.2",
- "sp-externalities 0.28.0",
- "sp-runtime-interface-proc-macro 18.0.0",
- "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-storage 21.0.0",
- "sp-tracing 17.0.0",
- "sp-wasm-interface 21.0.0",
- "static_assertions",
-]
-
-[[package]]
-name = "sp-runtime-interface-proc-macro"
-version = "11.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#838a534da874cf6071fba1df07643c6c5b033ae0"
-dependencies = [
- "Inflector",
- "proc-macro-crate 1.3.1",
- "proc-macro2 1.0.86",
- "quote 1.0.37",
- "syn 2.0.82",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
@@ -23889,16 +22632,11 @@ dependencies = [
  "proc-macro-crate 3.2.0",
  "proc-macro2 1.0.86",
  "quote 1.0.37",
-<<<<<<< HEAD
  "syn 2.0.77",
-=======
- "syn 2.0.82",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
 name = "sp-runtime-interface-proc-macro"
-<<<<<<< HEAD
 version = "17.0.0"
 source = "git+https://github.com/paritytech/polkadot-sdk#51f336711a0391987db69d6281c9b57bfe49d925"
 dependencies = [
@@ -23908,18 +22646,6 @@ dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
  "syn 2.0.77",
-=======
-version = "18.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0195f32c628fee3ce1dfbbf2e7e52a30ea85f3589da9fe62a8b816d70fc06294"
-dependencies = [
- "Inflector",
- "expander",
- "proc-macro-crate 3.1.0",
- "proc-macro2 1.0.86",
- "quote 1.0.37",
- "syn 2.0.82",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
@@ -24102,29 +22828,7 @@ version = "14.0.0"
 [[package]]
 name = "sp-std"
 version = "14.0.0"
-<<<<<<< HEAD
 source = "git+https://github.com/paritytech/polkadot-sdk#51f336711a0391987db69d6281c9b57bfe49d925"
-=======
-
-[[package]]
-name = "sp-std"
-version = "14.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12f8ee986414b0a9ad741776762f4083cd3a5128449b982a3919c4df36874834"
-
-[[package]]
-name = "sp-storage"
-version = "13.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#82912acb33a9030c0ef3bf590a34fca09b72dc5f"
-dependencies = [
- "impl-serde 0.4.0",
- "parity-scale-codec",
- "ref-cast",
- "serde",
- "sp-debug-derive 8.0.0",
- "sp-std 8.0.0",
-]
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 
 [[package]]
 name = "sp-storage"
@@ -24139,7 +22843,6 @@ dependencies = [
 
 [[package]]
 name = "sp-storage"
-<<<<<<< HEAD
 version = "19.0.0"
 source = "git+https://github.com/paritytech/polkadot-sdk#51f336711a0391987db69d6281c9b57bfe49d925"
 dependencies = [
@@ -24148,31 +22851,6 @@ dependencies = [
  "ref-cast",
  "serde",
  "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk)",
-=======
-version = "20.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8dba5791cb3978e95daf99dad919ecb3ec35565604e88cd38d805d9d4981e8bd"
-dependencies = [
- "impl-serde 0.4.0",
- "parity-scale-codec",
- "ref-cast",
- "serde",
- "sp-debug-derive 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "sp-storage"
-version = "21.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99c82989b3a4979a7e1ad848aad9f5d0b4388f1f454cc131766526601ab9e8f8"
-dependencies = [
- "impl-serde 0.4.0",
- "parity-scale-codec",
- "ref-cast",
- "serde",
- "sp-debug-derive 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
@@ -24406,38 +23084,8 @@ dependencies = [
  "proc-macro-warning 1.0.2",
  "proc-macro2 1.0.86",
  "quote 1.0.37",
-<<<<<<< HEAD
  "sp-version",
  "syn 2.0.77",
-=======
- "sp-version 29.0.0",
- "syn 2.0.82",
-]
-
-[[package]]
-name = "sp-version-proc-macro"
-version = "14.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aee8f6730641a65fcf0c8f9b1e448af4b3bb083d08058b47528188bccc7b7a7"
-dependencies = [
- "parity-scale-codec",
- "proc-macro2 1.0.86",
- "quote 1.0.37",
- "syn 2.0.82",
-]
-
-[[package]]
-name = "sp-wasm-interface"
-version = "14.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#82912acb33a9030c0ef3bf590a34fca09b72dc5f"
-dependencies = [
- "anyhow",
- "impl-trait-for-tuples",
- "log",
- "parity-scale-codec",
- "sp-std 8.0.0",
- "wasmtime",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
@@ -24454,35 +23102,12 @@ dependencies = [
 [[package]]
 name = "sp-wasm-interface"
 version = "20.0.0"
-<<<<<<< HEAD
 source = "git+https://github.com/paritytech/polkadot-sdk#51f336711a0391987db69d6281c9b57bfe49d925"
-=======
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ef97172c42eb4c6c26506f325f48463e9bc29b2034a587f1b9e48c751229bee"
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 dependencies = [
  "anyhow",
  "impl-trait-for-tuples",
  "log",
  "parity-scale-codec",
-<<<<<<< HEAD
-=======
- "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasmtime",
-]
-
-[[package]]
-name = "sp-wasm-interface"
-version = "21.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b04b919e150b4736d85089d49327eab65507deb1485eec929af69daa2278eb3"
-dependencies = [
- "anyhow",
- "impl-trait-for-tuples",
- "log",
- "parity-scale-codec",
- "wasmtime",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
@@ -24620,11 +23245,7 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
 name = "staging-chain-spec-builder"
 version = "1.6.1"
 dependencies = [
-<<<<<<< HEAD
  "clap 4.5.17",
-=======
- "clap 4.5.13",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "log",
  "sc-chain-spec",
  "serde",
@@ -24639,11 +23260,7 @@ version = "3.0.0-dev"
 dependencies = [
  "array-bytes",
  "assert_cmd",
-<<<<<<< HEAD
  "clap 4.5.17",
-=======
- "clap 4.5.13",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "clap_complete",
  "criterion",
  "futures",
@@ -24680,11 +23297,7 @@ dependencies = [
 name = "staging-node-inspect"
 version = "0.12.0"
 dependencies = [
-<<<<<<< HEAD
  "clap 4.5.17",
-=======
- "clap 4.5.13",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "parity-scale-codec",
  "sc-cli",
  "sc-client-api",
@@ -24755,11 +23368,7 @@ dependencies = [
  "polkadot-primitives",
  "polkadot-runtime-parachains",
  "polkadot-test-runtime",
-<<<<<<< HEAD
  "primitive-types 0.12.2",
-=======
- "primitive-types 0.13.1",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "scale-info",
  "sp-arithmetic 23.0.0",
  "sp-core 28.0.0",
@@ -24889,15 +23498,6 @@ dependencies = [
 name = "strum"
 version = "0.26.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-<<<<<<< HEAD
-=======
-checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125"
-
-[[package]]
-name = "strum"
-version = "0.26.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06"
 dependencies = [
  "strum_macros 0.26.4",
@@ -24926,35 +23526,14 @@ dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
  "rustversion",
-<<<<<<< HEAD
  "syn 2.0.77",
-=======
- "syn 2.0.82",
-]
-
-[[package]]
-name = "strum_macros"
-version = "0.26.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be"
-dependencies = [
- "heck 0.5.0",
- "proc-macro2 1.0.86",
- "quote 1.0.37",
- "rustversion",
- "syn 2.0.82",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
 name = "subkey"
 version = "9.0.0"
 dependencies = [
-<<<<<<< HEAD
  "clap 4.5.17",
-=======
- "clap 4.5.13",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "sc-cli",
 ]
 
@@ -25332,11 +23911,7 @@ dependencies = [
  "sp-io 30.0.0",
  "sp-maybe-compressed-blob 11.0.0",
  "sp-tracing 16.0.0",
-<<<<<<< HEAD
  "sp-version",
-=======
- "sp-version 29.0.0",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "strum 0.26.3",
  "tempfile",
  "toml 0.8.19",
@@ -25668,15 +24243,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-<<<<<<< HEAD
 version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
-=======
-version = "2.0.82"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83540f837a8afc019423a8edb95b52a8effe46957ee402287f4292fae35be021"
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
@@ -25692,24 +24261,14 @@ dependencies = [
  "paste",
  "proc-macro2 1.0.86",
  "quote 1.0.37",
-<<<<<<< HEAD
  "syn 2.0.77",
-=======
- "syn 2.0.82",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
 name = "sync_wrapper"
-<<<<<<< HEAD
 version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
-=======
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394"
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 
 [[package]]
 name = "synstructure"
@@ -25731,11 +24290,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
-<<<<<<< HEAD
  "syn 2.0.77",
-=======
- "syn 2.0.82",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
@@ -25804,17 +24359,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64"
 dependencies = [
  "cfg-if",
-<<<<<<< HEAD
  "fastrand 2.1.1",
  "once_cell",
  "rustix 0.38.37",
  "windows-sys 0.59.0",
-=======
- "fastrand 2.1.0",
- "redox_syscall 0.4.1",
- "rustix 0.38.25",
- "windows-sys 0.48.0",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
@@ -25843,11 +24391,7 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7"
 dependencies = [
-<<<<<<< HEAD
  "rustix 0.38.37",
-=======
- "rustix 0.38.25",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "windows-sys 0.48.0",
 ]
 
@@ -25876,11 +24420,7 @@ checksum = "5999e24eaa32083191ba4e425deb75cdf25efefabe5aaccb7446dd0d4122a3f5"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
-<<<<<<< HEAD
  "syn 2.0.77",
-=======
- "syn 2.0.82",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
@@ -25899,11 +24439,7 @@ dependencies = [
 name = "test-parachain-adder-collator"
 version = "1.0.0"
 dependencies = [
-<<<<<<< HEAD
  "clap 4.5.17",
-=======
- "clap 4.5.13",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "futures",
  "futures-timer",
  "log",
@@ -25950,11 +24486,7 @@ dependencies = [
 name = "test-parachain-undying-collator"
 version = "1.0.0"
 dependencies = [
-<<<<<<< HEAD
  "clap 4.5.17",
-=======
- "clap 4.5.13",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "futures",
  "futures-timer",
  "log",
@@ -26028,15 +24560,9 @@ checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9"
 
 [[package]]
 name = "thiserror"
-<<<<<<< HEAD
 version = "1.0.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
-=======
-version = "1.0.64"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84"
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 dependencies = [
  "thiserror-impl",
 ]
@@ -26063,7 +24589,6 @@ dependencies = [
 
 [[package]]
 name = "thiserror-impl"
-<<<<<<< HEAD
 version = "1.0.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
@@ -26071,15 +24596,6 @@ dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
  "syn 2.0.77",
-=======
-version = "1.0.64"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3"
-dependencies = [
- "proc-macro2 1.0.86",
- "quote 1.0.37",
- "syn 2.0.82",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
@@ -26221,19 +24737,6 @@ dependencies = [
  "socket2 0.5.7",
  "tokio-macros",
  "windows-sys 0.52.0",
-<<<<<<< HEAD
-=======
-]
-
-[[package]]
-name = "tokio-io-timeout"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf"
-dependencies = [
- "pin-project-lite",
- "tokio",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
@@ -26244,21 +24747,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
-<<<<<<< HEAD
  "syn 2.0.77",
-=======
- "syn 2.0.82",
-]
-
-[[package]]
-name = "tokio-native-tls"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
-dependencies = [
- "native-tls",
- "tokio",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
@@ -26299,11 +24788,7 @@ version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
 dependencies = [
-<<<<<<< HEAD
  "rustls 0.23.13",
-=======
- "rustls 0.23.14",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "rustls-pki-types",
  "tokio",
 ]
@@ -26374,23 +24859,7 @@ dependencies = [
 
 [[package]]
 name = "toml"
-<<<<<<< HEAD
 version = "0.8.19"
-=======
-version = "0.7.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257"
-dependencies = [
- "serde",
- "serde_spanned",
- "toml_datetime",
- "toml_edit 0.19.15",
-]
-
-[[package]]
-name = "toml"
-version = "0.8.12"
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e"
 dependencies = [
@@ -26415,13 +24884,7 @@ version = "0.19.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
 dependencies = [
-<<<<<<< HEAD
  "indexmap 2.5.0",
-=======
- "indexmap 2.2.3",
- "serde",
- "serde_spanned",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "toml_datetime",
  "winnow 0.5.40",
 ]
@@ -26525,11 +24988,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
-<<<<<<< HEAD
  "syn 2.0.77",
-=======
- "syn 2.0.82",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
@@ -26571,22 +25030,7 @@ dependencies = [
  "proc-macro-crate 3.2.0",
  "proc-macro2 1.0.86",
  "quote 1.0.37",
-<<<<<<< HEAD
  "syn 2.0.77",
-=======
- "syn 2.0.82",
-]
-
-[[package]]
-name = "tracing-log"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922"
-dependencies = [
- "lazy_static",
- "log",
- "tracing-core",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
@@ -27041,14 +25485,7 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 name = "uuid"
 version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-<<<<<<< HEAD
 checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
-=======
-checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d"
-dependencies = [
- "getrandom",
-]
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 
 [[package]]
 name = "valuable"
@@ -27213,11 +25650,7 @@ dependencies = [
  "once_cell",
  "proc-macro2 1.0.86",
  "quote 1.0.37",
-<<<<<<< HEAD
  "syn 2.0.77",
-=======
- "syn 2.0.82",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "wasm-bindgen-shared",
 ]
 
@@ -27251,11 +25684,7 @@ checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
-<<<<<<< HEAD
  "syn 2.0.77",
-=======
- "syn 2.0.82",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -28402,11 +26831,7 @@ dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
  "staging-xcm",
-<<<<<<< HEAD
  "syn 2.0.77",
-=======
- "syn 2.0.82",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
  "trybuild",
 ]
 
@@ -28578,11 +27003,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
-<<<<<<< HEAD
  "syn 2.0.77",
-=======
- "syn 2.0.82",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]
@@ -28602,11 +27023,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
-<<<<<<< HEAD
  "syn 2.0.77",
-=======
- "syn 2.0.82",
->>>>>>> df66d76f96b47b567dbbee7a6a8f40d3c3bbad43
 ]
 
 [[package]]