fix merge conflicts

Author: xiancao

imagetool/src/test/java/com/oracle/weblogic/imagetool/integration/BaseTest.java

@@ -277,7 +277,8 @@ private static void pullDockerImage(String repoServer, String username, String p
         ExecResult result = ExecCommand.exec("docker images | grep " + imagename  + " | grep " +
                 imagetag + "| wc -l");
         if(Integer.parseInt(result.stdout().trim()) != 1) {
-            throw new Exception("docker image " + imagename + ":" + imagetag + " is not pulled as expected");
+            throw new Exception("docker image " + imagename + ":" + imagetag + " is not pulled as expected."
+                    + " Expected 1 image, found " + resultString);
         }
     }