diff --git a/Cargo.lock b/Cargo.lock
index 51db45fc9be4..ba5d94e4d6ae 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1441,19 +1441,25 @@ dependencies = [
 
 [[package]]
 name = "ra-ap-rustc_lexer"
-version = "0.21.0"
+<<<<<<< HEAD
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc741c7a78103efab416b562e35bd73c8d4967478575010c86c6062f8d3cbf29"
-dependencies = [
- "unicode-properties",
+checksum = "9d5e8650195795c4023d8321846466994a975bc457cb8a91c0b3b17a5fc8ba40"
+=======
+version = "0.21.0"
  "unicode-xid",
 ]
 
-[[package]]
 name = "ra-ap-rustc_parse_format"
+<<<<<<< HEAD
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a6b325ee1ec90e4dbd4394913adf4ef32e4fcf2b311ec9563a0fa50cd549af6"
+=======
 version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d557201d71792487bd2bab637ab5be9aa6fff59b88e25e12de180b0f9d2df60f"
+>>>>>>> master
 dependencies = [
  "ra-ap-rustc_index",
  "ra-ap-rustc_lexer",