diff --git a/Cargo.lock b/Cargo.lock
index a5b30bfc..df329192 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7687,11 +7687,7 @@ checksum = "f2f6fb2847f6742cd76af783a2a2c49e9375d0a111c7bef6f71cd9e738c72d6e"
 dependencies = [
  "memoffset",
  "tempfile",
-<<<<<<< Updated upstream
  "windows-sys 0.61.2",
-=======
- "windows-sys 0.60.2",
->>>>>>> Stashed changes
 ]
 
 [[package]]