updated conflict