game conflict fix