Add changes to vimrc and zshrc
Fix git conflicts