merge in macbook emacs config