solving conflicts