Turn versioned Conflicts into Breaks, remove trailing comma
3 files changed