diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..db381bb9
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+.github/** merge=ours
\ No newline at end of file