I started by merging two feature branches, zac-dev and dan-dev, into staging. Along the way I hit a real merge conflict: both branches had touched the Dashboard page, one adding a floor plan editor, the other adding an entity linking panel. Rather than force them to coexist awkwardly, I moved the entity linking module into the Entry Settings page as its own section. It fits better there anyway, since it is a manager only tool, not something that belongs on a general dashboard. I also cleaned up a handful of lint failures that were blocking CI, some from my own changes and a few that had been sitting there from before.
Then came the bigger decision. We are not deploying to production. Not now, maybe not ever for this project. So instead of leaving dead infrastructure lying around, I stripped it out completely: the Kubernetes manifests, the deploy job and its approval gate, the Route 53 and ALB config, the GitHub environment and its secrets. Staging is now the only real target, and main is just a stable branch that does not trigger anything.
With that settled, I brought the staging AWS environment back online: recreated the EKS cluster, reinstalled the load balancer controller, and got the ALB provisioned. One manual DNS update in Cloudflare and staging is ready for testing again.
