Branch shows updates not made in the branch

I have a branch that’s showing changes to be merged back into the main file that haven’t been made in the branch. Additionally, one component from the main appears to be updated in the branch (which it wasn’t), and has some odd misalignment not found in the main file. “Update from main file…” is grayed out, so I can’t pull the latest from there either.

I do have a video I can share in a private thread.

Hi!

I’ve DM’d you for more information.