Added finializing the game
Fixed conflict