[Bug 60254] Merging versions is now ridiculous