commit emacs conf
merge