Merge pull request #91516 from jeana-redhat/fix-conflict-garbage

fix merge conflict junk

Author: jeana-redhat

machine_management/creating_machinesets/creating-infrastructure-machinesets.adoc

@@ -129,10 +129,4 @@ include::modules/nodes-cluster-resource-override-move-infra.adoc[leveloffset=+2]
 
 [role="_additional-resources"]
 .Additional resources
-<<<<<<< HEAD:machine_management/creating-infrastructure-machinesets.adoc
-* xref:../observability/monitoring/configuring-core-platform-monitoring/configuring-performance-and-scalability.adoc#moving-monitoring-components-to-different-nodes-cpm_configuring-performance-and-scalability[Moving monitoring components to different nodes]
-=======
-* xref:../../observability/monitoring/configuring-the-monitoring-stack.adoc#moving-monitoring-components-to-different-nodes_configuring-the-monitoring-stack[Moving monitoring components to different nodes]
-* xref:../../observability/logging/scheduling_resources/logging-node-selectors.adoc#logging-node-selectors[Using node selectors to move logging resources]
-* xref:../../observability/logging/scheduling_resources/logging-taints-tolerations.adoc#cluster-logging-logstore-tolerations_logging-taints-tolerations[Using taints and tolerations to control logging pod placement]
->>>>>>> 7b83cdb59c (OSDOCS-12375: Replace directory structure):machine_management/creating_machinesets/creating-infrastructure-machinesets.adoc
+* xref:../../observability/monitoring/configuring-core-platform-monitoring/configuring-performance-and-scalability.adoc#moving-monitoring-components-to-different-nodes-cpm_configuring-performance-and-scalability[Moving monitoring components to different nodes]