Resolve merge conflict and get latest from develop

Author: pmakode-akamai

package.json

@@ -27,7 +27,7 @@
     "typescript-eslint": "^8.29.0",
     "@typescript-eslint/eslint-plugin": "^8.29.0",
     "@typescript-eslint/parser": "^8.29.0",
-    "@linode/eslint-plugin-cloud-manager": "^0.0.10"
+    "@linode/eslint-plugin-cloud-manager": "^0.0.11"
   },
   "scripts": {
     "lint:all": "pnpm -r --parallel lint",

packages/api-v4/.changeset/pr-12217-changed-1747239928776.md

@@ -0,0 +1,5 @@
+---
+"@linode/api-v4": Changed
+---
+
+Make AccountMaintenance description field type more specific ([#12293](https://github.com/linode/manager/pull/12293))

packages/api-v4/.changeset/pr-12223-removed-1747346374792.md

@@ -0,0 +1,5 @@
+---
+"@linode/api-v4": Upcoming Features
+---
+
+IAM RBAC: Add role and new entity types ([#12296](https://github.com/linode/manager/pull/12296))

packages/api-v4/.changeset/pr-12231-added-1747351003855.md

@@ -0,0 +1,5 @@
+---
+"@linode/api-v4": Upcoming Features
+---
+
+Add ACLP `getCloudPulseServiceByServiceType` service and update `ServiceTypes` per API specs ([#12307](https://github.com/linode/manager/pull/12307))