diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..93defbb
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+_config.yml merge=ours
+courses/* merge=ours