diff --git a/Cargo.lock b/Cargo.lock
index c9ef3ce..a8966dd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1467,9 +1467,15 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "openssl"
+<<<<<<< HEAD
 version = "0.10.59"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a257ad03cd8fb16ad4172fedf8094451e1af1c4b70097636ef2eac9a5f0cc33"
+=======
+version = "0.10.55"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d"
+>>>>>>> 1da59811f0c6ee2f34c8453ff9a13227b3819db3
 dependencies = [
  "bitflags 2.4.1",
  "cfg-if",
@@ -1499,9 +1505,15 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-sys"
+<<<<<<< HEAD
 version = "0.9.97"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3eaad34cdd97d81de97964fc7f29e2d104f483840d906ef56daa1912338460b"
+=======
+version = "0.9.90"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6"
+>>>>>>> 1da59811f0c6ee2f34c8453ff9a13227b3819db3
 dependencies = [
  "cc",
  "libc",
@@ -1859,6 +1871,7 @@ dependencies = [
 ]
 
 [[package]]
+<<<<<<< HEAD
 name = "rustc-demangle"
 version = "0.1.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1869,6 +1882,12 @@ name = "rustc_version"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
+=======
+name = "rustix"
+version = "0.37.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "84f3f8f960ed3b5a59055428714943298bf3fa2d4a1d53135084e0544829d995"
+>>>>>>> 1da59811f0c6ee2f34c8453ff9a13227b3819db3
 dependencies = [
  "semver",
 ]