Conflict resolution shows blank screen.

I'm having somewhat similar issue to the person who is getting empty files to compare. As of the last update, every time I get an indication of conflicting note and attempt to check what has been changed, I get a blank screen. Please see attached screenshot.

I can't figure out where to find this second version but when I run Meld or diff from the command line, there is a difference. I can't fix it in the plugin though.

This is happening on the same version of Joplin Windows and Mac.
Joplin 3.4.12 (prod, win32)

Device: win32, AMD Ryzen 7 5825U with Radeon Graphics
Client ID: d8e1b957136d49faa0c1deca06869952
Sync Version: 3
Profile Version: 48
Keychain Supported: Yes
Alternative instance ID: -

Revision: e9a9f68

Backup: 1.4.3
Conflict Resolution: 1.2.3
Menu items, Shortcuts, Toolbar icons: 1.1.0
Quick Links: 1.3.2
Rich Markdown: 0.16.4
Search & Replace: 2.2.0
Table Formatter Plugin: 1.2.1