Solving conflicts