fix C-RET key conflict
git push
Merge branch 'master' of github.com:muflax/config