fix conflicts in emacs.el files between different boxes