Continue game activity
Continue with game activity
Fix conflicts