run clean_conflicts at the start of the upgrade procedure
authored
by
We tell people to look for those files but not what to do with them. That is what we do with them. We clean them up. That said, clean_conflicts doesn't handle exactly the same file set, but that's likely to be fixed in the (eventual?) rewrite.