unsupported vc-0.05 does not have vc-resolve-conflicts