disk drive image using JSAV
resolve merge conflicts