Turn versioned Conflicts into Breaks to simplify lockstep upgrades
3 files changed