Resolving conflicts between different measurements ofa property of a physical system may be a key step in a discoveryprocess. With the emergence of large-scale databases and knowledgebases with property measurements, computer support for the task ofconflict resolution has become highly desirable. We will describe amethod for model-based conflict resolution and the accompanyingcomputer tool KIMA, which have been applied in a case-study inmaterials science. In order to be a useful aid to scientists, the toolneeds to be integrated with other tools in a computer-supporteddiscovery environment. We will give an outline of such acomputer-supported discovery environment and argue that its use mightlead to new ways of doing science, so-called computer regimes.