diff --git a/docs/_static/llama-stack-spec.html b/docs/_static/llama-stack-spec.html
index c50554092..22fa781ac 100644
--- a/docs/_static/llama-stack-spec.html
+++ b/docs/_static/llama-stack-spec.html
@@ -4654,22 +4654,12 @@
             "CompletionResponse": {
                 "type": "object",
                 "properties": {
-<<<<<<< dest:   ed6caead724a - ehhuang: chore: simplify _get_tool_defs (#1384)
                     "metrics": {
                         "type": "array",
                         "items": {
                             "$ref": "#/components/schemas/MetricInResponse"
                         }
                     },
-||||||| base:   1311faf3f5e7 - ehhuang: fix: logging (#1598)
-=======
-                    "metrics": {
-                        "type": "array",
-                        "items": {
-                            "$ref": "#/components/schemas/MetricEvent"
-                        }
-                    },
->>>>>>> source: ad32270ad0d5 - erichuang: feat(api): remove tool_name from To...
                     "content": {
                         "type": "string",
                         "description": "The generated completion text"
@@ -5037,22 +5027,12 @@
             "CompletionResponseStreamChunk": {
                 "type": "object",
                 "properties": {
-<<<<<<< dest:   ed6caead724a - ehhuang: chore: simplify _get_tool_defs (#1384)
                     "metrics": {
                         "type": "array",
                         "items": {
                             "$ref": "#/components/schemas/MetricInResponse"
                         }
                     },
-||||||| base:   1311faf3f5e7 - ehhuang: fix: logging (#1598)
-=======
-                    "metrics": {
-                        "type": "array",
-                        "items": {
-                            "$ref": "#/components/schemas/MetricEvent"
-                        }
-                    },
->>>>>>> source: ad32270ad0d5 - erichuang: feat(api): remove tool_name from To...
                     "delta": {
                         "type": "string",
                         "description": "New content generated since last chunk. This can be one or more tokens."
diff --git a/docs/_static/llama-stack-spec.yaml b/docs/_static/llama-stack-spec.yaml
index 1f9536c2e..1f01351e9 100644
--- a/docs/_static/llama-stack-spec.yaml
+++ b/docs/_static/llama-stack-spec.yaml
@@ -3176,18 +3176,10 @@ components:
     CompletionResponse:
       type: object
       properties:
-<<<<<<< dest:   ed6caead724a - ehhuang: chore: simplify _get_tool_defs (#1384)
         metrics:
           type: array
           items:
             $ref: '#/components/schemas/MetricInResponse'
-||||||| base:   1311faf3f5e7 - ehhuang: fix: logging (#1598)
-=======
-        metrics:
-          type: array
-          items:
-            $ref: '#/components/schemas/MetricEvent'
->>>>>>> source: ad32270ad0d5 - erichuang: feat(api): remove tool_name from To...
         content:
           type: string
           description: The generated completion text
@@ -3506,18 +3498,10 @@ components:
     CompletionResponseStreamChunk:
       type: object
       properties:
-<<<<<<< dest:   ed6caead724a - ehhuang: chore: simplify _get_tool_defs (#1384)
         metrics:
           type: array
           items:
             $ref: '#/components/schemas/MetricInResponse'
-||||||| base:   1311faf3f5e7 - ehhuang: fix: logging (#1598)
-=======
-        metrics:
-          type: array
-          items:
-            $ref: '#/components/schemas/MetricEvent'
->>>>>>> source: ad32270ad0d5 - erichuang: feat(api): remove tool_name from To...
         delta:
           type: string
           description: >-