updating to resolve git conflicts

composer.json

@@ -11,18 +11,24 @@
     }
   ],
   "require": {
-    "php": ">=8.0.0",
-    "eftec/bladeone": "^4.8"
+    "php": ">=8.0.2",
+    "eftec/bladeone": "^3.52"
   },
   "require-dev": {
     "php-parallel-lint/php-parallel-lint": "^1.3.2",
-    "wp-cli/i18n-command": "^2.2.8",
+    "phpstan/extension-installer": "^1.1",
+    "phpstan/phpstan": "^1.8",
+    "szepeviktor/phpstan-wordpress": "^1.1",
+    "wp-cli/i18n-command": "^2.4.0",
     "wp-coding-standards/wpcs": "^2.3.0"
   },
   "config": {
     "optimize-autoloader": true,
     "preferred-install": "dist",
-    "sort-packages": true
+    "sort-packages": true,
+    "allow-plugins": {
+      "phpstan/extension-installer": true
+    }
   },
   "autoload": {
     "psr-4": {