diff --git a/faucet/Cargo.toml b/faucet/Cargo.toml
index c5145e85a1..16985f0d21 100644
--- a/faucet/Cargo.toml
+++ b/faucet/Cargo.toml
@@ -16,23 +16,13 @@ clap = "2.33"
 log = "0.4.11"
 serde = "1.0.122"
 serde_derive = "1.0.103"
-<<<<<<< HEAD
 solana-clap-utils = { path = "../clap-utils", version = "=1.6.5" }
 solana-cli-config = { path = "../cli-config", version = "=1.6.5" }
 solana-logger = { path = "../logger", version = "=1.6.5" }
 solana-metrics = { path = "../metrics", version = "=1.6.5" }
 solana-sdk = { path = "../sdk", version = "=1.6.5" }
 solana-version = { path = "../version", version = "=1.6.5" }
-tokio = { version = "1.1", features = ["full"] }
-=======
-solana-clap-utils = { path = "../clap-utils", version = "=1.7.0" }
-solana-cli-config = { path = "../cli-config", version = "=1.7.0" }
-solana-logger = { path = "../logger", version = "=1.7.0" }
-solana-metrics = { path = "../metrics", version = "=1.7.0" }
-solana-sdk = { path = "../sdk", version = "=1.7.0" }
-solana-version = { path = "../version", version = "=1.7.0" }
 tokio = { version = "1", features = ["full"] }
->>>>>>> 43feef736... Adjust tokio version to just "1"
 
 [lib]
 crate-type = ["lib"]