diff --git a/rust/main/Cargo.lock b/rust/main/Cargo.lock
index f98f290ba8..f13ac028c5 100644
--- a/rust/main/Cargo.lock
+++ b/rust/main/Cargo.lock
@@ -9987,11 +9987,6 @@ dependencies = [
 ]
 
 [[package]]
-<<<<<<< HEAD
-name = "tokio-stream"
-version = "0.1.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-=======
 name = "tokio-rustls"
 version = "0.26.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -10005,7 +10000,6 @@ dependencies = [
 name = "tokio-stream"
 version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
->>>>>>> main
 checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047"
 dependencies = [
  "futures-core",