diff --git a/.gitattributes b/.gitattributes
index 12315957..0b44be32 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,2 @@
-*.asm text merge=union eol=crlf
+*.asm text eol=crlf
 zuncom/zun*.txt -text