resolve confilict
remove scala2-mode file
adding scala-mode2