Started game logic timer handler
Merge conflict fix