update emacs and aliases
fix conflicts