[DOCS] Remove merge conflict for commit 6699a5 '[DOCS] Add anchors for Asciidoctor migration'

Author: jrodewig

docs/reference/mapping/params/fielddata.asciidoc

@@ -26,7 +26,9 @@ Loading fielddata is an expensive process so, once it has been loaded, it
 remains in memory for the lifetime of the segment.
 
 [WARNING]
-.Fielddata can fill up your heap space
+==================================================
+Fielddata can fill up your heap space
+==================================================
 
 
 [[fielddata-format]]
@@ -58,14 +60,9 @@ PUT my_index
 // AUTOSENSE
 <1> The `text` field cannot be used for sorting, aggregations, or in scripts.
 
-<<<<<<< HEAD
 .Fielddata and other datatypes
 [NOTE]
 ==================================================
-=======
-[[enable-fielddata-text-fields]]
-==== Enabling fielddata on `text` fields
->>>>>>> b7f569ec801... [DOCS] Add anchors for Asciidoctor migration (#41648)
 
 Historically, other field datatypes also used fielddata, but this has been replaced
 by index-time, disk-based <<doc-values,`doc_values`>>.