[Bug 474514] file conflict on upgrading