Solve the conflict