I used KeePassXC with syncthing over my laptop/server/phone and frequently get sync conflicts. Unlike with some files though these are very easy to resolve by hand as there's an option to merge in another file, after which you can delete it.