[java-sig-commits] [Bug 1966260] New: File conflicts prevent upgrade