A file-vs-folder name conflict offers Replace or Merge, which then fail #3726

Initial Checklist

• I understand this is a bug report and questions should be posted in the Community Discussions
• I searched issues and couldn’t find anything (or linked relevant results below)

Bug Description

A file-vs-folder name conflict offers Replace or Merge, which then fail. Cause: packages/web-app-files/src/helpers/resource/actions/upload.ts:62-86 takes the conflict type from the uploaded item, not from the existing one.

Reproduction Steps

1. A folder dup exists; upload a file named dup and choose Replace.
2. Or: a file dupf exists; upload a folder dupf and choose Merge.

Expected Outcome

Only Keep both / Skip are offered.

Actual Outcome

POST … 409 four times, or MKCOL 405 + POST 500; "1 of 1 item failed".