update mkimage, delete container after success
fix conflicts