Sure, but users never have to resolve this, the daemon solves this and the majority of conflicts are avoided by the protocol, as no file are stored you don’t have conflicts on files.
Some details here: 2.3. Swarm · Wiki · savoirfairelinux / jami-project · GitLab
But generally it’s a tree you sync (or two on some systems, one for the data, one for the messages). And yes we read how a lot of systems works, but not particularly Syncthing (however I also use it).