up .emacs
merge