diff --git a/docs/static/llama-stack-spec.html b/docs/static/llama-stack-spec.html
index ed6c0d25d..92ba11d58 100644
--- a/docs/static/llama-stack-spec.html
+++ b/docs/static/llama-stack-spec.html
@@ -5670,7 +5670,28 @@
                     }
                 }
             },
-<<<<<<< HEAD
+            "OpenAIResponseContentPartRefusal": {
+                "type": "object",
+                "properties": {
+                    "type": {
+                        "type": "string",
+                        "const": "refusal",
+                        "default": "refusal",
+                        "description": "Content part type identifier, always \"refusal\""
+                    },
+                    "refusal": {
+                        "type": "string",
+                        "description": "Refusal text supplied by the model"
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "type",
+                    "refusal"
+                ],
+                "title": "OpenAIResponseContentPartRefusal",
+                "description": "Refusal content within a streamed response part."
+            },
             "OpenAIResponseInputFunctionToolCallOutput": {
                 "type": "object",
                 "properties": {
@@ -5690,38 +5711,16 @@
                     },
                     "status": {
                         "type": "string"
-=======
-            "OpenAIResponseContentPartRefusal": {
-                "type": "object",
-                "properties": {
-                    "type": {
-                        "type": "string",
-                        "const": "refusal",
-                        "default": "refusal",
-                        "description": "Content part type identifier, always \"refusal\""
-                    },
-                    "refusal": {
-                        "type": "string",
-                        "description": "Refusal text supplied by the model"
->>>>>>> 181046f9 (feat: Add responses and safety impl extra_body)
                     }
                 },
                 "additionalProperties": false,
                 "required": [
-<<<<<<< HEAD
                     "call_id",
                     "output",
                     "type"
                 ],
                 "title": "OpenAIResponseInputFunctionToolCallOutput",
                 "description": "This represents the output of a function call that gets passed back to the model."
-=======
-                    "type",
-                    "refusal"
-                ],
-                "title": "OpenAIResponseContentPartRefusal",
-                "description": "Refusal content within a streamed response part."
->>>>>>> 181046f9 (feat: Add responses and safety impl extra_body)
             },
             "OpenAIResponseInputMessageContent": {
                 "oneOf": [
diff --git a/docs/static/llama-stack-spec.yaml b/docs/static/llama-stack-spec.yaml
index e4e39e7cc..f7f77e635 100644
--- a/docs/static/llama-stack-spec.yaml
+++ b/docs/static/llama-stack-spec.yaml
@@ -4291,7 +4291,25 @@ components:
           url_citation: '#/components/schemas/OpenAIResponseAnnotationCitation'
           container_file_citation: '#/components/schemas/OpenAIResponseAnnotationContainerFileCitation'
           file_path: '#/components/schemas/OpenAIResponseAnnotationFilePath'
-<<<<<<< HEAD
+    OpenAIResponseContentPartRefusal:
+      type: object
+      properties:
+        type:
+          type: string
+          const: refusal
+          default: refusal
+          description: >-
+            Content part type identifier, always "refusal"
+        refusal:
+          type: string
+          description: Refusal text supplied by the model
+      additionalProperties: false
+      required:
+        - type
+        - refusal
+      title: OpenAIResponseContentPartRefusal
+      description: >-
+        Refusal content within a streamed response part.
     "OpenAIResponseInputFunctionToolCallOutput":
       type: object
       properties:
@@ -4317,27 +4335,6 @@ components:
       description: >-
         This represents the output of a function call that gets passed back to the
         model.
-=======
-    OpenAIResponseContentPartRefusal:
-      type: object
-      properties:
-        type:
-          type: string
-          const: refusal
-          default: refusal
-          description: >-
-            Content part type identifier, always "refusal"
-        refusal:
-          type: string
-          description: Refusal text supplied by the model
-      additionalProperties: false
-      required:
-        - type
-        - refusal
-      title: OpenAIResponseContentPartRefusal
-      description: >-
-        Refusal content within a streamed response part.
->>>>>>> 181046f9 (feat: Add responses and safety impl extra_body)
     OpenAIResponseInputMessageContent:
       oneOf:
         - $ref: '#/components/schemas/OpenAIResponseInputMessageContentText'
diff --git a/docs/static/stainless-llama-stack-spec.html b/docs/static/stainless-llama-stack-spec.html
index 4b3b22886..08f19ff59 100644
--- a/docs/static/stainless-llama-stack-spec.html
+++ b/docs/static/stainless-llama-stack-spec.html
@@ -7342,7 +7342,28 @@
                     }
                 }
             },
-<<<<<<< HEAD
+            "OpenAIResponseContentPartRefusal": {
+                "type": "object",
+                "properties": {
+                    "type": {
+                        "type": "string",
+                        "const": "refusal",
+                        "default": "refusal",
+                        "description": "Content part type identifier, always \"refusal\""
+                    },
+                    "refusal": {
+                        "type": "string",
+                        "description": "Refusal text supplied by the model"
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "type",
+                    "refusal"
+                ],
+                "title": "OpenAIResponseContentPartRefusal",
+                "description": "Refusal content within a streamed response part."
+            },
             "OpenAIResponseInputFunctionToolCallOutput": {
                 "type": "object",
                 "properties": {
@@ -7362,38 +7383,16 @@
                     },
                     "status": {
                         "type": "string"
-=======
-            "OpenAIResponseContentPartRefusal": {
-                "type": "object",
-                "properties": {
-                    "type": {
-                        "type": "string",
-                        "const": "refusal",
-                        "default": "refusal",
-                        "description": "Content part type identifier, always \"refusal\""
-                    },
-                    "refusal": {
-                        "type": "string",
-                        "description": "Refusal text supplied by the model"
->>>>>>> 181046f9 (feat: Add responses and safety impl extra_body)
                     }
                 },
                 "additionalProperties": false,
                 "required": [
-<<<<<<< HEAD
                     "call_id",
                     "output",
                     "type"
                 ],
                 "title": "OpenAIResponseInputFunctionToolCallOutput",
                 "description": "This represents the output of a function call that gets passed back to the model."
-=======
-                    "type",
-                    "refusal"
-                ],
-                "title": "OpenAIResponseContentPartRefusal",
-                "description": "Refusal content within a streamed response part."
->>>>>>> 181046f9 (feat: Add responses and safety impl extra_body)
             },
             "OpenAIResponseInputMessageContent": {
                 "oneOf": [
diff --git a/docs/static/stainless-llama-stack-spec.yaml b/docs/static/stainless-llama-stack-spec.yaml
index 2e3d59ae0..5469b3cc2 100644
--- a/docs/static/stainless-llama-stack-spec.yaml
+++ b/docs/static/stainless-llama-stack-spec.yaml
@@ -5504,7 +5504,25 @@ components:
           url_citation: '#/components/schemas/OpenAIResponseAnnotationCitation'
           container_file_citation: '#/components/schemas/OpenAIResponseAnnotationContainerFileCitation'
           file_path: '#/components/schemas/OpenAIResponseAnnotationFilePath'
-<<<<<<< HEAD
+    OpenAIResponseContentPartRefusal:
+      type: object
+      properties:
+        type:
+          type: string
+          const: refusal
+          default: refusal
+          description: >-
+            Content part type identifier, always "refusal"
+        refusal:
+          type: string
+          description: Refusal text supplied by the model
+      additionalProperties: false
+      required:
+        - type
+        - refusal
+      title: OpenAIResponseContentPartRefusal
+      description: >-
+        Refusal content within a streamed response part.
     "OpenAIResponseInputFunctionToolCallOutput":
       type: object
       properties:
@@ -5530,27 +5548,6 @@ components:
       description: >-
         This represents the output of a function call that gets passed back to the
         model.
-=======
-    OpenAIResponseContentPartRefusal:
-      type: object
-      properties:
-        type:
-          type: string
-          const: refusal
-          default: refusal
-          description: >-
-            Content part type identifier, always "refusal"
-        refusal:
-          type: string
-          description: Refusal text supplied by the model
-      additionalProperties: false
-      required:
-        - type
-        - refusal
-      title: OpenAIResponseContentPartRefusal
-      description: >-
-        Refusal content within a streamed response part.
->>>>>>> 181046f9 (feat: Add responses and safety impl extra_body)
     OpenAIResponseInputMessageContent:
       oneOf:
         - $ref: '#/components/schemas/OpenAIResponseInputMessageContentText'