Changed how conflicts are recorded