While you're in here, do you mind reconciling `resolve` and `resolve_transfer`? The code from `resolve_transfer` was borrowed from the `pg` command, but I think there's a lot of overlapping functionality with `resolve`--ideally, the behavior should be consistent, but I don't think we need both here.