add

Signed-off-by: A.Arnold <anarnold@redhat.com>

Author: anarnold97

_topic_maps/_topic_map.yml

@@ -4745,30 +4745,6 @@ Topics:
 - Name: Advanced VM creation
   Dir: creating_vms_advanced
   Topics:
-<<<<<<< HEAD
-    - Name: Advanced virtual machine creation overview
-      File: advanced-vm-creation-overview
-    - Name: Creating VMs in the web console
-      Dir: creating_vms_advanced_web
-      Topics:
-      - Name: Creating VMs from Red Hat images
-        File: virt-creating-vms-from-rh-images-overview
-      - Name: Creating VMs by importing images from web pages
-        File: virt-creating-vms-from-web-images
-      - Name: Creating VMs by uploading images
-        File: virt-creating-vms-uploading-images
-      - Name: Cloning VMs
-        File: virt-cloning-vms
-    - Name: Creating VMs using the CLI
-      Dir: creating_vms_cli
-      Topics:
-      - Name: Creating virtual machines from the command line
-        File: virt-creating-vms-from-cli
-      - Name: Creating VMs by using container disks
-        File: virt-creating-vms-from-container-disks
-      - Name: Creating VMs by cloning PVCs
-        File: virt-creating-vms-by-cloning-pvcs
-=======
   - Name: Advanced virtual machine creation overview
     File: advanced-vm-creation-overview
   - Name: Creating VMs in the web console
@@ -4791,7 +4767,6 @@ Topics:
       File: virt-creating-vms-from-container-disks
     - Name: Creating VMs by cloning PVCs
       File: virt-creating-vms-by-cloning-pvcs
->>>>>>> c491184476 (add)
 - Name: Managing VMs
   Dir: managing_vms
   Topics: