update emacs
merge
update