diff --git a/.gitattributes b/.gitattributes
index aaf24388c..e63d80307 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -9,3 +9,4 @@
 *.html diff=html
 *.erb  diff=html
 /CHANGELOG.md merge=union
+config/locales/*.yml merge=union