Gerenating conflicts