From Conceptual Conflict towards Analogy