Gvim error during upgrade 3.14 → 3.15

After changing /etc/apk/repositories to point to 3.15 instead of 3.14, during apk -ia upgrade:

(130/247) Upgrading gvim (8.2.3437-r0 -> 8.2.3567-r0)
ERROR: gvim-8.2.3567-r0: trying to overwrite usr/bin/vimdiff owned by vimdiff-8.2.3437-r0.

Upgrade continued without error, and the new Gvim package seems to work. vimdiff:

lrwxrwxrwx    1 root     root           3 Nov 25 20:06 /usr/bin/vimdiff -> vim

However, it looks like the error still hangs around—when doing any further apk -v fix:

(1/1) Reinstalling gvim (8.2.3567-r0)
ERROR: gvim-8.2.3567-r0: trying to overwrite usr/bin/vimdiff owned by vimdiff-8.2.3650-r0.
Executing busybox-1.34.1-r3.trigger
Executing gtk-update-icon-cache-2.24.33-r0.trigger
1 error; 248 packages, 1516 dirs, 11368 files, 587 MiB

And thus doing a apk -v fix mkinitfs:

(1/1) Reinstalling mkinitfs (3.6.0-r0)
Executing mkinitfs-3.6.0-r0.pre-upgrade
Executing mkinitfs-3.6.0-r0.post-upgrade
Executing busybox-1.34.1-r3.trigger
Executing mkinitfs-3.6.0-r0.trigger
==> initramfs: creating /boot/initramfs-virt
1 error; 248 packages, 1516 dirs, 11368 files, 587 MiB