change config
change vim mode
Merge branch 'master' into linux