Fix merge errors

Author: screamerbg

mbed/mbed.py

@@ -45,6 +45,7 @@
 from itertools import chain, repeat
 import time
 import zipfile
+import argparse
 from random import randint