resolved conflcit