Released/handle broken conflicts

This resolves RT#75486 (and replaces the earlier branch that I mention in the ticket, more than a year ago.)

I also released this as 0.006-TRIAL (unauthorized of course), to try to get some cpantesters reports.