added emacsclient-merge