If you stage ours, the file vanishes from status.
Revamp the ResolverView.