Merging with GNU Emacs