emacs config / vim highlight
Merge