solving the conflict