diff --git a/.gitattributes b/.gitattributes
index 2cd37203..4619aa66 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -8,3 +8,5 @@ dependencies text merge=mps
 *.mpsr text merge=mps
 *.model text merge=mps
 *.mps text merge=mps
+build.xml merge=ours
+