added emacs theme
fixed merge error