[Bug 474514] New: file conflict on upgrading