resolve conflicts

package.json

@@ -62,53 +62,15 @@
   "author": "Google LLC",
   "license": "Apache-2.0",
   "dependencies": {
-<<<<<<< HEAD
-    "babel-plugin-replace-import-extension": "^1.1.4",
-    "gaxios": "^6.1.1",
-    "json-bigint": "^1.0.0"
+    "json-bigint": "^1.0.0",
+    "gaxios": "^6.7.1"
   },
   "devDependencies": {
+    "babel-plugin-replace-import-extension": "^1.1.4",
     "@babel/cli": "^7.23.0",
     "@babel/core": "^7.23.0",
     "@babel/preset-env": "^7.22.20",
     "@babel/preset-typescript": "^7.23.0",
-    "@google-cloud/functions": "^3.0.0",
-    "@types/json-bigint": "^1.0.0",
-    "@types/mocha": "^9.0.0",
-    "@types/mv": "^2.1.4",
-    "@types/ncp": "^2.0.1",
-    "@types/node": "^20.0.0",
-    "@types/proxyquire": "^1.3.31",
-    "@types/sinon": "^17.0.0",
-    "@types/tmp": "0.2.6",
-    "@types/uuid": "^9.0.0",
-    "c8": "^9.0.0",
-    "cross-env": "^7.0.3",
-    "esm": "^3.2.25",
-    "esmock": "^2.6.9",
-    "gapic-tools": "^0.4.0",
-    "gcbuild": "^1.3.4",
-    "gcx": "^1.0.0",
-    "gts": "^6.0.0",
-    "jsdoc": "^4.0.0",
-    "jsdoc-fresh": "^3.0.0",
-    "jsdoc-region-tag": "^3.0.0",
-    "linkinator": "^3.0.0",
-    "mocha": "^8.0.0",
-    "mv": "^2.1.1",
-    "ncp": "^2.0.0",
-    "nock": "^13.0.0",
-    "pack-n-play": "^2.0.3",
-    "proxyquire": "^2.1.3",
-    "sinon": "^18.0.0",
-    "tmp": "^0.2.0",
-    "typescript": "^5.1.6",
-    "uuid": "^9.0.0"
-=======
-    "json-bigint": "^1.0.0",
-    "gaxios": "^6.7.1"
-  },
-  "devDependencies": {
     "@google-cloud/functions": "^3.6.0",
     "@types/json-bigint": "^1.0.4",
     "@types/mocha": "^10.0.9",
@@ -119,6 +81,8 @@
     "@types/uuid": "^10.0.0",
     "c8": "^10.1.2",
     "cross-env": "^7.0.3",
+    "esmock": "^2.6.9",
+    "gapic-tools": "^0.4.0",
     "gcbuild": "^1.3.39",
     "gcx": "^1.0.0",
     "gts": "^6.0.2",
@@ -133,7 +97,6 @@
     "tmp": "^0.2.3",
     "typescript": "^5.6.3",
     "uuid": "^11.0.2"
->>>>>>> main
   },
   "engines": {
     "node": ">=18"

tsconfig.json

@@ -19,19 +19,12 @@
     ]
   },
   "include": [
-<<<<<<< HEAD
     "esm/src/*.ts",
     "esm/test/*.ts",
     "esm/system-test/*.ts",
     "esm/system-test/**/*.ts",
     "esm/system-test/fixtures/**/*.ts",
     "esm/system-test/fixtures/kitchen/package.json",
     "package.json"
-=======
-    "src/*.ts",
-    "test/*.ts",
-    "system-test/*.ts",
-    "test/**/*.ts"
->>>>>>> main
   ],
 }