solve the conflict