Merlin changes in Emacs