feat: add packages

Packages/packages-lock.json

@@ -1,19 +1,18 @@
 {
   "dependencies": {
-<<<<<<<<< Temporary merge branch 1
+    "com.merry-yellow.code-assist": {
+      "version": "file:com.merry-yellow.code-assist",
+      "depth": 0,
+      "source": "embedded",
+      "dependencies": {}
+    },
     "com.autodesk.fbx": {
       "version": "5.1.3",
       "depth": 1,
       "source": "registry",
       "dependencies": {},
       "url": "https://packages.unity.com"
-=========
-    "com.merry-yellow.code-assist": {
-      "version": "file:com.merry-yellow.code-assist",
-      "depth": 0,
-      "source": "embedded",
-      "dependencies": {}
->>>>>>>>> Temporary merge branch 2
+
     },
     "com.unity.ai.navigation": {
       "version": "2.0.10",