Fix merge commit
Add some packages to emacs