use vertical diff for merge explicitly