Fix merge conflicts

resources/qml/WelcomePages/WelcomeDialog.qml

@@ -4,6 +4,7 @@
 import QtQuick 2.10
 import QtQuick.Controls 2.3
 import QtQuick.Window 2.2
+import QtGraphicalEffects 1.0  // For the DropShadow
 
 import UM 1.3 as UM
 import Cura 1.1 as Cura
@@ -14,9 +15,9 @@ import Cura 1.1 as Cura
 //
 Window
 {
-    id: dialog
     UM.I18nCatalog { id: catalog; name: "cura" }
 
+    id: dialog
     title: catalog.i18nc("@title", "Welcome to Ultimaker Cura")
     modality: Qt.ApplicationModal
     flags: Qt.Window | Qt.FramelessWindowHint
@@ -25,14 +26,38 @@ Window
     height: 600  // TODO
     color: "transparent"
 
+    property int shadowOffset: 1 * screenScaleFactor
+
     property var model: CuraApplication.getWelcomePagesModel()
 
-    StepPanel
+    onVisibleChanged:
+    {
+        if (visible)
+        {
+            model.resetState()
+        }
+    }
+
+    WizardPanel
     {
         id: stepPanel
+        anchors.fill: parent
         model: dialog.model
     }
 
+    // Drop shadow around the panel
+    DropShadow
+    {
+        id: shadow
+        radius: UM.Theme.getSize("monitor_shadow_radius").width
+        anchors.fill: stepPanel
+        source: stepPanel
+        horizontalOffset: shadowOffset
+        verticalOffset: shadowOffset
+        color: UM.Theme.getColor("monitor_shadow")
+        transparentBorder: true
+    }
+
     // Close this dialog when there's no more page to show
     Connections
     {