issue fixed of long game
Conflict resolved