Emacs and rbenv
Merge conflicts