fix ./merge
emacs fix clipboard