Use "scala.vim".
Merge remote-tracking branch 'origin/master'