Implemented restarting the game
Resolved conflicts