Update the configure global header

Author: GitHub Actions

modules/customizing/proc-customizing-your-product-global-header.adoc

@@ -1,7 +1,6 @@
 [id="customizing-your-product-global-header_{context}"]
 = Customizing your {product} global header
 
-<<<<<<< HEAD
 As an administrator, you can add a global header to create a consistent and flexible navigation bar across your {product-custom-resource-type} instance. By default, the global header includes a search field, create, support and notification buttons, and a user profile drop-down. You can customize the order and position of icons and features.
 
 .Prerequisites
@@ -41,25 +40,3 @@ As an administrator, you can add a global header to create a consistent and flex
               config:
                 position: above-main-content
 ----
-=======
-As an administrator, you can add a global header to your {product-custom-resource-type} instance. You can enable the global header by default.
-You can do the following:
-
-* Add a logo, search, notifications, users settings, help, and more.
-* Customize the order and position of icons and features by placing them on either the left or right side of the header.
-
-.Prerequisites
-* You have configured your {product-custom-resource-type} instance.
-* You have administrative access and can modify a global header.
-
-.Procedure
-
-* Set the enabled property to `true`. For example:
-
-[source,yaml]
-----
-globalHeader:
-  enabled: true
-----
-* To disable this feature, update the configuration file by setting the property to `false`.
->>>>>>> 79e110bb2 (Update the configure global header)