Fix merge conflict

disk.py

 import json
+import shutil
+
 import os
 import subprocess
 import logging
@@ -287,12 +289,18 @@ class Disk(object):
                             meta={'percent': percent}
                         )
 
-            cmdline = ['qemu-img',
-                       'convert',
-                       '-O', 'qcow2',
-                       downloaded_file,
-                       self.get_path()]
-            subprocess.check_output(cmdline)
+            with magic.Magic() as m:
+                ftype = m.id_filename(downloaded_file)
+
+            if 'qcow' in ftype.lower():
+                shutil.move(downloaded_file, self.get_path())
+            else:
+                cmdline = ['qemu-img',
+                           'convert',
+                           '-O', 'qcow2',
+                           downloaded_file,
+                           self.get_path()]
+                subprocess.check_output(cmdline)
         except AbortException:
             os.unlink(downloaded_file)
             if os.path.exists(self.get_path()):