Added check to remove irrelevant ignore dirs and ignore files in traverse in ignore dirs
Fixed conflicts with merge