Fix conflict handling for empty directory.