For my notes, it is only me who edits, so I don't have conflicts as such. If I edit notes on the phone while on the move, syncthing syncs to PC once I'm back home; similarly any changes done at home on the PC flow to the phone. I also use the Obsidian Git plugin (though I have disabled automatic commits and commit as and when I feel the need) - haven't had any conflicts so far.