1Password is a great example of an application doing this well -- when there are conflicts, 1Password detects this, and there is an application-specific workflow that helps the user resolve the conflicts. It's pretty slick.