ssh-agent ZSH plugin messing with some things.
SSH with Emacs.
Fix merge conflicts.