diff --git a/package-lock.json b/package-lock.json
index 748ff5f2..7b3f6c0c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -111,14 +111,9 @@
             "devDependencies": {
                 "@dotenvx/dotenvx": "1.51.0",
                 "@esbuild-plugins/tsconfig-paths": "0.1.2",
-<<<<<<< HEAD
                 "@faker-js/faker": "^10.1.0",
-                "@react-email/preview-server": "4.3.1",
-                "@tailwindcss/postcss": "^4.1.14",
-=======
                 "@react-email/preview-server": "4.3.2",
                 "@tailwindcss/postcss": "^4.1.16",
->>>>>>> dev
                 "@types/better-sqlite3": "7.6.12",
                 "@types/cookie-parser": "1.4.10",
                 "@types/cors": "2.8.19",
@@ -128,16 +123,10 @@
                 "@types/jmespath": "^0.15.2",
                 "@types/js-yaml": "4.0.9",
                 "@types/jsonwebtoken": "^9.0.10",
-<<<<<<< HEAD
-                "@types/node": "24.8.1",
-                "@types/nodemailer": "7.0.2",
-                "@types/nprogress": "^0.2.3",
-                "@types/pg": "8.15.5",
-=======
                 "@types/node": "24.9.2",
                 "@types/nodemailer": "7.0.3",
+                "@types/nprogress": "^0.2.3",
                 "@types/pg": "8.15.6",
->>>>>>> dev
                 "@types/react": "19.2.2",
                 "@types/react-dom": "19.2.2",
                 "@types/semver": "^7.7.1",
diff --git a/server/routers/blueprints/listBluePrints.ts b/server/routers/blueprints/listBlueprints.ts
similarity index 100%
rename from server/routers/blueprints/listBluePrints.ts
rename to server/routers/blueprints/listBlueprints.ts