diff --git a/CMakeLists.txt b/CMakeLists.txt
index e38befe435..cfc417281d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,9 @@
 project(KWIN)
+<<<<<<< HEAD
 set(PROJECT_VERSION "5.8.90")
+=======
+set(PROJECT_VERSION "5.8.4")
+>>>>>>> Plasma/5.8
 set(PROJECT_VERSION_MAJOR 5)
 
 cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
diff --git a/kcmkwin/kwindecoration/qml/Previews.qml b/kcmkwin/kwindecoration/qml/Previews.qml
index fe4c5b3274..be8036c323 100644
--- a/kcmkwin/kwindecoration/qml/Previews.qml
+++ b/kcmkwin/kwindecoration/qml/Previews.qml
@@ -107,8 +107,9 @@ ScrollView {
                     Button {
                         id: configureButton
                         anchors {
-                            left: inactivePreview.left
-                            bottom: inactivePreview.bottom
+                            left: parent.left
+                            bottom: parent.bottom
+                            margins: 20
                         }
                         enabled: model["configureable"]
                         iconName: "configure"