diff --git a/.gitattributes b/.gitattributes
index c1965c2..1f7549b 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1 @@
-.github/workflows/*.lock.yml linguist-generated=true merge=ours
\ No newline at end of file
+.github/workflows/*.lock.yml linguist-generated=true
\ No newline at end of file