Hello,
Could you please try reset local changes? This resolves the issue most of the time, and I noticed you haven’t mentioned trying it yet.
Reset Local Changes tutorial: How to Reset Local Changes
If this doesn’t work for you, let us know and we can investigate further! 