add scala-mode2, yaml-mode
fix conflict