Show the correct set of unsatisfiable clauses with --alt-hint
Merge branch 'master' of github.com:conda/conda