trying to solve the conflict