Cannot resolve merge conflict

[streetwriters]

When I try to sync my notes, it tells me the sync failed because there is a merge conflict. However, when I go to the offending note, nothing shows up. The note window is completely blank/empty. Before, it used to show a split screen of the old note vs. the new note.

This behavior is the same in the webapp version and the Linux appImage version. The Android version shows the offending note correctly, but I think this is where the conflict was created. Either way, none of the three versions have synced properly for about two days now.

Device information:
App version: 2.1.2-fede0599-web
OS: OS X 11
Browser: Firefox 102.0
Pro: false

[thecodrr]

This has been fixed. Will be included in the next version.