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"
new breeze-light that is just as the old one REVIEW:127085 Change-Id: Iab4f79fff172e885f8188e0d1bbf2dea266cb9e3