There don't appear to be any useful options here to resolve this merge from dev -> main branches. Why? I just want to overwrite whoever changed the main branch incorrectly, but I don't have any option to do that here.
If I right click, I see some options but none of them are useful:
Disabling the "Optimize rendering for screens with different pixel densities" option works for me, though I'll note that another coworker here with the same exact version doesn't have that option.