conflict resolved

Packages/manifest.json

@@ -1,5 +1,7 @@
 {
   "dependencies": {
+
+    "com.unity.textmeshpro": "4.0.0",
     "com.unity.2d.sprite": "1.0.0",
     "com.unity.ide.visualstudio": "2.0.27",
     "com.unity.inputsystem": "1.14.2",
@@ -8,6 +10,8 @@
     "com.unity.remote-config": "4.2.5",
     "com.unity.render-pipelines.universal": "17.2.0",
     "com.unity.toolchain.linux-x86_64": "2.0.11",
+    "com.unity.probuilder": "6.0.9",
+    "com.unity.ugui": "2.0.0",
     "com.unity.modules.accessibility": "1.0.0",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",

Packages/packages-lock.json

@@ -82,6 +82,38 @@
       "dependencies": {},
       "url": "https://packages.unity.com"
     },
+    "com.unity.probuilder": {
+      "version": "6.0.9",
+      "depth": 0,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.shadergraph": "17.0.3",
+        "com.unity.modules.imgui": "1.0.0",
+        "com.unity.modules.physics": "1.0.0",
+        "com.unity.settings-manager": "1.0.3"
+      },
+      "url": "https://packages.unity.com"
+    },
+    "com.unity.settings-manager": {
+      "version": "2.1.0",
+      "depth": 1,
+      "source": "registry",
+      "dependencies": {},
+      "url": "https://packages.unity.com"
+    },
+    "com.unity.remote-config": {
+      "version": "4.2.5",
+      "depth": 0,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.nuget.newtonsoft-json": "3.0.2",
+        "com.unity.remote-config-runtime": "4.0.4",
+        "com.unity.modules.unitywebrequest": "1.0.0"
+      },
+      "url": "https://packages.unity.com"
+    },
+    "com.unity.remote-config-runtime": {
+      "version": "4.0.4",
     "com.unity.remote-config": {
       "version": "4.2.5",
       "depth": 0,
@@ -214,6 +246,14 @@
         "com.unity.modules.jsonserialize": "1.0.0"
       }
     },
+    "com.unity.textmeshpro": {
+      "version": "5.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {
+        "com.unity.ugui": "2.0.0"
+      }
+    },
     "com.unity.test-framework.performance": {
       "version": "3.2.0",
       "depth": 3,
@@ -502,3 +542,4 @@
     }
   }
 }
+}