merging another branch of .emacs file