resolved conlficts