Added collision detection for deleted directory (with recursively
contained modified file) or normal file.