added nerd tree go to file and indent guides
resolved merge conflicts