[Bug 60254] New: Merging versions is now ridiculous