diff --git a/packages/backend/package-lock.json b/packages/backend/package-lock.json
index 10d0b230c5..d5cb15250a 100644
--- a/packages/backend/package-lock.json
+++ b/packages/backend/package-lock.json
@@ -79,10 +79,7 @@
         "fetch-mock-jest": "^1.5.1",
         "jest": "^29.4.2",
         "mock-fs": "^5.1.2",
-<<<<<<< HEAD
         "run-script-os": "1.1.6",
-=======
->>>>>>> parent of ced218157 (Adjust project bootstrap scripts to be windows-friendly (#1870))
         "tmp": "^0.2.1",
         "ts-jest": "^29.0.3",
         "ts-loader": "9.4.2",
diff --git a/packages/backend/package.json b/packages/backend/package.json
index 5c96120f24..1ad9ffd651 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -17,7 +17,6 @@
 		"version": "git add -A src",
 		"lint": "eslint --ext .jsx,.js,.ts,.tsx ./src/ --fix",
 		"lint-ci": "eslint --ext .jsx,.js,.ts,.tsx ./src/",
-		"test2": "cross-env NODE_OPTIONS=--experimental-vm-modules DEBUG=ipfs:*,backend:* node_modules/jest/bin/jest.js",
 		"test-nest": "cross-env NODE_OPTIONS=--experimental-vm-modules DEBUG=ipfs:*,backend:* node_modules/jest/bin/jest.js --detectOpenHandles --forceExit   ./src/nest/**/*.spec.ts",
 		"test": "cross-env NODE_OPTIONS=--experimental-vm-modules DEBUG=ipfs:*,backend:* node_modules/jest/bin/jest.js ./src/**/* --runInBand --verbose --testPathIgnorePatterns=\".src/(!?nodeTest*)|(.node_modules*)\"",
 		"test-ci": "cross-env NODE_OPTIONS=--experimental-vm-modules jest ./src/**/* --runInBand --colors --ci --silent --verbose --testPathIgnorePatterns=\".src/nest/(!?nodeTest*)|(.node_modules*)|src/nest/.*\\.tor.spec\\.(t|j)s|src/nest/ipfs-file-manager/big-files.long.spec.ts$\"",