Eda minigame but new branch

Packages/packages-lock.json

@@ -1,5 +1,7 @@
 {
   "dependencies": {
+<<<<<<< HEAD
+=======
     "com.unity.2d.sprite": {
       "version": "1.0.0",
       "depth": 0,
@@ -107,6 +109,7 @@
       },
       "url": "https://packages.unity.com"
     },
+>>>>>>> origin/main
     "com.unity.multiplayer.center": {
       "version": "1.0.0",
       "depth": 0,
@@ -115,6 +118,16 @@
         "com.unity.modules.uielements": "1.0.0"
       }
     },
+<<<<<<< HEAD
+    "com.unity.textmeshpro": {
+      "version": "5.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {
+        "com.unity.ugui": "2.0.0"
+      }
+    },
+=======
     "com.unity.nuget.newtonsoft-json": {
       "version": "3.2.2",
       "depth": 0,
@@ -258,6 +271,7 @@
       },
       "url": "https://packages.unity.com"
     },
+>>>>>>> origin/main
     "com.unity.ugui": {
       "version": "2.0.0",
       "depth": 0,