I’m getting the same issue.. has anyone resolved this yet?
If it try to tidy up the duplicated fields then they all disappear from the edit screen. Only way I can retain content is by resyncing and having duplicate fields. Local version works fine its just my staging site.