emacs client
merge