Modified conflict