Adds NERDTree
Resolves simple conflict