[Bug 1200526] [Build 20220610-1] conflict when migrating from Leap15.{2,3} to Leap15.4