nerdtreetabs updated
merge fixed