chore: fix conflicts

Author: sangjanai

docs/docs/capabilities/embeddings.md

@@ -6,10 +6,6 @@ title: Embeddings
 :::
 
 cortex.cpp now support embeddings endpoint with fully OpenAI compatible.
-<<<<<<< HEAD
-
-=======
->>>>>>> a055f6906e43b3c3398874d540136425adae9114
 
 For embeddings API usage please refer to [API references](/api-reference#tag/chat/POST/v1/embeddings). This tutorial show you how to use embeddings in cortex with openai python SDK.
 
@@ -105,7 +101,3 @@ response = client.embeddings.create(input = [12,44,123], model=MODEL)
 # input as array of arrays contain tokens
 response = client.embeddings.create(input = [[912,312,54],[12,433,1241]], model=MODEL)
 ```
-<<<<<<< HEAD
-
-=======
->>>>>>> a055f6906e43b3c3398874d540136425adae9114

docs/static/openapi/cortex.json

@@ -209,11 +209,7 @@
                       },
                       {
                         "type": "array",
-<<<<<<< HEAD
-                        "description" : "The array of strings that will be turned into an embedding.",
-=======
                         "description": "The array of strings that will be turned into an embedding.",
->>>>>>> a055f6906e43b3c3398874d540136425adae9114
                         "items": {
                           "type": "string"
                         }
@@ -223,21 +219,11 @@
                         "description": "The array of integers that will be turned into an embedding.",
                         "items": {
                           "type": "integer"
-<<<<<<< HEAD
-                          
-=======
->>>>>>> a055f6906e43b3c3398874d540136425adae9114
                         }
                       },
                       {
                         "type": "array",
-<<<<<<< HEAD
-
-                        "description" : "The array of arrays containing integers that will be turned into an embedding.",
-
-=======
                         "description": "The array of arrays containing integers that will be turned into an embedding.",
->>>>>>> a055f6906e43b3c3398874d540136425adae9114
                         "items": {
                           "type": "array",
                           "items": {