Editor: Add a toggle to disable automatic merging of changes (non-obsidian sync)

Interesting. And makes sense too.
I disabled that and installed a replacement mentioned above. Will try disabling that.