Fixed the merge conflicts

Author: mashm

package-lock.json

@@ -93,9 +93,9 @@
     "@angular/compiler-cli": "^18.2.12",
     "@angular/language-service": "^18.2.12",
     "@pega/configs": "^0.16.2",
-    "@pega/constellationjs": "24.1.1-dev",
+    "@pega/constellationjs": "~24.2.0",
     "@pega/eslint-config": "^0.16.2",
-    "@pega/pcore-pconnect-typedefs": "~3.2.1",
+    "@pega/pcore-pconnect-typedefs": "3.2.1",
     "@pega/prettier-config": "^0.16.2",
     "@playwright/test": "^1.40.1",
     "@types/jasmine": "~5.1.4",