Phantom overrides

Working a very large and complex file, with regular branches and merges, I often find that my instances have what I call “phantom overrides”, which means Figma gives me the option to reset overrides, but that does nothing, and comparing the instance to main using Maximum Overrides doesn’t show any override.

I can’t share the whole file, and I’ve tried to repeat the bug on a demo file, but my issue is precisely that I don’t know how these overrides appear, so I couldn’t. I suspect it has something to do with branching (when in a branch, I have weird doubles of every component, one local to the branch, the other from the published version on main).

This is an issue because editing master components sometimes will not carry over to instances because Figma thinks they are overriden.

Below a screenshot of the situation:

Anyone else experiencing this?