Conflicts deleting empty files...