Keyring: More merge conflicts