[kelvinjps]

You can tell synching how to manage conflicts or the application can do it, for example KeePass has good conflict resolution.