Merge my config to this
Adding scala mode