Fix merge conflict #18480

Job	Run time
Detect Version	4s
Check Docs Changes	0s
Test and Build	0s
Build Dev ECR (./docker/db.Dockerfile, ECR_MIGRATIONS)	1m 0s
Build Dev ECR (./docker/realtime.Dockerfile, ECR_REALTIME)	1m 29s
Build Dev ECR (./docker/app.Dockerfile, ECR_APP)	6m 50s
Build ARM64 (GHCR Only)	0s
Build AMD64	0s
Process Docs	0s
Create GHCR Manifests	0s
Create GitHub Release	-1s
Migrate Dev DB / Apply Database Migrations	2m 17s
	11m 39s

Provide feedback