diff --git a/01-essentials/03-branching-and-merging/setup.ps1 b/01-essentials/03-branching-and-merging/setup.ps1
index 22b45fc..feec71b 100755
--- a/01-essentials/03-branching-and-merging/setup.ps1
+++ b/01-essentials/03-branching-and-merging/setup.ps1
@@ -129,8 +129,8 @@ Set-Content -Path "app.py" -Value $appContent
 git add .
 git commit -m "Add app.py entry point" | Out-Null
 
-# Merge feature-login into main
-Write-Host "Merging feature-login into main..." -ForegroundColor Green
+# Merge feature-login into $mainBranch
+Write-Host "Merging feature-login into $mainBranch..." -ForegroundColor Green
 git merge feature-login --no-edit | Out-Null
 
 # ============================================================================
@@ -197,8 +197,8 @@ Set-Content -Path "README.md" -Value $readmeContent
 git add .
 git commit -m "Update README with setup instructions" | Out-Null
 
-# Merge feature-api into main
-Write-Host "Merging feature-api into main..." -ForegroundColor Green
+# Merge feature-api into $mainBranch
+Write-Host "Merging feature-api into $mainBranch..." -ForegroundColor Green
 git merge feature-api --no-edit | Out-Null
 
 # ============================================================================
@@ -270,7 +270,7 @@ git add .
 git commit -m "Add configuration file" | Out-Null
 
 # Merge feature-database (will be three-way merge since main diverged)
-Write-Host "Merging feature-database into main..." -ForegroundColor Green
+Write-Host "Merging feature-database into $mainBranch..." -ForegroundColor Green
 git merge feature-database --no-edit | Out-Null
 
 # Final update on main