fixed conflict switches.scala