Fix rebase, more specutils 2 fixes #1219

Job	Run time
(Allowed Failure) Python 3.12 with remote data and dev version of key dependencies	21m 49s
(Allowed Failure) Python 3.12 with remote data and dev version of key dependencies	6m 27s
Code style checks	12s
Code style checks	12s
Python 3.12 (macOS)	1m 49s
Python 3.12 (macOS)	1m 49s
Python 3.11 with remote data and coverage	7m 5s
Python 3.11 with remote data and coverage	7m 5s
Python 3.12 (Windows)	2m 44s
Python 3.12 (Windows)	2m 44s
Python 3.10 (MacOS)	1m 55s
Python 3.10 (MacOS)	1m 55s
Python 3.10 with oldest supported version of key dependencies	2m 2s
Python 3.10 with oldest supported version of key dependencies	2m 2s
Upload Coverage	7s
Upload Coverage	7s
	1h 0m 4s

Provide feedback