resolved confilcts