resolved conlifcts