Solve the conflict again