conflicts again