From c8009883bf064e991c1d4877adc01c4afca2efb9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Mar 2026 09:20:39 +0000
Subject: [PATCH 1/2] deps(npm)(deps): update express requirement from ^4.19.2
 to ^4.22.1

Updates the requirements on [express](https://github.com/expressjs/express) to permit the latest version.
- [Release notes](https://github.com/expressjs/express/releases)
- [Changelog](https://github.com/expressjs/express/blob/v4.22.1/History.md)
- [Commits](https://github.com/expressjs/express/compare/4.19.2...v4.22.1)

---
updated-dependencies:
- dependency-name: express
  dependency-version: 4.22.1
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 backend/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/package.json b/backend/package.json
index 2437eac..9ce4b10 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -16,7 +16,7 @@
     "bcrypt": "^5.1.1",
     "cors": "^2.8.6",
     "dotenv": "^16.6.1",
-    "express": "^4.19.2",
+    "express": "^4.22.1",
     "express-rate-limit": "^7.3.1",
     "helmet": "^7.1.0",
     "jsonwebtoken": "^9.0.3",

From 54aa6ab8a9d71ecd3e5edfbc4ee9ccff16e915a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Systems=20Architect=20=E2=80=A2=20AI=20Tooling=20=E2=80=A2?=
 =?UTF-8?q?=20Civic=20Monitoring?=
 <137366958+POWDER-RANGER@users.noreply.github.com>
Date: Sat, 6 Jun 2026 17:51:59 -0500
Subject: [PATCH 2/2] fix: resolve merge conflict in backend/package.json

- Keep express ^4.22.1 from Dependabot branch
- Keep express-rate-limit ^7.5.1 from main
- Remove duplicate @types/pg entry, retain newer ^8.20.0
---
 backend/package.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/backend/package.json b/backend/package.json
index 9ce4b10..13db8a3 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -17,20 +17,20 @@
     "cors": "^2.8.6",
     "dotenv": "^16.6.1",
     "express": "^4.22.1",
-    "express-rate-limit": "^7.3.1",
+    "express-rate-limit": "^7.5.1",
     "helmet": "^7.1.0",
     "jsonwebtoken": "^9.0.3",
-    "pg": "^8.11.5",
+    "pg": "^8.20.0",
     "rss-parser": "^3.13.0",
-    "zod": "^3.23.8"
+    "zod": "^3.25.76"
   },
   "devDependencies": {
     "@types/bcrypt": "^5.0.2",
     "@types/cors": "^2.8.17",
     "@types/express": "^4.17.21",
-    "@types/jsonwebtoken": "^9.0.6",
+    "@types/jsonwebtoken": "^9.0.10",
     "@types/node": "^20.12.12",
-    "@types/pg": "^8.11.6",
+    "@types/pg": "^8.20.0",
     "@types/rss-parser": "^3.13.4",
     "jest": "^29.7.0",
     "ts-jest": "^29.4.6",