KDE: merge upstream config