Fix conflict with new ScalaSettings
#20264
+1
−1
Merged
new ScalaSettings
#20264