Added Game Over Menu
Fix conflicts