diff --git a/CSharp.gitattributes b/CSharp.gitattributes
index 0b8e2cb..f7c7529 100644
--- a/CSharp.gitattributes
+++ b/CSharp.gitattributes
@@ -4,5 +4,5 @@
 *.cs       text diff=csharp
 *.cshtml   text diff=html
 *.csx      text diff=csharp
-*.sln      text eol=crlf merge=union
-*.csproj   text merge=union
+*.sln      text eol=crlf
+*.csproj   text eol=crlf
diff --git a/FSharp.gitattributes b/FSharp.gitattributes
index 1dbae97..a9df632 100644
--- a/FSharp.gitattributes
+++ b/FSharp.gitattributes
@@ -3,5 +3,5 @@
 
 *.fs       text diff=fsharp
 *.fsx      text diff=fsharp
-*.sln      text eol=crlf merge=union
-*.fsproj   text merge=union
+*.sln      text eol=crlf
+*.fsproj   text eol=crlf