diff --git a/repbuild/Cargo.toml b/repbuild/Cargo.toml
index 8e2e10cb..16eaa423 100644
--- a/repbuild/Cargo.toml
+++ b/repbuild/Cargo.toml
@@ -5,10 +5,6 @@ edition = "2021"
 authors = ["Able", "NotAble"]
 
 [dependencies]
-<<<<<<< HEAD
-=======
-clap = { version = "3.1", features = ["cargo", "derive"] }
->>>>>>> e6dbfb4a0a4e14c8bf2ead04bb2078627f5780eb
 xshell = "0.1.9"
 anyhow = "*"