diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..b694929
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,3 @@
+Radio.cpp merge=ours
+Radio.hpp merge=ours
+opencom_xl_firmware.ino merge=ours