Conflicts:
* Calorimeter/CaloRecGPU/CMakeLists.txt
* Calorimeter/CaloRecGPU/CaloRecGPU/StandaloneDataIO.h
* Calorimeter/CaloRecGPU/src/CaloCellsCounterCPU.cxx
* Calorimeter/CaloRecGPU/src/CaloCellsCounterGPU.cxx

Conflict generated by the use of ^M character in 23.0. Fixed manually by propagating
the changes from 23.0 into main

* Calorimeter/CaloRecGPU/tools/plotter/ClusterPlotter.h
* Calorimeter/CaloRecGPU/tools/plotter/TimePlotter.h
* Calorimeter/CaloRecGPU/tools/plotter/clusterplotter.cxx

These files no longer exist in main. Did not propagate changes

* Generators/TruthUtils/TruthUtils/AtlasPID.h

Trivial conflict. Fixed manually

* InnerDetector/InDetRecAlgs/SiSpacePointFormation/src/SiTrackerSpacePointFinder.cxx

Manual resolution of the conflict caused by !64184 (main) and !64289 (23.0)

* InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_ttbarPU40_reco.sh

Kept the 23.0 version which drops execution of two steps in a test

* PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/CMakeLists.txt
* PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/src/TruthMetaDataWriter.cxx

Conflicting identical implementations in two branches. Kept the main version unchanged.