modified conflict