Rename Gem::Resolver::DependencyConflict to Conflict

This makes it easier to type.