diff --git a/src/cloud/openapi/openapi-typescript.ts b/src/cloud/openapi/openapi-typescript.ts
index 8533bac..3a96ec3 100644
--- a/src/cloud/openapi/openapi-typescript.ts
+++ b/src/cloud/openapi/openapi-typescript.ts
@@ -10368,6 +10368,11 @@ export interface paths {
 					headers: Readonly<Record<string, unknown>>
 					content?: never
 				}
+				/** @description Unable to merge because one of the refs involved changed while attempting to merge */
+				readonly 409: {
+					headers: Readonly<Record<string, unknown>>
+					content?: never
+				}
 				/** @description If the merge took too long and timed out.
 				 *     In this case the caller should retry the request later */
 				readonly 555: {
@@ -10491,6 +10496,11 @@ export interface paths {
 					headers: Readonly<Record<string, unknown>>
 					content?: never
 				}
+				/** @description Unable to merge because one of the refs involved changed while attempting to merge */
+				readonly 409: {
+					headers: Readonly<Record<string, unknown>>
+					content?: never
+				}
 			}
 		}
 		readonly put?: never
@@ -18949,6 +18959,9 @@ export interface components {
 				readonly merge_strategies?: readonly (
 					| "fast_forward"
 					| "merge_commit"
+					| "rebase_fast_forward"
+					| "rebase_merge"
+					| "squash_fast_forward"
 					| "squash"
 				)[]
 			})
@@ -22044,6 +22057,9 @@ export interface components {
 				readonly merge_strategies?: readonly (
 					| "fast_forward"
 					| "merge_commit"
+					| "rebase_fast_forward"
+					| "rebase_merge"
+					| "squash_fast_forward"
 					| "squash"
 				)[]
 				readonly name?: string
@@ -22066,7 +22082,13 @@ export interface components {
 			 * @default merge_commit
 			 * @enum {string}
 			 */
-			readonly merge_strategy?: "fast_forward" | "merge_commit" | "squash"
+			readonly merge_strategy?:
+				| "fast_forward"
+				| "merge_commit"
+				| "rebase_fast_forward"
+				| "rebase_merge"
+				| "squash_fast_forward"
+				| "squash"
 			/** @description The commit message that will be used on the resulting commit. Note that the size of the message is limited to 128 KiB. */
 			readonly message?: string
 			readonly type: string
@@ -22826,6 +22848,15 @@ export interface components {
 			(Readonly<Record<string, unknown>> & {
 				/** Format: date-time */
 				readonly created_on?: string
+				/**
+				 * @description Controls the rules for forking repositories within this workspace.
+				 *
+				 *     * **allow_forks**: unrestricted forking
+				 *     * **internal_only**: prevents forking of private repositories outside the workspace or to public repositories
+				 *
+				 * @enum {string}
+				 */
+				readonly forking_mode?: "allow_forks" | "internal_only"
 				/** @description Indicates whether the workspace enforces private content, or whether it allows public content. */
 				readonly is_privacy_enforced?: boolean
 				/** @description Indicates whether the workspace is publicly accessible, or whether it is
diff --git a/src/cloud/openapi/swagger.v3.json b/src/cloud/openapi/swagger.v3.json
index f7fafc1..f4a1ac1 100644
--- a/src/cloud/openapi/swagger.v3.json
+++ b/src/cloud/openapi/swagger.v3.json
@@ -14571,6 +14571,9 @@
 					"202": {
 						"description": "In the Location header, the URL to poll for the pull request merge status"
 					},
+					"409": {
+						"description": "Unable to merge because one of the refs involved changed while attempting to merge"
+					},
 					"555": {
 						"description": "If the merge took too long and timed out.\nIn this case the caller should retry the request later",
 						"content": {
@@ -14668,6 +14671,9 @@
 					},
 					"403": {
 						"description": "The user making the request does not have permission to the repo and is different from the user who queued the task"
+					},
+					"409": {
+						"description": "Unable to merge because one of the refs involved changed while attempting to merge"
 					}
 				},
 				"security": [
@@ -15821,7 +15827,10 @@
 													"merge_strategies": [
 														"merge_commit",
 														"squash",
-														"fast_forward"
+														"fast_forward",
+														"squash_fast_forward",
+														"rebase_fast_forward",
+														"rebase_merge"
 													],
 													"type": "branch",
 													"target": {
@@ -16133,7 +16142,10 @@
 											"merge_strategies": [
 												"merge_commit",
 												"squash",
-												"fast_forward"
+												"fast_forward",
+												"squash_fast_forward",
+												"rebase_fast_forward",
+												"rebase_merge"
 											],
 											"type": "branch",
 											"target": {
@@ -24659,7 +24671,7 @@
 			"description": "A workspace is where you create repositories, collaborate on\nyour code, and organize different streams of work in your Bitbucket\nCloud account. Workspaces replace the use of teams and users in API\ncalls.\n"
 		}
 	],
-	"x-revision": "33b035ea9108",
+	"x-revision": "6e8ad69baf7f",
 	"x-atlassian-narrative": {
 		"documents": [
 			{
@@ -29978,7 +29990,14 @@
 					"merge_strategy": {
 						"type": "string",
 						"description": "The merge strategy that will be used to merge the pull request.",
-						"enum": ["merge_commit", "squash", "fast_forward"],
+						"enum": [
+							"merge_commit",
+							"squash",
+							"fast_forward",
+							"squash_fast_forward",
+							"rebase_fast_forward",
+							"rebase_merge"
+						],
 						"default": "merge_commit"
 					}
 				},
@@ -30004,7 +30023,14 @@
 								"description": "Available merge strategies, when this endpoint is the destination of the pull request.",
 								"items": {
 									"type": "string",
-									"enum": ["merge_commit", "squash", "fast_forward"]
+									"enum": [
+										"merge_commit",
+										"squash",
+										"fast_forward",
+										"squash_fast_forward",
+										"rebase_fast_forward",
+										"rebase_merge"
+									]
 								}
 							},
 							"default_merge_strategy": {
@@ -31914,6 +31940,11 @@
 								"type": "boolean",
 								"description": "Indicates whether the workspace enforces private content, or whether it allows public content."
 							},
+							"forking_mode": {
+								"type": "string",
+								"description": "Controls the rules for forking repositories within this workspace.\n\n* **allow_forks**: unrestricted forking\n* **internal_only**: prevents forking of private repositories outside the workspace or to public repositories\n",
+								"enum": ["allow_forks", "internal_only"]
+							},
 							"created_on": {
 								"type": "string",
 								"format": "date-time"
@@ -32362,7 +32393,14 @@
 								"description": "Available merge strategies for pull requests targeting this branch.",
 								"items": {
 									"type": "string",
-									"enum": ["merge_commit", "squash", "fast_forward"]
+									"enum": [
+										"merge_commit",
+										"squash",
+										"fast_forward",
+										"squash_fast_forward",
+										"rebase_fast_forward",
+										"rebase_merge"
+									]
 								}
 							},
 							"default_merge_strategy": {