untracked sublime files
nodes conflict fixed