I have a Truecrypt volume that is backed up on Dropbox, and sometimes it gets out of sync, when changes are made on one machine but then the volume isn't closed before changes are made elsewhere. Then I have one file called, say, "archive.crypt" and "archive.crypt (username's conflicted copy 2020-02-22)". Back in Truecrypt time I'd just open both volumes, which would then have the same name, say archive, and then use a utility like SyncTwoFolders to fix so they both contained the same content, and...