resolved confl