It helps a lot if you have a third machine, which runs 24/7. Haven't had any sync conflicts in ages.
I wish there was something to make some sort of CRDT for modeling org though. I feel that the operation that ended up causing text conflicts in the past had obvious resolutions with the right structure and Metadata, but yeah, resorting to having a peer always on gets around it more easily that writing my own thing and deviating from emacs and orgzly