merge old emacs config