resolve conflicts and fixes

Author: dafnamatsry

Cargo.lock

@@ -55,14 +55,10 @@ apollo_starknet_client.workspace = true
 apollo_state_sync_types = { workspace = true, features = ["testing"] }
 apollo_storage = { workspace = true, features = ["testing"] }
 apollo_test_utils.workspace = true
-<<<<<<< HEAD
 apollo_time = { workspace = true, features = ["testing", "tokio"] }
-||||||| 511a6f78a
-=======
 assert_matches.workspace = true
 blockifier = { workspace = true, features = ["testing"] }
 blockifier_test_utils = { workspace = true }
->>>>>>> origin/constaking
 cairo-lang-casm.workspace = true
 cairo-lang-utils.workspace = true
 cairo-vm.workspace = true

crates/apollo_consensus_orchestrator/Cargo.toml

@@ -208,7 +208,7 @@ where
         let result = data_chunks
             .map(|chunk| {
                 T::try_from(
-                    chunk.try_into().unwrap_or_else(|_| panic!("chunk size must be N: {}.", N)),
+                    chunk.try_into().unwrap_or_else(|_| panic!("chunk size must be N: {N}.")),
                 )
             })
             .collect::<Result<Vec<_>, _>>()?;