diff --git a/docs/management/managing-licenses.asciidoc b/docs/management/managing-licenses.asciidoc
index 06c43999a01ce..78478cbe61bf6 100644
--- a/docs/management/managing-licenses.asciidoc
+++ b/docs/management/managing-licenses.asciidoc
@@ -6,28 +6,23 @@ with no expiration date. For the full list of free features that are included in
 the basic license, see https://www.elastic.co/subscriptions[the subscription page].
 
 If you want to try out the full set of platinum features, you can activate a
-30-day trial license. Go to *Management > License Management* to view the 
+30-day trial license. Go to *Management > License Management* to view the
 status of your license, start a trial, or install a new license.
 
 NOTE: You can start a trial only if your cluster has not already activated a
 trial license for the current major product version. For example, if you have
-already activated a trial for v6.0, you cannot start a new trial until 
+already activated a trial for v6.0, you cannot start a new trial until
 v7.0. You can, however, contact `info@elastic.co` to request an extended trial
 license.
 
-<<<<<<< HEAD
-When you activate a new license level, new features appear in the left sidebar 
-of the *Management* page.
-=======
 When you activate a new license level, new features appear in *Management*.
->>>>>>> 809ec97649... [DOCS] Removed references to left (#60807)
 
 [role="screenshot"]
 image::images/management-license.png[]
 
 At the end of the trial period, the platinum features operate in a
-<<license-expiration,degraded mode>>. You can revert to a basic license, 
-extend the trial, or purchase a subscription. 
+<<license-expiration,degraded mode>>. You can revert to a basic license,
+extend the trial, or purchase a subscription.
 
 TIP: If {security-features} are enabled, before you revert to a basic license or
 install a gold or platinum license, you must configure Transport Layer Security
@@ -46,7 +41,7 @@ file that you install in {kib} or by using the
 
 TIP: If you are using a basic or trial license, {security-features} are disabled
 by default. In all other licenses, {security-features} are enabled by default;
-you must secure the {stack} or disable the {security-features}. 
+you must secure the {stack} or disable the {security-features}.
 
 [discrete]
 [[license-expiration]]
@@ -101,7 +96,7 @@ cluster.
 and start {dfeeds} are disabled.
 * All started {dfeeds} are stopped.
 * All open {anomaly-jobs} are closed.
-* APIs to create and start {dfanalytics-jobs} are disabled. 
+* APIs to create and start {dfanalytics-jobs} are disabled.
 * Existing {anomaly-job} and {dfanalytics-job} results continue to be available
 by using {kib} or APIs.