[Bug 542803] New: File conflicts