optimizations
New Game now works
conflict solved