Fix main merge conflict (nebari-dev#2230)

Co-authored-by: eskild <[email protected]>
Co-authored-by: Amit Kumar <[email protected]>
Co-authored-by: Pavithra Eswaramoorthy <[email protected]>
Co-authored-by: Nebari-sensei <[email protected]>
Co-authored-by: João Carvalho <[email protected]>
Co-authored-by: iameskild <[email protected]>
Co-authored-by: Tania Allard <[email protected]>
Co-authored-by: Alistair Miles <[email protected]>
Co-authored-by: Christopher Ostrouchov <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Pam <[email protected]>
Co-authored-by: Tetsuo Koyama <[email protected]>
Co-authored-by: Kim Pevey <[email protected]>
Co-authored-by: Philip Meier <[email protected]>
Co-authored-by: Adam Lewis <[email protected]>
Co-authored-by: Ayush Mani <[email protected]>
Co-authored-by: iameskild <[email protected]>
Co-authored-by: kalpanachinnappan <[email protected]>
Co-authored-by: sblair-metrostar <[email protected]>
Co-authored-by: Scott Blair <[email protected]>
Co-authored-by: Fangchen Li <[email protected]>
Co-authored-by: Travis E. Oliphant <[email protected]>
Co-authored-by: kenafoster <[email protected]>