fix wrong rebase

Author: l-trotta

docs/overlays/elasticsearch-openapi-overlays.yaml

@@ -394,7 +394,6 @@ actions:
           examples:
             indicesLegacyPutTemplateRequestExample1:
               $ref: "../../specification/indices/put_template/indicesPutTemplateRequestExample1.yaml"
-<<<<<<< HEAD
 ## Examples for behavioral analytics
   - target: "$.paths['/_application/analytics/{collection_name}/event/{event_type}']['post']"
     description: "Add examples for post analytics collection event operation"
@@ -419,15 +418,10 @@ actions:
 ## Examples for ingest
   - target: "$.components['requestBodies']['simulate.ingest']"
     description: "Add example for simulate ingest request"
-=======
-  - target: "$.components['requestBodies']['inference.stream_inference']"
-    description: "Add example for inference stream request"
->>>>>>> dc0cd555b (Add inference.stream_inference)
-    update: 
+    update:
       content:
         application/json:
           examples:
-<<<<<<< HEAD
             simulateIngestRequestExample1:
               $ref: "../../specification/simulate/ingest/examples/request/SimulateIngestRequestExample1.yaml"
             simulateIngestRequestExample2: