mac ci .emacs
merge