support/hyperv.ps1 in kitchen-hyperv-0.1.8 vs support/hyperv.ps1 in kitchen-hyperv-0.1.9

@@ -192,12 +192,7 @@
 function Mount-VMISO 
 {
     [cmdletbinding()]
     param($Id, $Path)
 
-<<<<<<< HEAD
     set-VMDvdDrive -VMName (Get-VM -Id $Id).Name -Path $Path
-=======
-    set-VMDvdDrive -VMName (get-vm -id $Id).Name -Path $Path
-
->>>>>>> brantb/dynamic-memory
 }