ERESOLVE unable to resolve dependency tree

package-lock.json

@@ -90,25 +90,11 @@
     },
     "dist/common": {
       "name": "@farmmaps/common",
-      "version": "4.20.0-prerelease.2600",
+      "version": "2.1.0",
       "dependencies": {
         "tslib": "^2.3.0"
       },
       "peerDependencies": {
-<<<<<<< HEAD
-        "@angular/common": "18.2.3",
-        "@angular/core": "18.2.3",
-        "@angular/forms": "18.2.3",
-        "@microsoft/signalr": "^3.1.16",
-        "@ng-bootstrap/ng-bootstrap": "^17.0.1",
-        "@ngrx/effects": "^18.0.2",
-        "@ngrx/router-store": "^18.0.2",
-        "@ngrx/store": "^18.0.2",
-        "angular-oauth2-oidc": "^17.0.2",
-        "bootstrap": "^5.3.3",
-        "moment": "^2.29.4",
-        "ngx-avatars": "^1.8.0",
-=======
         "@angular/common": "20.3.16",
         "@angular/core": "20.3.16",
         "@angular/forms": "20.3.16",
@@ -121,69 +107,50 @@
         "bootstrap": "^5.3.3",
         "moment": "^2.29.4",
         "ngx-avatars": "1.10.0",
->>>>>>> feature/AW6526Angular20
         "ngx-clipboard": "^16.0.0",
         "ngx-image-cropper": "^7.0.0",
-        "ngx-uploadx": "^6.2.0",
+        "ngx-uploadx": "7.0.1",
         "tassign": "^1.0.0"
       }
     },
     "dist/common-map": {
       "name": "@farmmaps/common-map",
-      "version": "4.20.0-prerelease.2600",
+      "version": "2.0.0",
       "dependencies": {
         "tslib": "^2.0.0"
       },
       "peerDependencies": {
-<<<<<<< HEAD
-        "@angular/core": "18.2.3",
-        "@ngrx/effects": "^18.0.2",
-        "@ngrx/router-store": "^18.0.2",
-        "@ngrx/store": "^18.0.2",
-        "ngrx-store-localstorage": "^18.0.0",
-=======
         "@angular/core": "20.3.16",
         "@ngrx/effects": "20.1.0",
         "@ngrx/router-store": "20.1.0",
         "@ngrx/store": "20.1.0",
         "ngrx-store-localstorage": "20.1.0",
->>>>>>> feature/AW6526Angular20
         "tassign": "^1.0.0"
       }
     },
     "dist/common-map3d": {
       "name": "@farmmaps/common-map3d",
-      "version": "4.20.0-prerelease.2600",
+      "version": "2.0.0",
       "dependencies": {
         "tslib": "^2.0.0"
       },
       "peerDependencies": {
-<<<<<<< HEAD
-        "@angular/common": "18.2.3",
-        "@angular/core": "18.2.3",
-=======
         "@angular/common": "20.3.16",
         "@angular/core": "20.3.16",
->>>>>>> feature/AW6526Angular20
         "cesium": "^1.97.0",
         "ol-cesium": ">=2.13.0"
       }
     },
     "dist/ng-openlayers": {
       "name": "@farmmaps/ng-openlayers",
-      "version": "4.20.0-prerelease.2600",
+      "version": "18.0.0",
       "license": "MPL-2.0",
       "dependencies": {
         "tslib": "^2.3.0"
       },
       "peerDependencies": {
-<<<<<<< HEAD
-        "@angular/common": "18.2.3",
-        "@angular/core": "18.2.3",
-=======
         "@angular/common": "20.3.16",
         "@angular/core": "20.3.16",
->>>>>>> feature/AW6526Angular20
         "ol": "^8.2.0"
       }
     },

projects/ng-openlayers/package-lock.json

@@ -1,54 +1,63 @@
 {
-  "name": "ng-openlayers",
+  "name": "@farmmaps/ng-openlayers",
   "version": "18.0.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
-      "name": "ng-openlayers",
+      "name": "@farmmaps/ng-openlayers",
       "version": "18.0.0",
       "license": "MPL-2.0",
       "dependencies": {
         "tslib": "^2.3.0"
       },
       "peerDependencies": {
-        "@angular/common": "^18.2.3",
+        "@angular/common": "20.3.16",
-        "@angular/core": "^18.2.3",
+        "@angular/core": "20.3.16",
         "ol": "^8.2.0"
       }
     },
     "node_modules/@angular/common": {
-      "version": "18.2.3",
+      "version": "20.3.16",
-      "resolved": "https://registry.npmjs.org/@angular/common/-/common-18.2.3.tgz",
+      "resolved": "https://registry.npmjs.org/@angular/common/-/common-20.3.16.tgz",
-      "integrity": "sha512-NFL4yXXImSCH7i1xnHykUjHa9vl9827fGiwSV2mnf7LjSUsyDzFD8/54dNuYN9OY8AUD+PnK0YdNro6cczVyIA==",
+      "integrity": "sha512-GRAziNlntwdnJy3F+8zCOvDdy7id0gITjDnM6P9+n2lXvtDuBLGJKU3DWBbvxcCjtD6JK/g/rEX5fbCxbUHkQQ==",
       "license": "MIT",
       "peer": true,
       "dependencies": {
         "tslib": "^2.3.0"
       },
       "engines": {
-        "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
+        "node": "^20.19.0 || ^22.12.0 || >=24.0.0"
       },
       "peerDependencies": {
-        "@angular/core": "18.2.3",
+        "@angular/core": "20.3.16",
         "rxjs": "^6.5.3 || ^7.4.0"
       }
     },
     "node_modules/@angular/core": {
-      "version": "18.2.3",
+      "version": "20.3.16",
-      "resolved": "https://registry.npmjs.org/@angular/core/-/core-18.2.3.tgz",
+      "resolved": "https://registry.npmjs.org/@angular/core/-/core-20.3.16.tgz",
-      "integrity": "sha512-VGhMJxj7d0rYpqVfQrcGRB7EE/BCziotft/I/YPl6bOMPSAvMukG7DXQuJdYpNrr62ks78mlzHlZX/cdmB9Prw==",
+      "integrity": "sha512-KSFPKvOmWWLCJBbEO+CuRUXfecX2FRuO0jNi9c54ptXMOPHlK1lIojUnyXmMNzjdHgRug8ci9qDuftvC2B7MKg==",
       "license": "MIT",
       "peer": true,
       "dependencies": {
         "tslib": "^2.3.0"
       },
       "engines": {
-        "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
+        "node": "^20.19.0 || ^22.12.0 || >=24.0.0"
       },
       "peerDependencies": {
+        "@angular/compiler": "20.3.16",
         "rxjs": "^6.5.3 || ^7.4.0",
-        "zone.js": "~0.14.10"
+        "zone.js": "~0.15.0"
+      },
+      "peerDependenciesMeta": {
+        "@angular/compiler": {
+          "optional": true
+        },
+        "zone.js": {
+          "optional": true
+        }
       }
     },
     "node_modules/@petamoriken/float16": {
@@ -246,9 +255,9 @@
       }
     },
     "node_modules/rxjs": {
-      "version": "7.8.1",
+      "version": "7.8.2",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.2.tgz",
-      "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
+      "integrity": "sha512-dhKf903U/PQZY6boNNtAGdWbG85WAbjT/1xYoZIC7FAY0yWapOBQVsVrDl58W86//e1VpMNBtRV4MaXfdMySFA==",
       "license": "Apache-2.0",
       "peer": true,
       "dependencies": {
@@ -274,13 +283,6 @@
       "license": "CC0-1.0",
       "peer": true
     },
-    "node_modules/zone.js": {
-      "version": "0.14.10",
-      "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.14.10.tgz",
-      "integrity": "sha512-YGAhaO7J5ywOXW6InXNlLmfU194F8lVgu7bRntUF3TiG8Y3nBK0x1UJJuHUP/e8IyihkjCYqhCScpSwnlaSRkQ==",
-      "license": "MIT",
-      "peer": true
-    },
     "node_modules/zstddec": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/zstddec/-/zstddec-0.1.0.tgz",