merge conflicts from dev

[peterdudfield]

Pull Request

Description

merge development into branch

How Has This Been Tested?

• ran locally

• checked vercel - todo

• [ ] Yes

Checklist:

• [ ] My code follows OCF's coding style guidelines
• [ ] I have performed a self-review of my own code
• [ ] I have made corresponding changes to the documentation
• [ ] I have added tests that prove my fix is effective or that my feature works
• [ ] I have checked my code and corrected any misspellings

[vercel[bot]]

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name	Status	Preview	Comments	Updated (UTC)
nowcasting-app	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Aug 8, 2023 0:19am
nowcasting-website	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Aug 8, 2023 0:19am