New ways of managing conflict