Vim pane sizing and ssh-agent restarting
Resolving merge conflicts