diff --git a/node_modules/.package-lock.json b/node_modules/.package-lock.json
index d760d4aac2..9500f282f6 100644
--- a/node_modules/.package-lock.json
+++ b/node_modules/.package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "codeql",
-  "version": "3.24.1",
+  "version": "2.24.1",
   "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
diff --git a/package-lock.json b/package-lock.json
index 8431518fd6..7838b21792 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "codeql",
-  "version": "3.24.1",
+  "version": "2.24.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "codeql",
-      "version": "3.24.1",
+      "version": "2.24.1",
       "license": "MIT",
       "dependencies": {
         "@actions/artifact": "^1.1.2",
@@ -42,13 +42,8 @@
         "@types/adm-zip": "^0.5.5",
         "@types/get-folder-size": "^2.0.0",
         "@types/js-yaml": "^4.0.9",
-<<<<<<< HEAD
         "@types/node": "16.11.22",
-        "@types/semver": "^7.5.6",
-=======
-        "@types/node": "20.9.0",
         "@types/semver": "^7.5.7",
->>>>>>> origin/releases/v3
         "@types/sinon": "^17.0.3",
         "@typescript-eslint/eslint-plugin": "^6.21.0",
         "@typescript-eslint/parser": "^6.21.0",