Update emacs config
Merge conflict