diff --git a/kstyle/config/breezestyleconfig.desktop b/kstyle/config/breezestyleconfig.desktop
index e4092a35..5093c0f8 100644
--- a/kstyle/config/breezestyleconfig.desktop
+++ b/kstyle/config/breezestyleconfig.desktop
@@ -35,12 +35,6 @@ Name[tr]=Breeze Programcık Biçimi
 Name[uk]=Стиль віджетів Breeze
 Name[x-test]=xxBreeze Widget Stylexx
 Name[zh_CN]=微风小部件样式
-<<<<<<< HEAD
-=======
->>>>>>> Plasma/5.11
-<<<<<<< HEAD
-=======
->>>>>>> Plasma/5.11
 Comment=Modify the appearance of widgets
 Comment[ar]=عدّل مظهر الودجات
 Comment[ca]=Modifica l'aparença dels estris