Takes main's version of each conflicted file, then reapplies the same helper swap on every remaining site that still answered with the literal string "None" as error type or param, and ports the regression tests.