resolve merge conflicts

config/settings/base.py

@@ -272,5 +272,11 @@ SOCIALACCOUNT_FORMS = {"signup": "benchcoach.users.forms.UserSocialSignupForm"}
 
 # Your stuff...
 # ------------------------------------------------------------------------------
-INSTALLED_APPS += ["teamsnap", "instagen", "gamechanger"]
+INSTALLED_APPS += [
+    "teamsnap",
+    "instagen",
+    "gamechanger",
+    "teamsnap.lineup",
+    "teamsnap.dashboard",
+]
 SOCIALACCOUNT_PROVIDERS = {"teamsnap": {"SCOPE": ["read", "write"]}}

config/urls.py

@@ -17,7 +17,8 @@ urlpatterns = [
     path("accounts/", include("allauth.urls")),
     path("", include("teamsnap.urls")),
     path("", include("instagen.urls")),
-    path("gc/", include("gamechanger.urls"))
+    path("gc/", include("gamechanger.urls")),
+    path("", include("gamecard.urls")),
 ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)