*.po merge=ours
.gitignore merge=ours
.gitmodules merge=ours