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