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"
Move windows runner from plasma-workspace to kwin (convert it to dbus runner) This will allow to interract with windows on wayland too