merge scalastyle master