added emacs
solve conflicts