game updated
fixed conflict