Merge dot.emacs