conflict resolution
 
Keyring