diff --git a/Cargo.lock b/Cargo.lock
index 09d4b48..e189b75 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3995,28 +3995,6 @@ dependencies = [
 ]
 
 [[package]]
-<<<<<<< HEAD
-name = "webpki"
-version = "0.22.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07ecc0cd7cac091bf682ec5efa18b1cff79d617b84181f38b3951dbe135f607f"
-dependencies = [
- "ring",
- "untrusted",
-]
-
-[[package]]
-name = "webpki-roots"
-version = "0.22.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87"
-dependencies = [
- "webpki",
-]
-
-[[package]]
-=======
->>>>>>> d31a92b (Update deps)
 name = "winapi"
 version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"