Keepasswandroid can integrate with any cloud storage and will perform merge when needed