dumb commit
conflict resolved
dfsLoop is continued