We've been using 1Password on two computers. For a long time we stored the vault on Dropbox. Then one computer upgraded to v7, imported the Dropbox vault, deleted it, and now has several changes that happened after the import. The second computer continued to use the Dropbox vault and made its own changes. Oops.
So now we have two vaults that are almost the same, but each has changes that the other doesn't have. How can we merge them? After we do that, we'll stop using the Dropbox vault and it won't be an issue in the future.
There's over 1,000 entries in each vault, and perhaps a dozen or two that are out of sync. I don't mind fixing this by hand if there is a way to identify the mismatches.