diff --git a/node_modules/.package-lock.json b/node_modules/.package-lock.json
index 6a9f043778..39d16fd40b 100644
--- a/node_modules/.package-lock.json
+++ b/node_modules/.package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "codeql",
-  "version": "3.23.0",
+  "version": "2.23.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
diff --git a/node_modules/@types/node/package.json b/node_modules/@types/node/package.json
index bd84e41219..331cc70fd8 100755
--- a/node_modules/@types/node/package.json
+++ b/node_modules/@types/node/package.json
@@ -213,32 +213,13 @@
   ],
   "main": "",
   "types": "index.d.ts",
-<<<<<<< HEAD
-  "typesVersions": {
-    "<=4.8": {
-      "*": [
-        "ts4.8/*"
-      ]
-    }
-  },
-=======
->>>>>>> parent of f2d0c2e7a (upgrade node type definitions)
   "repository": {
     "type": "git",
     "url": "https://github.com/DefinitelyTyped/DefinitelyTyped.git",
     "directory": "types/node"
   },
   "scripts": {},
-<<<<<<< HEAD
-  "dependencies": {
-    "undici-types": "~5.26.4"
-  },
-  "typesPublisherContentHash": "a1b366d7b3bf1afaa88e038010565763e234c0e5fa8044db8b0d7c44995bfbf8",
-  "typeScriptVersion": "4.5",
-  "nonNpm": true
-=======
   "dependencies": {},
   "typesPublisherContentHash": "57a94e60cf640ea4d81b4fa914f3fb5929a63ae0b4d5141d7daf250c569e7d10",
   "typeScriptVersion": "3.8"
->>>>>>> parent of f2d0c2e7a (upgrade node type definitions)
-}
+}
\ No newline at end of file