Resolve conflict in emacs.d