[Bug 963565] Proposed digikam update has file conflict