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"
Add a plugin that sends a package to ring an alarm on a phone Also adjusts plasmoid to have a button to invoke this.