[Bug 542803] File conflicts