diff --git a/.gitattributes b/.gitattributes
index cc7e282..e452138 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,2 @@
-*	text=auto eol=lf
+	text=auto eol=lf merge=union
 *.pdf	filter=lfs diff=lfs merge=lfs -text