don't report a conflict for empty directories
wip