diff --git a/.gitattributes b/.gitattributes
index 55dc7bd8f..8232aa1c1 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,3 @@
-*.po merge=ours
\ No newline at end of file
+*.po merge=ours
+.gitignore merge=ours
+.gitmodules merge=ours
\ No newline at end of file