fix: Resolve conflicts and the remaining two errors

Cargo.lock

@@ -3524,8 +3524,4 @@ dependencies = [
 name = "zeroize"
 version = "1.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-<<<<<<< Updated upstream
-checksum = "7c88870063c39ee00ec285a2f8d6a966e5b6fb2becc4e8dac77ed0d370ed6006"
-=======
 checksum = "c394b5bd0c6f669e7275d9c20aa90ae064cb22e75a1cad54e1b34088034b149f"
->>>>>>> Stashed changes

Cargo.toml

@@ -33,28 +33,6 @@ path = "src/clarity_cli_main.rs"
 name = "blockstack-cli"
 path = "src/blockstack_cli.rs"
 
-<<<<<<< Updated upstream
-[[bench]]
-name = "marf_bench"
-harness = false
-
-[[bench]]
-name = "large_contract_bench"
-harness = false
-
-[[bench]]
-name = "block_limits"
-harness = false
-
-[[bench]]
-name = "c32_bench"
-harness = false
-=======
-[[bin]]
-name = "relay-server"
-path = "contrib/tools/relay-server/src/main.rs"
->>>>>>> Stashed changes
-
 [dependencies]
 rand = "0.7.3"
 rand_chacha = "=0.2.2"

testnet/stacks-node/src/tests/epoch_21.rs

@@ -4711,7 +4711,7 @@ fn trait_invocation_cross_epoch() {
 
     test_observer::spawn();
 
-    let (mut conf, miner_account) = neon_integration_test_conf();
+    let (mut conf, _) = neon_integration_test_conf();
     let mut initial_balances = vec![InitialBalance {
         address: spender_addr.clone(),
         amount: 200_000_000,
@@ -4728,8 +4728,6 @@ fn trait_invocation_cross_epoch() {
     epochs[3].start_height = epoch_2_1;
     conf.burnchain.epochs = Some(epochs);
 
-    let http_origin = format!("http://{}", &conf.node.rpc_bind);
-
     let mut burnchain_config = Burnchain::regtest(&conf.get_burn_db_path());
 
     let reward_cycle_len = 2000;