Merged .emacs