Git + NerdTree
Merged home + work
Vim
Merge remote-tracking branch 'origin/master'
Pull -ff