I usually upgrade with "zypper dup --no-allow-vendor-change" and can confirm the file conflict. Solver testcase available on request ;-)