[eclipse-sig] [Bug 1966257] File conflicts prevent upgrade