Fix merge errors

packages/runtime-tools-swf-gateway-api/src/graphql/types.tsx

@@ -1435,16 +1435,6 @@ export namespace GraphQL {
     }
   `;
 
-  export const GetProcessDefinitionsDocument = gql`
-    query getProcessDefinitions {
-      ProcessDefinitions {
-        id
-        endpoint
-        serviceUrl
-      }
-    }
-  `;
-
   export const GetProcessInstancesDocument = gql`
     query getProcessInstances(
       $where: ProcessInstanceArgument

packages/sonataflow-management-console-webapp/package.json

@@ -48,7 +48,7 @@
     "apollo-link-context": "^1.0.20",
     "apollo-link-error": "1.1.13",
     "apollo-link-http": "1.5.17",
-    "axios": "^1.6.4",
+    "axios": "^1.6.8",
     "graphql": "14.3.1",
     "history": "^4.9.0",
     "monaco-editor": "^0.39.0",
@@ -92,7 +92,7 @@
     "css-minimizer-webpack-plugin": "^5.0.1",
     "enzyme": "^3.11.0",
     "enzyme-to-json": "^3.6.2",
-    "express": "^4.18.2",
+    "express": "^4.19.2",
     "file-loader": "^6.2.0",
     "filemanager-webpack-plugin": "^7.0.0",
     "html-webpack-plugin": "^5.3.2",
@@ -108,7 +108,7 @@
     "rimraf": "^3.0.2",
     "sass-loader": "^12.3.0",
     "serve": "^12.0.1",
-    "start-server-and-test": "^1.12.1",
+    "start-server-and-test": "^2.0.3",
     "stream-http": "^3.2.0",
     "style-loader": "^2.0.0",
     "svg-url-loader": "^8.0.0",