Fixed a backtracking bug where the time would be running for the wrong player when a move was undone after the game was over
Resolved a conflict