another class of conflicts: subdir/file conflicts