added nerdtree
resolving conflict