diff --git a/Cargo.toml b/Cargo.toml
index 4dfc8cc..be24326 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -18,11 +18,7 @@ http3 = ["quinn", "h3", "h3-quinn"]
 [dependencies]
 env_logger = "0.9.1"
 anyhow = "1.0.65"
-<<<<<<< HEAD
-clap = { version = "4.0.13", features = ["std", "cargo", "wrap_help"] }
-=======
 clap = { version = "4.0.14", features = ["std", "cargo", "wrap_help"] }
->>>>>>> main
 futures = { version = "0.3.24", features = ["alloc", "async-await"] }
 hyper = { version = "0.14.20", default-features = false, features = [
   "server",