for mac
For mac
toolbar
fix conflict
merge master
ELPAの設定