Resolved conflict with master, Re #17590

.github/PULL_REQUEST_TEMPLATE.md

Framework/Algorithms/src/CreateGroupingWorkspace.cpp

Framework/Algorithms/test/ClearInstrumentParametersTest.h

Framework/Algorithms/test/ConvertUnitsTest.h

Framework/Algorithms/test/CreateLogTimeCorrectionTest.h

Framework/Algorithms/test/DetectorEfficiencyVariationTest.h

Framework/Algorithms/test/He3TubeEfficiencyTest.h

Framework/Algorithms/test/MedianDetectorTestTest.h

Framework/Algorithms/test/SolidAngleTest.h

Framework/CMakeLists.txt

Framework/Crystal/src/LoadIsawSpectrum.cpp

Framework/Crystal/test/CentroidPeaksTest.h

Framework/Crystal/test/FindUBUsingLatticeParametersTest.h

Framework/Crystal/test/NormaliseVanadiumTest.h

Framework/Crystal/test/PeakIntegrationTest.h

...work/DataHandling/inc/MantidDataHandling/LoadEventNexus.h

Framework/DataHandling/src/AppendGeometryToSNSNexus.cpp

...ework/DataHandling/src/FilterEventsByLogValuePreNexus.cpp

Framework/DataHandling/src/LoadBBY.cpp

Framework/DataHandling/src/LoadCalFile.cpp