#48 Improve Resolve "choices"

[David Corbin]

I always try to do "Safe Automatic Resolve", generally
followed by "Manual Resolve" if that fails. I would
like this to happen automatically on failure, and not
make me keep selecting combo choices.