merge conflict

apps/edr-freight-api/package.json

@@ -4,7 +4,10 @@
   "private": true,
   "description": "EDR Freight Management API",
   "scripts": {
+    "clean": "node -e \"const fs=require('fs'); fs.rmSync('dist',{recursive:true,force:true}); fs.rmSync('.tsbuildinfo',{force:true});\"",
+    "predev": "pnpm run clean",
     "dev": "nest start --watch",
+    "prebuild": "pnpm run clean",
     "build": "nest build",
     "start": "node dist/main.js",
     "lint": "eslint src",
@@ -15,11 +18,13 @@
   },
   "dependencies": {
     "@edr/api-common": "workspace:*",
+    "@edr/payment-providers": "workspace:*",
     "@edr/types": "workspace:*",
     "@nestjs/axios": "^4.0.1",
     "@nestjs/common": "^11.0.0",
     "@nestjs/config": "^4.0.0",
     "@nestjs/core": "^11.0.0",
+    "@nestjs/event-emitter": "^2.0.4",
     "@nestjs/mapped-types": "^2.1.1",
     "@nestjs/microservices": "^11.0.0",
     "@nestjs/platform-express": "^11.0.0",
@@ -61,7 +66,7 @@
     "ts-loader": "^9.5.1",
     "ts-node": "^10.9.2",
     "tsconfig-paths": "^4.2.0",
-    "typeorm": "^1.0.0",
+    "typeorm": "^0.3.30",
     "typescript": "^5.5.4"
   },
   "jest": {
@@ -81,4 +86,4 @@
     "coverageDirectory": "../coverage",
     "testEnvironment": "node"
   }
-}
+}