fix merge conflict issues

Author: JoaoJandre

plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStoragePool.java

@@ -127,10 +127,4 @@ default LibvirtVMDef.DiskDef.BlockIOSize getSupportedPhysicalBlockSize() {
 
     default void customizeLibvirtDiskDef(LibvirtVMDef.DiskDef disk) {
     }
-
-
-    default String getLocalPathFor(String relativePath) {
-        return String.format("%s%s%s", getLocalPath(), File.separator, relativePath);
-    }
-
 }

plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java

@@ -266,9 +266,6 @@ public class LibvirtComputingResourceTest {
     @Mock
     DomainBlockStats domainBlockStatsMock;
 
-    @Mock
-    VolumeObjectTO volumeObjectToMock;
-
     @Mock
     SnapshotObjectTO snapshotObjectToMock;