Merge two emacs configs into one