Good way to get out from dir desync?

Hi,

it seems I’ve got some issues like in here:

Made an update of a bit old Nextcloud (16.x and 17.x) using ncp to 20.0.3. It was made with all major (afair something like: 17.0.6 → 17.0.10 → 18.x (failed, see below) → 18.0.5 → 18.0.11 → 19.0.5 → 20.0.3, second one 16.0.5 → 16.0.10 → 17.0.10 → 18.x (failed, see below) → 18.0.5 → 18.0.11 → 19.0.5 → 20.0.3) releases between (at 18.x I had some issues with Nextcloud Talk, I think this one Upgrade fails with - Column name "oc_flow_operations.entity" is "NotNull", but has empty string or null as default · Issue #23174 · nextcloud/server · GitHub)

Anyway, after all this updates my shares are gone. There’s a huge desync now. The structure looked like that:
Shares
→ User A (shared by local admin to User A)
→ User B (shared by local admin to User B)
→ User C (shared by local admin to User C)
→ Everybody (shared by local admin to group of Users)

Now Users uploaded their “User X” dirs that are desynced from local admin share. Is there any good way to fix this? Now when “User A” is reshared by local admin it appears as “User A (2)”.