emacs adjusted
merge