update tmux,vim,zsh
resolve conflict