updated emacs.d
resolved conflict