fix GameShape timers
merge conflict