Update `resolve` command to offer user selection. Closes issue #16.