Fix merge conflicts

resources/qml/Cura.qml

@@ -53,7 +53,7 @@ UM.MainWindow
         id: greyOutBackground
         anchors.fill: parent
         visible: welcomeDialog.visible
-        color: "black"
+        color: UM.Theme.getColor("window_disabled_background")
         opacity: 0.7
         z: stageMenu.z + 1
     }

resources/qml/WelcomePages/AddLocalPrinterScrollView.qml

@@ -146,10 +146,9 @@ ScrollView
             font: UM.Theme.getFont("default")
             visible: base.currentSection == section
 
-            background: Rectangle
+            background: Item
             {
                 anchors.fill: parent
-                color: "transparent"
             }
 
             indicator: Rectangle

resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml

@@ -61,7 +61,7 @@ Item
             property int maxItemCountAtOnce: 8  // show at max 8 items at once, otherwise you need to scroll.
             height: maxItemCountAtOnce * UM.Theme.getSize("action_button").height
 
-            visible: networkPrinterListView.model.length > 0
+            visible: networkPrinterListView.count > 0
 
             clip: true
 

resources/themes/cura-light/theme.json

@@ -191,6 +191,8 @@
 
         "printer_type_label_background": [228, 228, 242, 255],
 
+        "window_disabled_background": [0, 0, 0, 255],
+
         "text_light_blue": [50, 130, 255, 255],
 
         "text": [25, 25, 25, 255],