bindkey -v
merge from origin/master