diff --git a/.gitattributes b/.gitattributes
index 0c4ae3d850..f54bcd3b72 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,5 +1,5 @@
 Lib/**      linguist-vendored
-Cargo.lock  linguist-generated -merge
+Cargo.lock  linguist-generated
 *.snap      linguist-generated -merge
 vm/src/stdlib/ast/gen.rs    linguist-generated -merge
 Lib/*.py    text working-tree-encoding=UTF-8 eol=LF