Extensions editing the files one one computer while I edit them on another can cause considerable syncthing conflicts.
I belive the cause of this was my syncthing configuration having overlapped directories ~/sync and ~/sync/obsidian fighting with eachother.

How to resolve these automatically?