zshrc: fix
gitconfig: add merge and pull options
vimrc: fix