Fix merge error

Author: Michael Burke

machine_configuration/index.adoc

@@ -47,15 +47,12 @@ include::modules/checking-mco-status.adoc[leveloffset=+1]
 
 include::modules/checking-mco-node-status.adoc[leveloffset=+1]
 
-<<<<<<< HEAD
-=======
 [role="_additional-resources"]
 .Additional resources
 
 * xref:../machine_configuration/mco-coreos-layering.adoc#coreos-layering-configuring-on_mco-coreos-layering[About on-cluster image mode]
 * xref:../nodes/clusters/nodes-cluster-enabling-features.adoc#nodes-cluster-enabling[Enabling features using feature gates]
 
->>>>>>> OSDOCS 17238 Update MCO to reflect API changes made for Status Reporting
 include::modules/checking-mco-node-status-configuring.adoc[leveloffset=+2]
 
 [role="_additional-resources"]