Marged lateset scalastyle/scalastyle

fixed conflict  and test.