Fix merge conflicts

cura/CuraApplication.py

@@ -24,6 +24,7 @@ from UM.PluginError import PluginNotFoundError
 from UM.Resources import Resources
 from UM.Preferences import Preferences
 from UM.Qt.QtApplication import QtApplication  # The class we're inheriting from.
+import UM.Util
 from UM.View.SelectionPass import SelectionPass  # For typing.
 
 from UM.Math.AxisAlignedBox import AxisAlignedBox
@@ -552,11 +553,11 @@ class CuraApplication(QtApplication):
 
     @pyqtProperty(bool)
     def needToShowUserAgreement(self) -> bool:
-        return not self.getPreferences().getValue("general/accepted_user_agreement")
+        return not UM.Util.parseBool(self.getPreferences().getValue("general/accepted_user_agreement"))
 
     @pyqtSlot(bool)
-    def setNeedToShowUserAgreement(self, set_value = True) -> None:
-        self.getPreferences().setValue("general/accepted_user_agreement", not set_value)
+    def setNeedToShowUserAgreement(self, set_value: bool = True) -> None:
+        self.getPreferences().setValue("general/accepted_user_agreement", str(not set_value))
 
     @pyqtSlot(str, str)
     def writeToLog(self, severity: str, message: str) -> None:

resources/qml/Cura.qml

@@ -74,13 +74,13 @@ UM.MainWindow
         Cura.Actions.parent = backgroundItem
         CuraApplication.purgeWindows()
 
-        if (CuraApplication.needToShowUserAgreement)
+        if (CuraApplication.needToShowUserAgreement || Cura.MachineManager.activeMachine == null)
         {
-            welcomeDialog.show()
+            welcomeDialog.visible = true
         }
         else
         {
-            welcomeDialog.close()
+            welcomeDialog.visible = false
         }
         // TODO: While the new onboarding process contains the user-agreement,
         //       it should probably not entirely rely on 'needToShowUserAgreement' for show/hide.

resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml

@@ -200,7 +200,7 @@ Item
                 onClicked:
                 {
                     // open the troubleshooting URL with web browser
-                    var url = "https://ultimaker.com/incoming-links/cura/material-compatibilty" // TODO
+                    const url = "https://ultimaker.com/en/resources/39129-network-troubleshooting-cura"
                     Qt.openUrlExternally(url)
                 }
                 onEntered: