Patch Set 5: I would prefer that you didn't submit this

it seems you lost the feature during the conflict resolution, I tried adding a new file under a new folder, but the folder doesn't show the ? decorator for untracked resources