Syncthing has pretty basic conflict resolution and depends on the devices being online at the time of the conflict, so that's expected. It does, however, keep everything on the file system, and even allow you to move files to a trash rather than completely deleting them if they're deleted on another device. Hasn't saved my ass yet but maybe one day it will.