diff --git a/Cargo.lock b/Cargo.lock
index c0f849e..4e09aed 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -9342,17 +9342,16 @@ dependencies = [
 ]
 
 [[package]]
-<<<<<<< HEAD
 name = "xml-rs"
 version = "0.8.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "af4e2e2f7cba5a093896c1e150fbfe177d1883e7448200efb81d40b9d339ef26"
-=======
+
+[[package]]
 name = "yansi"
 version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049"
->>>>>>> upstream/main
 
 [[package]]
 name = "yasna"