Over the week-end I updated some passwords on my iPad. Back home, I updated a few more on my Mac (Cloudbleed ftw). Then I realised the passwords from the iPad hadn't synced to the computer. I store my vault in dropbox. In the Mac prefs, I saw that syncing was off. Turned it on, but that created a new vault (opvault) next to the old one (agilekeychain) which I suspect is the iOS one (iPad-updated passwords show up on my iPhone, so iOS is syncing to iOS).
How do I get everybody to use the same vault?
How do I save both the passwords I updated on the iPad, and those I updated on my Mac? Can I merge the two vaults?
iOS app 6.5.2 on iPad mini and iPhone 6S
1Password Version: 6.5.3
Extension Version: 4.6.3
OS Version: OSX 10.12.3
Sync Type: Dropbox