hook up conflict state to conflict resolution dialog