diff --git a/docs/sources/alerting/_index.md b/docs/sources/alerting/_index.md
index 84142ce7014..080b0e9bf67 100644
--- a/docs/sources/alerting/_index.md
+++ b/docs/sources/alerting/_index.md
@@ -22,10 +22,7 @@ Existing installations that upgrade to v9.0 will have Grafana alerting enabled b
 
 Before you begin, we recommend that you familiarize yourself with some of the [fundamental concepts]({{< relref "./fundamentals/_index.md" >}}) of Grafana alerting. Refer to [Role-based access control]({{< relref "../enterprise/access-control/_index.md" >}}) in Grafana Enterprise to learn more about controlling access to alerts using role-based permissions.
 
-<<<<<<< HEAD
-
-- # [About alert rules]({{< relref "./fundamentals/alert-rules/_index.md" >}})
-  > > > > > > > b5d48d217a (Docs: Created separate section for migration under alerting (#49616))
+- [About alert rules]({{< relref "./fundamentals/alert-rules/_index.md" >}})
 - [Migrating legacy alerts]({{< relref "./migrating-alerts/_index.md" >}})
 - [Disable Grafana alerting in OSS]({{< relref "./migrating-alerts/opt-out.md" >}})
 - [Create Grafana managed alerting rules]({{< relref "alerting-rules/create-grafana-managed-rule.md" >}})
diff --git a/docs/sources/alerting/migrating-alerts/opt-out.md b/docs/sources/alerting/migrating-alerts/opt-out.md
index e300e4b9e79..c5a4627a1ab 100644
--- a/docs/sources/alerting/migrating-alerts/opt-out.md
+++ b/docs/sources/alerting/migrating-alerts/opt-out.md
@@ -30,16 +30,11 @@ To opt-out of Grafana alerts and roll back to legacy dashboard alerting:
 
 When you are ready to make the switch, the following procedure will help you migrate to Grafana alerting.
 
-<<<<<<< HEAD
 To opt-in to Grafana alerts:
-=======
-To opt-in Grafana alerts:
-
-> > > > > > > b5d48d217a (Docs: Created separate section for migration under alerting (#49616))
 
 1. In your custom configuration file ($WORKING_DIR/conf/custom.ini), go to the [unified alerts]({{< relref "../../administration/configuration.md#unified_alerting" >}}) section.
-1. Set the `enabled` property to `true`.
-1. Next, for [legacy dashboard alerting]({{< relref "../../administration/configuration.md#alerting" >}}), set the `enabled` flag to `false`.
-1. Restart Grafana for the configuration changes to take effect.
+2. Set the `enabled` property to `true`.
+3. Next, for [legacy dashboard alerting]({{< relref "../../administration/configuration.md#alerting" >}}), set the `enabled` flag to `false`.
+4. Restart Grafana for the configuration changes to take effect.
 
 > **Note:** The `ngalert` toggle previously used to enable or disable Grafana alerting is no longer available.