diff --git a/test-validator/Cargo.toml b/test-validator/Cargo.toml
index 00fffce29c..775143630a 100644
--- a/test-validator/Cargo.toml
+++ b/test-validator/Cargo.toml
@@ -13,7 +13,9 @@ edition = "2021"
 [dependencies]
 base64 = "0.12.3"
 log = "0.4.14"
-<<<<<<< HEAD
+serde_derive = "1.0.103"
+serde_json = "1.0.72"
+solana-cli-output = { path = "../cli-output", version = "=1.9.1" }
 solana-client = { path = "../client", version = "=1.9.1" }
 solana-core = { path = "../core", version = "=1.9.1" }
 solana-gossip = { path = "../gossip", version = "=1.9.1" }
@@ -25,22 +27,6 @@ solana-rpc = { path = "../rpc", version = "=1.9.1" }
 solana-runtime = { path = "../runtime", version = "=1.9.1" }
 solana-sdk = { path = "../sdk", version = "=1.9.1" }
 solana-streamer = { path = "../streamer", version = "=1.9.1" }
-=======
-serde_derive = "1.0.103"
-serde_json = "1.0.72"
-solana-cli-output = { path = "../cli-output", version = "=1.10.0" }
-solana-client = { path = "../client", version = "=1.10.0" }
-solana-core = { path = "../core", version = "=1.10.0" }
-solana-gossip = { path = "../gossip", version = "=1.10.0" }
-solana-ledger = { path = "../ledger", version = "=1.10.0" }
-solana-logger = { path = "../logger", version = "=1.10.0" }
-solana-net-utils = { path = "../net-utils", version = "=1.10.0" }
-solana-program-test = { path = "../program-test", version = "=1.10.0" }
-solana-rpc = { path = "../rpc", version = "=1.10.0" }
-solana-runtime = { path = "../runtime", version = "=1.10.0" }
-solana-sdk = { path = "../sdk", version = "=1.10.0" }
-solana-streamer = { path = "../streamer", version = "=1.10.0" }
->>>>>>> 9b06d64eb (Add option to load accounts from file)
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]