diff --git a/Cargo.toml b/Cargo.toml
index ca7a46e..df670d8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -4,7 +4,8 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-clap = { version = "4.5.16", default-features = false, features = ["std", "color", "help", "usage", "derive", "cargo"] }
+<<<<<<< HEAD
+clap = { version = "4.5.17", default-features = false, features = ["std", "color", "help", "usage", "derive", "cargo"] }
 dirs = "5.0.1"
 
 [profile.dev]
@@ -19,3 +20,5 @@ opt-level = "z"
 lto = true
 strip = true
 panic = "abort"
+=======
+>>>>>>> refs/remotes/origin/main