My 1Password is supposed to be synced, via Dropbox, between my MacBook Pro and iPhone (tech details below). I recently realized the sync function on my MacBook is turned off. This means my iPhone is syncing to the Dropbox, my MacBook is not. This has been the case for quite some time, it seems, as I have numerous 1Password items (notes, logins, etc.) found only on either the MacBook or iPhone. I have only one 1Password vault in each of the MacBook and iPhone, both called "Primary".
My goal is to get back to having only one vault, synced across my laptop and phone. I'm concerned that there is no way to combine two vaults without completely overwriting one, or only transferring "new" items from one to the other. What happens, for example, when two different Logins exist, one on the iPhone, one on MacBook, that each have different information (because one is out of date)? I'm hoping I can get some help with combining the two vaults into one...in a way that doesn't cause me to lose a bunch of information. Thank you for your help!
1Password Version: 6.8.8
Extension Version: Not Provided
OS Version: OS X High Sierra 10.13.4
Sync Type: Dropbox