merge confilct resolved

.aliases

@@ -34,3 +34,6 @@ alias gctls='gcloud compute tpus list'
 alias gctstart='gcloud compute tpus start'
 alias gctstop='gcloud compute tpus stop'
 alias code='code-oss'
+alias tf-docker='docker run --runtime=nvidia -it --rm -p 8888:8888 -v $PWD:/tf/local andrei/dev'
+alias conda-activate='source /opt/anaconda/bin/activate'
+alias conda-deactivete='source /opt/anaconda/bin/deactivate'

.vimrc

@@ -30,6 +30,8 @@ call vundle#begin()
 
 	Plugin 'dylanaraps/fff.vim'
 
+	Plugin 'mattn/emmet-vim'
+
 	" All of your Plugins must be added before the following line
 call vundle#end()            " required
 filetype plugin indent on    " required

.zshrc

@@ -73,7 +73,7 @@ source $ZSH/oh-my-zsh.sh
 
 # Preferred editor for local and remote sessions
 # if [[ -n $SSH_CONNECTION ]]; then
-#   export EDITOR='vim'
+   export EDITOR='vim'
 # else
 #   export EDITOR='mvim'
 # fi