Fix merge conflict

disk.py

 import json
+import shutil
+
 import os
 import subprocess
 import logging
@@ -287,6 +289,12 @@ class Disk(object):
                             meta={'percent': percent}
                         )
 
+            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',