diff --git a/.github/workflows/ci-and-deploy.yml b/.github/workflows/ci-and-deploy.yml
index c00afb8..3de49a8 100644
--- a/.github/workflows/ci-and-deploy.yml
+++ b/.github/workflows/ci-and-deploy.yml
@@ -53,7 +53,7 @@ jobs:
 
       - name: Merge dev into main
         run: |
-          git merge origin/dev --no-ff --commit -m "Auto-merge dev into main from CI"
+          git merge origin/dev --no-ff --allow-unrelated-histories --commit -m "Auto-merge dev into main from CI"
 
       - name: Push to main
         run: git push origin main
diff --git a/src/main.py b/src/main.py
index caf19cc..1927b1c 100755
--- a/src/main.py
+++ b/src/main.py
@@ -50,10 +50,10 @@
     oauth_client_config_path=OAUTH_CLIENT_CONFIG_JSON_FILE
 )
 
-app.local_creds_manager = CredentialManager(
-    scopes=SCOPES,
-    oauth_client_config_path="../secrets/local_auth_file"
-)
+# app.local_creds_manager = CredentialManager(
+#     scopes=SCOPES,
+#     oauth_client_config_path=OAUTH_CLIENT_CONFIG_JSON_FILE
+# )
 
 app.secret_manager = SecretManager(
     project_id= PROJECT_ID,