From cdb62cc47e6db8c7b6505a8a7a90bb36381deb6a Mon Sep 17 00:00:00 2001
From: Kinrezc <matt.czernik@gmail.com>
Date: Wed, 11 Oct 2023 11:52:45 -0400
Subject: [PATCH] fix conflicts

---
 box-simulation/Cargo.toml        | 4 ++--
 box-simulation/src/agents/mod.rs | 1 -
 box-simulation/src/main.rs       | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/box-simulation/Cargo.toml b/box-simulation/Cargo.toml
index 6641e8e1b..0c18a11e7 100644
--- a/box-simulation/Cargo.toml
+++ b/box-simulation/Cargo.toml
@@ -10,8 +10,8 @@ bindings.workspace = true
 box_core.workspace = true
 tokio = { version = "1.11.0", features = ["full"] }
 anyhow = "1.0.75"
-arbiter-core = { git = "https://github.com/primitivefinance/arbiter.git", branch = "arbiter/version" }
-arbiter-derive = { git = "https://github.com/primitivefinance/arbiter.git", branch = "arbiter/version" }
+arbiter-core = { git = "https://github.com/primitivefinance/arbiter.git", branch = "main" }
+arbiter-derive = { git = "https://github.com/primitivefinance/arbiter.git", branch = "main" }
 ethers = "2.0.10"
 serde = "1.0.188"
 serde_json = "1.0.107"
diff --git a/box-simulation/src/agents/mod.rs b/box-simulation/src/agents/mod.rs
index 9ffde5553..816561116 100644
--- a/box-simulation/src/agents/mod.rs
+++ b/box-simulation/src/agents/mod.rs
@@ -1,7 +1,6 @@
 use super::*;
 
 pub mod arbitrageur;
-pub mod atomic_arbitrage;
 pub mod liquidity_provider;
 pub mod price_changer;
 pub mod rebalancer;
diff --git a/box-simulation/src/main.rs b/box-simulation/src/main.rs
index ad78310d8..e1d660218 100644
--- a/box-simulation/src/main.rs
+++ b/box-simulation/src/main.rs
@@ -35,10 +35,10 @@ async fn main() -> Result<()> {
         .with_max_level(tracing::Level::TRACE)
         .init();
 
-    let _config = settings::params::SimulationConfig::new()?;
+    let config = settings::params::SimulationConfig::new()?;
 
     let env = EnvironmentBuilder::new().build();
-    let contracts = setup::deploy::deploy_contracts(&env).await?;
+    let contracts = setup::deploy::deploy_contracts(&env, &config).await?;
 
     let _arbitrageur = Arbitrageur::<G3M<RevmMiddleware>>::new(
         "arbitrageur",