diff --git a/.gitattributes b/.gitattributes
index 7acbd16c3..b9faf9092 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -46,4 +46,7 @@
 *.vbproj text merge=union 
 *.fsproj text merge=union 
 *.dbproj text merge=union 
-*.sln text eol=crlf merge=union 
\ No newline at end of file
+*.sln text eol=crlf merge=union 
+
+src/Setup/resource.h binary
+src/Setup/Setup.rc binary