Conflict resolution strategy