diff --git a/docs/reference/inference/put-inference.asciidoc b/docs/reference/inference/put-inference.asciidoc
index 7fe1379c76051..3569edd1c9cd4 100644
--- a/docs/reference/inference/put-inference.asciidoc
+++ b/docs/reference/inference/put-inference.asciidoc
@@ -42,11 +42,7 @@ include::inference-shared.asciidoc[tag=inference-id]
 include::inference-shared.asciidoc[tag=task-type]
 +
 --
-<<<<<<< HEAD
 Refer to the service list in the <<put-inference-api-desc,API description section>> for the available task types. 
-=======
-Refer to the integration list in the <<put-inference-api-desc,API description section>> for the available task types.
->>>>>>> c60b3be6c72 ([DOCS] Rename inference services to inference integrations in docs (#120212))
 --