I’m having the same issue. I also had some conflicts show up when I was on my windows PC, after I just setup a new macbook. These are the same file and showed up while editing the same note on Windows. Macbook was closed at the time.

I do currently have my vault set to a folder that’s in Dropbox so it might explain some of my issues. I plan to move away from that today or tomorrow when I have time.