refactor routes, add game helper
fix merge conflict