diff --git a/.gitattributes b/.gitattributes
index 5378fe08..ae85146a 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,5 @@
-* -text
\ No newline at end of file
+* -text
+backend/OpenFlare/**    merge=ours
+frontend/**             merge=ours
+docs/changelog/**       merge=ours
+docs/superpowers/**     merge=ours