In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
There's still some stuff that could potentially go elsewhere but I think it's enough for now.