diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,11 @@
 cmake_minimum_required(VERSION 3.0)
 
 project(plasma-workspace)
+<<<<<<< HEAD
 set(PROJECT_VERSION "5.15.80")
+=======
+set(PROJECT_VERSION "5.15.2")
+>>>>>>> Update version number for 5.15.2
 set(PROJECT_VERSION_MAJOR 5)
 
 set(QT_MIN_VERSION "5.12.0")
diff --git a/lookandfeel/metadata.desktop b/lookandfeel/metadata.desktop
--- a/lookandfeel/metadata.desktop
+++ b/lookandfeel/metadata.desktop
@@ -1,4 +1,5 @@
 [Desktop Entry]
+<<<<<<< HEAD
 Comment=Breeze by the KDE VDG
 Comment[ca]=Brisa pel VDG del KDE
 Comment[ca@valencia]=Brisa pel VDG del KDE
@@ -15,6 +16,50 @@
 Comment[x-test]=xxBreeze by the KDE VDGxx
 Comment[zh_CN]=微风，由 KDE VDG 创作
 Comment[zh_TW]=由 KDE VDG 設計的 Breeze
+=======
+Comment=Breeze Desktop Design Language by the KDE VDG
+Comment[bs]=Breeze jezik dizajna radne površine od strane KDE VDG
+Comment[ca]=Llenguatge de disseny d'escriptori Brisa pel VDG del KDE
+Comment[ca@valencia]=Llenguatge de disseny d'escriptori Brisa pel VDG del KDE
+Comment[cs]=Jazyk pro návrh pracovní plochy Breeze od KDE VDG
+Comment[da]=Breeze sprog til skrivebordsdesign af KDE VDG
+Comment[de]=Breeze-Arbeitsflächendesign der KDE VG
+Comment[el]=Γλώσσα σχεδιασμού επιφάνειας εργασίας Breeze από το KDE VDG
+Comment[en_GB]=Breeze Desktop Design Language by the KDE VDG
+Comment[es]=Lenguaje de diseño del escritorio Breeze, por el VDG de KDE
+Comment[et]=Breeze töölauakujunduse keel KDE VDG-lt
+Comment[eu]=Breeze mahaigain diseinurako lengoaia KDEren VDGk egina
+Comment[fi]=Työpöydän design-kieli Breeze KDE VDG:ltä
+Comment[fr]=Langue de conception de bureau Breeze par KDE VDG
+Comment[gl]=Linguaxe de deseño do escritorio para Breeze de KDE VDG
+Comment[hu]=Breeze asztali designnyelv a KDE VDG-től
+Comment[id]=Bahasa Desain Desktop Breeze oleh KDE VDG
+Comment[is]=Breeze skjáborðshönnunarmálið frá KDE VDG
+Comment[it]=Linguaggio di progettazione del desktop Brezza a cura del VDG di KDE
+Comment[ko]=KDE 시각 디자인 그룹의 Breeze 데스크톱 디자인 언어
+Comment[lt]=Breeze darbalaukio dizaino kalba, kurią sukūrė KDE VDG
+Comment[nb]=Breeze-språk for skrivebordsutforming  fra KDE-gruppa for visuell design
+Comment[nds]=De Schriefdisch-Utleggspraak Breeze vun de KDE-VDG
+Comment[nl]=Breeze ontwerptaal van het bureaublad door KDE VDG
+Comment[nn]=Breeze-designspråk av KDE VDG
+Comment[pa]=ਕੇਡੀਈ ਵੀਡੀਜੀ ਵਲੋਂ ਬਰੀਜ਼ ਡੈਸਕਟਾਪ ਡਿਜ਼ਾਇਨ ਭਾਸ਼ਾ
+Comment[pl]=Język projektowania pulpitu Bryza stworzony przez KDE VDG
+Comment[pt]=Linguagem de Desenho do Ecrã Brisa da VDG do KDE
+Comment[pt_BR]=Linguagem de desenho da área de trabalho Breeze por KDE VDG
+Comment[ru]=Оформление рабочей среды Breeze от KDE VDG
+Comment[sk]=Jazyk dizajnu plochy vánok od KDE VDG
+Comment[sl]=Sapica, oblikovalni jezik namizja avtorjev KDE VDG
+Comment[sr]=Језик дизајна површи Поветарац од КДЕ‑ВДГ‑а
+Comment[sr@ijekavian]=Језик дизајна површи Поветарац од КДЕ‑ВДГ‑а
+Comment[sr@ijekavianlatin]=Jezik dizajna površi Povetarac od KDE VDG‑a
+Comment[sr@latin]=Jezik dizajna površi Povetarac od KDE VDG‑a
+Comment[sv]=Breeze-konstruktionsspråk för skrivbord av KDE VDG
+Comment[tr]=KDE VDG tarafından hazırlanan Breeze Masaüstü Tasarım Dili
+Comment[uk]=Мова компонування стільниці Breeze, створена KDE VDG
+Comment[x-test]=xxBreeze Desktop Design Language by the KDE VDGxx
+Comment[zh_CN]=KDE 视觉设计组设计的微风桌面设计语言
+Comment[zh_TW]=KDE VDG 設計的微風桌面設計語言
+>>>>>>> SVN_SILENT made messages (.desktop file) - always resolve ours
 Keywords=Desktop;Workspace;Appearance;Look and Feel;Logout;Lock;Suspend;Shutdown;Hibernate;
 Keywords[ca]=Escriptori;Espai de treball;Aparença;Aspecte i comportament;Sortida;Bloqueig;Suspensió;Aturada;Hibernació;
 Keywords[ca@valencia]=Escriptori;Espai de treball;Aparença;Aspecte i comportament;Eixida;Bloqueig;Suspensió;Aturada;Hibernació;