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"
Creates a tiny messaging app that uses KPeople to query the contacts and KDE connect telephony plugins to send plugins. To be ready, still needs some work on the contacts sync side and some messages history would be nice.