fix(hubble): merge conflict and add yarn resolutions

Resolved a merge conflict in convertStringToJSON.js and removed unrelated Java code. Added a 'resolutions' field for 'pretty-format' in package.json to address dependency versioning. yarn.lock added to track dependencies.

Author: imbajin

hugegraph-hubble/hubble-fe/package.json

@@ -76,5 +76,8 @@
     "eslint": "^8.19.0",
     "eslint-plugin-react": "^7.30.1",
     "resize-observer-polyfill": "^1.5.1"
+  },
+  "resolutions": {
+    "pretty-format": "^28.1.3"
   }
 }

hugegraph-hubble/hubble-fe/src/utils/convertStringToJSON.js

@@ -16,7 +16,6 @@
  * under the License.
  */
 
-<<<<<<<< HEAD:hugegraph-hubble/hubble-fe/src/utils/convertStringToJSON.js
 export default function convertStringToJSON(text) {
     if (typeof text !== 'string') {
         return null;
@@ -31,13 +30,4 @@ export default function convertStringToJSON(text) {
     }
 
     return typeof context === 'object' && context !== null ? context : null;
-========
-package org.apache.hugegraph.structure.space;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-
-@JsonIgnoreProperties
-public class StorageService {
-
->>>>>>>> master:hugegraph-client/src/main/java/org/apache/hugegraph/structure/space/StorageService.java
 }