Fix up

Author: jbampton

server/src/main/java/com/cloud/deploy/DeploymentPlanningManagerImpl.java

@@ -1540,11 +1540,7 @@ public int compare(Volume v1, Volume v2) {
                                     continue;
                                 }
                             } catch (StorageUnavailableException e) {
-<<<<<<< HEAD
                                 logger.warn("Could not verify storage policy compliance against storage pool {} due to exception {}", storagePool, e.getMessage());
-=======
-                                logger.warn(String.format("Could not verify storage policy compliance against storage pool %s due to exception %s", storagePool.getUuid(), e.getMessage()));
->>>>>>> b833c077e5 (pre-commit upgrade codespell and fix spelling)
                                 continue;
                             }
                             haveEnoughSpace = true;