diff --git a/.auto-resolution/ALICE3/Core/DelphesO2TrackSmearer.h b/.auto-resolution/ALICE3/Core/DelphesO2TrackSmearer.h
index 1e0fd873e2c..7714e53f65f 100644
--- a/.auto-resolution/ALICE3/Core/DelphesO2TrackSmearer.h
+++ b/.auto-resolution/ALICE3/Core/DelphesO2TrackSmearer.h
@@ -24,12 +24,13 @@
 #ifndef ALICE3_CORE_DELPHESO2TRACKSMEARER_H_
 #define ALICE3_CORE_DELPHESO2TRACKSMEARER_H_
 
-#include <map>
-#include <iostream>
-#include <fstream>
+#include "ReconstructionDataFormats/Track.h"
 
 #include "TRandom.h"
-#include "ReconstructionDataFormats/Track.h"
+
+#include <fstream>
+#include <iostream>
+#include <map>
 
 ///////////////////////////////
 /// DelphesO2/src/lutCovm.hh //
@@ -85,7 +86,7 @@ struct map_t {
     if (bin > nbins - 1)
       return nbins - 1;
     return bin;
-  }                                                                                                            //;
+  } //;
   void print() { printf("nbins = %d, min = %f, max = %f, log = %s \n", nbins, min, max, log ? "on" : "off"); } //;
 };
 
@@ -214,8 +215,8 @@ class TrackSmearer
         return 7; // Helium3
       default:
         return 2; // Default: pion
-    }             //;
-  }               //;
+    } //;
+  } //;
 
   void setdNdEta(float val) { mdNdEta = val; } //;
 
diff --git a/.auto-resolution/ALICE3/Core/DetLayer.cxx b/.auto-resolution/ALICE3/Core/DetLayer.cxx
index 25e61e6e6d5..fa49e4d811e 100644
--- a/.auto-resolution/ALICE3/Core/DetLayer.cxx
+++ b/.auto-resolution/ALICE3/Core/DetLayer.cxx
@@ -16,11 +16,11 @@
 /// \brief  Basic struct to hold information regarding a detector layer to be used in fast simulation
 ///
 
-#include <vector>
-#include <string>
-
 #include "DetLayer.h"
 
+#include <string>
+#include <vector>
+
 namespace o2::fastsim
 {
 
diff --git a/.auto-resolution/ALICE3/Core/DetLayer.h b/.auto-resolution/ALICE3/Core/DetLayer.h
index 2577c73e42d..e70d719a6e4 100644
--- a/.auto-resolution/ALICE3/Core/DetLayer.h
+++ b/.auto-resolution/ALICE3/Core/DetLayer.h
@@ -19,10 +19,10 @@
 #ifndef ALICE3_CORE_DETLAYER_H_
 #define ALICE3_CORE_DETLAYER_H_
 
-#include <string>
-
 #include "TString.h"
 
+#include <string>
+
 namespace o2::fastsim
 {
 
diff --git a/.auto-resolution/ALICE3/Core/TOFResoALICE3.h b/.auto-resolution/ALICE3/Core/TOFResoALICE3.h
index b102091f756..9179c550e8e 100644
--- a/.auto-resolution/ALICE3/Core/TOFResoALICE3.h
+++ b/.auto-resolution/ALICE3/Core/TOFResoALICE3.h
@@ -20,9 +20,9 @@
 #define O2_ANALYSIS_PID_TOFRESOALICE3_H_
 
 // O2 includes
-#include "PID/ParamBase.h"
 #include "PID/DetectorResponse.h"
 #include "PID/PIDTOF.h"
+#include "PID/ParamBase.h"
 #include "ReconstructionDataFormats/PID.h"
 
 namespace o2::pid::tof
diff --git a/.auto-resolution/ALICE3/DataModel/A3DecayFinderTables.h b/.auto-resolution/ALICE3/DataModel/A3DecayFinderTables.h
index 55229bbb5d4..ed5bccfbb56 100644
--- a/.auto-resolution/ALICE3/DataModel/A3DecayFinderTables.h
+++ b/.auto-resolution/ALICE3/DataModel/A3DecayFinderTables.h
@@ -19,9 +19,10 @@
 #define ALICE3_DATAMODEL_A3DECAYFINDERTABLES_H_
 
 // O2 includes
-#include "Framework/AnalysisDataModel.h"
 #include "Common/Core/RecoDecay.h"
 
+#include "Framework/AnalysisDataModel.h"
+
 enum a3selectionBit : uint32_t { kDCAxy = 0,
                                  kInnerTOFPion,
                                  kInnerTOFKaon,
diff --git a/.auto-resolution/ALICE3/TableProducer/OTF/onTheFlyTrackerPid.cxx b/.auto-resolution/ALICE3/TableProducer/OTF/onTheFlyTrackerPid.cxx
index 42d2bcc5252..54de20c87b7 100644
--- a/.auto-resolution/ALICE3/TableProducer/OTF/onTheFlyTrackerPid.cxx
+++ b/.auto-resolution/ALICE3/TableProducer/OTF/onTheFlyTrackerPid.cxx
@@ -20,42 +20,45 @@
 /// \since  May 22, 2025
 ///
 
-#include <utility>
-#include <map>
-#include <string>
-#include <algorithm>
-#include <vector>
+#include "TableHelper.h"
 
+#include "ALICE3/Core/DelphesO2TrackSmearer.h"
+#include "ALICE3/Core/TrackUtilities.h"
+#include "ALICE3/DataModel/OTFPIDTrk.h"
+#include "ALICE3/DataModel/OTFRICH.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
+#include "CommonConstants/GeomConstants.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "CommonUtils/NameConf.h"
+#include "DataFormatsCalibration/MeanVertexObject.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "DetectorsVertexing/HelixHelper.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/Core/trackUtilities.h"
-#include "ALICE3/Core/TrackUtilities.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/DCA.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "CommonUtils/NameConf.h"
-#include "CCDB/CcdbApi.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "DataFormatsCalibration/MeanVertexObject.h"
-#include "CommonConstants/GeomConstants.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "TRandom3.h"
+
 #include "TF1.h"
 #include "TH2F.h"
-#include "TVector3.h"
+#include "TRandom3.h"
 #include "TString.h"
-#include "ALICE3/DataModel/OTFRICH.h"
-#include "DetectorsVertexing/HelixHelper.h"
-#include "TableHelper.h"
-#include "ALICE3/Core/DelphesO2TrackSmearer.h"
-#include "ALICE3/DataModel/OTFPIDTrk.h"
+#include "TVector3.h"
+
+#include <algorithm>
+#include <map>
+#include <string>
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/ALICE3/TableProducer/alice3-centrality.cxx b/.auto-resolution/ALICE3/TableProducer/alice3-centrality.cxx
index 48c7ae617bf..bd6b8ac09d1 100644
--- a/.auto-resolution/ALICE3/TableProducer/alice3-centrality.cxx
+++ b/.auto-resolution/ALICE3/TableProducer/alice3-centrality.cxx
@@ -12,12 +12,13 @@
 /// \author David Dobrigkeit Chinellato <david.dobrigkeit.chinellato@cern.ch>, UNICAMP/CERN
 
 // O2 includes
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 #include <CCDB/BasicCCDBManager.h>
-#include "Common/DataModel/Centrality.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/ALICE3/TableProducer/alice3-correlatorDDbar.cxx b/.auto-resolution/ALICE3/TableProducer/alice3-correlatorDDbar.cxx
index 6c270dc1cd5..63679b81b76 100644
--- a/.auto-resolution/ALICE3/TableProducer/alice3-correlatorDDbar.cxx
+++ b/.auto-resolution/ALICE3/TableProducer/alice3-correlatorDDbar.cxx
@@ -14,21 +14,20 @@
 ///
 /// \author Fabio Colamaria <fabio.colamaria@ba.infn.it>, INFN Bari
 
-#include <vector>
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/Core/SelectorCuts.h"
+#include "PWGHF/HFC/DataModel/CorrelationTables.h"
+
+#include "ALICE3/DataModel/A3DecayFinderTables.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
 #include "CommonConstants/PhysicsConstants.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
 
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-
-#include "ALICE3/DataModel/A3DecayFinderTables.h"
-
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/Core/SelectorCuts.h"
-#include "PWGHF/HFC/DataModel/CorrelationTables.h"
+#include <vector>
 // #include "PWGHF/DataModel/CandidateReconstructionTables.h"
 // #include "PWGHF/DataModel/CandidateSelectionTables.h"
 
diff --git a/.auto-resolution/ALICE3/TableProducer/alice3-decayfinder.cxx b/.auto-resolution/ALICE3/TableProducer/alice3-decayfinder.cxx
index 2d12ea9ed14..76ee4cc5027 100644
--- a/.auto-resolution/ALICE3/TableProducer/alice3-decayfinder.cxx
+++ b/.auto-resolution/ALICE3/TableProducer/alice3-decayfinder.cxx
@@ -17,35 +17,37 @@
 //    HF decays. Work in progress: use at your own risk!
 //
 
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <map>
-#include <iterator>
-#include <utility>
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "ReconstructionDataFormats/Track.h"
+#include "ALICE3/DataModel/A3DecayFinderTables.h"
+#include "ALICE3/DataModel/OTFTOF.h"
+#include "ALICE3/DataModel/RICH.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
 #include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "DCAFitter/DCAFitterN.h"
 #include "DataFormatsCalibration/MeanVertexObject.h"
-#include "ALICE3/DataModel/OTFTOF.h"
-#include "ALICE3/DataModel/RICH.h"
-#include "ALICE3/DataModel/A3DecayFinderTables.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <iterator>
+#include <map>
+#include <utility>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/ALICE3/TableProducer/alice3-decaypreselector.cxx b/.auto-resolution/ALICE3/TableProducer/alice3-decaypreselector.cxx
index 527d1c1d197..b613d893292 100644
--- a/.auto-resolution/ALICE3/TableProducer/alice3-decaypreselector.cxx
+++ b/.auto-resolution/ALICE3/TableProducer/alice3-decaypreselector.cxx
@@ -17,36 +17,38 @@
 //    HF decays. Work in progress: use at your own risk!
 //
 
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <map>
-#include <iterator>
-#include <vector>
-#include <utility>
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "ReconstructionDataFormats/Track.h"
+#include "ALICE3/DataModel/A3DecayFinderTables.h"
+#include "ALICE3/DataModel/OTFRICH.h"
+#include "ALICE3/DataModel/OTFTOF.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
 #include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "DCAFitter/DCAFitterN.h"
 #include "DataFormatsCalibration/MeanVertexObject.h"
-#include "ALICE3/DataModel/OTFTOF.h"
-#include "ALICE3/DataModel/OTFRICH.h"
-#include "ALICE3/DataModel/A3DecayFinderTables.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <iterator>
+#include <map>
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/ALICE3/TableProducer/alice3-multicharmTable.cxx b/.auto-resolution/ALICE3/TableProducer/alice3-multicharmTable.cxx
index 16b16c666d8..62713161343 100644
--- a/.auto-resolution/ALICE3/TableProducer/alice3-multicharmTable.cxx
+++ b/.auto-resolution/ALICE3/TableProducer/alice3-multicharmTable.cxx
@@ -17,41 +17,43 @@
 //    HF decays. Work in progress: use at your own risk!
 //
 
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <map>
-#include <iterator>
-#include <utility>
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "ReconstructionDataFormats/Track.h"
+#include "ALICE3/DataModel/A3DecayFinderTables.h"
+#include "ALICE3/DataModel/OTFMulticharm.h"
+#include "ALICE3/DataModel/OTFStrangeness.h"
+#include "ALICE3/DataModel/OTFTOF.h"
+#include "ALICE3/DataModel/RICH.h"
+#include "ALICE3/DataModel/tracksAlice3.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
 #include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "DCAFitter/DCAFitterN.h"
 #include "DataFormatsCalibration/MeanVertexObject.h"
-#include "ALICE3/DataModel/OTFTOF.h"
-#include "ALICE3/DataModel/RICH.h"
-#include "ALICE3/DataModel/A3DecayFinderTables.h"
-#include "ALICE3/DataModel/OTFStrangeness.h"
-#include "ALICE3/DataModel/OTFMulticharm.h"
-#include "ALICE3/DataModel/tracksAlice3.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
 #include "DetectorsVertexing/PVertexer.h"
 #include "DetectorsVertexing/PVertexerHelpers.h"
-#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <iterator>
+#include <map>
+#include <utility>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/ALICE3/TableProducer/alice3-pidTOF.cxx b/.auto-resolution/ALICE3/TableProducer/alice3-pidTOF.cxx
index 3e54b1f46dc..cd5fe0dfff0 100644
--- a/.auto-resolution/ALICE3/TableProducer/alice3-pidTOF.cxx
+++ b/.auto-resolution/ALICE3/TableProducer/alice3-pidTOF.cxx
@@ -17,15 +17,16 @@
 ///
 
 // O2 includes
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "ALICE3/Core/TOFResoALICE3.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StaticFor.h"
+#include "ReconstructionDataFormats/Track.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/ALICE3/TableProducer/alice3-trackextension.cxx b/.auto-resolution/ALICE3/TableProducer/alice3-trackextension.cxx
index 578d1979310..8709b5e7b7e 100644
--- a/.auto-resolution/ALICE3/TableProducer/alice3-trackextension.cxx
+++ b/.auto-resolution/ALICE3/TableProducer/alice3-trackextension.cxx
@@ -13,11 +13,12 @@
 // Task performing basic track selection for the ALICE3.
 //
 
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/Core/trackUtilities.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/ALICE3/TableProducer/alice3-trackselection.cxx b/.auto-resolution/ALICE3/TableProducer/alice3-trackselection.cxx
index 58f3a4f33ce..b45910da01d 100644
--- a/.auto-resolution/ALICE3/TableProducer/alice3-trackselection.cxx
+++ b/.auto-resolution/ALICE3/TableProducer/alice3-trackselection.cxx
@@ -14,11 +14,12 @@
 /// \brief  Track selection for the ALICE3 studies
 ///
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/ALICE3/Tasks/ECALqa.cxx b/.auto-resolution/ALICE3/Tasks/ECALqa.cxx
index b3d1b200f71..8903a101b56 100644
--- a/.auto-resolution/ALICE3/Tasks/ECALqa.cxx
+++ b/.auto-resolution/ALICE3/Tasks/ECALqa.cxx
@@ -17,12 +17,13 @@
 ///
 
 // O2 includes
-#include "Framework/AnalysisTask.h"
 #include "ALICE3/DataModel/ECAL.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "ReconstructionDataFormats/PID.h"
+
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/PID.h"
 
 using namespace o2;
 using namespace o2::track;
diff --git a/.auto-resolution/ALICE3/Tasks/alice3-cdeuteron.cxx b/.auto-resolution/ALICE3/Tasks/alice3-cdeuteron.cxx
index de6b6738d02..c8357dc9a30 100644
--- a/.auto-resolution/ALICE3/Tasks/alice3-cdeuteron.cxx
+++ b/.auto-resolution/ALICE3/Tasks/alice3-cdeuteron.cxx
@@ -13,15 +13,17 @@
 /// \author Alexander Kalweit <alexander.kalweit@cern.ch>, CERN
 
 // O2 includes
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/PIDResponse.h"
+
+#include "DCAFitter/DCAFitterN.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "TLorentzVector.h"
 #include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/PID.h"
-#include "Common/Core/RecoDecay.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/trackUtilities.h"
+
+#include "TLorentzVector.h"
 
 using namespace o2;
 using namespace o2::framework;
@@ -468,7 +470,7 @@ struct Alice3CDeuteron {
 
           // fitterCasc.getTrack(1).getPxPyPzGlo(pvecbach);
         } // End loop on pions
-      }   // End loop on kaons
+      } // End loop on kaons
       histos.fill(HIST("event/candperdeuteron"), ncand);
     } // End loop on deuterons
   }
diff --git a/.auto-resolution/ALICE3/Tasks/alice3-dilepton.cxx b/.auto-resolution/ALICE3/Tasks/alice3-dilepton.cxx
index e3632fc5a02..6f20f518d27 100644
--- a/.auto-resolution/ALICE3/Tasks/alice3-dilepton.cxx
+++ b/.auto-resolution/ALICE3/Tasks/alice3-dilepton.cxx
@@ -16,16 +16,17 @@
 
 #include "Math/Vector4D.h"
 // O2 includes
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/HistogramRegistry.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Framework/AnalysisDataModel.h"
-#include "ALICE3/DataModel/OTFTOF.h"
 #include "ALICE3/DataModel/OTFRICH.h"
+#include "ALICE3/DataModel/OTFTOF.h"
 #include "ALICE3/DataModel/tracksAlice3.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.auto-resolution/ALICE3/Tasks/alice3-multicharm.cxx b/.auto-resolution/ALICE3/Tasks/alice3-multicharm.cxx
index 2b6ad804ddf..16332ead7e0 100644
--- a/.auto-resolution/ALICE3/Tasks/alice3-multicharm.cxx
+++ b/.auto-resolution/ALICE3/Tasks/alice3-multicharm.cxx
@@ -17,41 +17,43 @@
 //    HF decays. Work in progress: use at your own risk!
 //
 
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <map>
-#include <iterator>
-#include <utility>
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "ReconstructionDataFormats/Track.h"
+#include "ALICE3/DataModel/A3DecayFinderTables.h"
+#include "ALICE3/DataModel/OTFMulticharm.h"
+#include "ALICE3/DataModel/OTFStrangeness.h"
+#include "ALICE3/DataModel/OTFTOF.h"
+#include "ALICE3/DataModel/RICH.h"
+#include "ALICE3/DataModel/tracksAlice3.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
 #include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "DCAFitter/DCAFitterN.h"
 #include "DataFormatsCalibration/MeanVertexObject.h"
-#include "ALICE3/DataModel/OTFTOF.h"
-#include "ALICE3/DataModel/RICH.h"
-#include "ALICE3/DataModel/A3DecayFinderTables.h"
-#include "ALICE3/DataModel/OTFStrangeness.h"
-#include "ALICE3/DataModel/OTFMulticharm.h"
-#include "ALICE3/DataModel/tracksAlice3.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
 #include "DetectorsVertexing/PVertexer.h"
 #include "DetectorsVertexing/PVertexerHelpers.h"
-#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <iterator>
+#include <map>
+#include <utility>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/ALICE3/Tasks/alice3-qa-multiplicity.cxx b/.auto-resolution/ALICE3/Tasks/alice3-qa-multiplicity.cxx
index b798209dfde..8d15316eb05 100644
--- a/.auto-resolution/ALICE3/Tasks/alice3-qa-multiplicity.cxx
+++ b/.auto-resolution/ALICE3/Tasks/alice3-qa-multiplicity.cxx
@@ -11,11 +11,12 @@
 /// \author Nicolo' Jacazio <nicolo.jacazio@cern.ch>, CERN
 
 // O2 includes
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.auto-resolution/ALICE3/Tasks/alice3-qa-singleparticle.cxx b/.auto-resolution/ALICE3/Tasks/alice3-qa-singleparticle.cxx
index 1c8f0f19330..32925a2708b 100644
--- a/.auto-resolution/ALICE3/Tasks/alice3-qa-singleparticle.cxx
+++ b/.auto-resolution/ALICE3/Tasks/alice3-qa-singleparticle.cxx
@@ -17,9 +17,10 @@
 
 // O2 includes
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TDatabasePDG.h"
 #include "TMCProcess.h"
 
diff --git a/.auto-resolution/ALICE3/Tasks/alice3-taskcorrelationDDbar.cxx b/.auto-resolution/ALICE3/Tasks/alice3-taskcorrelationDDbar.cxx
index b6c8058f747..914cc3ba95c 100644
--- a/.auto-resolution/ALICE3/Tasks/alice3-taskcorrelationDDbar.cxx
+++ b/.auto-resolution/ALICE3/Tasks/alice3-taskcorrelationDDbar.cxx
@@ -14,15 +14,15 @@
 ///
 /// \author Fabio Colamaria <fabio.colamaria@ba.infn.it>, INFN Bari
 
-#include <vector>
+#include "PWGHF/Core/SelectorCuts.h"
+#include "PWGHF/HFC/DataModel/CorrelationTables.h"
+#include "PWGHF/Utils/utilsAnalysis.h"
 
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
 
-#include "PWGHF/Core/SelectorCuts.h"
-#include "PWGHF/Utils/utilsAnalysis.h"
-#include "PWGHF/HFC/DataModel/CorrelationTables.h"
+#include <vector>
 // #include "PWGHF/DataModel/CandidateReconstructionTables.h"
 // #include "PWGHF/DataModel/CandidateSelectionTables.h"
 
diff --git a/.auto-resolution/ALICE3/Tasks/alice3Efficiency.cxx b/.auto-resolution/ALICE3/Tasks/alice3Efficiency.cxx
index 7741ea24696..0f247305d00 100644
--- a/.auto-resolution/ALICE3/Tasks/alice3Efficiency.cxx
+++ b/.auto-resolution/ALICE3/Tasks/alice3Efficiency.cxx
@@ -17,16 +17,17 @@
 /// \since  May 27, 2025
 ///
 
-#include <map>
-#include <vector>
-
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/HistogramRegistry.h"
 #include "Framework/ConfigParamRegistry.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TEfficiency.h"
 #include "THashList.h"
 
+#include <map>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 std::map<int, TEfficiency*> effVsPt;
diff --git a/.auto-resolution/ALICE3/Tasks/alice3SeparationPower.cxx b/.auto-resolution/ALICE3/Tasks/alice3SeparationPower.cxx
index ae5b52d0692..c01cbdaf767 100644
--- a/.auto-resolution/ALICE3/Tasks/alice3SeparationPower.cxx
+++ b/.auto-resolution/ALICE3/Tasks/alice3SeparationPower.cxx
@@ -17,20 +17,22 @@
 /// \since  May 13, 2025
 ///
 
-#include <utility>
-#include <map>
-#include <string>
-#include <vector>
+#include "ALICE3/DataModel/OTFRICH.h"
+#include "ALICE3/DataModel/OTFTOF.h"
 
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
 #include "Framework/HistogramRegistry.h"
-#include "TProfile2D.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+
 #include "THashList.h"
-#include "ALICE3/DataModel/OTFTOF.h"
-#include "ALICE3/DataModel/OTFRICH.h"
+#include "TProfile2D.h"
+
+#include <map>
+#include <string>
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/ALICE3/Tasks/pidFTOFqa.cxx b/.auto-resolution/ALICE3/Tasks/pidFTOFqa.cxx
index 52dbaf8dcfa..03fa51e58cc 100644
--- a/.auto-resolution/ALICE3/Tasks/pidFTOFqa.cxx
+++ b/.auto-resolution/ALICE3/Tasks/pidFTOFqa.cxx
@@ -10,14 +10,15 @@
 // or submit itself to any jurisdiction.
 
 // O2 includes
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
 #include "ALICE3/DataModel/FTOF.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.auto-resolution/ALICE3/Tasks/pidRICHqa.cxx b/.auto-resolution/ALICE3/Tasks/pidRICHqa.cxx
index ab2a71e3ad9..392d4d99b8d 100644
--- a/.auto-resolution/ALICE3/Tasks/pidRICHqa.cxx
+++ b/.auto-resolution/ALICE3/Tasks/pidRICHqa.cxx
@@ -16,9 +16,10 @@
 ///
 
 // O2 includes
-#include "Framework/AnalysisTask.h"
 #include "ALICE3/DataModel/RICH.h"
 #include "Common/DataModel/PIDResponse.h"
+
+#include "Framework/AnalysisTask.h"
 #include "ReconstructionDataFormats/PID.h"
 
 using namespace o2;
diff --git a/.auto-resolution/Common/CCDB/EventSelectionParams.h b/.auto-resolution/Common/CCDB/EventSelectionParams.h
index 4633ff7aa73..cc4c397dd1b 100644
--- a/.auto-resolution/Common/CCDB/EventSelectionParams.h
+++ b/.auto-resolution/Common/CCDB/EventSelectionParams.h
@@ -17,9 +17,10 @@
 #ifndef COMMON_CCDB_EVENTSELECTIONPARAMS_H_
 #define COMMON_CCDB_EVENTSELECTIONPARAMS_H_
 
-#include <Rtypes.h>
 #include <TMath.h>
 
+#include <Rtypes.h>
+
 namespace o2::aod::evsel
 {
 // Event selection criteria
diff --git a/.auto-resolution/Common/CCDB/RCTSelectionFlags.h b/.auto-resolution/Common/CCDB/RCTSelectionFlags.h
index 1f396751c25..f80a1a7aa1b 100644
--- a/.auto-resolution/Common/CCDB/RCTSelectionFlags.h
+++ b/.auto-resolution/Common/CCDB/RCTSelectionFlags.h
@@ -18,11 +18,13 @@
 #define COMMON_CCDB_RCTSELECTIONFLAGS_H_
 
 #include <CommonUtils/EnumFlags.h>
-#include <Rtypes.h>
+
 #include <TMath.h>
 
-#include <stdexcept>
+#include <Rtypes.h>
+
 #include <algorithm>
+#include <stdexcept>
 #include <string>
 #include <vector>
 
diff --git a/.auto-resolution/Common/CCDB/TriggerAliases.cxx b/.auto-resolution/Common/CCDB/TriggerAliases.cxx
index 789d293c1d0..1c013e58ad3 100644
--- a/.auto-resolution/Common/CCDB/TriggerAliases.cxx
+++ b/.auto-resolution/Common/CCDB/TriggerAliases.cxx
@@ -10,6 +10,7 @@
 // or submit itself to any jurisdiction.
 
 #include "Common/CCDB/TriggerAliases.h"
+
 #include "Framework/Logger.h"
 
 std::string aliasLabels[kNaliases] = {
diff --git a/.auto-resolution/Common/CCDB/TriggerAliases.h b/.auto-resolution/Common/CCDB/TriggerAliases.h
index f1baf04fdcc..fff86e67e1f 100644
--- a/.auto-resolution/Common/CCDB/TriggerAliases.h
+++ b/.auto-resolution/Common/CCDB/TriggerAliases.h
@@ -12,10 +12,11 @@
 #ifndef COMMON_CCDB_TRIGGERALIASES_H_
 #define COMMON_CCDB_TRIGGERALIASES_H_
 
+#include <Rtypes.h>
+
 #include <cstdint>
 #include <map>
 #include <string>
-#include <Rtypes.h>
 
 enum triggerAliases {
   kINT7 = 0,
diff --git a/.auto-resolution/Common/CCDB/ctpRateFetcher.cxx b/.auto-resolution/Common/CCDB/ctpRateFetcher.cxx
index e20fc41616c..5a3b1e48132 100644
--- a/.auto-resolution/Common/CCDB/ctpRateFetcher.cxx
+++ b/.auto-resolution/Common/CCDB/ctpRateFetcher.cxx
@@ -11,14 +11,14 @@
 
 #include "ctpRateFetcher.h"
 
-#include <map>
-#include <vector>
-
+#include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/LHCConstants.h"
 #include "DataFormatsCTP/Configuration.h"
 #include "DataFormatsCTP/Scalers.h"
 #include "DataFormatsParameters/GRPLHCIFData.h"
-#include "CCDB/BasicCCDBManager.h"
+
+#include <map>
+#include <vector>
 
 namespace o2
 {
diff --git a/.auto-resolution/Common/CCDB/ctpRateFetcher.h b/.auto-resolution/Common/CCDB/ctpRateFetcher.h
index 6aaf5e3ebaa..beb8cd28b8e 100644
--- a/.auto-resolution/Common/CCDB/ctpRateFetcher.h
+++ b/.auto-resolution/Common/CCDB/ctpRateFetcher.h
@@ -12,10 +12,10 @@
 #ifndef COMMON_CCDB_CTPRATEFETCHER_H_
 #define COMMON_CCDB_CTPRATEFETCHER_H_
 
-#include <string>
-
 #include "CCDB/BasicCCDBManager.h"
 
+#include <string>
+
 namespace o2
 {
 
diff --git a/.auto-resolution/Common/CCDB/macros/ctpRateF.C b/.auto-resolution/Common/CCDB/macros/ctpRateF.C
index 32b93e4aa6b..efce284c159 100644
--- a/.auto-resolution/Common/CCDB/macros/ctpRateF.C
+++ b/.auto-resolution/Common/CCDB/macros/ctpRateF.C
@@ -9,15 +9,16 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <map>
-#include <vector>
+#include "Common/CCDB/ctpRateFetcher.h"
 
+#include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/LHCConstants.h"
 #include "DataFormatsCTP/Configuration.h"
 #include "DataFormatsCTP/Scalers.h"
 #include "DataFormatsParameters/GRPLHCIFData.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "Common/CCDB/ctpRateFetcher.h"
+
+#include <map>
+#include <vector>
 
 struct ctpRateFetcher {
   ctpRateFetcher() = default;
diff --git a/.auto-resolution/Common/CCDB/macros/upload_event_selection_params.C b/.auto-resolution/Common/CCDB/macros/upload_event_selection_params.C
index cafc863ab03..8296dc0f78a 100644
--- a/.auto-resolution/Common/CCDB/macros/upload_event_selection_params.C
+++ b/.auto-resolution/Common/CCDB/macros/upload_event_selection_params.C
@@ -9,12 +9,15 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "CCDB/CcdbApi.h"
+#include "EventSelectionParams.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
+
 #include "TString.h"
+
 #include <map>
 #include <string>
-#include "EventSelectionParams.h"
 using std::map;
 using std::string;
 
diff --git a/.auto-resolution/Common/CCDB/macros/upload_event_selection_params_run3.C b/.auto-resolution/Common/CCDB/macros/upload_event_selection_params_run3.C
index f81491949c6..f7887aa1df5 100644
--- a/.auto-resolution/Common/CCDB/macros/upload_event_selection_params_run3.C
+++ b/.auto-resolution/Common/CCDB/macros/upload_event_selection_params_run3.C
@@ -9,11 +9,14 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
+#include "EventSelectionParams.h"
+
 #include "CCDB/CcdbApi.h"
+
 #include "TString.h"
+
 #include <map>
 #include <string>
-#include "EventSelectionParams.h"
 using std::map;
 using std::string;
 
@@ -140,4 +143,5 @@ void fillMapOfCustomOrbitShifts(std::map<int, int>& mapOrbitShift)
   mapOrbitShift[523797] = 41;
   mapOrbitShift[523821] = 36;
   mapOrbitShift[523897] = 38;
-}
\ No newline at end of file
+}
+ 
\ No newline at end of file
diff --git a/.auto-resolution/Common/CCDB/macros/upload_trigger_aliases.C b/.auto-resolution/Common/CCDB/macros/upload_trigger_aliases.C
index 9fa91cd9b13..a6bf004edb5 100644
--- a/.auto-resolution/Common/CCDB/macros/upload_trigger_aliases.C
+++ b/.auto-resolution/Common/CCDB/macros/upload_trigger_aliases.C
@@ -9,12 +9,15 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "CCDB/CcdbApi.h"
+#include "TriggerAliases.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
+
 #include "TObjArray.h"
-#include "TriggerAliases.h"
-#include "TTree.h"
 #include "TString.h"
+#include "TTree.h"
+
 #include <fstream>
 #include <map>
 #include <string>
diff --git a/.auto-resolution/Common/CCDB/macros/upload_trigger_aliases_run3.C b/.auto-resolution/Common/CCDB/macros/upload_trigger_aliases_run3.C
index e946d9117d4..75e813b6dd3 100644
--- a/.auto-resolution/Common/CCDB/macros/upload_trigger_aliases_run3.C
+++ b/.auto-resolution/Common/CCDB/macros/upload_trigger_aliases_run3.C
@@ -9,13 +9,16 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "DataFormatsCTP/Configuration.h"
-#include "CCDB/CcdbApi.h"
+#include "TriggerAliases.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
+#include "DataFormatsCTP/Configuration.h"
+
 #include "TObjArray.h"
-#include "TriggerAliases.h"
-#include "TTree.h"
 #include "TString.h"
+#include "TTree.h"
+
 #include <fstream>
 #include <map>
 #include <string>
diff --git a/.auto-resolution/Common/Core/CollisionAssociation.h b/.auto-resolution/Common/Core/CollisionAssociation.h
index 69ec38a24db..c505f0c6dbb 100644
--- a/.auto-resolution/Common/Core/CollisionAssociation.h
+++ b/.auto-resolution/Common/Core/CollisionAssociation.h
@@ -20,13 +20,13 @@
 #ifndef COMMON_CORE_COLLISIONASSOCIATION_H_
 #define COMMON_CORE_COLLISIONASSOCIATION_H_
 
-#include <vector>
-#include <memory>
-#include <utility>
-
 #include "CommonConstants/LHCConstants.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+
+#include <memory>
+#include <utility>
+#include <vector>
 
 namespace o2::aod
 {
diff --git a/.auto-resolution/Common/Core/EventPlaneHelper.cxx b/.auto-resolution/Common/Core/EventPlaneHelper.cxx
index 75424d900d9..b1e63af16fa 100644
--- a/.auto-resolution/Common/Core/EventPlaneHelper.cxx
+++ b/.auto-resolution/Common/Core/EventPlaneHelper.cxx
@@ -20,13 +20,13 @@
 
 #include "Common/Core/EventPlaneHelper.h"
 
+#include "TMath.h"
+#include "TVector3.h"
+
 #include <algorithm>
 #include <iterator>
-#include <vector>
 #include <memory>
-
-#include "TMath.h"
-#include "TVector3.h"
+#include <vector>
 
 double EventPlaneHelper::GetPhiFV0(int chno, o2::fv0::Geometry* fv0geom)
 {
diff --git a/.auto-resolution/Common/Core/EventPlaneHelper.h b/.auto-resolution/Common/Core/EventPlaneHelper.h
index d6a2f3cba11..c85c04fe092 100644
--- a/.auto-resolution/Common/Core/EventPlaneHelper.h
+++ b/.auto-resolution/Common/Core/EventPlaneHelper.h
@@ -21,17 +21,16 @@
 #ifndef COMMON_CORE_EVENTPLANEHELPER_H_
 #define COMMON_CORE_EVENTPLANEHELPER_H_
 
-#include <vector>
-#include <memory>
+#include "FT0Base/Geometry.h"
+#include "FV0Base/Geometry.h"
 
 #include "TNamed.h"
-
 #include <TComplex.h>
 #include <TH2D.h>
 #include <TProfile.h>
 
-#include "FV0Base/Geometry.h"
-#include "FT0Base/Geometry.h"
+#include <memory>
+#include <vector>
 
 class EventPlaneHelper
 {
diff --git a/.auto-resolution/Common/Core/FFitWeights.cxx b/.auto-resolution/Common/Core/FFitWeights.cxx
index 3a92114f48c..3cb9216ba85 100644
--- a/.auto-resolution/Common/Core/FFitWeights.cxx
+++ b/.auto-resolution/Common/Core/FFitWeights.cxx
@@ -16,12 +16,12 @@
 
 #include "FFitWeights.h"
 
-#include <string>
+#include <TSpline.h>
+
 #include <cstdio>
+#include <string>
 #include <vector>
 
-#include <TSpline.h>
-
 ClassImp(FFitWeights)
 
   FFitWeights::FFitWeights() : TNamed("", ""),
diff --git a/.auto-resolution/Common/Core/FFitWeights.h b/.auto-resolution/Common/Core/FFitWeights.h
index c80165730f7..5227eefa359 100644
--- a/.auto-resolution/Common/Core/FFitWeights.h
+++ b/.auto-resolution/Common/Core/FFitWeights.h
@@ -17,22 +17,22 @@
 #ifndef COMMON_CORE_FFITWEIGHTS_H_
 #define COMMON_CORE_FFITWEIGHTS_H_
 
-#include <vector>
-#include <string>
-#include <utility>
-#include <algorithm>
-#include <complex>
-#include <memory>
-
+#include "TCollection.h"
+#include "TFile.h"
+#include "TH1D.h"
+#include "TH2D.h"
+#include "TH3D.h"
+#include "TMath.h"
 #include "TNamed.h"
 #include "TObjArray.h"
-#include "TH3D.h"
-#include "TH2D.h"
-#include "TH1D.h"
-#include "TFile.h"
-#include "TCollection.h"
 #include "TString.h"
-#include "TMath.h"
+
+#include <algorithm>
+#include <complex>
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
 
 class FFitWeights : public TNamed
 {
diff --git a/.auto-resolution/Common/Core/OrbitRange.cxx b/.auto-resolution/Common/Core/OrbitRange.cxx
index 51a3ec5fe78..b57654079bc 100644
--- a/.auto-resolution/Common/Core/OrbitRange.cxx
+++ b/.auto-resolution/Common/Core/OrbitRange.cxx
@@ -14,6 +14,7 @@
 //
 
 #include "Common/Core/OrbitRange.h"
+
 #include "TCollection.h"
 #include "TMath.h"
 
diff --git a/.auto-resolution/Common/Core/PID/DetectorResponse.h b/.auto-resolution/Common/Core/PID/DetectorResponse.h
index 1f687a4605c..e78251935ee 100644
--- a/.auto-resolution/Common/Core/PID/DetectorResponse.h
+++ b/.auto-resolution/Common/Core/PID/DetectorResponse.h
@@ -20,18 +20,21 @@
 #ifndef O2_ANALYSIS_PID_DETECTORRESPONSE_H_
 #define O2_ANALYSIS_PID_DETECTORRESPONSE_H_
 
+#include "Framework/Logger.h"
+
 #include <array>
 #include <vector>
-#include "Framework/Logger.h"
 // ROOT includes
 #include "Rtypes.h"
-#include "TMath.h"
+
 #include "TFile.h"
+#include "TMath.h"
 
 // O2 includes
-#include "ReconstructionDataFormats/PID.h"
 #include "Common/Core/PID/ParamBase.h"
 
+#include "ReconstructionDataFormats/PID.h"
+
 namespace o2::pid
 {
 /// \brief Class to handle the general detector response
diff --git a/.auto-resolution/Common/Core/PID/PIDTOF.cxx b/.auto-resolution/Common/Core/PID/PIDTOF.cxx
index bec41fafc43..10a3588730c 100644
--- a/.auto-resolution/Common/Core/PID/PIDTOF.cxx
+++ b/.auto-resolution/Common/Core/PID/PIDTOF.cxx
@@ -17,6 +17,7 @@
 ///
 
 #include "PIDTOF.h"
+
 #include <string>
 
 namespace o2::pid::tof
diff --git a/.auto-resolution/Common/Core/PID/PIDTOF.h b/.auto-resolution/Common/Core/PID/PIDTOF.h
index ad16716916c..fb02804745a 100644
--- a/.auto-resolution/Common/Core/PID/PIDTOF.h
+++ b/.auto-resolution/Common/Core/PID/PIDTOF.h
@@ -25,17 +25,18 @@
 
 // ROOT includes
 #include "Rtypes.h"
-#include "TMath.h"
-#include "TGraph.h"
-#include "TFile.h"
+
 #include "TF2.h"
+#include "TFile.h"
+#include "TGraph.h"
+#include "TMath.h"
 
 // O2 includes
+#include "CommonConstants/PhysicsConstants.h"
 #include "DataFormatsTOF/ParameterContainers.h"
+#include "Framework/DataTypes.h"
 #include "Framework/Logger.h"
 #include "ReconstructionDataFormats/PID.h"
-#include "Framework/DataTypes.h"
-#include "CommonConstants/PhysicsConstants.h"
 
 namespace o2::pid::tof
 {
diff --git a/.auto-resolution/Common/Core/PID/ParamBase.cxx b/.auto-resolution/Common/Core/PID/ParamBase.cxx
index 74824781d07..ab5a0d0f4dd 100644
--- a/.auto-resolution/Common/Core/PID/ParamBase.cxx
+++ b/.auto-resolution/Common/Core/PID/ParamBase.cxx
@@ -18,7 +18,9 @@
 ///
 
 #include "PID/ParamBase.h"
+
 #include "Framework/Logger.h"
+
 #include "TFile.h"
 
 namespace o2::pid
diff --git a/.auto-resolution/Common/Core/PID/ParamBase.h b/.auto-resolution/Common/Core/PID/ParamBase.h
index ec4b17083f4..28bbc6b732b 100644
--- a/.auto-resolution/Common/Core/PID/ParamBase.h
+++ b/.auto-resolution/Common/Core/PID/ParamBase.h
@@ -26,11 +26,11 @@
 #include <vector>    // std::vector
 
 // ROOT includes
-#include "TNamed.h"
-#include "TFile.h"
-
 #include "Framework/Logger.h"
 
+#include "TFile.h"
+#include "TNamed.h"
+
 namespace o2::pid
 {
 /// Variable to use for the pid input/output i.e. float, double et cetera
diff --git a/.auto-resolution/Common/Core/PID/TPCPIDResponse.h b/.auto-resolution/Common/Core/PID/TPCPIDResponse.h
index f25e1acd69e..03ec6c2302f 100644
--- a/.auto-resolution/Common/Core/PID/TPCPIDResponse.h
+++ b/.auto-resolution/Common/Core/PID/TPCPIDResponse.h
@@ -17,14 +17,15 @@
 #ifndef COMMON_CORE_PID_TPCPIDRESPONSE_H_
 #define COMMON_CORE_PID_TPCPIDRESPONSE_H_
 
+#include "Framework/Logger.h"
+
 #include <array>
-#include <vector>
 #include <cmath>
-#include "Framework/Logger.h"
+#include <vector>
 // O2 includes
-#include "ReconstructionDataFormats/PID.h"
-#include "Framework/DataTypes.h"
 #include "DataFormatsTPC/BetheBlochAleph.h"
+#include "Framework/DataTypes.h"
+#include "ReconstructionDataFormats/PID.h"
 
 namespace o2::pid::tpc
 {
diff --git a/.auto-resolution/Common/Core/TPCVDriftManager.h b/.auto-resolution/Common/Core/TPCVDriftManager.h
index 5d35db5ea99..54f0f26a9f6 100644
--- a/.auto-resolution/Common/Core/TPCVDriftManager.h
+++ b/.auto-resolution/Common/Core/TPCVDriftManager.h
@@ -12,17 +12,17 @@
 #ifndef COMMON_CORE_TPCVDRIFTMANAGER_H_
 #define COMMON_CORE_TPCVDRIFTMANAGER_H_
 
-#include <string>
-
 #include "CCDB/BasicCCDBManager.h"
-#include "Framework/Logger.h"
-#include "Framework/DataTypes.h"
-#include "DataFormatsTPC/VDriftCorrFact.h"
 #include "CommonConstants/LHCConstants.h"
-#include "DataFormatsParameters/GRPLHCIFData.h"
 #include "DataFormatsParameters/GRPECSObject.h"
+#include "DataFormatsParameters/GRPLHCIFData.h"
+#include "DataFormatsTPC/VDriftCorrFact.h"
+#include "Framework/DataTypes.h"
+#include "Framework/Logger.h"
 #include "ReconstructionDataFormats/Track.h"
 
+#include <string>
+
 namespace o2::aod::common
 {
 
diff --git a/.auto-resolution/Common/Core/TrackSelection.cxx b/.auto-resolution/Common/Core/TrackSelection.cxx
index 717d7db77f5..1103b678024 100644
--- a/.auto-resolution/Common/Core/TrackSelection.cxx
+++ b/.auto-resolution/Common/Core/TrackSelection.cxx
@@ -13,9 +13,10 @@
 // Class for track selection
 //
 
-#include "Framework/Logger.h"
 #include "Common/Core/TrackSelection.h"
 
+#include "Framework/Logger.h"
+
 bool TrackSelection::FulfillsITSHitRequirements(uint8_t itsClusterMap) const
 {
   constexpr uint8_t bit = 1;
diff --git a/.auto-resolution/Common/Core/TrackSelection.h b/.auto-resolution/Common/Core/TrackSelection.h
index 19d77a198e1..94285fbdda8 100644
--- a/.auto-resolution/Common/Core/TrackSelection.h
+++ b/.auto-resolution/Common/Core/TrackSelection.h
@@ -16,13 +16,15 @@
 #ifndef COMMON_CORE_TRACKSELECTION_H_
 #define COMMON_CORE_TRACKSELECTION_H_
 
+#include "Rtypes.h"
+
+#include "Framework/DataTypes.h"
+#include "Framework/Logger.h"
+
 #include <set>
-#include <vector>
-#include <utility>
 #include <string>
-#include "Framework/Logger.h"
-#include "Framework/DataTypes.h"
-#include "Rtypes.h"
+#include <utility>
+#include <vector>
 
 class TrackSelection
 {
diff --git a/.auto-resolution/Common/Core/TrackSelectionDefaults.cxx b/.auto-resolution/Common/Core/TrackSelectionDefaults.cxx
index 2958718feba..3e659db0502 100644
--- a/.auto-resolution/Common/Core/TrackSelectionDefaults.cxx
+++ b/.auto-resolution/Common/Core/TrackSelectionDefaults.cxx
@@ -15,10 +15,12 @@
 /// \since 20-10-2020
 ///
 
-#include "Framework/DataTypes.h"
-#include "Common/Core/TrackSelection.h"
 #include "TrackSelectionDefaults.h"
 
+#include "Common/Core/TrackSelection.h"
+
+#include "Framework/DataTypes.h"
+
 // Default track selection requiring one hit in the SPD
 TrackSelection getGlobalTrackSelection()
 {
diff --git a/.auto-resolution/Common/Core/TrackSelectionDefaults.h b/.auto-resolution/Common/Core/TrackSelectionDefaults.h
index 72c666456ae..9dc2f1aa661 100644
--- a/.auto-resolution/Common/Core/TrackSelectionDefaults.h
+++ b/.auto-resolution/Common/Core/TrackSelectionDefaults.h
@@ -18,9 +18,10 @@
 #ifndef COMMON_CORE_TRACKSELECTIONDEFAULTS_H_
 #define COMMON_CORE_TRACKSELECTIONDEFAULTS_H_
 
-#include "Framework/DataTypes.h"
 #include "Common/Core/TrackSelection.h"
 
+#include "Framework/DataTypes.h"
+
 // Default track selection requiring one hit in the SPD
 TrackSelection getGlobalTrackSelection();
 
diff --git a/.auto-resolution/Common/Core/TrackSelectorPID.h b/.auto-resolution/Common/Core/TrackSelectorPID.h
index 214627a2d72..afda01c5a44 100644
--- a/.auto-resolution/Common/Core/TrackSelectorPID.h
+++ b/.auto-resolution/Common/Core/TrackSelectorPID.h
@@ -17,11 +17,11 @@
 #ifndef COMMON_CORE_TRACKSELECTORPID_H_
 #define COMMON_CORE_TRACKSELECTORPID_H_
 
-#include <TPDGCode.h>
-
 #include "Framework/Logger.h"
 #include "ReconstructionDataFormats/PID.h"
 
+#include <TPDGCode.h>
+
 /// Class for track selection using PID detectors
 
 struct TrackSelectorPID {
diff --git a/.auto-resolution/Common/Core/trackUtilities.h b/.auto-resolution/Common/Core/trackUtilities.h
index e67e0f82d6f..744647915f8 100644
--- a/.auto-resolution/Common/Core/trackUtilities.h
+++ b/.auto-resolution/Common/Core/trackUtilities.h
@@ -17,11 +17,13 @@
 #ifndef COMMON_CORE_TRACKUTILITIES_H_
 #define COMMON_CORE_TRACKUTILITIES_H_
 
-#include <utility> // std::move
+#include "Common/Core/RecoDecay.h"
+
 #include "CommonConstants/MathConstants.h"
 #include "ReconstructionDataFormats/Track.h"
 #include "ReconstructionDataFormats/Vertex.h"
-#include "Common/Core/RecoDecay.h"
+
+#include <utility> // std::move
 
 /// Extracts track parameters from a track.
 template <typename TrackPrecision = float, typename T>
diff --git a/.auto-resolution/Common/DataModel/CaloClusters.h b/.auto-resolution/Common/DataModel/CaloClusters.h
index 23a44371d80..9a83a92ccec 100644
--- a/.auto-resolution/Common/DataModel/CaloClusters.h
+++ b/.auto-resolution/Common/DataModel/CaloClusters.h
@@ -12,9 +12,10 @@
 #ifndef COMMON_DATAMODEL_CALOCLUSTERS_H_
 #define COMMON_DATAMODEL_CALOCLUSTERS_H_
 
-#include <vector>
 #include "Framework/AnalysisDataModel.h"
 
+#include <vector>
+
 namespace o2::aod
 {
 namespace calocluster
diff --git a/.auto-resolution/Common/DataModel/EseTable.h b/.auto-resolution/Common/DataModel/EseTable.h
index 68ffdff450a..defc3c750a5 100644
--- a/.auto-resolution/Common/DataModel/EseTable.h
+++ b/.auto-resolution/Common/DataModel/EseTable.h
@@ -17,10 +17,10 @@
 #ifndef COMMON_DATAMODEL_ESETABLE_H_
 #define COMMON_DATAMODEL_ESETABLE_H_
 
-#include <vector>
-
-#include "Framework/AnalysisTask.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+
+#include <vector>
 
 namespace o2::aod
 {
diff --git a/.auto-resolution/Common/DataModel/EventSelection.h b/.auto-resolution/Common/DataModel/EventSelection.h
index 77849d0d7cf..093ae4303c3 100644
--- a/.auto-resolution/Common/DataModel/EventSelection.h
+++ b/.auto-resolution/Common/DataModel/EventSelection.h
@@ -17,10 +17,11 @@
 #ifndef COMMON_DATAMODEL_EVENTSELECTION_H_
 #define COMMON_DATAMODEL_EVENTSELECTION_H_
 
-#include "Framework/AnalysisDataModel.h"
-#include "Common/CCDB/TriggerAliases.h"
 #include "Common/CCDB/EventSelectionParams.h"
 #include "Common/CCDB/RCTSelectionFlags.h"
+#include "Common/CCDB/TriggerAliases.h"
+
+#include "Framework/AnalysisDataModel.h"
 
 namespace o2::aod
 {
diff --git a/.auto-resolution/Common/DataModel/McCollisionExtra.h b/.auto-resolution/Common/DataModel/McCollisionExtra.h
index 14b11b9a4e8..4b0f20c92fa 100644
--- a/.auto-resolution/Common/DataModel/McCollisionExtra.h
+++ b/.auto-resolution/Common/DataModel/McCollisionExtra.h
@@ -14,15 +14,16 @@
 #ifndef COMMON_DATAMODEL_MCCOLLISIONEXTRA_H_
 #define COMMON_DATAMODEL_MCCOLLISIONEXTRA_H_
 
-#include <cmath>
 #include "Framework/AnalysisDataModel.h"
 
+#include <cmath>
+
 namespace o2::aod
 {
 namespace mccollisionprop
 {
-DECLARE_SOA_COLUMN(NumRecoCollision, numRecoCollision, int);     //! stores N times this PV was recoed
-DECLARE_SOA_COLUMN(BestCollisionIndex, bestCollisionIndex, int); //! stores N times this PV was recoed
+DECLARE_SOA_COLUMN(NumRecoCollision, numRecoCollision, int);             //! stores N times this PV was recoed
+DECLARE_SOA_COLUMN(BestCollisionIndex, bestCollisionIndex, int);         //! stores N times this PV was recoed
 DECLARE_SOA_COLUMN(BestCollisionCentFT0C, bestCollisionCentFT0C, float); //! stores best FT0C centrality
 
 // collision MC context (neighbours contain PoI?)
@@ -35,4 +36,4 @@ DECLARE_SOA_TABLE(McCollContexts, "AOD", "MCCOLLCONTEXT",
                   mccollisionprop::ForwardCollisionMap, mccollisionprop::BackwardCollisionMap);
 } // namespace o2::aod
 
-#endif // COMMON_DATAMODEL_MCCOLLISIONEXTRA_H_
\ No newline at end of file
+#endif // COMMON_DATAMODEL_MCCOLLISIONEXTRA_H_
diff --git a/.auto-resolution/Common/DataModel/MftmchMatchingML.h b/.auto-resolution/Common/DataModel/MftmchMatchingML.h
index f243411f3b7..56171cb052e 100644
--- a/.auto-resolution/Common/DataModel/MftmchMatchingML.h
+++ b/.auto-resolution/Common/DataModel/MftmchMatchingML.h
@@ -12,9 +12,10 @@
 #ifndef COMMON_DATAMODEL_MFTMCHMATCHINGML_H_
 #define COMMON_DATAMODEL_MFTMCHMATCHINGML_H_
 
-#include "Framework/AnalysisDataModel.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+
 namespace o2::aod
 {
 DECLARE_SOA_TABLE(FwdTracksML, "AOD", "FWDTRACKML",
diff --git a/.auto-resolution/Common/DataModel/Multiplicity.h b/.auto-resolution/Common/DataModel/Multiplicity.h
index 0ac2a0074c6..8b0bcc2f051 100644
--- a/.auto-resolution/Common/DataModel/Multiplicity.h
+++ b/.auto-resolution/Common/DataModel/Multiplicity.h
@@ -16,9 +16,10 @@
 #ifndef COMMON_DATAMODEL_MULTIPLICITY_H_
 #define COMMON_DATAMODEL_MULTIPLICITY_H_
 
-#include "Framework/AnalysisDataModel.h"
 #include "Common/DataModel/EventSelection.h"
 
+#include "Framework/AnalysisDataModel.h"
+
 namespace o2::aod
 {
 namespace mult
diff --git a/.auto-resolution/Common/DataModel/OccupancyTables.h b/.auto-resolution/Common/DataModel/OccupancyTables.h
index 9e14fd8f4f2..70db5b31793 100644
--- a/.auto-resolution/Common/DataModel/OccupancyTables.h
+++ b/.auto-resolution/Common/DataModel/OccupancyTables.h
@@ -14,11 +14,11 @@
 ///
 /// \author Rahul Verma (rahul.verma@iitb.ac.in) :: Marian I Ivanov (marian.ivanov@cern.ch)
 
-#include <vector>
-
 #include "Framework/ASoA.h"
 #include "Framework/AnalysisDataModel.h"
 
+#include <vector>
+
 #ifndef COMMON_DATAMODEL_OCCUPANCYTABLES_H_
 #define COMMON_DATAMODEL_OCCUPANCYTABLES_H_
 
diff --git a/.auto-resolution/Common/DataModel/PIDResponse.h b/.auto-resolution/Common/DataModel/PIDResponse.h
index eee2e4df2e3..f113f3a4c1f 100644
--- a/.auto-resolution/Common/DataModel/PIDResponse.h
+++ b/.auto-resolution/Common/DataModel/PIDResponse.h
@@ -19,9 +19,9 @@
 #ifndef COMMON_DATAMODEL_PIDRESPONSE_H_
 #define COMMON_DATAMODEL_PIDRESPONSE_H_
 
+#include "PIDResponseCombined.h"
 #include "PIDResponseTOF.h"
 #include "PIDResponseTPC.h"
-#include "PIDResponseCombined.h"
 
 namespace o2::aod
 {
diff --git a/.auto-resolution/Common/DataModel/PIDResponseCombined.h b/.auto-resolution/Common/DataModel/PIDResponseCombined.h
index 4b54d214838..e6f859ab692 100644
--- a/.auto-resolution/Common/DataModel/PIDResponseCombined.h
+++ b/.auto-resolution/Common/DataModel/PIDResponseCombined.h
@@ -24,8 +24,8 @@
 // O2 includes
 #include "Framework/ASoA.h"
 #include "Framework/AnalysisDataModel.h"
-#include "ReconstructionDataFormats/PID.h"
 #include "Framework/Logger.h"
+#include "ReconstructionDataFormats/PID.h"
 
 namespace o2::aod
 {
diff --git a/.auto-resolution/Common/DataModel/PIDResponseTOF.h b/.auto-resolution/Common/DataModel/PIDResponseTOF.h
index 5edfe931ad8..85beb113851 100644
--- a/.auto-resolution/Common/DataModel/PIDResponseTOF.h
+++ b/.auto-resolution/Common/DataModel/PIDResponseTOF.h
@@ -23,11 +23,12 @@
 #include <experimental/type_traits>
 
 // O2 includes
+#include "Common/Core/PID/PIDTOF.h"
+
 #include "Framework/ASoA.h"
 #include "Framework/AnalysisDataModel.h"
-#include "ReconstructionDataFormats/PID.h"
 #include "Framework/Logger.h"
-#include "Common/Core/PID/PIDTOF.h"
+#include "ReconstructionDataFormats/PID.h"
 
 namespace o2::aod
 {
diff --git a/.auto-resolution/Common/DataModel/PIDResponseTPC.h b/.auto-resolution/Common/DataModel/PIDResponseTPC.h
index a22d5c9c008..e5247b90432 100644
--- a/.auto-resolution/Common/DataModel/PIDResponseTPC.h
+++ b/.auto-resolution/Common/DataModel/PIDResponseTPC.h
@@ -25,8 +25,8 @@
 // O2 includes
 #include "Framework/ASoA.h"
 #include "Framework/AnalysisDataModel.h"
-#include "ReconstructionDataFormats/PID.h"
 #include "Framework/Logger.h"
+#include "ReconstructionDataFormats/PID.h"
 
 namespace o2::aod
 {
diff --git a/.auto-resolution/Common/DataModel/Qvectors.h b/.auto-resolution/Common/DataModel/Qvectors.h
index 423c2648e89..1ff0ceebabd 100644
--- a/.auto-resolution/Common/DataModel/Qvectors.h
+++ b/.auto-resolution/Common/DataModel/Qvectors.h
@@ -21,9 +21,10 @@
 #ifndef COMMON_DATAMODEL_QVECTORS_H_
 #define COMMON_DATAMODEL_QVECTORS_H_
 
-#include <vector>
 #include "Framework/AnalysisDataModel.h"
 
+#include <vector>
+
 namespace o2::aod
 {
 namespace qvec
diff --git a/.auto-resolution/Common/LegacyDataQA/centqa.cxx b/.auto-resolution/Common/LegacyDataQA/centqa.cxx
index 0d69be10754..00bb1fee419 100644
--- a/.auto-resolution/Common/LegacyDataQA/centqa.cxx
+++ b/.auto-resolution/Common/LegacyDataQA/centqa.cxx
@@ -22,13 +22,15 @@
 // - david.dobrigkeit.chinellato@cern.ch
 //
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Common/DataModel/McCollisionExtra.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/McCollisionExtra.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TH1F.h"
 #include "TH2F.h"
 
diff --git a/.auto-resolution/Common/LegacyDataQA/otfv0qa.cxx b/.auto-resolution/Common/LegacyDataQA/otfv0qa.cxx
index 8dc446d9a01..13ee2809bcd 100644
--- a/.auto-resolution/Common/LegacyDataQA/otfv0qa.cxx
+++ b/.auto-resolution/Common/LegacyDataQA/otfv0qa.cxx
@@ -9,13 +9,15 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/McCollisionExtra.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TH1F.h"
 #include "TH2F.h"
 
diff --git a/.auto-resolution/Common/LegacyDataQA/pmdQa.cxx b/.auto-resolution/Common/LegacyDataQA/pmdQa.cxx
index 9958fd26761..3d355f33f0b 100644
--- a/.auto-resolution/Common/LegacyDataQA/pmdQa.cxx
+++ b/.auto-resolution/Common/LegacyDataQA/pmdQa.cxx
@@ -15,21 +15,23 @@
 /// \author Abhi Modak (abhi.modak@cern.ch)
 /// \since May 17, 2025
 
-#include <cstdlib>
-#include <cmath>
-#include <vector>
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PmdTable.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
+#include "CCDB/BasicCCDBManager.h"
 #include "Framework/ASoA.h"
 #include "Framework/AnalysisDataModel.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/PmdTable.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "CCDB/BasicCCDBManager.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TH1F.h"
 #include "TH2F.h"
 
+#include <cmath>
+#include <cstdlib>
+#include <vector>
+
 using namespace o2;
 using namespace o2::aod::run2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Common/LegacyDataQA/tpcpidqa.cxx b/.auto-resolution/Common/LegacyDataQA/tpcpidqa.cxx
index a67043fd342..fd9988f7251 100644
--- a/.auto-resolution/Common/LegacyDataQA/tpcpidqa.cxx
+++ b/.auto-resolution/Common/LegacyDataQA/tpcpidqa.cxx
@@ -18,12 +18,14 @@
 //
 // Warning: expected resolution is NOT provided.
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "TableHelper.h"
 
+#include "Common/DataModel/PIDResponse.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.auto-resolution/Common/TableProducer/Converters/bcConverter.cxx b/.auto-resolution/Common/TableProducer/Converters/bcConverter.cxx
index 54f9a90aa8b..a023c530236 100644
--- a/.auto-resolution/Common/TableProducer/Converters/bcConverter.cxx
+++ b/.auto-resolution/Common/TableProducer/Converters/bcConverter.cxx
@@ -8,9 +8,9 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Common/TableProducer/Converters/bcFlagsCreator.cxx b/.auto-resolution/Common/TableProducer/Converters/bcFlagsCreator.cxx
index 972832716b5..6300998830c 100644
--- a/.auto-resolution/Common/TableProducer/Converters/bcFlagsCreator.cxx
+++ b/.auto-resolution/Common/TableProducer/Converters/bcFlagsCreator.cxx
@@ -8,9 +8,9 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Common/TableProducer/Converters/caloLabelConverter.cxx b/.auto-resolution/Common/TableProducer/Converters/caloLabelConverter.cxx
index 0186e34f628..2200df1e1a6 100644
--- a/.auto-resolution/Common/TableProducer/Converters/caloLabelConverter.cxx
+++ b/.auto-resolution/Common/TableProducer/Converters/caloLabelConverter.cxx
@@ -8,9 +8,9 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Common/TableProducer/Converters/collisionConverter.cxx b/.auto-resolution/Common/TableProducer/Converters/collisionConverter.cxx
index d3186ea462f..9f6da391425 100644
--- a/.auto-resolution/Common/TableProducer/Converters/collisionConverter.cxx
+++ b/.auto-resolution/Common/TableProducer/Converters/collisionConverter.cxx
@@ -8,9 +8,9 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Common/TableProducer/Converters/fddConverter.cxx b/.auto-resolution/Common/TableProducer/Converters/fddConverter.cxx
index 50d47ade048..a5aaaffecf3 100644
--- a/.auto-resolution/Common/TableProducer/Converters/fddConverter.cxx
+++ b/.auto-resolution/Common/TableProducer/Converters/fddConverter.cxx
@@ -8,9 +8,9 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Common/TableProducer/Converters/hmpConverter.cxx b/.auto-resolution/Common/TableProducer/Converters/hmpConverter.cxx
index da4eeeb7bca..2c8b5815868 100644
--- a/.auto-resolution/Common/TableProducer/Converters/hmpConverter.cxx
+++ b/.auto-resolution/Common/TableProducer/Converters/hmpConverter.cxx
@@ -12,9 +12,9 @@
 // HMPID converter to new format
 // to be used with Run 2 converted data and older AO2Ds
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Common/TableProducer/Converters/mcCollisionConverter.cxx b/.auto-resolution/Common/TableProducer/Converters/mcCollisionConverter.cxx
index b965a092117..eb837e9cf22 100644
--- a/.auto-resolution/Common/TableProducer/Converters/mcCollisionConverter.cxx
+++ b/.auto-resolution/Common/TableProducer/Converters/mcCollisionConverter.cxx
@@ -8,9 +8,9 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Common/TableProducer/Converters/mcConverter.cxx b/.auto-resolution/Common/TableProducer/Converters/mcConverter.cxx
index a78ac3158ea..8680bcb65dc 100644
--- a/.auto-resolution/Common/TableProducer/Converters/mcConverter.cxx
+++ b/.auto-resolution/Common/TableProducer/Converters/mcConverter.cxx
@@ -8,9 +8,9 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Common/TableProducer/Converters/mftTracksConverter.cxx b/.auto-resolution/Common/TableProducer/Converters/mftTracksConverter.cxx
index 425bb0c6392..006e9bbe742 100644
--- a/.auto-resolution/Common/TableProducer/Converters/mftTracksConverter.cxx
+++ b/.auto-resolution/Common/TableProducer/Converters/mftTracksConverter.cxx
@@ -19,9 +19,9 @@
 
 /// \author L.Micheletti <luca.micheletti@cern.ch>
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Common/TableProducer/Converters/multMCExtrasConverter.cxx b/.auto-resolution/Common/TableProducer/Converters/multMCExtrasConverter.cxx
index ac2c074ba1b..27eeaf78bcb 100644
--- a/.auto-resolution/Common/TableProducer/Converters/multMCExtrasConverter.cxx
+++ b/.auto-resolution/Common/TableProducer/Converters/multMCExtrasConverter.cxx
@@ -9,11 +9,12 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Common/DataModel/Multiplicity.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.auto-resolution/Common/TableProducer/Converters/multsExtraConverter.cxx b/.auto-resolution/Common/TableProducer/Converters/multsExtraConverter.cxx
index d62b34508b8..2e30ed2a266 100644
--- a/.auto-resolution/Common/TableProducer/Converters/multsExtraConverter.cxx
+++ b/.auto-resolution/Common/TableProducer/Converters/multsExtraConverter.cxx
@@ -9,11 +9,12 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Common/DataModel/Multiplicity.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.auto-resolution/Common/TableProducer/Converters/run2TinyToFullPID.cxx b/.auto-resolution/Common/TableProducer/Converters/run2TinyToFullPID.cxx
index 23b6c5a8cbf..098318e3c3a 100644
--- a/.auto-resolution/Common/TableProducer/Converters/run2TinyToFullPID.cxx
+++ b/.auto-resolution/Common/TableProducer/Converters/run2TinyToFullPID.cxx
@@ -18,12 +18,14 @@
 //
 // Warning: expected resolution is NOT provided.
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "TableHelper.h"
 
+#include "Common/DataModel/PIDResponse.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.auto-resolution/Common/TableProducer/Converters/run2bcinfosConverter.cxx b/.auto-resolution/Common/TableProducer/Converters/run2bcinfosConverter.cxx
index 6257d371824..06d5282a9ee 100644
--- a/.auto-resolution/Common/TableProducer/Converters/run2bcinfosConverter.cxx
+++ b/.auto-resolution/Common/TableProducer/Converters/run2bcinfosConverter.cxx
@@ -9,9 +9,9 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Common/TableProducer/Converters/run2tracksExtraConverter.cxx b/.auto-resolution/Common/TableProducer/Converters/run2tracksExtraConverter.cxx
index 28ae54c4367..ffb9b9cf24e 100644
--- a/.auto-resolution/Common/TableProducer/Converters/run2tracksExtraConverter.cxx
+++ b/.auto-resolution/Common/TableProducer/Converters/run2tracksExtraConverter.cxx
@@ -9,9 +9,9 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Common/TableProducer/Converters/trackQA002Converter.cxx b/.auto-resolution/Common/TableProducer/Converters/trackQA002Converter.cxx
index 566c998e1bc..2e74c50d8e9 100644
--- a/.auto-resolution/Common/TableProducer/Converters/trackQA002Converter.cxx
+++ b/.auto-resolution/Common/TableProducer/Converters/trackQA002Converter.cxx
@@ -8,11 +8,11 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include <limits>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include <limits>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Common/TableProducer/Converters/trackQA003Converter.cxx b/.auto-resolution/Common/TableProducer/Converters/trackQA003Converter.cxx
index 56a6d3551e9..2447283f468 100644
--- a/.auto-resolution/Common/TableProducer/Converters/trackQA003Converter.cxx
+++ b/.auto-resolution/Common/TableProducer/Converters/trackQA003Converter.cxx
@@ -8,11 +8,11 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include <limits>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include <limits>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Common/TableProducer/Converters/trackQAConverter.cxx b/.auto-resolution/Common/TableProducer/Converters/trackQAConverter.cxx
index bdfecbca8d0..fd8657ebcdd 100644
--- a/.auto-resolution/Common/TableProducer/Converters/trackQAConverter.cxx
+++ b/.auto-resolution/Common/TableProducer/Converters/trackQAConverter.cxx
@@ -8,11 +8,11 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include <limits>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include <limits>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Common/TableProducer/Converters/tracksExtraConverter.cxx b/.auto-resolution/Common/TableProducer/Converters/tracksExtraConverter.cxx
index b097cb7c4a3..ed8b6c21db8 100644
--- a/.auto-resolution/Common/TableProducer/Converters/tracksExtraConverter.cxx
+++ b/.auto-resolution/Common/TableProducer/Converters/tracksExtraConverter.cxx
@@ -19,9 +19,9 @@
 
 /// \author F.Mazzaschi <fmazzasc@cern.ch>
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Common/TableProducer/Converters/tracksExtraV002Converter.cxx b/.auto-resolution/Common/TableProducer/Converters/tracksExtraV002Converter.cxx
index a70ac8ea8a8..8c4c8a22d4a 100644
--- a/.auto-resolution/Common/TableProducer/Converters/tracksExtraV002Converter.cxx
+++ b/.auto-resolution/Common/TableProducer/Converters/tracksExtraV002Converter.cxx
@@ -9,9 +9,9 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Common/TableProducer/Converters/v0converter.cxx b/.auto-resolution/Common/TableProducer/Converters/v0converter.cxx
index 849e35591e1..3131a4a5ad2 100644
--- a/.auto-resolution/Common/TableProducer/Converters/v0converter.cxx
+++ b/.auto-resolution/Common/TableProducer/Converters/v0converter.cxx
@@ -8,9 +8,9 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Common/TableProducer/Converters/zdcConverter.cxx b/.auto-resolution/Common/TableProducer/Converters/zdcConverter.cxx
index 2c94d5ca46f..2b97f8ff102 100644
--- a/.auto-resolution/Common/TableProducer/Converters/zdcConverter.cxx
+++ b/.auto-resolution/Common/TableProducer/Converters/zdcConverter.cxx
@@ -12,9 +12,9 @@
 // ZDC converter to new format
 // to be used with Run 2 converted data and older AO2Ds
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 #include "ZDCBase/Constants.h"
 
 using namespace o2;
diff --git a/.auto-resolution/Common/TableProducer/PID/pidBayes.cxx b/.auto-resolution/Common/TableProducer/PID/pidBayes.cxx
index abedb281668..4654caf1580 100644
--- a/.auto-resolution/Common/TableProducer/PID/pidBayes.cxx
+++ b/.auto-resolution/Common/TableProducer/PID/pidBayes.cxx
@@ -16,29 +16,30 @@
 ///         Only the tables for the mass hypotheses requested are filled, the others are sent empty.
 ///
 
-#include <utility>
 #include <algorithm>
-#include <vector>
 #include <memory>
 #include <string>
+#include <utility>
+#include <vector>
 
 // O2 includes
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/Array2D.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "Common/Core/PID/TPCPIDResponse.h"
+#include "pidTOFBase.h"
+
 #include "Common/Core/PID/DetectorResponse.h"
-#include "Common/Core/PID/ParamBase.h"
 #include "Common/Core/PID/PIDTOF.h"
+#include "Common/Core/PID/ParamBase.h"
+#include "Common/Core/PID/TPCPIDResponse.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/PIDResponseCombined.h"
-#include "Common/DataModel/PIDResponseTPC.h"
 #include "Common/DataModel/PIDResponseTOF.h"
+#include "Common/DataModel/PIDResponseTPC.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "pidTOFBase.h"
+#include "CCDB/BasicCCDBManager.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/Array2D.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Common/TableProducer/PID/pidITS.cxx b/.auto-resolution/Common/TableProducer/PID/pidITS.cxx
index 1a6cdbc5491..64c05ea41c9 100644
--- a/.auto-resolution/Common/TableProducer/PID/pidITS.cxx
+++ b/.auto-resolution/Common/TableProducer/PID/pidITS.cxx
@@ -19,22 +19,23 @@
 ///         Only the tables for the mass hypotheses requested are filled, the others are sent empty.
 ///
 
+#include <string>
 #include <utility>
 #include <vector>
-#include <string>
 
 // O2 includes
-#include "Framework/runDataProcessing.h"
+#include "CCDB/BasicCCDBManager.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "CCDB/BasicCCDBManager.h"
 #include "TOFBase/EventTimeMaker.h"
 
 // O2Physics includes
-#include "Common/DataModel/PIDResponseITS.h"
 #include "MetadataHelper.h"
 
+#include "Common/DataModel/PIDResponseITS.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.auto-resolution/Common/TableProducer/PID/pidTOF.cxx b/.auto-resolution/Common/TableProducer/PID/pidTOF.cxx
index 076cc0c26de..ab4b9c6ce02 100644
--- a/.auto-resolution/Common/TableProducer/PID/pidTOF.cxx
+++ b/.auto-resolution/Common/TableProducer/PID/pidTOF.cxx
@@ -17,10 +17,10 @@
 ///
 
 // O2 includes
-#include <CCDB/BasicCCDBManager.h>
-#include "TOFBase/EventTimeMaker.h"
 #include "Framework/AnalysisTask.h"
 #include "ReconstructionDataFormats/Track.h"
+#include "TOFBase/EventTimeMaker.h"
+#include <CCDB/BasicCCDBManager.h>
 
 // O2Physics includes
 #include "TableHelper.h"
diff --git a/.auto-resolution/Common/TableProducer/PID/pidTOFBase.cxx b/.auto-resolution/Common/TableProducer/PID/pidTOFBase.cxx
index f0f9722fc6b..2300535c274 100644
--- a/.auto-resolution/Common/TableProducer/PID/pidTOFBase.cxx
+++ b/.auto-resolution/Common/TableProducer/PID/pidTOFBase.cxx
@@ -15,25 +15,27 @@
 /// \brief  Base to build tasks for TOF PID tasks.
 ///
 
+#include <string>
 #include <utility>
 #include <vector>
-#include <string>
 
 // O2 includes
 #include "CCDB/BasicCCDBManager.h"
-#include "TOFBase/EventTimeMaker.h"
 #include "Framework/AnalysisTask.h"
 #include "ReconstructionDataFormats/Track.h"
+#include "TOFBase/EventTimeMaker.h"
 
 // O2Physics includes
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "TableHelper.h"
+#include "pidTOFBase.h"
+
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/FT0Corrected.h"
 #include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
-#include "TableHelper.h"
-#include "pidTOFBase.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Common/TableProducer/PID/pidTOFBase.h b/.auto-resolution/Common/TableProducer/PID/pidTOFBase.h
index 44367eacb75..98189aa03b1 100644
--- a/.auto-resolution/Common/TableProducer/PID/pidTOFBase.h
+++ b/.auto-resolution/Common/TableProducer/PID/pidTOFBase.h
@@ -22,10 +22,11 @@
 #include <vector>
 
 // O2Physics
-#include "PID/ParamBase.h"
-#include "PID/PIDTOF.h"
-#include "Common/DataModel/PIDResponseTOF.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/PIDResponseTOF.h"
+
+#include "PID/PIDTOF.h"
+#include "PID/ParamBase.h"
 
 static constexpr int nSpecies = 9;
 static constexpr int nParameters = 1;
diff --git a/.auto-resolution/Common/TableProducer/PID/pidTOFFull.cxx b/.auto-resolution/Common/TableProducer/PID/pidTOFFull.cxx
index 6fec03a10ff..98bd612a166 100644
--- a/.auto-resolution/Common/TableProducer/PID/pidTOFFull.cxx
+++ b/.auto-resolution/Common/TableProducer/PID/pidTOFFull.cxx
@@ -17,10 +17,10 @@
 ///
 
 // O2 includes
-#include <CCDB/BasicCCDBManager.h>
-#include "TOFBase/EventTimeMaker.h"
 #include "Framework/AnalysisTask.h"
 #include "ReconstructionDataFormats/Track.h"
+#include "TOFBase/EventTimeMaker.h"
+#include <CCDB/BasicCCDBManager.h>
 
 // O2Physics includes
 #include "TableHelper.h"
diff --git a/.auto-resolution/Common/TableProducer/PID/pidTOFbeta.cxx b/.auto-resolution/Common/TableProducer/PID/pidTOFbeta.cxx
index d76d631bc4d..c8c6a65c22c 100644
--- a/.auto-resolution/Common/TableProducer/PID/pidTOFbeta.cxx
+++ b/.auto-resolution/Common/TableProducer/PID/pidTOFbeta.cxx
@@ -16,11 +16,13 @@
 ///
 
 // O2 includes
+#include "TableHelper.h"
+#include "pidTOFBase.h"
+
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
 #include "Framework/AnalysisTask.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "pidTOFBase.h"
-#include "TableHelper.h"
 
 // O2Physics includes
 #include "PID/PIDTOF.h"
diff --git a/.auto-resolution/Common/TableProducer/caloClusterProducer.cxx b/.auto-resolution/Common/TableProducer/caloClusterProducer.cxx
index 086885beb4c..d0336adcef4 100644
--- a/.auto-resolution/Common/TableProducer/caloClusterProducer.cxx
+++ b/.auto-resolution/Common/TableProducer/caloClusterProducer.cxx
@@ -14,35 +14,34 @@
 ///
 /// \author Dmitri Peresunko <Dmitri.Peresunko@cern.ch>
 
-#include <algorithm>
-#include <map>
-#include <memory>
-#include <string>
-#include <vector>
-
-#include "Framework/ConfigParamSpec.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/CaloClusters.h"
 #include "Common/Core/trackUtilities.h"
-#include "ReconstructionDataFormats/TrackParametrization.h"
-#include "DetectorsBase/Propagator.h"
+#include "Common/DataModel/CaloClusters.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "CommonUtils/NameConf.h"
 #include "CCDB/BasicCCDBManager.h"
-#include "SimulationDataFormat/MCTruthContainer.h"
-
-#include "DataFormatsParameters/GRPMagField.h"
+#include "CommonUtils/NameConf.h"
+#include "DataFormatsPHOS/BadChannelsMap.h"
+#include "DataFormatsPHOS/CalibParams.h"
 #include "DataFormatsPHOS/Cell.h"
 #include "DataFormatsPHOS/Cluster.h"
-#include "DataFormatsPHOS/TriggerRecord.h"
 #include "DataFormatsPHOS/MCLabel.h"
-#include "DataFormatsPHOS/BadChannelsMap.h"
-#include "DataFormatsPHOS/CalibParams.h"
+#include "DataFormatsPHOS/TriggerRecord.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/ConfigParamSpec.h"
+#include "Framework/runDataProcessing.h"
 #include "PHOSBase/Geometry.h"
 #include "PHOSReconstruction/Clusterer.h"
+#include "ReconstructionDataFormats/TrackParametrization.h"
+#include "SimulationDataFormat/MCTruthContainer.h"
+
+#include <algorithm>
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
 
 using namespace o2::framework;
 using namespace o2;
diff --git a/.auto-resolution/Common/TableProducer/centralityTable.cxx b/.auto-resolution/Common/TableProducer/centralityTable.cxx
index 9198f79499e..701d26f9ebb 100644
--- a/.auto-resolution/Common/TableProducer/centralityTable.cxx
+++ b/.auto-resolution/Common/TableProducer/centralityTable.cxx
@@ -15,25 +15,28 @@
 /// \author ALICE
 //
 
-#include <string>
-#include <vector>
-#include <algorithm>
-#include <map>
+#include "MetadataHelper.h"
+#include "TableHelper.h"
 
-#include <CCDB/BasicCCDBManager.h>
-#include <TH1F.h>
-#include <TFormula.h>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/HistogramRegistry.h"
-#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "MetadataHelper.h"
-#include "TableHelper.h"
+#include "Common/DataModel/Multiplicity.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include <CCDB/BasicCCDBManager.h>
+
 #include "TList.h"
+#include <TFormula.h>
+#include <TH1F.h>
+
+#include <algorithm>
+#include <map>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Common/TableProducer/eseTableProducer.cxx b/.auto-resolution/Common/TableProducer/eseTableProducer.cxx
index 098bfbe400f..9f6619060fe 100644
--- a/.auto-resolution/Common/TableProducer/eseTableProducer.cxx
+++ b/.auto-resolution/Common/TableProducer/eseTableProducer.cxx
@@ -14,30 +14,29 @@
 ///
 /// \author Joachim C. K. B. Hansen
 
-#include <CCDB/BasicCCDBManager.h>
+#include "FFitWeights.h"
 
-#include <chrono>
-#include <string>
-#include <algorithm>
-#include <numeric>
-#include <vector>
-#include <tuple>
-#include <unordered_map>
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EseTable.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/Qvectors.h"
 
 #include "Framework/ASoA.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
 #include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include <CCDB/BasicCCDBManager.h>
 
-#include "Common/DataModel/EventSelection.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-
-#include "Common/DataModel/EseTable.h"
-#include "Common/DataModel/Qvectors.h"
-#include "FFitWeights.h"
+#include <algorithm>
+#include <chrono>
+#include <numeric>
+#include <string>
+#include <tuple>
+#include <unordered_map>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Common/TableProducer/eventSelection.cxx b/.auto-resolution/Common/TableProducer/eventSelection.cxx
index 5ead8e80493..52bf23cda7b 100644
--- a/.auto-resolution/Common/TableProducer/eventSelection.cxx
+++ b/.auto-resolution/Common/TableProducer/eventSelection.cxx
@@ -14,35 +14,38 @@
 ///
 /// \author Evgeny Kryshen <evgeny.kryshen@cern.ch> and Igor Altsybeev <Igor.Altsybeev@cern.ch>
 
-#include <vector>
-#include <map>
-#include <string>
-#include <limits>
-
-#include "Framework/ConfigParamSpec.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Common/DataModel/EventSelection.h"
+
+#include "MetadataHelper.h"
+
 #include "Common/CCDB/EventSelectionParams.h"
 #include "Common/CCDB/TriggerAliases.h"
+
 #include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/LHCConstants.h"
-#include "Framework/HistogramRegistry.h"
+#include "DataFormatsCTP/Configuration.h"
+#include "DataFormatsCTP/Scalers.h"
 #include "DataFormatsFT0/Digit.h"
-#include "DataFormatsParameters/GRPLHCIFData.h"
-#include "DataFormatsParameters/GRPECSObject.h"
-#include "ITSMFTBase/DPLAlpideParam.h"
-#include "MetadataHelper.h"
-#include "DataFormatsParameters/AggregatedRunInfo.h"
 #include "DataFormatsITSMFT/NoiseMap.h" // missing include in TimeDeadMap.h
 #include "DataFormatsITSMFT/TimeDeadMap.h"
+#include "DataFormatsParameters/AggregatedRunInfo.h"
+#include "DataFormatsParameters/GRPECSObject.h"
+#include "DataFormatsParameters/GRPLHCIFData.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/ConfigParamSpec.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include "ITSMFTBase/DPLAlpideParam.h"
 #include "ITSMFTReconstruction/ChipMappingITS.h"
-#include "DataFormatsCTP/Configuration.h"
-#include "DataFormatsCTP/Scalers.h"
 
 #include "TH1D.h"
 
+#include <limits>
+#include <map>
+#include <string>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::aod::evsel;
diff --git a/.auto-resolution/Common/TableProducer/ft0CorrectedTable.cxx b/.auto-resolution/Common/TableProducer/ft0CorrectedTable.cxx
index a8a2787aa5a..694fed73c4c 100644
--- a/.auto-resolution/Common/TableProducer/ft0CorrectedTable.cxx
+++ b/.auto-resolution/Common/TableProducer/ft0CorrectedTable.cxx
@@ -9,22 +9,26 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <bitset>
-#include <string>
-#include "Framework/ConfigParamSpec.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Common/DataModel/FT0Corrected.h"
+#include "CollisionTypeHelper.h"
+
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/FT0Corrected.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/LHCConstants.h"
 #include "CommonConstants/PhysicsConstants.h"
 #include "DataFormatsFT0/Digit.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "CollisionTypeHelper.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/ConfigParamSpec.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TRandom3.h"
 
+#include <bitset>
+#include <string>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::aod;
diff --git a/.auto-resolution/Common/TableProducer/fwdtrackToCollisionAssociator.cxx b/.auto-resolution/Common/TableProducer/fwdtrackToCollisionAssociator.cxx
index 20d6e4c6a60..a8b6fa22baa 100644
--- a/.auto-resolution/Common/TableProducer/fwdtrackToCollisionAssociator.cxx
+++ b/.auto-resolution/Common/TableProducer/fwdtrackToCollisionAssociator.cxx
@@ -17,6 +17,7 @@
 #include "Common/Core/CollisionAssociation.h"
 #include "Common/DataModel/CollisionAssociationTables.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CommonConstants/LHCConstants.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
diff --git a/.auto-resolution/Common/TableProducer/fwdtrackextension.cxx b/.auto-resolution/Common/TableProducer/fwdtrackextension.cxx
index 4a78bf8de5f..965fca008f1 100644
--- a/.auto-resolution/Common/TableProducer/fwdtrackextension.cxx
+++ b/.auto-resolution/Common/TableProducer/fwdtrackextension.cxx
@@ -13,19 +13,20 @@
 // Task performing forward track DCA computation
 //
 
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonUtils/NameConf.h"
+#include "DetectorsBase/Propagator.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/Core/trackUtilities.h"
 #include "ReconstructionDataFormats/DCA.h"
-#include "DetectorsBase/Propagator.h"
-#include "CommonUtils/NameConf.h"
+#include "ReconstructionDataFormats/TrackFwd.h"
 
 #include "Math/SMatrix.h"
-#include "ReconstructionDataFormats/TrackFwd.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Common/TableProducer/match-mft-ft0.cxx b/.auto-resolution/Common/TableProducer/match-mft-ft0.cxx
index a4b208a03c9..bc5e0feec12 100644
--- a/.auto-resolution/Common/TableProducer/match-mft-ft0.cxx
+++ b/.auto-resolution/Common/TableProducer/match-mft-ft0.cxx
@@ -18,31 +18,27 @@
 //        called aod::BCofMFT
 // \date 03/09/24
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
+#include "Common/Core/trackUtilities.h" //for getTrackPar()
 
-#include "MathUtils/Utils.h"
 #include "CommonConstants/LHCConstants.h"
-#include "Common/Core/trackUtilities.h"         //for getTrackPar()
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "MathUtils/Utils.h"
 #include "ReconstructionDataFormats/TrackFwd.h" //for propagate
 // https://github.com/AliceO2Group/AliceO2/blob/dev/DataFormats/Reconstruction/include/ReconstructionDataFormats/TrackFwd.h
-#include "CommonConstants/LHCConstants.h"
-#include "Math/MatrixFunctions.h"
-#include "Math/SMatrix.h"
+#include "Common/DataModel/MatchMFTFT0.h"
 
 #include "CCDB/BasicCCDBManager.h"
 #include "CCDB/CcdbApi.h"
-
-#include "DataFormatsParameters/GRPMagField.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "Field/MagneticField.h"
-#include "TGeoGlobalMagField.h"
-
+#include "CommonConstants/LHCConstants.h"
 #include "DataFormatsParameters/GRPMagField.h"
 #include "DetectorsBase/GeometryManager.h"
 #include "DetectorsBase/Propagator.h"
+#include "Field/MagneticField.h"
 
-#include "Common/DataModel/MatchMFTFT0.h"
+#include "Math/MatrixFunctions.h"
+#include "Math/SMatrix.h"
+#include "TGeoGlobalMagField.h"
 
 using SMatrix55 = ROOT::Math::SMatrix<double, 5, 5, ROOT::Math::MatRepSym<double, 5>>;
 using SMatrix5 = ROOT::Math::SVector<Double_t, 5>;
diff --git a/.auto-resolution/Common/TableProducer/match-mft-mch-data-mc.cxx b/.auto-resolution/Common/TableProducer/match-mft-mch-data-mc.cxx
index 11d59611772..1f330b45422 100644
--- a/.auto-resolution/Common/TableProducer/match-mft-mch-data-mc.cxx
+++ b/.auto-resolution/Common/TableProducer/match-mft-mch-data-mc.cxx
@@ -8,29 +8,31 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include <map>
-#include <string>
-#include <unordered_set>
-#include <unordered_map>
-#include <vector>
-
-#include "CCDB/BasicCCDBManager.h"
+#include "Common/DataModel/CollisionAssociationTables.h"
 #include "Common/DataModel/MatchMFTFT0.h"
 #include "Common/DataModel/MatchMFTMuonData.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsGlobalTracking/RecoContainer.h"
-#include "Common/DataModel/CollisionAssociationTables.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include "Field/MagneticField.h"
-#include "TGeoGlobalMagField.h"
-#include "DetectorsBase/Propagator.h"
 #include "DetectorsBase/GeometryManager.h"
-#include "MCHTracking/TrackExtrap.h"
+#include "DetectorsBase/Propagator.h"
+#include "Field/MagneticField.h"
 #include "GlobalTracking/MatchGlobalFwd.h"
+#include "MCHTracking/TrackExtrap.h"
+
 #include "Math/SMatrix.h"
 #include "Math/SVector.h"
+#include "TDatabasePDG.h"
+#include "TGeoGlobalMagField.h"
 #include "TLorentzVector.h"
 #include "TVector2.h"
-#include "TDatabasePDG.h"
+
+#include <map>
+#include <string>
+#include <unordered_map>
+#include <unordered_set>
+#include <vector>
 
 using namespace std;
 
@@ -40,9 +42,9 @@ using namespace o2::aod;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/DataTypes.h"
 #include "Framework/runDataProcessing.h"
 
diff --git a/.auto-resolution/Common/TableProducer/match-mft-mch-data.cxx b/.auto-resolution/Common/TableProducer/match-mft-mch-data.cxx
index 96471ddefab..eafcd54c51c 100644
--- a/.auto-resolution/Common/TableProducer/match-mft-mch-data.cxx
+++ b/.auto-resolution/Common/TableProducer/match-mft-mch-data.cxx
@@ -8,29 +8,31 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include <map>
-#include <string>
-#include <unordered_set>
-#include <unordered_map>
-#include <vector>
-
-#include "CCDB/BasicCCDBManager.h"
+#include "Common/DataModel/CollisionAssociationTables.h"
 #include "Common/DataModel/MatchMFTFT0.h"
 #include "Common/DataModel/MatchMFTMuonData.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsGlobalTracking/RecoContainer.h"
-#include "Common/DataModel/CollisionAssociationTables.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include "Field/MagneticField.h"
-#include "TGeoGlobalMagField.h"
-#include "DetectorsBase/Propagator.h"
 #include "DetectorsBase/GeometryManager.h"
-#include "MCHTracking/TrackExtrap.h"
+#include "DetectorsBase/Propagator.h"
+#include "Field/MagneticField.h"
 #include "GlobalTracking/MatchGlobalFwd.h"
+#include "MCHTracking/TrackExtrap.h"
+
 #include "Math/SMatrix.h"
 #include "Math/SVector.h"
+#include "TDatabasePDG.h"
+#include "TGeoGlobalMagField.h"
 #include "TLorentzVector.h"
 #include "TVector2.h"
-#include "TDatabasePDG.h"
+
+#include <map>
+#include <string>
+#include <unordered_map>
+#include <unordered_set>
+#include <vector>
 
 using namespace std;
 
@@ -40,9 +42,9 @@ using namespace o2::aod;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/DataTypes.h"
 #include "Framework/runDataProcessing.h"
 
diff --git a/.auto-resolution/Common/TableProducer/mcCollsExtra.cxx b/.auto-resolution/Common/TableProducer/mcCollsExtra.cxx
index 452930494ba..83523cf45d0 100644
--- a/.auto-resolution/Common/TableProducer/mcCollsExtra.cxx
+++ b/.auto-resolution/Common/TableProducer/mcCollsExtra.cxx
@@ -12,38 +12,40 @@
 // Quick and dirty task to correlate MC <-> data
 //
 
-#include <array>
-#include <cmath>
-#include <cstdlib>
-#include <vector>
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/McCollisionExtra.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
 #include "Math/Vector4D.h"
+#include <TDatabasePDG.h>
 #include <TFile.h>
 #include <TH2F.h>
-#include <TProfile.h>
 #include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
+#include <TProfile.h>
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/DataModel/McCollisionExtra.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Common/TableProducer/mftmchMatchingML.cxx b/.auto-resolution/Common/TableProducer/mftmchMatchingML.cxx
index 4df90bbfdd1..78e1902d6b4 100644
--- a/.auto-resolution/Common/TableProducer/mftmchMatchingML.cxx
+++ b/.auto-resolution/Common/TableProducer/mftmchMatchingML.cxx
@@ -9,30 +9,36 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <math.h>
-#include <onnxruntime_cxx_api.h>
-#include <string>
-#include <regex>
-#include <TLorentzVector.h>
 #include "Common/DataModel/MftmchMatchingML.h"
+
+#include "Common/CCDB/EventSelectionParams.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+#include "Tools/ML/model.h"
+
+#include "CCDB/CcdbApi.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/CCDB/EventSelectionParams.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/Core/trackUtilities.h"
-#include "Common/Core/TrackSelection.h"
+#include "GlobalTracking/MatchGlobalFwd.h"
+#include "MCHTracking/TrackExtrap.h"
+#include "MCHTracking/TrackParam.h"
+#include "MFTTracking/Tracker.h"
 #include "ReconstructionDataFormats/TrackFwd.h"
+
 #include "Math/SMatrix.h"
-#include "DetectorsBase/Propagator.h"
-#include "MFTTracking/Tracker.h"
-#include "MCHTracking/TrackParam.h"
-#include "MCHTracking/TrackExtrap.h"
-#include "GlobalTracking/MatchGlobalFwd.h"
-#include "CCDB/CcdbApi.h"
-#include "Tools/ML/model.h"
+#include <TLorentzVector.h>
+
+#include <onnxruntime_cxx_api.h>
+
+#include <regex>
+#include <string>
+
+#include <math.h>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Common/TableProducer/multCentTable.cxx b/.auto-resolution/Common/TableProducer/multCentTable.cxx
index 612125715cf..daed806ebb3 100644
--- a/.auto-resolution/Common/TableProducer/multCentTable.cxx
+++ b/.auto-resolution/Common/TableProducer/multCentTable.cxx
@@ -20,27 +20,29 @@
 //
 //===============================================================
 
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "MetadataHelper.h"
+
 #include "Common/Core/trackUtilities.h"
-#include "ReconstructionDataFormats/DCA.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "CommonUtils/NameConf.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/Tools/MultModule.h"
+#include "Common/Tools/StandardCCDBLoader.h"
+#include "Common/Tools/TrackPropagationModule.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "CCDB/CcdbApi.h"
+#include "CommonConstants/GeomConstants.h"
+#include "CommonUtils/NameConf.h"
+#include "DataFormatsCalibration/MeanVertexObject.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "DataFormatsCalibration/MeanVertexObject.h"
-#include "CommonConstants/GeomConstants.h"
-#include "Common/Tools/TrackPropagationModule.h"
-#include "Common/Tools/StandardCCDBLoader.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "MetadataHelper.h"
-#include "Common/Tools/MultModule.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/DCA.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Common/TableProducer/multiplicityExtraTable.cxx b/.auto-resolution/Common/TableProducer/multiplicityExtraTable.cxx
index 001e75e6adb..13d9a43f3e7 100644
--- a/.auto-resolution/Common/TableProducer/multiplicityExtraTable.cxx
+++ b/.auto-resolution/Common/TableProducer/multiplicityExtraTable.cxx
@@ -8,20 +8,23 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include <CCDB/BasicCCDBManager.h> // megalinter thinks this is a C header...
-#include <bitset>
-#include "Framework/ConfigParamSpec.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "TableHelper.h"
+
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "DataFormatsFIT/Triggers.h"
-#include "TableHelper.h"
+
 #include "CCDB/CcdbApi.h"
 #include "CommonDataFormat/BunchFilling.h"
-#include "DataFormatsParameters/GRPObject.h"
+#include "DataFormatsFIT/Triggers.h"
 #include "DataFormatsParameters/GRPLHCIFData.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/ConfigParamSpec.h"
+#include "Framework/runDataProcessing.h"
+#include <CCDB/BasicCCDBManager.h> // megalinter thinks this is a C header...
+
+#include <bitset>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Common/TableProducer/multiplicityTable.cxx b/.auto-resolution/Common/TableProducer/multiplicityTable.cxx
index 12cde8a9869..45a712e5803 100644
--- a/.auto-resolution/Common/TableProducer/multiplicityTable.cxx
+++ b/.auto-resolution/Common/TableProducer/multiplicityTable.cxx
@@ -15,26 +15,30 @@
 /// \author ALICE
 ///
 
-#include <vector>
-#include <algorithm>
-#include <map>
-#include <string>
+#include "MetadataHelper.h"
+#include "TableHelper.h"
 
-#include "Framework/ConfigParamSpec.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
+#include "PWGMM/Mult/DataModel/bestCollisionTable.h"
+
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/ConfigParamSpec.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "TableHelper.h"
-#include "MetadataHelper.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TList.h"
-#include "PWGMM/Mult/DataModel/bestCollisionTable.h"
+
+#include <algorithm>
+#include <map>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
@@ -100,9 +104,9 @@ struct MultiplicityTable {
   Produces<aod::PVMultZeqs> tablePVZeqs;        // 12
   Produces<aod::MultMCExtras> tableExtraMc;     // 13
   Produces<aod::Mult2MCExtras> tableExtraMult2MCExtras;
-  Produces<aod::MultHepMCHIs> multHepMCHIs;     // Not accounted for, produced using custom process function to avoid dependencies
-  Produces<aod::MFTMults> mftMults;             // Not accounted for, produced using custom process function to avoid dependencies
-  Produces<aod::MultsGlobal> multsGlobal;       // Not accounted for, produced based on process function processGlobalTrackingCounters
+  Produces<aod::MultHepMCHIs> multHepMCHIs; // Not accounted for, produced using custom process function to avoid dependencies
+  Produces<aod::MFTMults> mftMults;         // Not accounted for, produced using custom process function to avoid dependencies
+  Produces<aod::MultsGlobal> multsGlobal;   // Not accounted for, produced based on process function processGlobalTrackingCounters
 
   // For vertex-Z corrections in calibration
   Service<o2::ccdb::BasicCCDBManager> ccdb;
diff --git a/.auto-resolution/Common/TableProducer/muonRealignment.cxx b/.auto-resolution/Common/TableProducer/muonRealignment.cxx
index 58745af69a6..3d1516dd5fc 100644
--- a/.auto-resolution/Common/TableProducer/muonRealignment.cxx
+++ b/.auto-resolution/Common/TableProducer/muonRealignment.cxx
@@ -13,33 +13,34 @@
 /// \brief Task for muon re-alignment at analysis level
 /// \author Chi Zhang <chi.zhang@cern.ch>, CEA-Saclay
 
-#include <string>
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/ASoAHelpers.h"
+#include "Common/DataModel/CollisionAssociationTables.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/FwdTrackReAlignTables.h"
 
 #include "CCDB/BasicCCDBManager.h"
 #include "CCDB/CCDBTimeStampUtils.h"
-#include "CommonUtils/NameConf.h"
 #include "CommonUtils/ConfigurableParam.h"
+#include "CommonUtils/NameConf.h"
 #include "DataFormatsMCH/Cluster.h"
 #include "DataFormatsParameters/GRPObject.h"
-#include "DetectorsBase/GeometryManager.h"
 #include "DetectorsBase/GRPGeomHelper.h"
+#include "DetectorsBase/GeometryManager.h"
 #include "DetectorsBase/Propagator.h"
-#include "MathUtils/Cartesian.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "GlobalTracking/MatchGlobalFwd.h"
+#include "MCHBase/TrackerParam.h"
 #include "MCHGeometryTransformer/Transformations.h"
 #include "MCHTracking/Track.h"
 #include "MCHTracking/TrackExtrap.h"
-#include "MCHTracking/TrackParam.h"
 #include "MCHTracking/TrackFitter.h"
-#include "MCHBase/TrackerParam.h"
-#include "GlobalTracking/MatchGlobalFwd.h"
+#include "MCHTracking/TrackParam.h"
+#include "MathUtils/Cartesian.h"
 #include "ReconstructionDataFormats/TrackFwd.h"
-#include "Common/DataModel/FwdTrackReAlignTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/CollisionAssociationTables.h"
+
+#include <string>
 
 using namespace std;
 using namespace o2;
diff --git a/.auto-resolution/Common/TableProducer/occupancyTableProducer.cxx b/.auto-resolution/Common/TableProducer/occupancyTableProducer.cxx
index a700b394772..8f9c36bad2b 100644
--- a/.auto-resolution/Common/TableProducer/occupancyTableProducer.cxx
+++ b/.auto-resolution/Common/TableProducer/occupancyTableProducer.cxx
@@ -15,31 +15,29 @@
 ///         Ambg tracks were not used
 /// \author Rahul Verma (rahul.verma@iitb.ac.in) :: Marian I Ivanov (marian.ivanov@cern.ch)
 
-#include <vector>
-#include <unordered_map>
-#include <algorithm>
-#include <cmath>
-#include <string>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/O2DatabasePDGPlugin.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-
 #include "Common/DataModel/OccupancyTables.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
 #include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsFT0/Digit.h"
 #include "DataFormatsParameters/GRPLHCIFData.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
+#include <algorithm>
+#include <cmath>
+#include <string>
+#include <unordered_map>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Common/TableProducer/qVectorsTable.cxx b/.auto-resolution/Common/TableProducer/qVectorsTable.cxx
index 9de8faf028f..b6d1e98d803 100644
--- a/.auto-resolution/Common/TableProducer/qVectorsTable.cxx
+++ b/.auto-resolution/Common/TableProducer/qVectorsTable.cxx
@@ -19,28 +19,27 @@
 ///
 
 // C++/ROOT includes.
+#include <TComplex.h>
+#include <TH3F.h>
+
 #include <chrono>
 #include <string>
 #include <vector>
-#include <TComplex.h>
-#include <TH3F.h>
 
 // o2Physics includes.
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-
 #include "Common/Core/EventPlaneHelper.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/FT0Corrected.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-
 #include "Common/DataModel/Qvectors.h"
-
-#include "Common/Core/TrackSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
 // o2 includes.
 #include "CCDB/BasicCCDBManager.h"
 #include "DetectorsCommonDataFormats/AlignParam.h"
diff --git a/.auto-resolution/Common/TableProducer/timestamp.cxx b/.auto-resolution/Common/TableProducer/timestamp.cxx
index 40ab7000772..a3d071cf305 100644
--- a/.auto-resolution/Common/TableProducer/timestamp.cxx
+++ b/.auto-resolution/Common/TableProducer/timestamp.cxx
@@ -16,14 +16,16 @@
 /// \brief  A task to fill the timestamp table from run number.
 ///         Uses headers from CCDB
 ///
-#include <vector>
-#include <map>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
+#include "MetadataHelper.h"
+
 #include "CCDB/BasicCCDBManager.h"
 #include "CommonDataFormat/InteractionRecord.h"
 #include "DetectorsRaw/HBFUtils.h"
-#include "MetadataHelper.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include <map>
+#include <vector>
 
 using namespace o2::framework;
 using namespace o2::header;
@@ -32,15 +34,15 @@ using namespace o2;
 o2::common::core::MetadataHelper metadataInfo; // Metadata helper
 
 struct TimestampTask {
-  Produces<aod::Timestamps> timestampTable;  /// Table with SOR timestamps produced by the task
-  Service<o2::ccdb::BasicCCDBManager> ccdb;  /// CCDB manager to access orbit-reset timestamp
-  o2::ccdb::CcdbApi ccdb_api;                /// API to access CCDB headers
+  Produces<aod::Timestamps> timestampTable; /// Table with SOR timestamps produced by the task
+  Service<o2::ccdb::BasicCCDBManager> ccdb; /// CCDB manager to access orbit-reset timestamp
+  o2::ccdb::CcdbApi ccdb_api;               /// API to access CCDB headers
   Configurable<bool> fatalOnInvalidTimestamp{"fatalOnInvalidTimestamp", false, "Generate fatal error for invalid timestamps"};
-  std::map<int, int64_t> mapRunToOrbitReset; /// Cache of orbit reset timestamps
+  std::map<int, int64_t> mapRunToOrbitReset;                      /// Cache of orbit reset timestamps
   std::map<int, std::pair<int64_t, int64_t>> mapRunToRunDuration; /// Cache of run duration timestamps
-  int lastRunNumber = 0;                     /// Last run number processed
-  int64_t orbitResetTimestamp = 0;           /// Orbit-reset timestamp in us
-  std::pair<int64_t, int64_t> runDuration;   /// Pair of SOR and EOR timestamps
+  int lastRunNumber = 0;                                          /// Last run number processed
+  int64_t orbitResetTimestamp = 0;                                /// Orbit-reset timestamp in us
+  std::pair<int64_t, int64_t> runDuration;                        /// Pair of SOR and EOR timestamps
 
   // Configurables
   Configurable<bool> verbose{"verbose", false, "verbose mode"};
diff --git a/.auto-resolution/Common/TableProducer/trackDcaCovFillerRun2.cxx b/.auto-resolution/Common/TableProducer/trackDcaCovFillerRun2.cxx
index d07833ae9e0..ca56615dfee 100644
--- a/.auto-resolution/Common/TableProducer/trackDcaCovFillerRun2.cxx
+++ b/.auto-resolution/Common/TableProducer/trackDcaCovFillerRun2.cxx
@@ -15,12 +15,14 @@
 // Run 2 AO2Ds cannot have their dcacov filled by the current track-propagation workflow as the workflow isn't designed for them, given Run 2 tracks are already propagated to the PV.
 // This task fills the DCA Cov (and DCA) tables for Run 2 tracks by "propagating" the tracks (though given they are already at the PV it doesn't actually do the propagation) and retrieving the DCA and DCA cov given by the propagateToDCABxByBz function
 
-#include <string>
-
 #include "TableHelper.h"
+
 #include "Common/Tools/TrackTuner.h"
+
 #include "DataFormatsParameters/GRPObject.h"
 
+#include <string>
+
 using namespace o2;
 using namespace o2::framework;
 // using namespace o2::framework::expressions;
diff --git a/.auto-resolution/Common/TableProducer/trackPropagation.cxx b/.auto-resolution/Common/TableProducer/trackPropagation.cxx
index e1b6528ce53..dbe1c93a56c 100644
--- a/.auto-resolution/Common/TableProducer/trackPropagation.cxx
+++ b/.auto-resolution/Common/TableProducer/trackPropagation.cxx
@@ -14,6 +14,7 @@
 //
 
 #include "TableHelper.h"
+
 #include "Common/Tools/TrackTuner.h"
 
 // The Run 3 AO2D stores the tracks at the point of innermost update. For a track with ITS this is the innermost (or second innermost)
diff --git a/.auto-resolution/Common/TableProducer/trackPropagationTester.cxx b/.auto-resolution/Common/TableProducer/trackPropagationTester.cxx
index 694ff77d3c0..7b851aa1ce0 100644
--- a/.auto-resolution/Common/TableProducer/trackPropagationTester.cxx
+++ b/.auto-resolution/Common/TableProducer/trackPropagationTester.cxx
@@ -23,24 +23,25 @@
 //
 //===============================================================
 
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/Core/trackUtilities.h"
-#include "ReconstructionDataFormats/DCA.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "CommonUtils/NameConf.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/Tools/StandardCCDBLoader.h"
+#include "Common/Tools/TrackPropagationModule.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "CCDB/CcdbApi.h"
+#include "CommonConstants/GeomConstants.h"
+#include "CommonUtils/NameConf.h"
+#include "DataFormatsCalibration/MeanVertexObject.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "DataFormatsCalibration/MeanVertexObject.h"
-#include "CommonConstants/GeomConstants.h"
-#include "Common/Tools/TrackPropagationModule.h"
-#include "Common/Tools/StandardCCDBLoader.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/DCA.h"
 
 // The Run 3 AO2D stores the tracks at the point of innermost update. For a track with ITS this is the innermost (or second innermost)
 // ITS layer. For a track without ITS, this is the TPC inner wall or for loopers in the TPC even a radius beyond that.
diff --git a/.auto-resolution/Common/TableProducer/trackToCollisionAssociator.cxx b/.auto-resolution/Common/TableProducer/trackToCollisionAssociator.cxx
index 62d90edaa9f..7c0e4fe147c 100644
--- a/.auto-resolution/Common/TableProducer/trackToCollisionAssociator.cxx
+++ b/.auto-resolution/Common/TableProducer/trackToCollisionAssociator.cxx
@@ -18,6 +18,7 @@
 #include "Common/Core/CollisionAssociation.h"
 #include "Common/DataModel/CollisionAssociationTables.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
diff --git a/.auto-resolution/Common/TableProducer/trackextension.cxx b/.auto-resolution/Common/TableProducer/trackextension.cxx
index 210f9adc122..1bfd9f700bb 100644
--- a/.auto-resolution/Common/TableProducer/trackextension.cxx
+++ b/.auto-resolution/Common/TableProducer/trackextension.cxx
@@ -13,17 +13,18 @@
 // Task performing basic track selection.
 //
 
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Multiplicity.h"
 #include "Common/Core/trackUtilities.h"
-#include "ReconstructionDataFormats/DCA.h"
-#include "DetectorsBase/Propagator.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CommonUtils/NameConf.h"
 #include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/DCA.h"
 #include <CCDB/BasicCCDBManager.h>
 
 using namespace o2;
diff --git a/.auto-resolution/Common/TableProducer/trackselection.cxx b/.auto-resolution/Common/TableProducer/trackselection.cxx
index 8ce5a88e0bd..505a24af68b 100644
--- a/.auto-resolution/Common/TableProducer/trackselection.cxx
+++ b/.auto-resolution/Common/TableProducer/trackselection.cxx
@@ -17,14 +17,17 @@
 /// \brief Task performing basic track selection.
 ///
 
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Common/Core/TrackSelection.h"
+
+#include "TableHelper.h"
+
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/Core/trackUtilities.h"
-#include "TableHelper.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Common/TableProducer/weakDecayIndices.cxx b/.auto-resolution/Common/TableProducer/weakDecayIndices.cxx
index b2937e1c8a5..50358f9f82a 100644
--- a/.auto-resolution/Common/TableProducer/weakDecayIndices.cxx
+++ b/.auto-resolution/Common/TableProducer/weakDecayIndices.cxx
@@ -8,9 +8,9 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Common/TableProducer/zdcTaskInterCalib.cxx b/.auto-resolution/Common/TableProducer/zdcTaskInterCalib.cxx
index 78054580b81..c4ed223b67e 100644
--- a/.auto-resolution/Common/TableProducer/zdcTaskInterCalib.cxx
+++ b/.auto-resolution/Common/TableProducer/zdcTaskInterCalib.cxx
@@ -13,17 +13,18 @@
 /// \brief Task for ZDC tower inter-calibration
 /// \author chiara.oppedisano@cern.ch
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/CCDB/EventSelectionParams.h"
 #include "Common/CCDB/TriggerAliases.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/ZDCInterCalib.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TH1F.h"
 #include "TH2F.h"
 
diff --git a/.auto-resolution/Common/Tasks/centralityQa.cxx b/.auto-resolution/Common/Tasks/centralityQa.cxx
index 9e39194415c..8fa08f047cb 100644
--- a/.auto-resolution/Common/Tasks/centralityQa.cxx
+++ b/.auto-resolution/Common/Tasks/centralityQa.cxx
@@ -8,12 +8,14 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TH1F.h"
 
 using namespace o2;
diff --git a/.auto-resolution/Common/Tasks/checkDataModel.cxx b/.auto-resolution/Common/Tasks/checkDataModel.cxx
index 33b059e870b..17fad881f68 100644
--- a/.auto-resolution/Common/Tasks/checkDataModel.cxx
+++ b/.auto-resolution/Common/Tasks/checkDataModel.cxx
@@ -25,8 +25,8 @@ void customize(std::vector<ConfigParamSpec>& workflowOptions)
   // workflowOptions.push_back(ConfigParamSpec{"isMC", VariantType::Bool, false, {"Check also MC tables if set"}});
 }
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 using namespace o2::framework::expressions;
 
 template <typename Table>
diff --git a/.auto-resolution/Common/Tasks/checkDataModelMC.cxx b/.auto-resolution/Common/Tasks/checkDataModelMC.cxx
index fb2762a02b7..14cf55589d7 100644
--- a/.auto-resolution/Common/Tasks/checkDataModelMC.cxx
+++ b/.auto-resolution/Common/Tasks/checkDataModelMC.cxx
@@ -13,8 +13,8 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Common/Tasks/cpvQa.cxx b/.auto-resolution/Common/Tasks/cpvQa.cxx
index e549d89e33d..badf7e7adbd 100644
--- a/.auto-resolution/Common/Tasks/cpvQa.cxx
+++ b/.auto-resolution/Common/Tasks/cpvQa.cxx
@@ -13,9 +13,9 @@
 /// \author Sergey Evdokimov
 /// \since 25.10.2022
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Common/Tasks/evtPlanesResolution.cxx b/.auto-resolution/Common/Tasks/evtPlanesResolution.cxx
index e493ff3f00e..741194a2c64 100644
--- a/.auto-resolution/Common/Tasks/evtPlanesResolution.cxx
+++ b/.auto-resolution/Common/Tasks/evtPlanesResolution.cxx
@@ -18,25 +18,26 @@
 ///
 
 // C++/ROOT includes.
+#include <TComplex.h>
+#include <TH1F.h>
+#include <TMath.h>
+#include <TProfile.h>
+
 #include <chrono>
 #include <string>
 #include <vector>
-#include <TComplex.h>
-#include <TProfile.h>
-#include <TMath.h>
-#include <TH1F.h>
 
 // o2Physics includes.
+#include "Common/Core/EventPlaneHelper.h"
+#include "Common/DataModel/EvtPlanes.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StaticFor.h"
-
-#include "Common/DataModel/EvtPlanes.h"
-#include "Common/Core/EventPlaneHelper.h"
+#include "Framework/runDataProcessing.h"
 
 // o2 includes.
 
@@ -146,7 +147,7 @@ struct evtPlanesResolution {
         fillHistosEvtPl<7>(evPl);
         break;
     } // End switch(centBin)
-  }   // End void process(...)
+  } // End void process(...)
 };
 
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
diff --git a/.auto-resolution/Common/Tasks/flowTest.cxx b/.auto-resolution/Common/Tasks/flowTest.cxx
index bb27c0cc504..f70831d5c9a 100644
--- a/.auto-resolution/Common/Tasks/flowTest.cxx
+++ b/.auto-resolution/Common/Tasks/flowTest.cxx
@@ -13,20 +13,21 @@
 // cross-PWG effort in tracking studies
 // includes basic tracking, V0s and Cascades
 
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGMM/Mult/DataModel/Index.h" // for Particles2Tracks table
+
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPObject.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-
-#include "PWGMM/Mult/DataModel/Index.h" // for Particles2Tracks table
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "ReconstructionDataFormats/Track.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Common/Tasks/ft0Qa.cxx b/.auto-resolution/Common/Tasks/ft0Qa.cxx
index f7dcb8d75c4..6b200c6092f 100644
--- a/.auto-resolution/Common/Tasks/ft0Qa.cxx
+++ b/.auto-resolution/Common/Tasks/ft0Qa.cxx
@@ -9,17 +9,20 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <bitset>
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/FT0Corrected.h"
 #include "Common/DataModel/Multiplicity.h"
+
 #include "DataFormatsFT0/Digit.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
+
 #include "TH1F.h"
 #include "TH2F.h"
 
+#include <bitset>
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.auto-resolution/Common/Tasks/integrationTest.cxx b/.auto-resolution/Common/Tasks/integrationTest.cxx
index 04e0ad4778e..4768814154a 100644
--- a/.auto-resolution/Common/Tasks/integrationTest.cxx
+++ b/.auto-resolution/Common/Tasks/integrationTest.cxx
@@ -15,17 +15,18 @@
 //
 // Includes further QA if option enabled
 
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPObject.h"
 #include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "ReconstructionDataFormats/Track.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Common/Tasks/integrationTestCCDB.cxx b/.auto-resolution/Common/Tasks/integrationTestCCDB.cxx
index 33dbc6dd3e4..1966ca70126 100644
--- a/.auto-resolution/Common/Tasks/integrationTestCCDB.cxx
+++ b/.auto-resolution/Common/Tasks/integrationTestCCDB.cxx
@@ -22,19 +22,20 @@
 //
 // +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPObject.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include "DetectorsBase/Propagator.h"
+#include "DataFormatsParameters/GRPObject.h"
 #include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "ReconstructionDataFormats/Track.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Common/Tasks/multiplicityDerivedQa.cxx b/.auto-resolution/Common/Tasks/multiplicityDerivedQa.cxx
index 78f229fa2d6..64fe84840d3 100644
--- a/.auto-resolution/Common/Tasks/multiplicityDerivedQa.cxx
+++ b/.auto-resolution/Common/Tasks/multiplicityDerivedQa.cxx
@@ -12,13 +12,15 @@
 // This code does QA based on a saved derived dataset using the
 // tables provided by multiplicityTable.
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/McCollisionExtra.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TH1F.h"
 #include "TH2F.h"
 
diff --git a/.auto-resolution/Common/Tasks/multiplicityQa.cxx b/.auto-resolution/Common/Tasks/multiplicityQa.cxx
index 3fc2374c2cc..6b8a10d6f5f 100644
--- a/.auto-resolution/Common/Tasks/multiplicityQa.cxx
+++ b/.auto-resolution/Common/Tasks/multiplicityQa.cxx
@@ -22,13 +22,15 @@
 // - david.dobrigkeit.chinellato@cern.ch
 //
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/McCollisionExtra.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TH1F.h"
 #include "TH2F.h"
 
diff --git a/.auto-resolution/Common/Tasks/orbitRangeTask.cxx b/.auto-resolution/Common/Tasks/orbitRangeTask.cxx
index 250751c25ba..5cfb8c44f13 100644
--- a/.auto-resolution/Common/Tasks/orbitRangeTask.cxx
+++ b/.auto-resolution/Common/Tasks/orbitRangeTask.cxx
@@ -11,11 +11,13 @@
 
 // This task finds minimum and maximum orbit among all processed bcs
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "CommonConstants/LHCConstants.h"
 #include "OrbitRange.h"
+
+#include "CommonConstants/LHCConstants.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TMath.h"
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Common/Tasks/propagatorQa.cxx b/.auto-resolution/Common/Tasks/propagatorQa.cxx
index f978f8bc564..47280cbd44e 100644
--- a/.auto-resolution/Common/Tasks/propagatorQa.cxx
+++ b/.auto-resolution/Common/Tasks/propagatorQa.cxx
@@ -14,20 +14,22 @@
 // Work in progress! More to follow, use at your own peril
 //
 
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "trackSelectionRequest.h"
+
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
 #include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
 #include "DetectorsBase/Propagator.h"
-#include "trackSelectionRequest.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "ReconstructionDataFormats/Track.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Common/Tasks/qVectorsCorrection.cxx b/.auto-resolution/Common/Tasks/qVectorsCorrection.cxx
index 10e37a4c210..9400fa185c5 100644
--- a/.auto-resolution/Common/Tasks/qVectorsCorrection.cxx
+++ b/.auto-resolution/Common/Tasks/qVectorsCorrection.cxx
@@ -18,31 +18,31 @@
 ///
 
 // C++/ROOT includes.
-#include <chrono>
-#include <string>
-#include <vector>
 #include <TComplex.h>
 #include <TH1F.h>
 #include <TH2D.h>
 #include <TMath.h>
 #include <TVector2.h>
 
+#include <chrono>
+#include <string>
+#include <vector>
+
 // o2Physics includes.
+#include "Common/Core/EventPlaneHelper.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Qvectors.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StaticFor.h"
-
-#include "Common/DataModel/Qvectors.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/Core/EventPlaneHelper.h"
-#include "Common/Core/TrackSelection.h"
-
-#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/runDataProcessing.h"
 
 // o2 includes.
 
diff --git a/.auto-resolution/Common/Tasks/trackqa.cxx b/.auto-resolution/Common/Tasks/trackqa.cxx
index d10d42af8da..53f73517c83 100644
--- a/.auto-resolution/Common/Tasks/trackqa.cxx
+++ b/.auto-resolution/Common/Tasks/trackqa.cxx
@@ -13,15 +13,16 @@
 // Task producing basic tracking qa histograms
 //
 
-#include <utility> // std::swap
-#include <vector>
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/Core/TrackSelectionDefaults.h"
+
+#include <utility> // std::swap
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Common/Tasks/validation.cxx b/.auto-resolution/Common/Tasks/validation.cxx
index 5c464aebb30..f3b79197d16 100644
--- a/.auto-resolution/Common/Tasks/validation.cxx
+++ b/.auto-resolution/Common/Tasks/validation.cxx
@@ -8,15 +8,16 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
 
 #include <TFile.h>
 #include <TH1F.h>
-#include <cmath>
+
 #include <array>
+#include <cmath>
 namespace o2::aod
 {
 } // namespace o2::aod
diff --git a/.auto-resolution/Common/Tools/MultModule.h b/.auto-resolution/Common/Tools/MultModule.h
index 1a445cb186a..3a372670e04 100644
--- a/.auto-resolution/Common/Tools/MultModule.h
+++ b/.auto-resolution/Common/Tools/MultModule.h
@@ -16,23 +16,28 @@
 #ifndef COMMON_TOOLS_MULTMODULE_H_
 #define COMMON_TOOLS_MULTMODULE_H_
 
-#include <vector>
-#include <memory>
-#include <cstdlib>
-#include <cmath>
-#include <array>
-#include <string>
-#include <map>
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/Configurable.h"
-#include "Framework/HistogramSpec.h"
 #include "TableHelper.h"
+
+#include "PWGMM/Mult/DataModel/bestCollisionTable.h"
+
 #include "Common/Core/TPCVDriftManager.h"
-#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/Centrality.h"
-#include "PWGMM/Mult/DataModel/bestCollisionTable.h"
+#include "Common/DataModel/Multiplicity.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/Configurable.h"
+#include "Framework/HistogramSpec.h"
+
 #include "TFormula.h"
 
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
+
 //__________________________________________
 // MultModule
 
diff --git a/.auto-resolution/Common/Tools/Multiplicity/multCalibrator.cxx b/.auto-resolution/Common/Tools/Multiplicity/multCalibrator.cxx
index e9931c0389f..38959bef8c9 100644
--- a/.auto-resolution/Common/Tools/Multiplicity/multCalibrator.cxx
+++ b/.auto-resolution/Common/Tools/Multiplicity/multCalibrator.cxx
@@ -16,16 +16,17 @@
 // - victor.gonzalez@cern.ch
 // - david.dobrigkeit.chinellato@cern.ch
 //
-#include "TList.h"
+#include "multCalibrator.h"
+
+#include "TArrayF.h"
+#include "TArrayL64.h"
 #include "TDirectory.h"
 #include "TFile.h"
-#include "TH1F.h"
 #include "TH1D.h"
+#include "TH1F.h"
+#include "TList.h"
 #include "TProfile.h"
 #include "TStopwatch.h"
-#include "TArrayL64.h"
-#include "TArrayF.h"
-#include "multCalibrator.h"
 
 using namespace std;
 
@@ -100,7 +101,7 @@ Bool_t multCalibrator::Calibrate()
     return kFALSE;
   }
 
-  //Step 1: verify if input file contains desired histograms
+  // Step 1: verify if input file contains desired histograms
   TH1D* hRaw[kNCentEstim];
   for (Int_t iv = 0; iv < kNCentEstim; iv++) {
     hRaw[iv] = (TH1D*)fileInput->Get(Form("multiplicity-qa/multiplicityQa/h%s", fCentEstimName[iv].Data()));
@@ -112,7 +113,7 @@ Bool_t multCalibrator::Calibrate()
 
   cout << "Histograms loaded! Will now calibrate..." << endl;
 
-  //Create output file
+  // Create output file
   TFile* fOut = new TFile(fOutputFileName.Data(), "RECREATE");
   TH1F* hCalib[kNCentEstim];
   for (Int_t iv = 0; iv < kNCentEstim; iv++) {
@@ -129,7 +130,7 @@ Bool_t multCalibrator::Calibrate()
 
 Double_t multCalibrator::GetRawMax(TH1* histo)
 {
-  //This function gets the max X value (right edge) which is filled.
+  // This function gets the max X value (right edge) which is filled.
   for (Int_t ii = histo->GetNbinsX(); ii > 0; ii--) {
     if (histo->GetBinContent(ii) < 1e-10)
       return histo->GetBinLowEdge(ii + 1);
@@ -139,24 +140,24 @@ Double_t multCalibrator::GetRawMax(TH1* histo)
 
 Double_t multCalibrator::GetBoundaryForPercentile(TH1* histo, Double_t lPercentileRequested, Double_t& lPrecisionEstimate)
 {
-  //This function returns the boundary for a specific percentile.
-  //It uses a linear interpolation in an attempt to get more precision
-  //than the binning of the histogram used for quantiling.
+  // This function returns the boundary for a specific percentile.
+  // It uses a linear interpolation in an attempt to get more precision
+  // than the binning of the histogram used for quantiling.
   //
-  //It also estimates a certain level of precision of the procedure
-  //by explicitly comparing the bin content of the bins around the boundary
-  //with the entire cross section, effectively reporting back a percentage
-  //that corresponds to those bins. If this percentage is O(percentile bin
-  //width requested), then the user should worry and we print out a warning.
+  // It also estimates a certain level of precision of the procedure
+  // by explicitly comparing the bin content of the bins around the boundary
+  // with the entire cross section, effectively reporting back a percentage
+  // that corresponds to those bins. If this percentage is O(percentile bin
+  // width requested), then the user should worry and we print out a warning.
 
   const Double_t lPrecisionConstant = 2.0;
 
   Double_t lRawMax = GetRawMax(histo);
 
   if (lPercentileRequested < 1e-7)
-    return lRawMax; //safeguard
+    return lRawMax; // safeguard
   if (lPercentileRequested > 100 - 1e-7)
-    return 0.0; //safeguard
+    return 0.0; // safeguard
 
   Double_t lReturnValue = 0.0;
   Double_t lPercentile = 100.0 - lPercentileRequested;
@@ -182,7 +183,7 @@ Double_t multCalibrator::GetBoundaryForPercentile(TH1* histo, Double_t lPercenti
   for (Long_t ibin = lFirstBin; ibin < lNBins; ibin++) {
     lCount += histo->GetBinContent(ibin);
     if (lCount >= lCountDesired) {
-      //Found bin I am looking for!
+      // Found bin I am looking for!
       Double_t lWidth = histo->GetBinWidth(ibin);
       Double_t lLeftPercentile = 100. * (lCount - histo->GetBinContent(ibin)) / lHadronicTotal;
       Double_t lRightPercentile = 100. * lCount / lHadronicTotal;
@@ -200,12 +201,12 @@ Double_t multCalibrator::GetBoundaryForPercentile(TH1* histo, Double_t lPercenti
 //________________________________________________________________
 void multCalibrator::SetStandardAdaptiveBoundaries()
 {
-  //Function to set standard adaptive boundaries
-  //Typically used in pp, goes to 0.001% binning for highest multiplicity
+  // Function to set standard adaptive boundaries
+  // Typically used in pp, goes to 0.001% binning for highest multiplicity
   lNDesiredBoundaries = 0;
   lDesiredBoundaries = new Double_t[1100];
   lDesiredBoundaries[0] = 100;
-  //From Low To High Multiplicity
+  // From Low To High Multiplicity
   for (Int_t ib = 1; ib < 91; ib++) {
     lNDesiredBoundaries++;
     lDesiredBoundaries[lNDesiredBoundaries] = lDesiredBoundaries[lNDesiredBoundaries - 1] - 1.0;
@@ -229,12 +230,12 @@ void multCalibrator::SetStandardAdaptiveBoundaries()
 //________________________________________________________________
 void multCalibrator::SetStandardOnePercentBoundaries()
 {
-  //Function to set standard adaptive boundaries
-  //Typically used in pp, goes to 0.001% binning for highest multiplicity
+  // Function to set standard adaptive boundaries
+  // Typically used in pp, goes to 0.001% binning for highest multiplicity
   lNDesiredBoundaries = 101;
   lDesiredBoundaries = new Double_t[101];
   lDesiredBoundaries[0] = 100;
-  //From Low To High Multiplicity
+  // From Low To High Multiplicity
   for (Int_t ib = 1; ib < 101; ib++)
     lDesiredBoundaries[ib] = lDesiredBoundaries[ib - 1] - 1.0;
   cout << "Set standard 1%-wide percentile boundaries! Nboundaries: " << lNDesiredBoundaries << endl;
@@ -243,10 +244,10 @@ void multCalibrator::SetStandardOnePercentBoundaries()
 //________________________________________________________________
 TH1F* multCalibrator::GetCalibrationHistogram(TH1* histoRaw, TString lHistoName)
 {
-  //This function returns a calibration histogram
+  // This function returns a calibration histogram
   //(pp or p-Pb like, no anchor point considered)
 
-  //Reset + recreate precision histogram
+  // Reset + recreate precision histogram
   ResetPrecisionHistogram();
 
   // Consistency check
@@ -256,10 +257,10 @@ TH1F* multCalibrator::GetCalibrationHistogram(TH1* histoRaw, TString lHistoName)
     cout << "Last boundary: " << lDesiredBoundaries[0] << endl;
   }
 
-  //Aux vars
+  // Aux vars
   Double_t lMiddleOfBins[1000];
   for (Long_t lB = 1; lB < lNDesiredBoundaries; lB++) {
-    //place squarely at the middle to ensure it's all fine
+    // place squarely at the middle to ensure it's all fine
     lMiddleOfBins[lB - 1] = 0.5 * (lDesiredBoundaries[lB] + lDesiredBoundaries[lB - 1]);
   }
   Double_t lBounds[lNDesiredBoundaries + 1];
@@ -276,7 +277,7 @@ TH1F* multCalibrator::GetCalibrationHistogram(TH1* histoRaw, TString lHistoName)
     lBounds[lDisplacedii] = GetBoundaryForPercentile(histoRaw, lDesiredBoundaries[ii], lPrecision[ii]);
     TString lPrecisionString = "(Precision OK)";
     if (ii != 0 && ii != lNDesiredBoundaries - 1) {
-      //check precision, please
+      // check precision, please
       if (lPrecision[ii] / TMath::Abs(lDesiredBoundaries[ii + 1] - lDesiredBoundaries[ii]) > fkPrecisionWarningThreshold)
         lPrecisionString = "(WARNING: BINNING MAY LEAD TO IMPRECISION!)";
       if (lPrecision[ii] / TMath::Abs(lDesiredBoundaries[ii - 1] - lDesiredBoundaries[ii]) > fkPrecisionWarningThreshold)
@@ -302,8 +303,8 @@ void multCalibrator::ResetPrecisionHistogram()
     delete fPrecisionHistogram;
     fPrecisionHistogram = 0x0;
   }
-  if (lNDesiredBoundaries > 0) { //only if initialized
-    //invert boundaries, please
+  if (lNDesiredBoundaries > 0) { // only if initialized
+    // invert boundaries, please
     Double_t lInverseDesiredBoundaries[1100];
     for (Int_t ii = 0; ii < lNDesiredBoundaries; ii++) {
       lInverseDesiredBoundaries[ii] = lDesiredBoundaries[lNDesiredBoundaries - (ii + 1)];
diff --git a/.auto-resolution/Common/Tools/Multiplicity/multCalibrator.h b/.auto-resolution/Common/Tools/Multiplicity/multCalibrator.h
index b5c618bdc3d..27e530983df 100644
--- a/.auto-resolution/Common/Tools/Multiplicity/multCalibrator.h
+++ b/.auto-resolution/Common/Tools/Multiplicity/multCalibrator.h
@@ -19,30 +19,30 @@
 #ifndef MULTCALIBRATOR_H
 #define MULTCALIBRATOR_H
 
+#include "TH1D.h"
+#include "TNamed.h"
+
 #include <iostream>
 #include <map>
 
-#include "TNamed.h"
-#include "TH1D.h"
-
 class multCalibrator : public TNamed
 {
 
  public:
-  //Constructors/Destructor
+  // Constructors/Destructor
   multCalibrator();
   multCalibrator(const char* name, const char* title = "Multiplicity Calibration Class");
   ~multCalibrator();
 
-  //void    Print(Option_t *option="") const;
+  // void    Print(Option_t *option="") const;
 
   //_________________________________________________________________________
-  //Interface: steering functions to be used in calibration macro
+  // Interface: steering functions to be used in calibration macro
 
-  //Set Filenames
+  // Set Filenames
   void SetInputFile(TString lFile) { fInputFileName = lFile.Data(); }
   void SetOutputFile(TString lFile) { fOutputFileName = lFile.Data(); }
-  //Set Boundaries to find
+  // Set Boundaries to find
   void SetBoundaries(Long_t lNB, Double_t* lB)
   {
     if (lNB < 2 || lNB > 1e+6) {
@@ -56,24 +56,24 @@ class multCalibrator : public TNamed
   void SetAnchorPointRaw(Float_t lRaw) { fAnchorPointValue = lRaw; }
   void SetAnchorPointPercentage(Float_t lPer) { fAnchorPointPercentage = lPer; }
 
-  void SetStandardAdaptiveBoundaries();   //standard adaptive (pp-like)
-  void SetStandardOnePercentBoundaries(); //standard 1% (Pb-Pb like)
+  void SetStandardAdaptiveBoundaries();   // standard adaptive (pp-like)
+  void SetStandardOnePercentBoundaries(); // standard 1% (Pb-Pb like)
 
-  //Master Function in this Class: To be called once filenames are set
+  // Master Function in this Class: To be called once filenames are set
   Bool_t Calibrate();
 
-  //Aux function. Keep public, accessible outside as rather useful utility
+  // Aux function. Keep public, accessible outside as rather useful utility
   TH1F* GetCalibrationHistogram(TH1* histoRaw, TString lHistoName = "hCalib");
 
-  //Auxiliary functions
+  // Auxiliary functions
   Double_t GetRawMax(TH1* histo);
   Double_t GetBoundaryForPercentile(TH1* histo, Double_t lPercentileRequested, Double_t& lPrecisionEstimate);
 
-  //Precision bookkeeping
-  TH1D* GetPrecisionHistogram() { return fPrecisionHistogram; }; //gets precision histogram from current object
-  void ResetPrecisionHistogram();                                //Reset precision histogram, if it exists
+  // Precision bookkeeping
+  TH1D* GetPrecisionHistogram() { return fPrecisionHistogram; }; // gets precision histogram from current object
+  void ResetPrecisionHistogram();                                // Reset precision histogram, if it exists
 
-  //Aliases for centrality estimators
+  // Aliases for centrality estimators
   enum fCentEstim {
     kCentRawV0M = 0,
     kCentRawT0M,
@@ -89,7 +89,7 @@ class multCalibrator : public TNamed
   static const TString fCentEstimName[kNCentEstim]; //! name (internal)
 
  private:
-  //Calibration Boundaries to locate
+  // Calibration Boundaries to locate
   Double_t* lDesiredBoundaries;
   Long_t lNDesiredBoundaries;
   Double_t fkPrecisionWarningThreshold;
@@ -105,7 +105,7 @@ class multCalibrator : public TNamed
   // TList object for storing histograms
   TList* fCalibHists;
 
-  TH1D* fPrecisionHistogram; //for bookkeeping of precision report
+  TH1D* fPrecisionHistogram; // for bookkeeping of precision report
 
   ClassDef(multCalibrator, 1);
   //(this classdef is only for bookkeeping, class will not usually
diff --git a/.auto-resolution/Common/Tools/Multiplicity/multGlauberNBDFitter.cxx b/.auto-resolution/Common/Tools/Multiplicity/multGlauberNBDFitter.cxx
index a765db72448..91a71b78eaf 100644
--- a/.auto-resolution/Common/Tools/Multiplicity/multGlauberNBDFitter.cxx
+++ b/.auto-resolution/Common/Tools/Multiplicity/multGlauberNBDFitter.cxx
@@ -26,13 +26,14 @@
  **********************************************/
 
 #include "multGlauberNBDFitter.h"
-#include "TList.h"
-#include "TFile.h"
+
 #include "TF1.h"
+#include "TFile.h"
+#include "TFitResult.h"
+#include "TList.h"
+#include "TProfile.h"
 #include "TStopwatch.h"
 #include "TVirtualFitter.h"
-#include "TProfile.h"
-#include "TFitResult.h"
 
 using namespace std;
 
@@ -63,14 +64,14 @@ multGlauberNBDFitter::multGlauberNBDFitter() : TNamed(),
   fNcoll = new Double_t[fMaxNpNcPairs];
   fContent = new Long_t[fMaxNpNcPairs];
 
-  //Ancestor histo
+  // Ancestor histo
   fhNanc = new TH1D("fhNanc", "", 1000, -0.5, 999.5);
 
-  //NBD
+  // NBD
   fNBD = new TF1("fNBD", "ROOT::Math::negative_binomial_pdf(x,[0],[1])", 0, 45000);
   fNBD->SetNpx(45000);
 
-  //master function
+  // master function
   fGlauberNBD = new TF1("fGlauberNBD", this, &multGlauberNBDFitter::ProbDistrib,
                         0, 50000, 4, "multGlauberNBDFitter", "ProbDistrib");
   fGlauberNBD->SetParameter(0, fMu);
@@ -105,19 +106,19 @@ multGlauberNBDFitter::multGlauberNBDFitter(const char* name, const char* title)
                                                                                   fFitOptions("R0"),
                                                                                   fFitNpx(5000)
 {
-  //Named constructor
+  // Named constructor
   fNpart = new Double_t[fMaxNpNcPairs];
   fNcoll = new Double_t[fMaxNpNcPairs];
   fContent = new Long_t[fMaxNpNcPairs];
 
-  //Ancestor histo
-  //fhNanc = new TH1D("fhNanc", "", fAncestorMode==2?10000:1000, -0.5, 999.5);
+  // Ancestor histo
+  // fhNanc = new TH1D("fhNanc", "", fAncestorMode==2?10000:1000, -0.5, 999.5);
 
-  //NBD
+  // NBD
   fNBD = new TF1("fNBD", "ROOT::Math::negative_binomial_pdf(x,[0],[1])", 0, 45000);
   fNBD->SetNpx(45000);
 
-  //master function
+  // master function
   fGlauberNBD = new TF1("fGlauberNBD", this, &multGlauberNBDFitter::ProbDistrib,
                         0, 50000, 5, "multGlauberNBDFitter", "ProbDistrib");
   fGlauberNBD->SetParameter(0, fMu);
@@ -157,18 +158,18 @@ multGlauberNBDFitter::~multGlauberNBDFitter()
 
 //______________________________________________________
 Double_t multGlauberNBDFitter::ProbDistrib(Double_t* x, Double_t* par)
-//Master fitter function
+// Master fitter function
 {
   Double_t lMultValue = x[0];
   Double_t lProbability = 0.0;
   ffChanged = kTRUE;
   const Double_t lAlmost0 = 1.e-13;
-  //Comment this line in order to make the code evaluate Nancestor all the time
+  // Comment this line in order to make the code evaluate Nancestor all the time
   if (TMath::Abs(fCurrentf - par[2]) < lAlmost0)
     ffChanged = kFALSE;
 
   //______________________________________________________
-  //Recalculate the ancestor distribution in case f changed
+  // Recalculate the ancestor distribution in case f changed
   if (ffChanged) {
     fCurrentf = par[2];
     fhNanc->Reset();
@@ -192,12 +193,12 @@ Double_t multGlauberNBDFitter::ProbDistrib(Double_t* x, Double_t* par)
     fhNanc->Scale(1. / fhNanc->Integral());
   }
   //______________________________________________________
-  //Actually evaluate function
+  // Actually evaluate function
   Int_t lStartBin = fhNanc->FindBin(0.0) + 1;
   for (Long_t iNanc = lStartBin; iNanc < fhNanc->GetNbinsX() + 1; iNanc++) {
     Double_t lNancestors = fhNanc->GetBinCenter(iNanc);
     Double_t lNancestorCount = fhNanc->GetBinContent(iNanc);
-    //if(lNancestorCount<1e-12&&lNancestors>10) break;
+    // if(lNancestorCount<1e-12&&lNancestors>10) break;
 
     // allow for variable mu in case requested
     Double_t lThisMu = (((Double_t)lNancestors)) * (par[0] + par[4] * lNancestors);
@@ -279,7 +280,7 @@ void multGlauberNBDFitter::InitAncestor()
 Bool_t multGlauberNBDFitter::DoFit()
 {
   InitAncestor();
-  //Try very hard, please
+  // Try very hard, please
   TVirtualFitter::SetMaxIterations(5000000);
   if (!InitializeNpNc()) {
     cout << "---> Initialization of Npart x Ncoll correlation info failed!" << endl;
@@ -317,12 +318,12 @@ Bool_t multGlauberNBDFitter::DoFit()
 //________________________________________________________________
 Bool_t multGlauberNBDFitter::InitializeNpNc()
 {
-  //This function initializes fhNpNc
-  //Warning: X == Npart, Y == Ncoll
+  // This function initializes fhNpNc
+  // Warning: X == Npart, Y == Ncoll
   Bool_t lReturnValue = kFALSE;
   if (fhNpNc) {
     fNNpNcPairs = 0;
-    //Sweep all allowed values of Npart, Ncoll; find counters
+    // Sweep all allowed values of Npart, Ncoll; find counters
     for (int xbin = 1; xbin < 500; xbin++) {
       for (int ybin = 1; ybin < 3000; ybin++) {
         if (fhNpNc->GetBinContent(fhNpNc->FindBin(xbin, ybin)) != 0) {
@@ -345,12 +346,12 @@ Bool_t multGlauberNBDFitter::InitializeNpNc()
 //________________________________________________________________
 Double_t multGlauberNBDFitter::ContinuousNBD(Double_t n, Double_t mu, Double_t k)
 {
-  //Adaptation of the negative binomial distribution
-  //for non-integer arguments: analytical continuation
+  // Adaptation of the negative binomial distribution
+  // for non-integer arguments: analytical continuation
   //
-  //This function would actually also be fine with integers;
-  //in fact it is equivalent to that if 'n' is typecast as
-  //an integer prior to use
+  // This function would actually also be fine with integers;
+  // in fact it is equivalent to that if 'n' is typecast as
+  // an integer prior to use
 
   Double_t F;
   Double_t f;
@@ -390,10 +391,10 @@ void multGlauberNBDFitter::CalculateAvNpNc(TProfile* lNPartProf, TProfile* lNCol
   cout << "Glauber NBD norm ..........: " << fnorm << endl;
   cout << "Glauber NBD dmu/dNanc .....: " << fdMu << endl;
 
-  //2-fold nested loop:
-  // + looping over all Nancestor combinations
-  // + looping over all possible final multiplicities
-  // ^---> final product already multiplicity-binned
+  // 2-fold nested loop:
+  //  + looping over all Nancestor combinations
+  //  + looping over all possible final multiplicities
+  //  ^---> final product already multiplicity-binned
 
   //______________________________________________________
   if (lLoRange < -1 && lHiRange < -1) {
diff --git a/.auto-resolution/Common/Tools/Multiplicity/multGlauberNBDFitter.h b/.auto-resolution/Common/Tools/Multiplicity/multGlauberNBDFitter.h
index 42d5cab046f..effd18e843f 100644
--- a/.auto-resolution/Common/Tools/Multiplicity/multGlauberNBDFitter.h
+++ b/.auto-resolution/Common/Tools/Multiplicity/multGlauberNBDFitter.h
@@ -12,56 +12,57 @@
 #ifndef MULTGLAUBERNBDFITTER_H
 #define MULTGLAUBERNBDFITTER_H
 
-#include <iostream>
-#include "TNamed.h"
 #include "TF1.h"
 #include "TH1.h"
 #include "TH1D.h"
 #include "TH2.h"
+#include "TNamed.h"
 #include "TProfile.h"
 
+#include <iostream>
+
 class multGlauberNBDFitter : public TNamed
 {
 
  public:
-  //basic functionality
+  // basic functionality
   multGlauberNBDFitter();
   multGlauberNBDFitter(const char* name, const char* title = "Glauber+NBD fitter");
   ~multGlauberNBDFitter();
 
-  //Master fitter function
+  // Master fitter function
   Double_t ProbDistrib(Double_t* x, Double_t* par);
 
   void InitAncestor();
 
-  //Do Fit: where everything happens
+  // Do Fit: where everything happens
   Bool_t DoFit();
 
-  //Set input characteristics: the 2D plot with Npart, Nanc
+  // Set input characteristics: the 2D plot with Npart, Nanc
   Bool_t SetNpartNcollCorrelation(TH2* hNpNc);
 
-  //Set main input to be fitted (the V0M distribution)
+  // Set main input to be fitted (the V0M distribution)
   Bool_t SetInputV0M(TH1* hV0M);
 
-  //Interface to get funtions if asked to
+  // Interface to get funtions if asked to
   TF1* GetNBD();
   TF1* GetGlauberNBD();
 
-  //Helper
+  // Helper
   Bool_t InitializeNpNc();
 
-  //Interface for debug
+  // Interface for debug
   void SetAncestorMode(Int_t lAncMode = 0) { fAncestorMode = lAncMode; }
   Int_t GetAncestorMode() { return fAncestorMode; }
   TH1D* GetAncestorHistogram() { return fhNanc; }
 
-  //Interface to set vals
+  // Interface to set vals
   void SetMu(Double_t lVal) { fMu = lVal; }
   void Setk(Double_t lVal) { fk = lVal; }
   void Setf(Double_t lVal) { ff = lVal; }
   void SetNorm(Double_t lVal) { fnorm = lVal; }
 
-  //Interface to get vals
+  // Interface to get vals
   Double_t GetMu() { return fMu; }
   Double_t Getk() { return fk; }
   Double_t Getf() { return ff; }
@@ -71,41 +72,41 @@ class multGlauberNBDFitter : public TNamed
   void SetFitOptions(TString lOpt);
   void SetFitNpx(Long_t lNpx);
 
-  //For ancestor mode 2
+  // For ancestor mode 2
   Double_t ContinuousNBD(Double_t n, Double_t mu, Double_t k);
 
-  //For estimating Npart, Ncoll in multiplicity bins
+  // For estimating Npart, Ncoll in multiplicity bins
   void CalculateAvNpNc(TProfile* lNPartProf, TProfile* lNCollProf, TH2F* lNPart2DPlot, TH2F* lNColl2DPlot, TH1F* hPercentileMap, Double_t lLoRange = -1, Double_t lHiRange = -1);
 
-  //void    Print(Option_t *option="") const;
+  // void    Print(Option_t *option="") const;
 
  private:
-  //This function serves as the (analytical) NBD
+  // This function serves as the (analytical) NBD
   TF1* fNBD;
 
-  //This function is the key fitting function
+  // This function is the key fitting function
   TF1* fGlauberNBD;
 
-  //Reference histo
-  TH1D* fhNanc; //basic ancestor distribution
-  TH2* fhNpNc;  //correlation between Npart and Ncoll
-  TH1* fhV0M;   //basic ancestor distribution
+  // Reference histo
+  TH1D* fhNanc; // basic ancestor distribution
+  TH2* fhNpNc;  // correlation between Npart and Ncoll
+  TH1* fhV0M;   // basic ancestor distribution
 
-  //Fitting utilities
+  // Fitting utilities
   Bool_t ffChanged;
   Double_t fCurrentf;
 
-  //0: truncation, 1: rounding, 2: analytical continuation
+  // 0: truncation, 1: rounding, 2: analytical continuation
   Int_t fAncestorMode;
 
-  //Buffer for (Npart, Ncoll) pairs in memory
+  // Buffer for (Npart, Ncoll) pairs in memory
   Double_t* fNpart;
   Double_t* fNcoll;
   Long_t* fContent;
-  Long_t fNNpNcPairs; //number of pairs to use
+  Long_t fNNpNcPairs; // number of pairs to use
   Long_t fMaxNpNcPairs;
 
-  //The actual output: mu, k, f, norm
+  // The actual output: mu, k, f, norm
   Double_t fMu;
   Double_t fdMu; // variable mu option
   Double_t fk;
diff --git a/.auto-resolution/Common/Tools/Multiplicity/multMCCalibrator.cxx b/.auto-resolution/Common/Tools/Multiplicity/multMCCalibrator.cxx
index 5b490daf77d..f0960da4b07 100644
--- a/.auto-resolution/Common/Tools/Multiplicity/multMCCalibrator.cxx
+++ b/.auto-resolution/Common/Tools/Multiplicity/multMCCalibrator.cxx
@@ -16,18 +16,20 @@
 // - victor.gonzalez@cern.ch
 // - david.dobrigkeit.chinellato@cern.ch
 //
-#include "TList.h"
+#include "multMCCalibrator.h"
+
+#include "multCalibrator.h"
+
+#include "TArrayF.h"
+#include "TArrayL64.h"
 #include "TDirectory.h"
-#include "TFile.h"
 #include "TF1.h"
-#include "TH1F.h"
+#include "TFile.h"
 #include "TH1D.h"
+#include "TH1F.h"
+#include "TList.h"
 #include "TProfile.h"
 #include "TStopwatch.h"
-#include "TArrayL64.h"
-#include "TArrayF.h"
-#include "multCalibrator.h"
-#include "multMCCalibrator.h"
 
 using namespace std;
 
@@ -79,11 +81,11 @@ Bool_t multMCCalibrator::Calibrate()
   cout << " * Output File............: " << fOutputFileName.Data() << endl;
   cout << endl;
 
-  //Opening data and simulation file...
+  // Opening data and simulation file...
   TFile* fileData = new TFile(fDataInputFileName.Data(), "READ");
   TFile* fileSim = new TFile(fSimInputFileName.Data(), "READ");
 
-  //Step 1: verify if input file contains desired histograms
+  // Step 1: verify if input file contains desired histograms
   TProfile* hProfData[multCalibrator::kNCentEstim];
   TProfile* hProfSim[multCalibrator::kNCentEstim];
   cout << " * acquiring input profiles..." << endl;
@@ -135,14 +137,14 @@ Bool_t multMCCalibrator::Calibrate()
 //________________________________________________________________
 TF1* multMCCalibrator::GetFit(TProfile* fProf, Bool_t lQuadratic)
 {
-  TString fFormula = "[0]*x"; //old/deprecated (avoid if possible, please)
+  TString fFormula = "[0]*x"; // old/deprecated (avoid if possible, please)
   if (lQuadratic)
     fFormula = "[0]+[1]*TMath::Power(x,[2])";
 
   // Function to return fit function to profile for posterior inversion
   TF1* fit = new TF1(Form("%s_fit", fProf->GetName()), fFormula.Data(), fProf->GetBinLowEdge(1), fProf->GetBinLowEdge(fProf->GetNbinsX()));
 
-  //Guesstimate inclination from data points in profile
+  // Guesstimate inclination from data points in profile
   Double_t lMeanInclination = 0;
   Long_t lInclinationCount = 0;
   for (Int_t ii = 2; ii < fProf->GetNbinsX(); ii++) {
@@ -158,7 +160,7 @@ TF1* multMCCalibrator::GetFit(TProfile* fProf, Bool_t lQuadratic)
   if (lInclinationCount >= 5)
     lMeanInclination /= lInclinationCount;
 
-  //Give it a little nudge, cause life's hard
+  // Give it a little nudge, cause life's hard
   fit->SetParameter(0, 0.0);
   fit->SetParameter(1, lMeanInclination);
   fit->SetParameter(2, 1.0);
diff --git a/.auto-resolution/Common/Tools/Multiplicity/multMCCalibrator.h b/.auto-resolution/Common/Tools/Multiplicity/multMCCalibrator.h
index f88bddf98c3..4e19d38acd1 100644
--- a/.auto-resolution/Common/Tools/Multiplicity/multMCCalibrator.h
+++ b/.auto-resolution/Common/Tools/Multiplicity/multMCCalibrator.h
@@ -19,31 +19,32 @@
 #ifndef MULTMCCALIBRATOR_H
 #define MULTMCCALIBRATOR_H
 
-#include <iostream>
-#include "TNamed.h"
 #include "TF1.h"
 #include "TH1D.h"
+#include "TNamed.h"
 #include "TProfile.h"
+
+#include <iostream>
 #include <map>
 
 class multMCCalibrator : public TNamed
 {
 
  public:
-  //Constructors/Destructor
+  // Constructors/Destructor
   multMCCalibrator();
   multMCCalibrator(const char* name, const char* title = "MC Multiplicity Calibration Class");
   ~multMCCalibrator();
 
   //_________________________________________________________________________
-  //Interface: steering functions to be used in calibration macro
+  // Interface: steering functions to be used in calibration macro
 
-  //Set Filenames
+  // Set Filenames
   void SetDataInputFile(TString lFile) { fDataInputFileName = lFile.Data(); }
   void SetSimInputFile(TString lFile) { fSimInputFileName = lFile.Data(); }
   void SetOutputFile(TString lFile) { fOutputFileName = lFile.Data(); }
 
-  //Master Function in this Class: To be called once filenames are set
+  // Master Function in this Class: To be called once filenames are set
   Bool_t Calibrate();
 
   TF1* GetFit(TProfile* fProf, Bool_t lQuadratic = kTRUE);
diff --git a/.auto-resolution/Common/Tools/PID/checkPidPacking.cxx b/.auto-resolution/Common/Tools/PID/checkPidPacking.cxx
index 84f72c4f48c..6416ab50669 100644
--- a/.auto-resolution/Common/Tools/PID/checkPidPacking.cxx
+++ b/.auto-resolution/Common/Tools/PID/checkPidPacking.cxx
@@ -16,14 +16,15 @@
 /// \since  03/05/2024
 ///
 
-#include <string>
-
 #include "Common/DataModel/PIDResponseTOF.h"
 #include "Common/DataModel/PIDResponseTPC.h"
-#include "TH1F.h"
+
 #include "TCanvas.h"
+#include "TH1F.h"
 #include "TRandom.h"
 
+#include <string>
+
 using namespace o2;
 
 template <typename T>
diff --git a/.auto-resolution/Common/Tools/PID/handleParamBase.h b/.auto-resolution/Common/Tools/PID/handleParamBase.h
index 01c2a66ab8b..263f05a1f0b 100644
--- a/.auto-resolution/Common/Tools/PID/handleParamBase.h
+++ b/.auto-resolution/Common/Tools/PID/handleParamBase.h
@@ -19,13 +19,16 @@
 #ifndef COMMON_TOOLS_PID_HANDLEPARAMBASE_H_
 #define COMMON_TOOLS_PID_HANDLEPARAMBASE_H_
 
-#include <map>
-#include <string>
 #include "CCDB/CcdbApi.h"
-#include <boost/program_options.hpp>
 #include "Framework/Logger.h"
+
 #include "TFile.h"
 
+#include <boost/program_options.hpp>
+
+#include <map>
+#include <string>
+
 // Global executable arguments
 namespace bpo = boost::program_options;
 bpo::variables_map arguments;             // Command line arguments
diff --git a/.auto-resolution/Common/Tools/PID/handleParamTPCResponse.cxx b/.auto-resolution/Common/Tools/PID/handleParamTPCResponse.cxx
index 64741503fae..abe70d1e1ba 100644
--- a/.auto-resolution/Common/Tools/PID/handleParamTPCResponse.cxx
+++ b/.auto-resolution/Common/Tools/PID/handleParamTPCResponse.cxx
@@ -14,14 +14,19 @@
 /// \author Jeremy Wilkinson
 /// \brief exec for writing and reading TPC PID Response object
 
+#include "handleParamBase.h"
+
+#include "Common/Core/PID/TPCPIDResponse.h"
+
+#include "Algorithm/RangeTokenizer.h"
+
+#include "TFile.h"
+
+#include <boost/algorithm/string.hpp>
+
 #include <array>
 #include <fstream>
 #include <sstream>
-#include <boost/algorithm/string.hpp>
-#include "TFile.h"
-#include "Common/Core/PID/TPCPIDResponse.h"
-#include "handleParamBase.h"
-#include "Algorithm/RangeTokenizer.h"
 using namespace o2::pid::tpc;
 
 bool initOptionsAndParse(bpo::options_description& options, int argc, char* argv[])
diff --git a/.auto-resolution/Common/Tools/StandardCCDBLoader.h b/.auto-resolution/Common/Tools/StandardCCDBLoader.h
index 6ba4c9be9a1..ac9bc97a950 100644
--- a/.auto-resolution/Common/Tools/StandardCCDBLoader.h
+++ b/.auto-resolution/Common/Tools/StandardCCDBLoader.h
@@ -16,12 +16,13 @@
 #ifndef COMMON_TOOLS_STANDARDCCDBLOADER_H_
 #define COMMON_TOOLS_STANDARDCCDBLOADER_H_
 
-#include <string>
-#include <cstdlib>
-#include <cmath>
-#include <array>
 #include "Framework/AnalysisDataModel.h"
 
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <string>
+
 //__________________________________________
 // Standard class to load stuff
 // such as matLUT, B and mean Vertex
diff --git a/.auto-resolution/Common/Tools/TrackPropagationModule.h b/.auto-resolution/Common/Tools/TrackPropagationModule.h
index fb957a87b9d..edaf8130b3d 100644
--- a/.auto-resolution/Common/Tools/TrackPropagationModule.h
+++ b/.auto-resolution/Common/Tools/TrackPropagationModule.h
@@ -16,16 +16,19 @@
 #ifndef COMMON_TOOLS_TRACKPROPAGATIONMODULE_H_
 #define COMMON_TOOLS_TRACKPROPAGATIONMODULE_H_
 
-#include <memory>
-#include <cstdlib>
-#include <cmath>
-#include <array>
-#include <string>
+#include "TableHelper.h"
+
+#include "Common/Tools/TrackTuner.h"
+
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/Configurable.h"
 #include "Framework/HistogramSpec.h"
-#include "Common/Tools/TrackTuner.h"
-#include "TableHelper.h"
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <memory>
+#include <string>
 
 //__________________________________________
 // track propagation module
diff --git a/.auto-resolution/Common/Tools/TrackTuner.h b/.auto-resolution/Common/Tools/TrackTuner.h
index 26937eb9131..aa951a4802f 100644
--- a/.auto-resolution/Common/Tools/TrackTuner.h
+++ b/.auto-resolution/Common/Tools/TrackTuner.h
@@ -18,35 +18,38 @@
 #ifndef COMMON_TOOLS_TRACKTUNER_H_
 #define COMMON_TOOLS_TRACKTUNER_H_
 
-#include <map>
-#include <memory>
-#include <string>
-#include <utility>
-#include <vector>
-#include <algorithm>
-#include <numbers>
-#include <fmt/core.h>
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
 #include "CCDB/BasicCCDBManager.h"
 #include "CCDB/CcdbApi.h"
 #include "CommonConstants/GeomConstants.h"
-#include "Common/Core/trackUtilities.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "CommonUtils/NameConf.h"
 #include "DataFormatsCalibration/MeanVertexObject.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include "DetectorsBase/Propagator.h"
 #include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/Configurable.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/DCA.h"
 #include "ReconstructionDataFormats/Track.h"
+
 #include <TGraphErrors.h>
 
+#include <fmt/core.h>
+
+#include <algorithm>
+#include <map>
+#include <memory>
+#include <numbers>
+#include <string>
+#include <utility>
+#include <vector>
+
 namespace o2::aod
 {
 namespace track_tuner
diff --git a/.auto-resolution/Common/Tools/aodDataModelGraph.cxx b/.auto-resolution/Common/Tools/aodDataModelGraph.cxx
index da854a700f5..c051a5dccc3 100644
--- a/.auto-resolution/Common/Tools/aodDataModelGraph.cxx
+++ b/.auto-resolution/Common/Tools/aodDataModelGraph.cxx
@@ -9,19 +9,23 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <fmt/printf.h>
-#include <utility>
-#include <string>
-#include <cstdio>
-#include "Framework/AnalysisDataModel.h"
 #include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGJE/DataModel/Jet.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponseTOF.h"
 #include "Common/DataModel/PIDResponseTPC.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "PWGJE/DataModel/Jet.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Framework/AnalysisDataModel.h"
+
+#include <fmt/printf.h>
+
+#include <cstdio>
+#include <string>
+#include <utility>
 
 using namespace o2::framework;
 using namespace o2::aod;
diff --git a/.auto-resolution/Common/Tools/trackSelectionRequest.cxx b/.auto-resolution/Common/Tools/trackSelectionRequest.cxx
index ed82f1ff7bf..e9d2ebbeca7 100644
--- a/.auto-resolution/Common/Tools/trackSelectionRequest.cxx
+++ b/.auto-resolution/Common/Tools/trackSelectionRequest.cxx
@@ -12,7 +12,9 @@
 // see header for a more detailed description.
 
 #include "trackSelectionRequest.h"
+
 #include "Framework/Logger.h"
+
 #include <iostream>
 
 std::ostream& operator<<(std::ostream& os, trackSelectionRequest const& c)
diff --git a/.auto-resolution/Common/Tools/trackSelectionRequest.h b/.auto-resolution/Common/Tools/trackSelectionRequest.h
index 123392611f0..38f4026c1b3 100644
--- a/.auto-resolution/Common/Tools/trackSelectionRequest.h
+++ b/.auto-resolution/Common/Tools/trackSelectionRequest.h
@@ -24,10 +24,12 @@
 #ifndef TRACKSELECTIONREQUEST_H
 #define TRACKSELECTIONREQUEST_H
 
-#include <iosfwd>
-#include <Rtypes.h>
 #include <TMath.h>
 
+#include <Rtypes.h>
+
+#include <iosfwd>
+
 class trackSelectionRequest
 {
  public:
diff --git a/.auto-resolution/DPG/Tasks/AOTEvent/dEdxVsOccupancyWithTrackQAinfo.cxx b/.auto-resolution/DPG/Tasks/AOTEvent/dEdxVsOccupancyWithTrackQAinfo.cxx
index c87fd48bc99..a9e90a1b33a 100644
--- a/.auto-resolution/DPG/Tasks/AOTEvent/dEdxVsOccupancyWithTrackQAinfo.cxx
+++ b/.auto-resolution/DPG/Tasks/AOTEvent/dEdxVsOccupancyWithTrackQAinfo.cxx
@@ -14,31 +14,32 @@
 ///
 /// \author Igor Altsybeev <Igor.Altsybeev@cern.ch>
 
-#include <vector>
-#include <map>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/CCDB/EventSelectionParams.h"
 #include "Common/CCDB/ctpRateFetcher.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "Framework/HistogramRegistry.h"
-#include "CommonDataFormat/BunchFilling.h"
-#include "DataFormatsParameters/GRPLHCIFData.h"
-#include "DataFormatsParameters/GRPECSObject.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonDataFormat/BunchFilling.h"
 #include "DataFormatsParameters/AggregatedRunInfo.h"
+#include "DataFormatsParameters/GRPECSObject.h"
+#include "DataFormatsParameters/GRPLHCIFData.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 
 #include "TH1F.h"
 #include "TH2F.h"
 #include "TH3.h"
 
+#include <map>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::aod::evsel;
diff --git a/.auto-resolution/DPG/Tasks/AOTEvent/detectorOccupancyQa.cxx b/.auto-resolution/DPG/Tasks/AOTEvent/detectorOccupancyQa.cxx
index 123cbd0e442..ec133b1bcea 100644
--- a/.auto-resolution/DPG/Tasks/AOTEvent/detectorOccupancyQa.cxx
+++ b/.auto-resolution/DPG/Tasks/AOTEvent/detectorOccupancyQa.cxx
@@ -14,30 +14,31 @@
 ///
 /// \author Igor Altsybeev <Igor.Altsybeev@cern.ch>
 
-#include <vector>
-#include <map>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/CCDB/EventSelectionParams.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "Framework/HistogramRegistry.h"
-#include "CommonDataFormat/BunchFilling.h"
-#include "DataFormatsParameters/GRPLHCIFData.h"
-#include "DataFormatsParameters/GRPECSObject.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonDataFormat/BunchFilling.h"
 #include "DataFormatsParameters/AggregatedRunInfo.h"
+#include "DataFormatsParameters/GRPECSObject.h"
+#include "DataFormatsParameters/GRPLHCIFData.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 
 #include "TH1F.h"
 #include "TH2F.h"
 #include "TH3.h"
 
+#include <map>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::aod::evsel;
diff --git a/.auto-resolution/DPG/Tasks/AOTEvent/eventSelectionQa.cxx b/.auto-resolution/DPG/Tasks/AOTEvent/eventSelectionQa.cxx
index 52ec04b0f2e..216522f528c 100644
--- a/.auto-resolution/DPG/Tasks/AOTEvent/eventSelectionQa.cxx
+++ b/.auto-resolution/DPG/Tasks/AOTEvent/eventSelectionQa.cxx
@@ -14,31 +14,33 @@
 ///
 /// \author Evgeny Kryshen <evgeny.kryshen@cern.ch>
 
-#include <map>
-#include <vector>
-#include <string>
-#include <unordered_map>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/CCDB/EventSelectionParams.h"
+#include "Common/DataModel/EventSelection.h"
+
 #include "CCDB/BasicCCDBManager.h"
-#include "Framework/HistogramRegistry.h"
 #include "CommonDataFormat/BunchFilling.h"
-#include "DataFormatsParameters/GRPLHCIFData.h"
-#include "DataFormatsParameters/GRPECSObject.h"
-#include "DataFormatsParameters/AggregatedRunInfo.h"
 #include "DataFormatsITSMFT/NoiseMap.h" // missing include in TimeDeadMap.h
-#include "DataFormatsITSMFT/TimeDeadMap.h"
 #include "DataFormatsITSMFT/ROFRecord.h"
-#include "ReconstructionDataFormats/Vertex.h"
+#include "DataFormatsITSMFT/TimeDeadMap.h"
+#include "DataFormatsParameters/AggregatedRunInfo.h"
+#include "DataFormatsParameters/GRPECSObject.h"
+#include "DataFormatsParameters/GRPLHCIFData.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 #include "ITSMFTBase/DPLAlpideParam.h"
 #include "ITSMFTReconstruction/ChipMappingITS.h"
+#include "ReconstructionDataFormats/Vertex.h"
+
 #include "TH1F.h"
 #include "TH2F.h"
 
+#include <map>
+#include <string>
+#include <unordered_map>
+#include <vector>
+
 using namespace o2::framework;
 using namespace o2;
 using namespace o2::aod::evsel;
diff --git a/.auto-resolution/DPG/Tasks/AOTEvent/lumiQa.cxx b/.auto-resolution/DPG/Tasks/AOTEvent/lumiQa.cxx
index 254e58f0b67..6f27ce2cb31 100644
--- a/.auto-resolution/DPG/Tasks/AOTEvent/lumiQa.cxx
+++ b/.auto-resolution/DPG/Tasks/AOTEvent/lumiQa.cxx
@@ -9,15 +9,16 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "CCDB/BasicCCDBManager.h"
-#include "Framework/HistogramRegistry.h"
-#include "DataFormatsParameters/GRPLHCIFData.h"
 #include "DataFormatsFT0/Digit.h"
-#include "TList.h"
+#include "DataFormatsParameters/GRPLHCIFData.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TH1.h"
+#include "TList.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/DPG/Tasks/AOTEvent/matchingQa.cxx b/.auto-resolution/DPG/Tasks/AOTEvent/matchingQa.cxx
index 3b266f047e9..944db040d8c 100644
--- a/.auto-resolution/DPG/Tasks/AOTEvent/matchingQa.cxx
+++ b/.auto-resolution/DPG/Tasks/AOTEvent/matchingQa.cxx
@@ -9,14 +9,15 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
+#include "MetadataHelper.h"
+
 #include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsFT0/Digit.h"
 #include "DataFormatsParameters/GRPLHCIFData.h"
-#include "MetadataHelper.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/DPG/Tasks/AOTEvent/rofBorderQa.cxx b/.auto-resolution/DPG/Tasks/AOTEvent/rofBorderQa.cxx
index 83f704960b6..a2a071e9e0d 100644
--- a/.auto-resolution/DPG/Tasks/AOTEvent/rofBorderQa.cxx
+++ b/.auto-resolution/DPG/Tasks/AOTEvent/rofBorderQa.cxx
@@ -12,27 +12,26 @@
 /// \brief QA task to study ROF border effect for different event, track and particle selection parameters
 /// \author Igor Altsybeev, Igor.Altsybeev@cern.ch
 
-#include <iostream>
-#include <string>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
+#include "Common/CCDB/EventSelectionParams.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/FT0Corrected.h"
 #include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/CCDB/EventSelectionParams.h"
 
 #include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPObject.h"
+#include "DataFormatsFT0/Digit.h"
 #include "DataFormatsParameters/GRPECSObject.h"
 #include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
-#include "Common/DataModel/FT0Corrected.h"
-#include "DataFormatsFT0/Digit.h"
+#include <iostream>
+#include <string>
 
 using namespace std;
 using namespace o2;
diff --git a/.auto-resolution/DPG/Tasks/AOTEvent/rofOccupancyQa.cxx b/.auto-resolution/DPG/Tasks/AOTEvent/rofOccupancyQa.cxx
index cbc8d7d56d1..c2040ac3e6e 100644
--- a/.auto-resolution/DPG/Tasks/AOTEvent/rofOccupancyQa.cxx
+++ b/.auto-resolution/DPG/Tasks/AOTEvent/rofOccupancyQa.cxx
@@ -14,20 +14,21 @@
 ///
 /// \author Igor Altsybeev <Igor.Altsybeev@cern.ch>
 
-#include <vector>
-
-#include "Framework/ConfigParamSpec.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/CCDB/EventSelectionParams.h"
+#include "Common/DataModel/EventSelection.h"
+
 #include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/LHCConstants.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/ConfigParamSpec.h"
 #include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+
+#include <vector>
 // #include "DataFormatsParameters/GRPLHCIFData.h"
-#include "ITSMFTBase/DPLAlpideParam.h"
 #include "DataFormatsParameters/AggregatedRunInfo.h"
+#include "ITSMFTBase/DPLAlpideParam.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/DPG/Tasks/AOTEvent/timeDependentQa.cxx b/.auto-resolution/DPG/Tasks/AOTEvent/timeDependentQa.cxx
index 61fbb690e6c..497a2a4d986 100644
--- a/.auto-resolution/DPG/Tasks/AOTEvent/timeDependentQa.cxx
+++ b/.auto-resolution/DPG/Tasks/AOTEvent/timeDependentQa.cxx
@@ -14,27 +14,28 @@
 ///
 /// \author Evgeny Kryshen <evgeny.kryshen@cern.ch> and Igor Altsybeev <Igor.Altsybeev@cern.ch>
 
-#include <map>
-#include <vector>
-#include <string>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/CCDB/EventSelectionParams.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/CCDB/ctpRateFetcher.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "TPCCalibration/TPCMShapeCorrection.h"
-#include "DataFormatsParameters/AggregatedRunInfo.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsITSMFT/ROFRecord.h"
+#include "DataFormatsParameters/AggregatedRunInfo.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Vertex.h"
+#include "TPCCalibration/TPCMShapeCorrection.h"
 
 #include "TTree.h"
 
+#include <map>
+#include <string>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::aod::evsel;
diff --git a/.auto-resolution/DPG/Tasks/AOTTrack/MonitorFilterBit.cxx b/.auto-resolution/DPG/Tasks/AOTTrack/MonitorFilterBit.cxx
index b8fb6679b1c..5eed1a42ce0 100644
--- a/.auto-resolution/DPG/Tasks/AOTTrack/MonitorFilterBit.cxx
+++ b/.auto-resolution/DPG/Tasks/AOTTrack/MonitorFilterBit.cxx
@@ -15,12 +15,13 @@
 /// \brief Task performing basic checks on filter-bit selections.
 ///
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/Core/RecoDecay.h"
-#include "Framework/ASoAHelpers.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/DPG/Tasks/AOTTrack/PID/Combined/qaPIDWithV0s.cxx b/.auto-resolution/DPG/Tasks/AOTTrack/PID/Combined/qaPIDWithV0s.cxx
index 3f1ed2a8640..3bc6803d041 100644
--- a/.auto-resolution/DPG/Tasks/AOTTrack/PID/Combined/qaPIDWithV0s.cxx
+++ b/.auto-resolution/DPG/Tasks/AOTTrack/PID/Combined/qaPIDWithV0s.cxx
@@ -16,18 +16,20 @@
 /// \brief  Task to monitor the PID performance making use of V0s
 ///
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/DPG/Tasks/AOTTrack/PID/HMPID/analysisHMPID.cxx b/.auto-resolution/DPG/Tasks/AOTTrack/PID/HMPID/analysisHMPID.cxx
index c5a6b9d0597..6501fa74ed4 100644
--- a/.auto-resolution/DPG/Tasks/AOTTrack/PID/HMPID/analysisHMPID.cxx
+++ b/.auto-resolution/DPG/Tasks/AOTTrack/PID/HMPID/analysisHMPID.cxx
@@ -10,23 +10,24 @@
 // or submit itself to any jurisdiction.
 
 // O2 includes
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "ReconstructionDataFormats/TrackParametrization.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/Core/PID/PIDTOF.h"
-#include "Common/TableProducer/PID/pidTOFBase.h"
-#include "ReconstructionDataFormats/PID.h"
 #include "Common/Core/trackUtilities.h"
-#include "ReconstructionDataFormats/DCA.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/ASoA.h"
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/TableProducer/PID/pidTOFBase.h"
+
+#include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/DCA.h"
+#include "ReconstructionDataFormats/PID.h"
+#include "ReconstructionDataFormats/Track.h"
+#include "ReconstructionDataFormats/TrackParametrization.h"
 
 #include <TTree.h>
 
diff --git a/.auto-resolution/DPG/Tasks/AOTTrack/PID/HMPID/qaHMPID.cxx b/.auto-resolution/DPG/Tasks/AOTTrack/PID/HMPID/qaHMPID.cxx
index a4e01d6a980..b7e3da0df41 100644
--- a/.auto-resolution/DPG/Tasks/AOTTrack/PID/HMPID/qaHMPID.cxx
+++ b/.auto-resolution/DPG/Tasks/AOTTrack/PID/HMPID/qaHMPID.cxx
@@ -10,23 +10,24 @@
 // or submit itself to any jurisdiction.
 
 // O2 includes
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "ReconstructionDataFormats/TrackParametrization.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/Core/PID/PIDTOF.h"
-#include "Common/TableProducer/PID/pidTOFBase.h"
-#include "ReconstructionDataFormats/PID.h"
 #include "Common/Core/trackUtilities.h"
-#include "ReconstructionDataFormats/DCA.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/ASoA.h"
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/TableProducer/PID/pidTOFBase.h"
+
+#include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/DCA.h"
+#include "ReconstructionDataFormats/PID.h"
+#include "ReconstructionDataFormats/Track.h"
+#include "ReconstructionDataFormats/TrackParametrization.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFBeta.cxx b/.auto-resolution/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFBeta.cxx
index 60ad0a9ab38..7661990a12b 100644
--- a/.auto-resolution/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFBeta.cxx
+++ b/.auto-resolution/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFBeta.cxx
@@ -15,16 +15,17 @@
 /// \brief  Task to produce the TOF QA plots for Beta
 ///
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/StaticFor.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/FT0Corrected.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/TableProducer/PID/pidTOFBase.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.auto-resolution/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFBetaImp.cxx b/.auto-resolution/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFBetaImp.cxx
index f503ab1d92d..ad445323605 100644
--- a/.auto-resolution/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFBetaImp.cxx
+++ b/.auto-resolution/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFBetaImp.cxx
@@ -15,16 +15,17 @@
 /// \brief  Task to produce the TOF QA plots for Beta. Version using dynamic columns. Interim solution for test and benchmarking
 ///
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/StaticFor.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/FT0Corrected.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/TableProducer/PID/pidTOFBase.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.auto-resolution/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFEvTime.cxx b/.auto-resolution/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFEvTime.cxx
index 204bff837fb..2e57d875f3e 100644
--- a/.auto-resolution/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFEvTime.cxx
+++ b/.auto-resolution/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFEvTime.cxx
@@ -15,20 +15,21 @@
 /// \brief  Tasks of the TOF PID quantities for the event times
 ///
 
-#include "TEfficiency.h"
-#include "THashList.h"
-
-#include "Framework/HistogramRegistry.h"
-#include "Framework/StaticFor.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/FT0Corrected.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/TableProducer/PID/pidTOFBase.h"
-#include "Framework/runDataProcessing.h"
+
 #include "CommonConstants/LHCConstants.h"
 #include "DataFormatsFT0/Digit.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TEfficiency.h"
+#include "THashList.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFMC.cxx b/.auto-resolution/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFMC.cxx
index 73d1c72ad1e..8f35b228191 100644
--- a/.auto-resolution/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFMC.cxx
+++ b/.auto-resolution/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFMC.cxx
@@ -16,11 +16,12 @@
 ///
 
 // O2 includes
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/StaticFor.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Framework/runDataProcessing.h"
 
 using namespace o2;
diff --git a/.auto-resolution/DPG/Tasks/AOTTrack/PID/TPC/qaPIDTPC.cxx b/.auto-resolution/DPG/Tasks/AOTTrack/PID/TPC/qaPIDTPC.cxx
index 2794070498d..819b26a74c0 100644
--- a/.auto-resolution/DPG/Tasks/AOTTrack/PID/TPC/qaPIDTPC.cxx
+++ b/.auto-resolution/DPG/Tasks/AOTTrack/PID/TPC/qaPIDTPC.cxx
@@ -15,13 +15,14 @@
 /// \brief  Implementation for QA tasks of the TPC PID quantities
 ///
 
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/StaticFor.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/PIDResponse.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/DPG/Tasks/AOTTrack/PID/TPC/qaPIDTPCMC.cxx b/.auto-resolution/DPG/Tasks/AOTTrack/PID/TPC/qaPIDTPCMC.cxx
index 993c2f7b24c..a84e874af6f 100644
--- a/.auto-resolution/DPG/Tasks/AOTTrack/PID/TPC/qaPIDTPCMC.cxx
+++ b/.auto-resolution/DPG/Tasks/AOTTrack/PID/TPC/qaPIDTPCMC.cxx
@@ -16,10 +16,11 @@
 ///
 
 // O2 includes
+#include "Common/DataModel/PIDResponse.h"
+
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/StaticFor.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Framework/runDataProcessing.h"
 
 using namespace o2;
diff --git a/.auto-resolution/DPG/Tasks/AOTTrack/PID/TPC/qaPIDTPCSignal.cxx b/.auto-resolution/DPG/Tasks/AOTTrack/PID/TPC/qaPIDTPCSignal.cxx
index bf8492b8036..44e12f36e3a 100644
--- a/.auto-resolution/DPG/Tasks/AOTTrack/PID/TPC/qaPIDTPCSignal.cxx
+++ b/.auto-resolution/DPG/Tasks/AOTTrack/PID/TPC/qaPIDTPCSignal.cxx
@@ -16,12 +16,13 @@
 /// \brief  Implementation for QA tasks of the TPC signal (lite task, refer to qaPIDTPC.cxx for full TPC QA for PID)
 ///
 
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/StaticFor.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/DPG/Tasks/AOTTrack/V0Cascades/perfK0sResolution.cxx b/.auto-resolution/DPG/Tasks/AOTTrack/V0Cascades/perfK0sResolution.cxx
index 91effcc47b4..5a2a7aa0a21 100644
--- a/.auto-resolution/DPG/Tasks/AOTTrack/V0Cascades/perfK0sResolution.cxx
+++ b/.auto-resolution/DPG/Tasks/AOTTrack/V0Cascades/perfK0sResolution.cxx
@@ -9,22 +9,24 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <string>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "ReconstructionDataFormats/PID.h"
-#include "Common/Core/trackUtilities.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/Tools/TrackTuner.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/PID.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <string>
+
 using namespace o2;
 using namespace o2::track;
 using namespace o2::framework;
diff --git a/.auto-resolution/DPG/Tasks/AOTTrack/V0Cascades/qaCascades.cxx b/.auto-resolution/DPG/Tasks/AOTTrack/V0Cascades/qaCascades.cxx
index 4e42b50da2a..eed88c54dc2 100644
--- a/.auto-resolution/DPG/Tasks/AOTTrack/V0Cascades/qaCascades.cxx
+++ b/.auto-resolution/DPG/Tasks/AOTTrack/V0Cascades/qaCascades.cxx
@@ -16,20 +16,22 @@
 /// \brief  QA task for basic quantities on cascades
 ///
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/DPG/Tasks/AOTTrack/V0Cascades/qaEfficiencyV0s.cxx b/.auto-resolution/DPG/Tasks/AOTTrack/V0Cascades/qaEfficiencyV0s.cxx
index a728b252007..bf09dd8f6b0 100644
--- a/.auto-resolution/DPG/Tasks/AOTTrack/V0Cascades/qaEfficiencyV0s.cxx
+++ b/.auto-resolution/DPG/Tasks/AOTTrack/V0Cascades/qaEfficiencyV0s.cxx
@@ -18,22 +18,24 @@
 ///
 
 // O2 includes
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/DCA.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 
 // ROOT includes
-#include "TPDGCode.h"
 #include "TEfficiency.h"
 #include "THashList.h"
+#include "TPDGCode.h"
 
 using namespace o2::framework;
 static constexpr int nSpecies = 2; // One per PDG
diff --git a/.auto-resolution/DPG/Tasks/AOTTrack/V0Cascades/qaK0sTrackingEfficiency.cxx b/.auto-resolution/DPG/Tasks/AOTTrack/V0Cascades/qaK0sTrackingEfficiency.cxx
index 6ee7c4e7a5c..75189988459 100644
--- a/.auto-resolution/DPG/Tasks/AOTTrack/V0Cascades/qaK0sTrackingEfficiency.cxx
+++ b/.auto-resolution/DPG/Tasks/AOTTrack/V0Cascades/qaK0sTrackingEfficiency.cxx
@@ -9,18 +9,20 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/DPG/Tasks/AOTTrack/V0Cascades/qaLamMomResolution.cxx b/.auto-resolution/DPG/Tasks/AOTTrack/V0Cascades/qaLamMomResolution.cxx
index 9ee92d0a509..778ac59f79d 100644
--- a/.auto-resolution/DPG/Tasks/AOTTrack/V0Cascades/qaLamMomResolution.cxx
+++ b/.auto-resolution/DPG/Tasks/AOTTrack/V0Cascades/qaLamMomResolution.cxx
@@ -14,23 +14,26 @@
 /// \author Carolina Reetz c.reetz@cern.ch
 /// \brief  QA task to study momentum resolution of Lambda daughter tracks
 
-#include <string>
+#include "DPG/Tasks/AOTTrack/V0Cascades/qaLamMomResolution.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "ReconstructionDataFormats/PID.h"
-#include "Common/Core/trackUtilities.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "DPG/Tasks/AOTTrack/V0Cascades/qaLamMomResolution.h"
+
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/Tools/TrackTuner.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/PID.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <string>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
@@ -540,8 +543,8 @@ struct qaLamMomResolution {
             }
           }
         } // end Anti-Lambda
-      }   // end MC
-    }     // end V0 loop
+      } // end MC
+    } // end V0 loop
   }
   PROCESS_SWITCH(qaLamMomResolution, processMC, "Process MC", true);
 };
diff --git a/.auto-resolution/DPG/Tasks/AOTTrack/V0Cascades/qaLamMomResolution.h b/.auto-resolution/DPG/Tasks/AOTTrack/V0Cascades/qaLamMomResolution.h
index 603195404d4..67b8620ab6b 100644
--- a/.auto-resolution/DPG/Tasks/AOTTrack/V0Cascades/qaLamMomResolution.h
+++ b/.auto-resolution/DPG/Tasks/AOTTrack/V0Cascades/qaLamMomResolution.h
@@ -14,10 +14,11 @@
 #ifndef DPG_TASKS_AOTTRACK_V0CASCADES_QALAMMOMRESOLUTION_H_
 #define DPG_TASKS_AOTTRACK_V0CASCADES_QALAMMOMRESOLUTION_H_
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Common/Core/trackUtilities.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+
 namespace o2::aod
 {
 namespace qaLamMomResolution
diff --git a/.auto-resolution/DPG/Tasks/AOTTrack/qaDcaMC.cxx b/.auto-resolution/DPG/Tasks/AOTTrack/qaDcaMC.cxx
index 4054c59b33a..7e76026fed6 100644
--- a/.auto-resolution/DPG/Tasks/AOTTrack/qaDcaMC.cxx
+++ b/.auto-resolution/DPG/Tasks/AOTTrack/qaDcaMC.cxx
@@ -16,22 +16,24 @@
 ///
 
 // O2 includes
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/DCA.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
 
 // ROOT includes
-#include "TPDGCode.h"
 #include "TEfficiency.h"
 #include "THashList.h"
+#include "TPDGCode.h"
 
 using namespace o2::framework;
 
diff --git a/.auto-resolution/DPG/Tasks/AOTTrack/qaEfficiency.cxx b/.auto-resolution/DPG/Tasks/AOTTrack/qaEfficiency.cxx
index a55d205ed57..13703e3d92d 100644
--- a/.auto-resolution/DPG/Tasks/AOTTrack/qaEfficiency.cxx
+++ b/.auto-resolution/DPG/Tasks/AOTTrack/qaEfficiency.cxx
@@ -17,27 +17,29 @@
 ///
 
 // O2 includes
-#include <memory>
-#include <vector>
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/DCA.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
-#include "Common/Core/RecoDecay.h"
+
+#include <memory>
+#include <vector>
 
 // ROOT includes
-#include "TPDGCode.h"
 #include "TEfficiency.h"
 #include "THashList.h"
+#include "TPDGCode.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/DPG/Tasks/AOTTrack/qaEventTrack.cxx b/.auto-resolution/DPG/Tasks/AOTTrack/qaEventTrack.cxx
index 09590267ed8..8bc884208cb 100644
--- a/.auto-resolution/DPG/Tasks/AOTTrack/qaEventTrack.cxx
+++ b/.auto-resolution/DPG/Tasks/AOTTrack/qaEventTrack.cxx
@@ -23,19 +23,20 @@
 
 #include "qaEventTrack.h"
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "ReconstructionDataFormats/DCA.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/Core/TrackSelectionDefaults.h"
 #include "Common/TableProducer/PID/pidTOFBase.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/DCA.h"
+
 #include <string>
 #include <vector>
 
diff --git a/.auto-resolution/DPG/Tasks/AOTTrack/qaEventTrack.h b/.auto-resolution/DPG/Tasks/AOTTrack/qaEventTrack.h
index e2230e37c87..274ec3d1d31 100644
--- a/.auto-resolution/DPG/Tasks/AOTTrack/qaEventTrack.h
+++ b/.auto-resolution/DPG/Tasks/AOTTrack/qaEventTrack.h
@@ -17,10 +17,11 @@
 /// \brief  Header file for QA tasks for the track and the event properties.
 ///
 
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
 
 // Output table declaration
 namespace o2::aod
diff --git a/.auto-resolution/DPG/Tasks/AOTTrack/qaEventTrackLite.cxx b/.auto-resolution/DPG/Tasks/AOTTrack/qaEventTrackLite.cxx
index eecb5d7c240..a5d381960b9 100644
--- a/.auto-resolution/DPG/Tasks/AOTTrack/qaEventTrackLite.cxx
+++ b/.auto-resolution/DPG/Tasks/AOTTrack/qaEventTrackLite.cxx
@@ -20,17 +20,18 @@
 
 #include "qaEventTrack.h"
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisDataModel.h"
-#include "ReconstructionDataFormats/DCA.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/Core/TrackSelectionDefaults.h"
+
 #include "DataFormatsTPC/BetheBlochAleph.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/DCA.h"
 #include "ReconstructionDataFormats/PID.h"
 
 #include "TF1.h"
diff --git a/.auto-resolution/DPG/Tasks/AOTTrack/qaEventTrackLiteProducer.cxx b/.auto-resolution/DPG/Tasks/AOTTrack/qaEventTrackLiteProducer.cxx
index 0184d5b39f0..945f6ec08f1 100644
--- a/.auto-resolution/DPG/Tasks/AOTTrack/qaEventTrackLiteProducer.cxx
+++ b/.auto-resolution/DPG/Tasks/AOTTrack/qaEventTrackLiteProducer.cxx
@@ -19,22 +19,24 @@
 
 #include "qaEventTrack.h"
 
-#include <vector>
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/McCollisionExtra.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/TableProducer/PID/pidTOFBase.h"
 
-#include "TRandom.h"
+#include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisDataModel.h"
 #include "ReconstructionDataFormats/DCA.h"
-#include "Common/Core/trackUtilities.h"
-#include "Common/DataModel/McCollisionExtra.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/TableProducer/PID/pidTOFBase.h"
+
+#include "TRandom.h"
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/DPG/Tasks/AOTTrack/qaFakeHits.cxx b/.auto-resolution/DPG/Tasks/AOTTrack/qaFakeHits.cxx
index 1da3a6a6674..88a794770cc 100644
--- a/.auto-resolution/DPG/Tasks/AOTTrack/qaFakeHits.cxx
+++ b/.auto-resolution/DPG/Tasks/AOTTrack/qaFakeHits.cxx
@@ -17,17 +17,19 @@
 ///
 
 // O2 includes
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/DCA.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
 
 using namespace o2::framework;
 // Particle information
diff --git a/.auto-resolution/DPG/Tasks/AOTTrack/qaMatchEff.cxx b/.auto-resolution/DPG/Tasks/AOTTrack/qaMatchEff.cxx
index 704d3fa89ad..7b289d68de3 100644
--- a/.auto-resolution/DPG/Tasks/AOTTrack/qaMatchEff.cxx
+++ b/.auto-resolution/DPG/Tasks/AOTTrack/qaMatchEff.cxx
@@ -21,20 +21,21 @@
 //
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "CommonConstants/MathConstants.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "CommonConstants/MathConstants.h"
 //
 #include "Framework/AnalysisTask.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/runDataProcessing.h"
 //
+#include <set>
 #include <string>
 #include <vector>
-#include <set>
 //
 namespace extConfPar
 {
diff --git a/.auto-resolution/DPG/Tasks/AOTTrack/qaPrimVtxVsTime.cxx b/.auto-resolution/DPG/Tasks/AOTTrack/qaPrimVtxVsTime.cxx
index dd66692a4e2..1ac1b97b5c1 100644
--- a/.auto-resolution/DPG/Tasks/AOTTrack/qaPrimVtxVsTime.cxx
+++ b/.auto-resolution/DPG/Tasks/AOTTrack/qaPrimVtxVsTime.cxx
@@ -10,16 +10,18 @@
 // or submit itself to any jurisdiction.
 /// \author Mattia Faggin <mattia.faggin@cern.ch>, Padova University and INFN
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/CCDB/EventSelectionParams.h"
+#include "Common/DataModel/EventSelection.h"
+
 #include "CCDB/BasicCCDBManager.h"
-#include "Framework/HistogramRegistry.h"
 #include "CommonDataFormat/BunchFilling.h"
-#include "DataFormatsParameters/GRPLHCIFData.h"
 #include "DataFormatsParameters/GRPECSObject.h"
+#include "DataFormatsParameters/GRPLHCIFData.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TH1F.h"
 #include "TH2F.h"
 
diff --git a/.auto-resolution/DPG/Tasks/AOTTrack/qaSignChargeMC.cxx b/.auto-resolution/DPG/Tasks/AOTTrack/qaSignChargeMC.cxx
index e40dd0e76e9..d8ad1bf21bc 100644
--- a/.auto-resolution/DPG/Tasks/AOTTrack/qaSignChargeMC.cxx
+++ b/.auto-resolution/DPG/Tasks/AOTTrack/qaSignChargeMC.cxx
@@ -18,9 +18,9 @@
 
 // O2 includes
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2::framework;
 
diff --git a/.auto-resolution/DPG/Tasks/AOTTrack/qaTrackSelection.cxx b/.auto-resolution/DPG/Tasks/AOTTrack/qaTrackSelection.cxx
index f7ea3dd2f53..bf9f732d5c1 100644
--- a/.auto-resolution/DPG/Tasks/AOTTrack/qaTrackSelection.cxx
+++ b/.auto-resolution/DPG/Tasks/AOTTrack/qaTrackSelection.cxx
@@ -17,14 +17,15 @@
 ///
 
 // O2 includes
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/HistogramRegistry.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2::framework;
 
 struct QaTrackCuts {
diff --git a/.auto-resolution/DPG/Tasks/AOTTrack/qaTrackSplitting.cxx b/.auto-resolution/DPG/Tasks/AOTTrack/qaTrackSplitting.cxx
index 3125f1e7c03..c8abc81ae7e 100644
--- a/.auto-resolution/DPG/Tasks/AOTTrack/qaTrackSplitting.cxx
+++ b/.auto-resolution/DPG/Tasks/AOTTrack/qaTrackSplitting.cxx
@@ -15,13 +15,14 @@
 /// \brief  Task to analyse the numbers of particles reconstructed more than once
 ///
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/HistogramRegistry.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.auto-resolution/DPG/Tasks/FDD/qaFDD.cxx b/.auto-resolution/DPG/Tasks/FDD/qaFDD.cxx
index c985d7dbb9d..37914166c8e 100644
--- a/.auto-resolution/DPG/Tasks/FDD/qaFDD.cxx
+++ b/.auto-resolution/DPG/Tasks/FDD/qaFDD.cxx
@@ -9,19 +9,20 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Common/DataModel/EventSelection.h"
-#include "DataFormatsFDD/Digit.h"
-#include "DataFormatsFIT/Triggers.h"
 #include "Common/DataModel/FT0Corrected.h"
 
+#include "CCDB/BasicCCDBManager.h"
 #include "CCDB/CcdbApi.h"
 #include "CommonDataFormat/BunchFilling.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPObject.h"
+#include "DataFormatsFDD/Digit.h"
+#include "DataFormatsFIT/Triggers.h"
 #include "DataFormatsParameters/GRPLHCIFData.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TH1F.h"
 #include "TH2F.h"
 
diff --git a/.auto-resolution/DPG/Tasks/FT0/ft0AnalysisTask.cxx b/.auto-resolution/DPG/Tasks/FT0/ft0AnalysisTask.cxx
index a7d487fbdff..498847b65cd 100644
--- a/.auto-resolution/DPG/Tasks/FT0/ft0AnalysisTask.cxx
+++ b/.auto-resolution/DPG/Tasks/FT0/ft0AnalysisTask.cxx
@@ -9,19 +9,20 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <bitset>
-#include <map>
-#include <string>
-#include <numeric>
-
-#include "TH1.h"
-
 #include "Common/DataModel/EventSelection.h"
+
 #include "DataFormatsFT0/Digit.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
 
+#include "TH1.h"
+
+#include <bitset>
+#include <map>
+#include <numeric>
+#include <string>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::aod::evsel;
diff --git a/.auto-resolution/DPG/Tasks/FT0/qaFT0TrgBased.cxx b/.auto-resolution/DPG/Tasks/FT0/qaFT0TrgBased.cxx
index 35a2c2cc884..89bfed1dfe5 100644
--- a/.auto-resolution/DPG/Tasks/FT0/qaFT0TrgBased.cxx
+++ b/.auto-resolution/DPG/Tasks/FT0/qaFT0TrgBased.cxx
@@ -13,20 +13,13 @@
 /// \author Uliana Dmitrieva uliana.dmitrieva@cern.ch
 /// \brief  FT0 QA
 
-#include <bitset>
-#include <cstddef>
-#include <cstdint>
-#include <map>
-#include <string>
-#include <vector>
-
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/FT0Corrected.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "DataFormatsFT0/Digit.h"
 
 #include "CommonConstants/LHCConstants.h"
 #include "DataFormatsFIT/Triggers.h"
+#include "DataFormatsFT0/Digit.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
@@ -34,6 +27,13 @@
 #include "Framework/InitContext.h"
 #include "Framework/runDataProcessing.h"
 
+#include <bitset>
+#include <cstddef>
+#include <cstdint>
+#include <map>
+#include <string>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.auto-resolution/DPG/Tasks/FV0/qaFV0.cxx b/.auto-resolution/DPG/Tasks/FV0/qaFV0.cxx
index 295f981b0b7..fda2bc3b9c4 100644
--- a/.auto-resolution/DPG/Tasks/FV0/qaFV0.cxx
+++ b/.auto-resolution/DPG/Tasks/FV0/qaFV0.cxx
@@ -13,13 +13,6 @@
 /// \author Andreas Molander andreas.molander@cern.ch
 /// \brief  FV0 QA
 
-#include <bitset>
-#include <cstddef>
-#include <cstdint>
-#include <string>
-#include <map>
-#include <vector>
-
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
 
@@ -27,14 +20,21 @@
 #include "DataFormatsFIT/Triggers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/InitContext.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/HistogramSpec.h"
+#include "Framework/InitContext.h"
 #include "Framework/runDataProcessing.h"
 
 #include "TH1F.h"
 #include "TH2F.h"
 
+#include <bitset>
+#include <cstddef>
+#include <cstdint>
+#include <map>
+#include <string>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.auto-resolution/DPG/Tasks/ITS/itsImpParStudies.cxx b/.auto-resolution/DPG/Tasks/ITS/itsImpParStudies.cxx
index 67fba3b4989..6ed71d41aa5 100644
--- a/.auto-resolution/DPG/Tasks/ITS/itsImpParStudies.cxx
+++ b/.auto-resolution/DPG/Tasks/ITS/itsImpParStudies.cxx
@@ -10,33 +10,32 @@
 // or submit itself to any jurisdiction.
 /// \author Samuele Cattaruzzi <samuele.cattaruzzi@cern.ch>
 
-#include <string>
-
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "ReconstructionDataFormats/DCA.h"
+#include "Common/Core/TrackSelection.h"
 #include "Common/Core/trackUtilities.h" // for propagation to primary vertex
-
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "CommonUtils/NameConf.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Common/Core/TrackSelection.h"
-#include "DetectorsVertexing/PVertexer.h"
-#include "ReconstructionDataFormats/Vertex.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "Framework/RunningWorkflowInfo.h"
 #include "CCDB/CcdbApi.h"
-#include "DataFormatsCalibration/MeanVertexObject.h"
 #include "CommonConstants/GeomConstants.h"
+#include "CommonUtils/NameConf.h"
+#include "DataFormatsCalibration/MeanVertexObject.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "DetectorsVertexing/PVertexer.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "ReconstructionDataFormats/DCA.h"
+#include "ReconstructionDataFormats/Vertex.h"
 
 #include "iostream"
-#include "vector"
 #include "set"
+#include "vector"
+#include <string>
 
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.auto-resolution/DPG/Tasks/Monitor/MC/taskMcSimpleQC.cxx b/.auto-resolution/DPG/Tasks/Monitor/MC/taskMcSimpleQC.cxx
index 5f285fcc2b4..cb773c8beb2 100644
--- a/.auto-resolution/DPG/Tasks/Monitor/MC/taskMcSimpleQC.cxx
+++ b/.auto-resolution/DPG/Tasks/Monitor/MC/taskMcSimpleQC.cxx
@@ -12,12 +12,13 @@
 /// \brief Simple QC task to run
 /// \author Fabrizio Grosa, fabrizio.grosa@cern.ch (CERN)
 
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::aod;
@@ -36,7 +37,7 @@ struct mcSimpleQc {
       {"histNumGlobalTracks", ";#it{N}_{global tracks};entries", {HistType::kTH1F, {{200, -0.5, 200.}}}},                               //
       {"histNumPvContributors", ";#it{N}_{PV contributors};entries", {HistType::kTH1F, {{200, -0.5, 200.}}}},                           //
       {"histFracAmbiguousTracks", ";#it{N}_{ambiguous tracks} / #it{N}_{tracks};entries", {HistType::kTH1F, {{100, 0., 1.}}}}           //
-    }                                                                                                                                   //
+    } //
   };
 
   using CollisionsWithMCLabels = soa::Join<aod::Collisions, aod::McCollisionLabels>;
@@ -84,4 +85,5 @@ struct mcSimpleQc {
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
   return WorkflowSpec{adaptAnalysisTask<mcSimpleQc>(cfgc)};
-}
\ No newline at end of file
+}
+ 
\ No newline at end of file
diff --git a/.auto-resolution/DPG/Tasks/TOF/tofOfflineCalib.cxx b/.auto-resolution/DPG/Tasks/TOF/tofOfflineCalib.cxx
index ccfea13f1b1..cae7f462dec 100644
--- a/.auto-resolution/DPG/Tasks/TOF/tofOfflineCalib.cxx
+++ b/.auto-resolution/DPG/Tasks/TOF/tofOfflineCalib.cxx
@@ -16,15 +16,16 @@
 /// \brief  Task to produce calibration objects for the TOF. Based on AO2D or TOF skimmed data
 ///
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "tofSkimsTableCreator.h"
+
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/FT0Corrected.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "tofSkimsTableCreator.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/DPG/Tasks/TOF/tofSkimsTableCreator.cxx b/.auto-resolution/DPG/Tasks/TOF/tofSkimsTableCreator.cxx
index 1c2d1a79608..9b4ed496252 100644
--- a/.auto-resolution/DPG/Tasks/TOF/tofSkimsTableCreator.cxx
+++ b/.auto-resolution/DPG/Tasks/TOF/tofSkimsTableCreator.cxx
@@ -16,15 +16,16 @@
 /// \brief  Task to defined the skimmed data format for the TOF skims
 ///
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "tofSkimsTableCreator.h"
+
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/FT0Corrected.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "tofSkimsTableCreator.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/DPG/Tasks/TOF/tofSkimsTableCreator.h b/.auto-resolution/DPG/Tasks/TOF/tofSkimsTableCreator.h
index 4f0ec48ed06..aa79ae4cdf5 100644
--- a/.auto-resolution/DPG/Tasks/TOF/tofSkimsTableCreator.h
+++ b/.auto-resolution/DPG/Tasks/TOF/tofSkimsTableCreator.h
@@ -19,9 +19,10 @@
 #ifndef DPG_TASKS_TOF_TOFSKIMSTABLECREATOR_H_
 #define DPG_TASKS_TOF_TOFSKIMSTABLECREATOR_H_
 
-#include "Common/TableProducer/PID/pidTOFBase.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/FT0Corrected.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/TableProducer/PID/pidTOFBase.h"
+
 #include "Framework/AnalysisDataModel.h"
 
 namespace o2::aod
diff --git a/.auto-resolution/DPG/Tasks/TPC/tpcSkimsTableCreator.h b/.auto-resolution/DPG/Tasks/TPC/tpcSkimsTableCreator.h
index decb3a9de60..583e38efd32 100644
--- a/.auto-resolution/DPG/Tasks/TPC/tpcSkimsTableCreator.h
+++ b/.auto-resolution/DPG/Tasks/TPC/tpcSkimsTableCreator.h
@@ -19,11 +19,12 @@
 #ifndef DPG_TASKS_TPC_TPCSKIMSTABLECREATOR_H_
 #define DPG_TASKS_TPC_TPCSKIMSTABLECREATOR_H_
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/PIDResponse.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+
 namespace o2::aod
 {
 namespace tpcskims
diff --git a/.auto-resolution/DPG/Tasks/TPC/tpcTreeCreatorLight.cxx b/.auto-resolution/DPG/Tasks/TPC/tpcTreeCreatorLight.cxx
index 807c85ba414..d17d850a9da 100644
--- a/.auto-resolution/DPG/Tasks/TPC/tpcTreeCreatorLight.cxx
+++ b/.auto-resolution/DPG/Tasks/TPC/tpcTreeCreatorLight.cxx
@@ -17,7 +17,9 @@
 /// \author Jeremy Wilkinson <jeremy.wilkinson@cern.ch>
 
 #include "tpcTreeCreatorLight.h"
+
 #include <CCDB/BasicCCDBManager.h>
+
 #include <cmath>
 /// ROOT
 #include "TRandom3.h"
@@ -27,10 +29,10 @@
 #include "Framework/runDataProcessing.h"
 /// O2Physics
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
 
 using namespace o2;
 using namespace o2::framework;
@@ -197,8 +199,8 @@ struct TreeWriterTPCTOF {
       }
 
     } /// Loop tracks
-  }   /// process
-};    /// struct TreeWriterTPCTOF
+  } /// process
+}; /// struct TreeWriterTPCTOF
 
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
diff --git a/.auto-resolution/DPG/Tasks/TPC/tpcTreeCreatorLight.h b/.auto-resolution/DPG/Tasks/TPC/tpcTreeCreatorLight.h
index df02c1de1ec..f8d806da5da 100644
--- a/.auto-resolution/DPG/Tasks/TPC/tpcTreeCreatorLight.h
+++ b/.auto-resolution/DPG/Tasks/TPC/tpcTreeCreatorLight.h
@@ -17,11 +17,12 @@
 #ifndef DPG_TASKS_TPC_TPCTREECREATORLIGHT_H_
 #define DPG_TASKS_TPC_TPCTREECREATORLIGHT_H_
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/PIDResponse.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+
 enum ParticleSpecies {
   kPionTrack = BIT(0),
   kKaonTrack = BIT(1),
diff --git a/.auto-resolution/EventFiltering/PWGCF/CFFilter.cxx b/.auto-resolution/EventFiltering/PWGCF/CFFilter.cxx
index 7219ba03d45..30dbfe6f071 100644
--- a/.auto-resolution/EventFiltering/PWGCF/CFFilter.cxx
+++ b/.auto-resolution/EventFiltering/PWGCF/CFFilter.cxx
@@ -14,27 +14,27 @@
 ///
 /// \author Laura Serksnyte, TU München, laura.serksnyte@cern.ch
 
-#include <string>
-
-#include "../filterTables.h"
 #include "../../PWGCF/FemtoDream/FemtoUtils.h"
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/HistogramRegistry.h"
+#include "../filterTables.h"
 
 #include "PWGCF/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoDream/FemtoDreamParticleHisto.h"
+#include "PWGCF/FemtoDream/FemtoDreamContainer.h"
+#include "PWGCF/FemtoDream/FemtoDreamDetaDphiStar.h"
 #include "PWGCF/FemtoDream/FemtoDreamMath.h"
 #include "PWGCF/FemtoDream/FemtoDreamPairCleaner.h"
-#include "PWGCF/FemtoDream/FemtoDreamDetaDphiStar.h"
-#include "PWGCF/FemtoDream/FemtoDreamContainer.h"
+#include "PWGCF/FemtoDream/FemtoDreamParticleHisto.h"
 
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+
+#include <string>
+
 namespace
 {
 
diff --git a/.auto-resolution/EventFiltering/PWGCF/CFFilterAll.cxx b/.auto-resolution/EventFiltering/PWGCF/CFFilterAll.cxx
index efc7625b215..512c6d48f32 100644
--- a/.auto-resolution/EventFiltering/PWGCF/CFFilterAll.cxx
+++ b/.auto-resolution/EventFiltering/PWGCF/CFFilterAll.cxx
@@ -14,36 +14,36 @@
 ///
 /// \author Laura Serksnyte, TU München, laura.serksnyte@cern.ch; Anton Riedel, TU München, anton.riedel@cern.ch; Maximilian Korwieser, TU Munich, maximilian.korwieser@cern.ch
 
-#include <string>
-#include <vector>
-
 #include "../filterTables.h"
 
-#include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "DetectorsBase/Propagator.h"
+#include "PWGLF/Utils/strangenessBuilderHelper.h"
 
-#include "fairlogger/Logger.h"
+#include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/PIDResponseITS.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/Core/RecoDecay.h"
 
+#include "CCDB/BasicCCDBManager.h"
+#include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DetectorsBase/Propagator.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/Configurable.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
 
-#include "PWGLF/Utils/strangenessBuilderHelper.h"
-
 #include "Math/GenVector/Boost.h"
 #include "Math/Vector4D.h"
 #include "TMath.h"
 
+#include "fairlogger/Logger.h"
+
+#include <string>
+#include <vector>
+
 using namespace o2;
 using namespace o2::aod;
 using namespace o2::framework;
diff --git a/.auto-resolution/EventFiltering/PWGCF/CFFilterPPPhi.cxx b/.auto-resolution/EventFiltering/PWGCF/CFFilterPPPhi.cxx
index 623b5cb9086..1c849a7707b 100644
--- a/.auto-resolution/EventFiltering/PWGCF/CFFilterPPPhi.cxx
+++ b/.auto-resolution/EventFiltering/PWGCF/CFFilterPPPhi.cxx
@@ -14,29 +14,32 @@
 ///
 /// \author Anton Riedel, TU München, anton.riedel@cern.ch
 
-#include <Math/GenVector/Boost.h>
-#include <Math/Vector4D.h>
-#include <TMath.h>
-#include <iostream>
-#include <iterator>
-#include <string>
-
 #include "../filterTables.h"
 
-#include "Framework/Configurable.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonConstants/MathConstants.h"
+#include "DataFormatsTPC/BetheBlochAleph.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/Configurable.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
+
+#include <Math/GenVector/Boost.h>
+#include <Math/Vector4D.h>
+#include <TMath.h>
+
 #include "fairlogger/Logger.h"
-#include "CommonConstants/MathConstants.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "DataFormatsTPC/BetheBlochAleph.h"
+
+#include <iostream>
+#include <iterator>
+#include <string>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/EventFiltering/PWGCF/CFFilterQA.cxx b/.auto-resolution/EventFiltering/PWGCF/CFFilterQA.cxx
index 372b3387dc1..2108c7bc0d7 100644
--- a/.auto-resolution/EventFiltering/PWGCF/CFFilterQA.cxx
+++ b/.auto-resolution/EventFiltering/PWGCF/CFFilterQA.cxx
@@ -14,33 +14,36 @@
 ///
 /// \author Laura Serksnyte, TU München, laura.serksnyte@cern.ch; Anton Riedel, TU München, anton.riedel@cern.ch
 
-#include <Framework/Configurable.h>
-#include <Math/GenVector/Boost.h>
-#include <Math/Vector4D.h>
-#include <TMath.h>
-#include <cstdint>
-#include <iostream>
-#include <iterator>
-#include <string>
-
 #include "../filterTables.h"
 
-#include "Framework/ASoAHelpers.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
-#include "CommonConstants/MathConstants.h"
+#include "PWGCF/DataModel/FemtoDerived.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGCF/DataModel/FemtoDerived.h"
-#include "DataFormatsTPC/BetheBlochAleph.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
 #include "CCDB/CcdbApi.h"
+#include "CommonConstants/MathConstants.h"
+#include "DataFormatsTPC/BetheBlochAleph.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include <Framework/Configurable.h>
+
+#include <Math/GenVector/Boost.h>
+#include <Math/Vector4D.h>
+#include <TMath.h>
+
+#include <cstdint>
+#include <iostream>
+#include <iterator>
+#include <string>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/EventFiltering/PWGCF/CFFilterTwoN.cxx b/.auto-resolution/EventFiltering/PWGCF/CFFilterTwoN.cxx
index 2d2b64a1088..03d14a4713e 100644
--- a/.auto-resolution/EventFiltering/PWGCF/CFFilterTwoN.cxx
+++ b/.auto-resolution/EventFiltering/PWGCF/CFFilterTwoN.cxx
@@ -14,29 +14,28 @@
 ///
 /// \author Anton Riedel, TU München, anton.riedel@cern.ch
 
-#include <Framework/Configurable.h>
-#include <TMath.h>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/HistogramRegistry.h"
-
-#include "../filterTables.h"
 #include "../../PWGCF/FemtoDream/FemtoUtils.h"
+#include "../filterTables.h"
 
 #include "PWGCF/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoDream/FemtoDreamParticleHisto.h"
-#include "PWGCF/FemtoDream/FemtoDreamPairCleaner.h"
 #include "PWGCF/FemtoDream/FemtoDreamContainer.h"
+#include "PWGCF/FemtoDream/FemtoDreamDetaDphiStar.h"
 #include "PWGCF/FemtoDream/FemtoDreamMath.h"
 #include "PWGCF/FemtoDream/FemtoDreamPairCleaner.h"
-#include "PWGCF/FemtoDream/FemtoDreamDetaDphiStar.h"
-#include "PWGCF/FemtoDream/FemtoDreamContainer.h"
+#include "PWGCF/FemtoDream/FemtoDreamParticleHisto.h"
 
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
+
 #include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include <Framework/Configurable.h>
+
+#include <TMath.h>
 
 #include <vector>
 
diff --git a/.auto-resolution/EventFiltering/PWGEM/EMPhotonFilter.cxx b/.auto-resolution/EventFiltering/PWGEM/EMPhotonFilter.cxx
index a254c7245a1..119e36daa69 100644
--- a/.auto-resolution/EventFiltering/PWGEM/EMPhotonFilter.cxx
+++ b/.auto-resolution/EventFiltering/PWGEM/EMPhotonFilter.cxx
@@ -12,16 +12,19 @@
 // \brief software trigger for EM photon
 // \author daiki.sekihata@cern.ch
 
-#include "Math/Vector4D.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/CaloClusters.h"
-#include "DataFormatsPHOS/TriggerRecord.h"
 #include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+
+#include "Common/DataModel/CaloClusters.h"
 #include "EventFiltering/filterTables.h"
+
+#include "DataFormatsPHOS/TriggerRecord.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+
+#include "Math/Vector4D.h"
 
 using namespace o2;
 using namespace o2::soa;
diff --git a/.auto-resolution/EventFiltering/PWGEM/EMPhotonFilterQC.cxx b/.auto-resolution/EventFiltering/PWGEM/EMPhotonFilterQC.cxx
index de4d59f00da..d03bcd50908 100644
--- a/.auto-resolution/EventFiltering/PWGEM/EMPhotonFilterQC.cxx
+++ b/.auto-resolution/EventFiltering/PWGEM/EMPhotonFilterQC.cxx
@@ -12,18 +12,21 @@
 // \brief Quick QC task for CEFP for EM photon
 // \author daiki.sekihata@cern.ch
 
-#include "Math/Vector4D.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/CaloClusters.h"
-#include "DataFormatsPHOS/TriggerRecord.h"
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
 #include "PWGEM/PhotonMeson/Core/CutsLibrary.h"
+#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+
+#include "Common/DataModel/CaloClusters.h"
 #include "EventFiltering/filterTables.h"
+
+#include "DataFormatsPHOS/TriggerRecord.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+
+#include "Math/Vector4D.h"
 
 using namespace o2;
 using namespace o2::soa;
diff --git a/.auto-resolution/EventFiltering/PWGEM/HeavyNeutralMesonFilter.cxx b/.auto-resolution/EventFiltering/PWGEM/HeavyNeutralMesonFilter.cxx
index 6909d1561ee..46f86de11f0 100644
--- a/.auto-resolution/EventFiltering/PWGEM/HeavyNeutralMesonFilter.cxx
+++ b/.auto-resolution/EventFiltering/PWGEM/HeavyNeutralMesonFilter.cxx
@@ -16,32 +16,34 @@
 /// \author Nicolas Strangmann (nicolas.strangmann@cern.ch) - Goethe University Frankfurt; Maximilian Korwieser (maximilian.korwieser@cern.ch) - Technical University Munich
 ///
 
-#include <vector>
-#include <iterator>
-#include <string>
-
-#include "Math/GenVector/Boost.h"
-#include "Math/Vector4D.h"
-#include "TMath.h"
-#include "TRandom3.h"
-
 #include "PWGEM/PhotonMeson/Utils/HNMUtilities.h"
 #include "PWGJE/DataModel/EMCALMatchedCollisions.h"
 
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/PIDResponseITS.h"
-#include "fairlogger/Logger.h"
-#include "Framework/Configurable.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonConstants/MathConstants.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/Configurable.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
-#include "CommonConstants/MathConstants.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
+
+#include "Math/GenVector/Boost.h"
+#include "Math/Vector4D.h"
+#include "TMath.h"
+#include "TRandom3.h"
+
+#include "fairlogger/Logger.h"
+
+#include <iterator>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/EventFiltering/PWGHF/HFFilterPrepareMLSamples.cxx b/.auto-resolution/EventFiltering/PWGHF/HFFilterPrepareMLSamples.cxx
index b7a9637ba10..cfbcb6573da 100644
--- a/.auto-resolution/EventFiltering/PWGHF/HFFilterPrepareMLSamples.cxx
+++ b/.auto-resolution/EventFiltering/PWGHF/HFFilterPrepareMLSamples.cxx
@@ -28,8 +28,6 @@
 #include "Common/DataModel/PIDResponseTPC.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
-#include <onnxruntime_cxx_api.h>
-
 #include <CCDB/BasicCCDBManager.h>
 #include <CCDB/CcdbApi.h>
 #include <CommonConstants/PhysicsConstants.h>
@@ -46,6 +44,8 @@
 
 #include <TPDGCode.h>
 
+#include <onnxruntime_cxx_api.h>
+
 #include <Rtypes.h>
 
 #include <array>
diff --git a/.auto-resolution/EventFiltering/PWGJE/fullJetFilter.cxx b/.auto-resolution/EventFiltering/PWGJE/fullJetFilter.cxx
index 25096b7bb7a..d8d851fde88 100644
--- a/.auto-resolution/EventFiltering/PWGJE/fullJetFilter.cxx
+++ b/.auto-resolution/EventFiltering/PWGJE/fullJetFilter.cxx
@@ -12,35 +12,36 @@
 // Full Jet Filter
 // Author: Gijs van Weelden
 
-#include <array>
-#include <cmath>
-#include <string>
-#include <string_view>
-#include <TMath.h>
+#include "../filterTables.h"
 
-#include <boost/algorithm/string/case_conv.hpp>
+#include "PWGJE/Core/FastJetUtilities.h"
+#include "PWGJE/Core/JetFinder.h"
+#include "PWGJE/DataModel/EMCALClusters.h"
+#include "PWGJE/DataModel/Jet.h"
+
+#include "Common/CCDB/TriggerAliases.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
 #include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsCTP/Configuration.h"
 #include "EMCALBase/Geometry.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoA.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/CCDB/TriggerAliases.h"
+#include <TMath.h>
 
-#include "PWGJE/DataModel/Jet.h"
-#include "PWGJE/DataModel/EMCALClusters.h"
-#include "PWGJE/Core/JetFinder.h"
-#include "PWGJE/Core/FastJetUtilities.h"
+#include <boost/algorithm/string/case_conv.hpp>
 
-#include "../filterTables.h"
+#include <array>
+#include <cmath>
+#include <string>
+#include <string_view>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/EventFiltering/PWGJE/jetFilter.cxx b/.auto-resolution/EventFiltering/PWGJE/jetFilter.cxx
index 277f749d22b..d147a4a6849 100644
--- a/.auto-resolution/EventFiltering/PWGJE/jetFilter.cxx
+++ b/.auto-resolution/EventFiltering/PWGJE/jetFilter.cxx
@@ -11,32 +11,32 @@
 
 // Author: Filip Krizek
 
-#include <TMath.h>
-#include <cmath>
-#include <string>
-#include <vector>
+#include "../filterTables.h"
 
-#include "Framework/ASoA.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "ReconstructionDataFormats/Track.h"
+#include "PWGJE/Core/FastJetUtilities.h"
+#include "PWGJE/Core/JetBkgSubUtils.h"
+#include "PWGJE/Core/JetFinder.h"
+#include "PWGJE/DataModel/EMCALClusters.h"
+#include "PWGJE/DataModel/Jet.h"
 
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
-#include "PWGJE/Core/JetFinder.h"
-#include "PWGJE/Core/FastJetUtilities.h"
-#include "PWGJE/Core/JetBkgSubUtils.h"
-#include "PWGJE/DataModel/EMCALClusters.h"
-#include "PWGJE/DataModel/Jet.h"
+#include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
-#include "../filterTables.h"
+#include <TMath.h>
 
-#include "Framework/HistogramRegistry.h"
+#include <cmath>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/EventFiltering/PWGJE/jetHFFilter.cxx b/.auto-resolution/EventFiltering/PWGJE/jetHFFilter.cxx
index 6657e785751..61f627256c5 100644
--- a/.auto-resolution/EventFiltering/PWGJE/jetHFFilter.cxx
+++ b/.auto-resolution/EventFiltering/PWGJE/jetHFFilter.cxx
@@ -11,31 +11,31 @@
 
 // Author: Nima Zardoshti
 
-#include <TMath.h>
-#include <cmath>
-#include <string>
+#include "../filterTables.h"
 
-#include "Framework/ASoA.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "ReconstructionDataFormats/Track.h"
+#include "PWGJE/Core/FastJetUtilities.h"
+#include "PWGJE/Core/JetBkgSubUtils.h"
+#include "PWGJE/Core/JetFinder.h"
+#include "PWGJE/DataModel/EMCALClusters.h"
+#include "PWGJE/DataModel/Jet.h"
 
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
-#include "PWGJE/Core/JetFinder.h"
-#include "PWGJE/Core/FastJetUtilities.h"
-#include "PWGJE/Core/JetBkgSubUtils.h"
-#include "PWGJE/DataModel/EMCALClusters.h"
-#include "PWGJE/DataModel/Jet.h"
+#include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
-#include "../filterTables.h"
+#include <TMath.h>
 
-#include "Framework/HistogramRegistry.h"
+#include <cmath>
+#include <string>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/EventFiltering/PWGLF/filterdoublephi.cxx b/.auto-resolution/EventFiltering/PWGLF/filterdoublephi.cxx
index 0ee9f34b535..5b92f2ff092 100644
--- a/.auto-resolution/EventFiltering/PWGLF/filterdoublephi.cxx
+++ b/.auto-resolution/EventFiltering/PWGLF/filterdoublephi.cxx
@@ -14,37 +14,41 @@
 ///
 /// \author Sourav Kundu, sourav.kundu@cern.ch
 
+#include "../filterTables.h"
+
+#include "PWGLF/DataModel/ReducedDoublePhiTables.h"
+
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/PIDResponseITS.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
+#include "CommonConstants/MathConstants.h"
+#include "DataFormatsTPC/BetheBlochAleph.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 #include <Framework/Configurable.h>
+
 #include <Math/GenVector/Boost.h>
 #include <Math/Vector4D.h>
+#include <TDatabasePDG.h> // FIXME
 #include <TMath.h>
+#include <TPDGCode.h> // FIXME
+
 #include <fairlogger/Logger.h>
-#include <TDatabasePDG.h> // FIXME
-#include <TPDGCode.h>     // FIXME
 
 #include <iostream>
 #include <iterator>
 #include <string>
 #include <vector>
 
-#include "../filterTables.h"
-#include "PWGLF/DataModel/ReducedDoublePhiTables.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
-#include "CommonConstants/MathConstants.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "DataFormatsTPC/BetheBlochAleph.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "CCDB/CcdbApi.h"
-#include "Common/DataModel/PIDResponseITS.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.auto-resolution/EventFiltering/PWGLF/filterf1proton.cxx b/.auto-resolution/EventFiltering/PWGLF/filterf1proton.cxx
index abdfe9c272a..4a679fc22b8 100644
--- a/.auto-resolution/EventFiltering/PWGLF/filterf1proton.cxx
+++ b/.auto-resolution/EventFiltering/PWGLF/filterf1proton.cxx
@@ -14,43 +14,48 @@
 ///
 /// \author Sourav Kundu, sourav.kundu@cern.ch
 
+#include "../filterTables.h"
+
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/Utils/strangenessBuilderHelper.h"
+
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
+#include "CommonConstants/MathConstants.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DataFormatsTPC/BetheBlochAleph.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+#include "ReconstructionDataFormats/TrackParametrization.h"
 #include <Framework/Configurable.h>
+
 #include <Math/GenVector/Boost.h>
 #include <Math/Vector4D.h>
 #include <TLorentzVector.h>
 #include <TMath.h>
+
 #include <fairlogger/Logger.h>
+
 #include <iostream>
 #include <iterator>
 #include <string>
 #include <vector>
 
-#include "DataFormatsParameters/GRPMagField.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "ReconstructionDataFormats/TrackParametrization.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "../filterTables.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
-#include "CommonConstants/MathConstants.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/Utils/strangenessBuilderHelper.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "DataFormatsTPC/BetheBlochAleph.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "CCDB/CcdbApi.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.auto-resolution/EventFiltering/PWGLF/nucleiFilter.cxx b/.auto-resolution/EventFiltering/PWGLF/nucleiFilter.cxx
index 54f3ed507ad..bd82fd3c2f8 100644
--- a/.auto-resolution/EventFiltering/PWGLF/nucleiFilter.cxx
+++ b/.auto-resolution/EventFiltering/PWGLF/nucleiFilter.cxx
@@ -10,37 +10,38 @@
 // or submit itself to any jurisdiction.
 // O2 includes
 
-#include <cmath>
-#include <string>
+#include "../filterTables.h"
 
-#include "Math/Vector4D.h"
-#include "Math/GenVector/Boost.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/DataModel/Vtx3BodyTables.h"
+#include "PWGLF/DataModel/pidTOFGeneric.h"
+
+#include "Common/Core/PID/PIDTOF.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DataFormatsTOF/ParameterContainers.h"
 #include "DataFormatsTPC/BetheBlochAleph.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
 
-#include "PWGLF/DataModel/Vtx3BodyTables.h"
-#include "../filterTables.h"
+#include "Math/GenVector/Boost.h"
+#include "Math/Vector4D.h"
 
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/trackUtilities.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "DataFormatsTOF/ParameterContainers.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "PWGLF/DataModel/pidTOFGeneric.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "Common/Core/PID/PIDTOF.h"
+#include <cmath>
+#include <string>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/EventFiltering/PWGLF/strangenessFilter.cxx b/.auto-resolution/EventFiltering/PWGLF/strangenessFilter.cxx
index ceabf8eddfb..e54fb617c1a 100644
--- a/.auto-resolution/EventFiltering/PWGLF/strangenessFilter.cxx
+++ b/.auto-resolution/EventFiltering/PWGLF/strangenessFilter.cxx
@@ -14,32 +14,37 @@
 /// \author Francesca Ercolessi (francesca.ercolessi@cern.ch)
 /// \since June 1, 2021
 
-#include <cmath>
-#include "TVector3.h"
+#include "../filterTables.h"
+
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/Utils/strangenessBuilderHelper.h"
+
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "DCAFitter/DCAFitterN.h"
 #include "DataFormatsParameters/GRPMagField.h"
 #include "DataFormatsParameters/GRPObject.h"
-#include "DCAFitter/DCAFitterN.h"
 #include "DetectorsBase/Propagator.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
 #include "ReconstructionDataFormats/TrackParametrization.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "../filterTables.h"
-#include "PWGLF/Utils/strangenessBuilderHelper.h"
+
+#include "TVector3.h"
+
+#include <cmath>
 
 using namespace o2;
 using namespace o2::framework;
@@ -778,7 +783,7 @@ struct strangenessFilter {
     }
 
     for (auto& casc : cascadesBase) { // loop over cascades
-      hCandidate->Fill(0.5); // All candidates
+      hCandidate->Fill(0.5);          // All candidates
 
       const auto bachTrack = casc.bachelor_as<TrackCandidates>();
       const auto v0Dau = casc.v0_as<o2::aod::V0s>();
diff --git a/.auto-resolution/EventFiltering/PWGUD/diffractionBCFilter.cxx b/.auto-resolution/EventFiltering/PWGUD/diffractionBCFilter.cxx
index c6ce85ec845..d07fe3c0948 100644
--- a/.auto-resolution/EventFiltering/PWGUD/diffractionBCFilter.cxx
+++ b/.auto-resolution/EventFiltering/PWGUD/diffractionBCFilter.cxx
@@ -14,13 +14,15 @@
 // \author P. Buehler, paul.buehler@oeaw.ac.at
 // \since December, 2022
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "PWGUD/TableProducer/DGBCCandProducer.h"
+#include "../filterTables.h"
+
 #include "PWGUD/Core/DGCutparHolder.h"
 #include "PWGUD/Core/DGSelector.h"
 #include "PWGUD/Core/UDHelpers.h"
-#include "../filterTables.h"
+#include "PWGUD/TableProducer/DGBCCandProducer.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/EventFiltering/PWGUD/diffractionFilter.cxx b/.auto-resolution/EventFiltering/PWGUD/diffractionFilter.cxx
index c5adfcf90c5..07bbf115535 100644
--- a/.auto-resolution/EventFiltering/PWGUD/diffractionFilter.cxx
+++ b/.auto-resolution/EventFiltering/PWGUD/diffractionFilter.cxx
@@ -14,14 +14,17 @@
 // \author P. Buehler, paul.buehler@oeaw.ac.at
 // \since June 1, 2021
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/StaticFor.h"
-#include "Common/DataModel/EventSelection.h"
+#include "../filterTables.h"
+
 #include "PWGUD/Core/DGCutparHolder.h"
 #include "PWGUD/Core/DGSelector.h"
 #include "PWGUD/Core/UDHelpers.h"
-#include "../filterTables.h"
+
+#include "Common/DataModel/EventSelection.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/EventFiltering/cefpTask.cxx b/.auto-resolution/EventFiltering/cefpTask.cxx
index 64cf4435b85..584c8292903 100644
--- a/.auto-resolution/EventFiltering/cefpTask.cxx
+++ b/.auto-resolution/EventFiltering/cefpTask.cxx
@@ -10,6 +10,19 @@
 // or submit itself to any jurisdiction.
 // O2 includes
 
+#include "filterTables.h"
+
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonConstants/LHCConstants.h"
+#include "CommonDataFormat/InteractionRecord.h"
+#include "DataFormatsCTP/Scalers.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+
 #include <fmt/format.h>
 #include <rapidjson/document.h>
 #include <rapidjson/filereadstream.h>
@@ -18,21 +31,9 @@
 #include <random>
 #include <string>
 #include <string_view>
-#include <vector>
 #include <unordered_map>
 #include <utility>
-
-#include "filterTables.h"
-
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/HistogramRegistry.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "CommonConstants/LHCConstants.h"
-#include "CommonDataFormat/InteractionRecord.h"
-#include "DataFormatsCTP/Scalers.h"
+#include <vector>
 
 // we need to add workflow options before including Framework/runDataProcessing
 void customize(std::vector<o2::framework::ConfigParamSpec>& workflowOptions)
diff --git a/.auto-resolution/EventFiltering/filterTables.h b/.auto-resolution/EventFiltering/filterTables.h
index 1371d152e75..1ae7472fea6 100644
--- a/.auto-resolution/EventFiltering/filterTables.h
+++ b/.auto-resolution/EventFiltering/filterTables.h
@@ -12,10 +12,10 @@
 #define EVENTFILTERING_FILTERTABLES_H_
 
 #include <array>
-#include <unordered_map>
+#include <cstdint>
 #include <string>
+#include <unordered_map>
 #include <vector>
-#include <cstdint>
 
 namespace o2::aod
 {
diff --git a/.auto-resolution/EventFiltering/macros/checkBCRange.C b/.auto-resolution/EventFiltering/macros/checkBCRange.C
index 9bcc14981f4..76bdab016b0 100644
--- a/.auto-resolution/EventFiltering/macros/checkBCRange.C
+++ b/.auto-resolution/EventFiltering/macros/checkBCRange.C
@@ -10,12 +10,13 @@
 // or submit itself to any jurisdiction.
 // O2 includes
 
-#include <iostream>
+#include "CommonDataFormat/IRFrame.h"
+#include "CommonDataFormat/InteractionRecord.h"
+
 #include <TFile.h>
 #include <TTree.h>
 
-#include "CommonDataFormat/InteractionRecord.h"
-#include "CommonDataFormat/IRFrame.h"
+#include <iostream>
 
 using o2::InteractionRecord;
 using o2::dataformats::IRFrame;
diff --git a/.auto-resolution/EventFiltering/macros/checkBCrangesSkimming.C b/.auto-resolution/EventFiltering/macros/checkBCrangesSkimming.C
index f71212238c3..078aac59999 100644
--- a/.auto-resolution/EventFiltering/macros/checkBCrangesSkimming.C
+++ b/.auto-resolution/EventFiltering/macros/checkBCrangesSkimming.C
@@ -10,16 +10,18 @@
 // or submit itself to any jurisdiction.
 // O2 includes
 
-#include <cmath>
-#include <vector>
-#include <regex>
-#include <iostream>
+#include "CommonDataFormat/IRFrame.h"
+#include "CommonDataFormat/InteractionRecord.h"
+
 #include <TFile.h>
 #include <TGrid.h>
 #include <TH1.h>
 #include <TTree.h>
-#include "CommonDataFormat/InteractionRecord.h"
-#include "CommonDataFormat/IRFrame.h"
+
+#include <cmath>
+#include <iostream>
+#include <regex>
+#include <vector>
 
 using o2::InteractionRecord;
 using o2::dataformats::IRFrame;
diff --git a/.auto-resolution/EventFiltering/macros/checkSkimming.C b/.auto-resolution/EventFiltering/macros/checkSkimming.C
index 5496f303873..d7888dbd43e 100644
--- a/.auto-resolution/EventFiltering/macros/checkSkimming.C
+++ b/.auto-resolution/EventFiltering/macros/checkSkimming.C
@@ -10,15 +10,15 @@
 // or submit itself to any jurisdiction.
 
 #include <TCanvas.h>
-#include <TH1.h>
 #include <TFile.h>
+#include <TH1.h>
 #include <TStyle.h>
 
 #include <fstream>
 #include <iostream>
-#include <vector>
-#include <string>
 #include <regex>
+#include <string>
+#include <vector>
 
 void checkSkimming(std::string original_path = "AnalysisResults.root", std::string skimmed_path = "AnalysisResults_skimmed.root", TFile* outputFile = nullptr, bool skipDownscaled = true)
 {
@@ -129,4 +129,5 @@ void checkSkimming(std::string listName = "period.txt", bool skipDownscaled = tr
     counter++;
   }
   outputFile->Close();
-}
\ No newline at end of file
+}
+ 
\ No newline at end of file
diff --git a/.auto-resolution/EventFiltering/macros/splitFile.C b/.auto-resolution/EventFiltering/macros/splitFile.C
index b38149dca42..51da9f1aae7 100644
--- a/.auto-resolution/EventFiltering/macros/splitFile.C
+++ b/.auto-resolution/EventFiltering/macros/splitFile.C
@@ -10,12 +10,13 @@
 // or submit itself to any jurisdiction.
 // O2 includes
 
-#include <iostream>
-#include <string>
-#include "TFile.h"
 #include "TDirectory.h"
+#include "TFile.h"
 #include "TTree.h"
 
+#include <iostream>
+#include <string>
+
 void splitFile(const char* inputFileName = "bcSelection.root", const char* outputFileName1 = "bcRanges.root")
 {
   // Open the input ROOT file
diff --git a/.auto-resolution/EventFiltering/macros/uploadOTSobjects.C b/.auto-resolution/EventFiltering/macros/uploadOTSobjects.C
index 2a9be2de17e..0e950545aaf 100644
--- a/.auto-resolution/EventFiltering/macros/uploadOTSobjects.C
+++ b/.auto-resolution/EventFiltering/macros/uploadOTSobjects.C
@@ -10,13 +10,10 @@
 // or submit itself to any jurisdiction.
 //
 
-#include <fstream>
-#include <iostream>
-#include <vector>
-#include <string>
-#include <map>
-#include <array>
-#include <cmath>
+#include "EventFiltering/ZorroHelper.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonConstants/LHCConstants.h"
 
 #include "TFile.h"
 #include "TGrid.h"
@@ -25,9 +22,13 @@
 #include "TSystem.h"
 #include "TTree.h"
 
-#include "CCDB/BasicCCDBManager.h"
-#include "EventFiltering/ZorroHelper.h"
-#include "CommonConstants/LHCConstants.h"
+#include <array>
+#include <cmath>
+#include <fstream>
+#include <iostream>
+#include <map>
+#include <string>
+#include <vector>
 
 constexpr uint32_t chunkSize = 1000000;
 
diff --git a/.auto-resolution/EventFiltering/selectBCRange.cxx b/.auto-resolution/EventFiltering/selectBCRange.cxx
index 8a2d200e8e6..99261d38b4a 100644
--- a/.auto-resolution/EventFiltering/selectBCRange.cxx
+++ b/.auto-resolution/EventFiltering/selectBCRange.cxx
@@ -9,16 +9,17 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
+#include "filterTables.h"
+
 #include "Common/DataModel/EventSelection.h"
+
 #include "CommonConstants/LHCConstants.h"
-#include "CommonDataFormat/InteractionRecord.h"
 #include "CommonDataFormat/IRFrame.h"
+#include "CommonDataFormat/InteractionRecord.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/Logger.h"
 #include "Framework/runDataProcessing.h"
 
-#include "filterTables.h"
-
 using namespace o2;
 using namespace o2::framework;
 using o2::dataformats::IRFrame;
diff --git a/.auto-resolution/PWGCF/Core/AnalysisConfigurableCuts.h b/.auto-resolution/PWGCF/Core/AnalysisConfigurableCuts.h
index 886d78c95fe..65288471902 100644
--- a/.auto-resolution/PWGCF/Core/AnalysisConfigurableCuts.h
+++ b/.auto-resolution/PWGCF/Core/AnalysisConfigurableCuts.h
@@ -11,12 +11,14 @@
 #ifndef PWGCF_CORE_ANALYSISCONFIGURABLECUTS_H_
 #define PWGCF_CORE_ANALYSISCONFIGURABLECUTS_H_
 
+#include <TMath.h>
+#include <TNamed.h>
+#include <TObject.h>
+
+#include <Rtypes.h>
+
 #include <string>
 #include <vector>
-#include <Rtypes.h>
-#include <TObject.h>
-#include <TNamed.h>
-#include <TMath.h>
 
 namespace o2
 {
diff --git a/.auto-resolution/PWGCF/Core/CorrelationContainer.cxx b/.auto-resolution/PWGCF/Core/CorrelationContainer.cxx
index 1421288bd18..9ef399d2acb 100644
--- a/.auto-resolution/PWGCF/Core/CorrelationContainer.cxx
+++ b/.auto-resolution/PWGCF/Core/CorrelationContainer.cxx
@@ -15,20 +15,22 @@
 // Author: Jan Fiete Grosse-Oetringhaus
 
 #include "PWGCF/Core/CorrelationContainer.h"
-#include "Framework/StepTHn.h"
+
+#include "CommonConstants/MathConstants.h"
+#include "Framework/HistogramSpec.h"
 #include "Framework/Logger.h"
-#include "THnSparse.h"
-#include "TMath.h"
-#include "TList.h"
+#include "Framework/StepTHn.h"
+
+#include "TCanvas.h"
 #include "TCollection.h"
+#include "TF1.h"
 #include "TH1D.h"
 #include "TH2D.h"
 #include "TH3D.h"
-#include "TCanvas.h"
-#include "TF1.h"
 #include "THn.h"
-#include "Framework/HistogramSpec.h"
-#include "CommonConstants/MathConstants.h"
+#include "THnSparse.h"
+#include "TList.h"
+#include "TMath.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGCF/Core/CorrelationContainer.h b/.auto-resolution/PWGCF/Core/CorrelationContainer.h
index b037b7d7ad4..7d30c042de0 100644
--- a/.auto-resolution/PWGCF/Core/CorrelationContainer.h
+++ b/.auto-resolution/PWGCF/Core/CorrelationContainer.h
@@ -14,9 +14,10 @@
 
 // encapsulate histogram and corrections for correlation analysis
 
+#include "Framework/HistogramSpec.h"
+
 #include "TNamed.h"
 #include "TString.h"
-#include "Framework/HistogramSpec.h"
 
 class TH1;
 class TH1F;
diff --git a/.auto-resolution/PWGCF/Core/PairCuts.h b/.auto-resolution/PWGCF/Core/PairCuts.h
index b90094f30e2..a65647f1d65 100644
--- a/.auto-resolution/PWGCF/Core/PairCuts.h
+++ b/.auto-resolution/PWGCF/Core/PairCuts.h
@@ -12,11 +12,11 @@
 #ifndef O2_ANALYSIS_PAIRCUTS_H
 #define O2_ANALYSIS_PAIRCUTS_H
 
-#include <cmath>
-
-#include "Framework/Logger.h"
-#include "Framework/HistogramRegistry.h"
 #include "CommonConstants/MathConstants.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/Logger.h"
+
+#include <cmath>
 
 // Functions which cut on particle pairs (decays, conversions, two-track cuts)
 //
@@ -147,7 +147,7 @@ bool PairCuts::twoTrackCut(T const& track1, T const& track2, int magField)
       }
 
       if (dphistarminabs < mTwoTrackDistance && std::fabs(deta) < mTwoTrackDistance) {
-        //LOGF(debug, "Removed track pair %ld %ld with %f %f %f %f %d %f %f %d %d", track1.index(), track2.index(), deta, dphistarminabs, track1.phi2(), track1.pt(), track1.sign(), track2.phi2(), track2.pt(), track2.sign(), magField);
+        // LOGF(debug, "Removed track pair %ld %ld with %f %f %f %f %d %f %f %d %d", track1.index(), track2.index(), deta, dphistarminabs, track1.phi2(), track1.pt(), track1.sign(), track2.phi2(), track2.pt(), track2.sign(), magField);
         return true;
       }
 
@@ -163,7 +163,7 @@ bool PairCuts::twoTrackCut(T const& track1, T const& track2, int magField)
 template <typename T>
 bool PairCuts::conversionCut(T const& track1, T const& track2, Particle conv, double cut)
 {
-  //LOGF(info, "pt is %f %f", track1.pt(), track2.pt());
+  // LOGF(info, "pt is %f %f", track1.pt(), track2.pt());
 
   if (cut < 0) {
     return false;
@@ -304,7 +304,7 @@ double PairCuts::getInvMassSquaredFast(T const& track1, double m0_1, T const& tr
 
   double mass2 = m0_1 * m0_1 + m0_2 * m0_2 + 2.0f * (std::sqrt(e1squ * e2squ) - (pt1 * pt2 * (cosDeltaPhi + 1.0f / tantheta1 / tantheta2)));
 
-  //LOGF(debug, "%f %f %f %f %f %f %f %f %f", pt1, eta1, phi1, pt2, eta2, phi2, m0_1, m0_2, mass2);
+  // LOGF(debug, "%f %f %f %f %f %f %f %f %f", pt1, eta1, phi1, pt2, eta2, phi2, m0_1, m0_2, mass2);
 
   return mass2;
 }
diff --git a/.auto-resolution/PWGCF/DataModel/FemtoDerived.h b/.auto-resolution/PWGCF/DataModel/FemtoDerived.h
index 4caf0166303..7e916d543ff 100644
--- a/.auto-resolution/PWGCF/DataModel/FemtoDerived.h
+++ b/.auto-resolution/PWGCF/DataModel/FemtoDerived.h
@@ -12,18 +12,21 @@
 #ifndef PWGCF_DATAMODEL_FEMTODERIVED_H_
 #define PWGCF_DATAMODEL_FEMTODERIVED_H_
 
-#include <cmath>
-#include "Framework/ASoA.h"
-#include "MathUtils/Utils.h"
-#include "Framework/DataTypes.h"
 #include "PWGHF/Core/HfHelper.h"
 #include "PWGHF/DataModel/CandidateReconstructionTables.h"
 #include "PWGHF/DataModel/CandidateSelectionTables.h"
+
 #include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoA.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/DataTypes.h"
 #include "Framework/Expressions.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
+#include "MathUtils/Utils.h"
+
+#include <cmath>
 
 namespace o2::aod
 {
diff --git a/.auto-resolution/PWGCF/DataModel/SPTableZDC.h b/.auto-resolution/PWGCF/DataModel/SPTableZDC.h
index fcafff23c90..19896dd0c32 100644
--- a/.auto-resolution/PWGCF/DataModel/SPTableZDC.h
+++ b/.auto-resolution/PWGCF/DataModel/SPTableZDC.h
@@ -14,13 +14,14 @@
 #ifndef PWGCF_DATAMODEL_SPTABLEZDC_H_
 #define PWGCF_DATAMODEL_SPTABLEZDC_H_
 
-#include <cmath>
-
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/Core/RecoDecay.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/AnalysisDataModel.h"
 
+#include <cmath>
+
 namespace o2::aod
 {
 namespace sptablezdc
diff --git a/.auto-resolution/PWGCF/EbyEFluctuations/Tasks/Diff_pT_fluct_PID.cxx b/.auto-resolution/PWGCF/EbyEFluctuations/Tasks/Diff_pT_fluct_PID.cxx
index 5710ab1e864..16afcb3219e 100644
--- a/.auto-resolution/PWGCF/EbyEFluctuations/Tasks/Diff_pT_fluct_PID.cxx
+++ b/.auto-resolution/PWGCF/EbyEFluctuations/Tasks/Diff_pT_fluct_PID.cxx
@@ -13,37 +13,37 @@
 ///           v0(pT) along with its statistical uncertainity using subsampling technique.
 /// \author Anna Binoy (anna.binoy@niser.ac.in)
 
-#include <CCDB/BasicCCDBManager.h>
-#include <algorithm>
-#include <numeric>
-#include <cmath>
-#include <vector>
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/HistogramSpec.h"
+#include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StaticFor.h"
-
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
+#include "Framework/runDataProcessing.h"
+#include <CCDB/BasicCCDBManager.h>
 
 #include "TDatabasePDG.h"
-#include "TLorentzVector.h"
+#include "TF1.h"
+#include "TH1D.h"
+#include "TH2D.h"
 #include "TList.h"
+#include "TLorentzVector.h"
+#include "TMath.h"
 #include "TProfile.h"
 #include "TProfile2D.h"
-#include "TH2D.h"
-#include "TH1D.h"
 #include "TRandom3.h"
-#include "TMath.h"
-#include "TF1.h"
+
+#include <algorithm>
+#include <cmath>
+#include <numeric>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGCF/EbyEFluctuations/Tasks/FactorialMomentsTask.cxx b/.auto-resolution/PWGCF/EbyEFluctuations/Tasks/FactorialMomentsTask.cxx
index c76556ec26f..4c905ede9ed 100644
--- a/.auto-resolution/PWGCF/EbyEFluctuations/Tasks/FactorialMomentsTask.cxx
+++ b/.auto-resolution/PWGCF/EbyEFluctuations/Tasks/FactorialMomentsTask.cxx
@@ -13,22 +13,24 @@
 /// \author Salman Malik
 /// \author Balwan Singh
 
-#include <iostream>
-#include <array>
-#include <TH1F.h>
 #include "TRandom.h"
+#include <TH1F.h>
+
+#include <array>
+#include <iostream>
 // O2 includes
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "ReconstructionDataFormats/GlobalTrackID.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "Framework/ASoAHelpers.h"
 using std::array;
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGCF/EbyEFluctuations/Tasks/NetProtonCumulants.cxx b/.auto-resolution/PWGCF/EbyEFluctuations/Tasks/NetProtonCumulants.cxx
index a18b0b97df9..79ea94ab5ad 100644
--- a/.auto-resolution/PWGCF/EbyEFluctuations/Tasks/NetProtonCumulants.cxx
+++ b/.auto-resolution/PWGCF/EbyEFluctuations/Tasks/NetProtonCumulants.cxx
@@ -9,26 +9,27 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <CCDB/BasicCCDBManager.h>
-#include <cmath>
-#include <vector>
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/HistogramRegistry.h"
-
-#include "Common/DataModel/EventSelection.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include <CCDB/BasicCCDBManager.h>
 
 #include "TList.h"
+#include "TMath.h"
 #include "TProfile.h"
 #include "TProfile2D.h"
 #include "TRandom3.h"
-#include "TMath.h"
+
+#include <cmath>
+#include <vector>
 
 namespace o2::aod
 {
diff --git a/.auto-resolution/PWGCF/EbyEFluctuations/Tasks/RobustFluctuationObservables.cxx b/.auto-resolution/PWGCF/EbyEFluctuations/Tasks/RobustFluctuationObservables.cxx
index f4d50ac9c7a..2db80cf4351 100644
--- a/.auto-resolution/PWGCF/EbyEFluctuations/Tasks/RobustFluctuationObservables.cxx
+++ b/.auto-resolution/PWGCF/EbyEFluctuations/Tasks/RobustFluctuationObservables.cxx
@@ -12,35 +12,34 @@
 /// \brief This task is a QA task to accumulate basic event- and track-level plots.
 /// \author Igor Altsybeev, Igor.Altsybeev@cern.ch
 
-#include <iostream>
-#include <string>
-#include <memory>
-#include <vector>
-#include <map>
-
-#include "TF1.h"
-#include "TGraphErrors.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
+#include "Common/CCDB/EventSelectionParams.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/FT0Corrected.h"
 #include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/CCDB/EventSelectionParams.h"
 
 #include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPObject.h"
+#include "DataFormatsFT0/Digit.h"
 #include "DataFormatsParameters/GRPECSObject.h"
 #include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
-#include "Common/DataModel/FT0Corrected.h"
-#include "DataFormatsFT0/Digit.h"
+#include "TF1.h"
+#include "TGraphErrors.h"
 
-#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include <iostream>
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
 
 using namespace std;
 using namespace o2;
@@ -2293,8 +2292,8 @@ struct RobustFluctuationObservables {
         }
 
       } // end of v0 loop
-    }   // end of if (flagIncludeQAHistK0S)
-  }     // end of processRobustFluctuationObservables()
+    } // end of if (flagIncludeQAHistK0S)
+  } // end of processRobustFluctuationObservables()
 
   // shortcut function to fill 2D histograms
   void fillHistForThisCut(string cutName, int multNTracksPV, int multTrk, int nTracksGlobalAccepted, double multT0A, double multT0C, double multV0A, double /*t0cCentr*/, int bc)
diff --git a/.auto-resolution/PWGCF/EbyEFluctuations/Tasks/antiprotonCumulantsMc.cxx b/.auto-resolution/PWGCF/EbyEFluctuations/Tasks/antiprotonCumulantsMc.cxx
index f0398450cae..3da35749d11 100644
--- a/.auto-resolution/PWGCF/EbyEFluctuations/Tasks/antiprotonCumulantsMc.cxx
+++ b/.auto-resolution/PWGCF/EbyEFluctuations/Tasks/antiprotonCumulantsMc.cxx
@@ -13,48 +13,49 @@
 /// \brief Task for analyzing efficiency of proton, and net-proton distributions in MC reconstructed and generated, and calculating net-proton cumulants
 /// \author Swati Saha
 
-#include <CCDB/BasicCCDBManager.h>
-#include <cstdlib>
-#include <cmath>
-#include <array>
-#include <vector>
-#include <string>
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/StepTHn.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/PIDResponseITS.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CommonConstants/PhysicsConstants.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "DataFormatsParameters/GRPObject.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include <TList.h>
-#include <TProfile.h>
-#include <TProfile2D.h>
-#include <TRandom3.h>
-#include <TMath.h>
-#include <TH1F.h>
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+#include <CCDB/BasicCCDBManager.h>
+
 #include <TDirectory.h>
+#include <TF1.h>
+#include <TFile.h>
+#include <TH1F.h>
+#include <TH2F.h>
 #include <THn.h>
+#include <TList.h>
 #include <TLorentzVector.h>
 #include <TMath.h>
 #include <TObjArray.h>
-#include <TFile.h>
-#include <TH2F.h>
-#include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <TF1.h>
+#include <TProfile.h>
+#include <TProfile2D.h>
+#include <TRandom3.h>
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGCF/EbyEFluctuations/Tasks/kaonIsospinFluctuations.cxx b/.auto-resolution/PWGCF/EbyEFluctuations/Tasks/kaonIsospinFluctuations.cxx
index 4170d078843..7284bbc329b 100644
--- a/.auto-resolution/PWGCF/EbyEFluctuations/Tasks/kaonIsospinFluctuations.cxx
+++ b/.auto-resolution/PWGCF/EbyEFluctuations/Tasks/kaonIsospinFluctuations.cxx
@@ -14,22 +14,21 @@
 ///
 /// \author Rahul Verma (rahul.verma@iitb.ac.in) :: Sadhana Dash (sadhana@phy.iitb.ac.in)
 
-#include <algorithm>
-#include <vector>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/O2DatabasePDGPlugin.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/DataModel/mcCentrality.h"
 
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 
-#include "PWGLF/DataModel/mcCentrality.h"
+#include <algorithm>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGCF/EbyEFluctuations/Tasks/meanPtFlucId.cxx b/.auto-resolution/PWGCF/EbyEFluctuations/Tasks/meanPtFlucId.cxx
index d6eca57ad0e..e010e737227 100644
--- a/.auto-resolution/PWGCF/EbyEFluctuations/Tasks/meanPtFlucId.cxx
+++ b/.auto-resolution/PWGCF/EbyEFluctuations/Tasks/meanPtFlucId.cxx
@@ -16,26 +16,27 @@
 ///
 /// \author Tanu Gahlaut <tanu.gahlaut@cern.ch>
 
-#include <utility>
-#include <vector>
-#include <string>
-#include <TPDGCode.h>
+#include "Common/Core/RecoDecay.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "CCDB/BasicCCDBManager.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/HistogramSpec.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/Core/RecoDecay.h"
-#include "CCDB/BasicCCDBManager.h"
+#include <TPDGCode.h>
+
+#include <string>
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGCF/EbyEFluctuations/Tasks/nchCumulantsId.cxx b/.auto-resolution/PWGCF/EbyEFluctuations/Tasks/nchCumulantsId.cxx
index 2d4ba400285..acd5185be1b 100644
--- a/.auto-resolution/PWGCF/EbyEFluctuations/Tasks/nchCumulantsId.cxx
+++ b/.auto-resolution/PWGCF/EbyEFluctuations/Tasks/nchCumulantsId.cxx
@@ -13,8 +13,11 @@
 /// \brief Event by Event conserved charges fluctuations
 /// \author Pravata Panigrahi <pravata.panigrahi@cern.ch> :: Sadhana Dash(sadhana@phy.iitb.ac.in)
 
-#include <algorithm>
-#include <vector>
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
@@ -24,11 +27,8 @@
 #include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/runDataProcessing.h"
 
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include <algorithm>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGCF/EbyEFluctuations/Tasks/netprotonCumulantsMc.cxx b/.auto-resolution/PWGCF/EbyEFluctuations/Tasks/netprotonCumulantsMc.cxx
index 36a797a17a9..62318743462 100644
--- a/.auto-resolution/PWGCF/EbyEFluctuations/Tasks/netprotonCumulantsMc.cxx
+++ b/.auto-resolution/PWGCF/EbyEFluctuations/Tasks/netprotonCumulantsMc.cxx
@@ -13,48 +13,49 @@
 /// \brief Task for analyzing efficiency of proton, and net-proton distributions in MC reconstructed and generated, and calculating net-proton cumulants
 /// \author Swati Saha
 
-#include <CCDB/BasicCCDBManager.h>
-#include <cstdlib>
-#include <cmath>
-#include <array>
-#include <vector>
-#include <string>
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/StepTHn.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/PIDResponseITS.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CommonConstants/PhysicsConstants.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "DataFormatsParameters/GRPObject.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include <TList.h>
-#include <TProfile.h>
-#include <TProfile2D.h>
-#include <TRandom3.h>
-#include <TMath.h>
-#include <TH1F.h>
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+#include <CCDB/BasicCCDBManager.h>
+
 #include <TDirectory.h>
+#include <TF1.h>
+#include <TFile.h>
+#include <TH1F.h>
+#include <TH2F.h>
 #include <THn.h>
+#include <TList.h>
 #include <TLorentzVector.h>
 #include <TMath.h>
 #include <TObjArray.h>
-#include <TFile.h>
-#include <TH2F.h>
-#include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <TF1.h>
+#include <TProfile.h>
+#include <TProfile2D.h>
+#include <TRandom3.h>
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGCF/Femto/DataModel/PionDeuteronTables.h b/.auto-resolution/PWGCF/Femto/DataModel/PionDeuteronTables.h
index 89754a8cc97..89fc4cdfa8f 100644
--- a/.auto-resolution/PWGCF/Femto/DataModel/PionDeuteronTables.h
+++ b/.auto-resolution/PWGCF/Femto/DataModel/PionDeuteronTables.h
@@ -15,8 +15,8 @@
 /// \author CMY
 /// \date 2025-04-10
 
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
 
 #ifndef PWGCF_FEMTO_DATAMODEL_PIONDEUTERONTABLES_H_
 #define PWGCF_FEMTO_DATAMODEL_PIONDEUTERONTABLES_H_
diff --git a/.auto-resolution/PWGCF/Femto3D/Core/femto3dPairTask.h b/.auto-resolution/PWGCF/Femto3D/Core/femto3dPairTask.h
index db5949f4ae0..12638089841 100755
--- a/.auto-resolution/PWGCF/Femto3D/Core/femto3dPairTask.h
+++ b/.auto-resolution/PWGCF/Femto3D/Core/femto3dPairTask.h
@@ -24,14 +24,15 @@
 // #include "Framework/Logger.h"
 // #include "Common/DataModel/Multiplicity.h"
 
-#include <vector>
-#include <memory>
+#include "CommonConstants/MathConstants.h"
+#include "CommonConstants/PhysicsConstants.h"
+
+#include "TDatabasePDG.h"
 #include "TLorentzVector.h"
 #include "TVector3.h"
-#include "TDatabasePDG.h"
 
-#include "CommonConstants/PhysicsConstants.h"
-#include "CommonConstants/MathConstants.h"
+#include <memory>
+#include <vector>
 
 double particle_mass(const int PDGcode)
 {
diff --git a/.auto-resolution/PWGCF/Femto3D/DataModel/PIDutils.h b/.auto-resolution/PWGCF/Femto3D/DataModel/PIDutils.h
index 9e28f7b5863..2c2eda3e2ce 100644
--- a/.auto-resolution/PWGCF/Femto3D/DataModel/PIDutils.h
+++ b/.auto-resolution/PWGCF/Femto3D/DataModel/PIDutils.h
@@ -19,10 +19,11 @@
 #ifndef PWGCF_FEMTO3D_DATAMODEL_PIDUTILS_H_
 #define PWGCF_FEMTO3D_DATAMODEL_PIDUTILS_H_
 
+#include "Common/DataModel/PIDResponse.h"
+
 #include <type_traits>
 #include <utility>
 #include <vector>
-#include "Common/DataModel/PIDResponse.h"
 
 namespace o2::aod::singletrackselector
 {
diff --git a/.auto-resolution/PWGCF/Femto3D/DataModel/singletrackselector.h b/.auto-resolution/PWGCF/Femto3D/DataModel/singletrackselector.h
index c7323d15a32..2156db8bf2e 100644
--- a/.auto-resolution/PWGCF/Femto3D/DataModel/singletrackselector.h
+++ b/.auto-resolution/PWGCF/Femto3D/DataModel/singletrackselector.h
@@ -17,16 +17,18 @@
 #define PWGCF_FEMTO3D_DATAMODEL_SINGLETRACKSELECTOR_H_
 
 // #include <experimental/type_traits>
-#include <utility>
-#include <vector>
+#include "PWGCF/Femto3D/DataModel/PIDutils.h"
 
-#include "Framework/ASoA.h"
-#include "Framework/AnalysisDataModel.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/PIDResponseITS.h"
+
+#include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
 #include "Framework/Logger.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "PWGCF/Femto3D/DataModel/PIDutils.h"
+
+#include <utility>
+#include <vector>
 
 namespace o2::aod
 {
diff --git a/.auto-resolution/PWGCF/Femto3D/TableProducer/Converters/singleTrackSelectorConverter.cxx b/.auto-resolution/PWGCF/Femto3D/TableProducer/Converters/singleTrackSelectorConverter.cxx
index 4a44e331e9b..5ca57c11369 100644
--- a/.auto-resolution/PWGCF/Femto3D/TableProducer/Converters/singleTrackSelectorConverter.cxx
+++ b/.auto-resolution/PWGCF/Femto3D/TableProducer/Converters/singleTrackSelectorConverter.cxx
@@ -13,11 +13,13 @@
 /// \author Sofia Tomassini, Gleb Romanenko, Nicolò Jacazio
 /// \since 03 May 2024
 
-#include <fairlogger/Logger.h>
 #include "PWGCF/Femto3D/DataModel/singletrackselector.h"
+
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
 
+#include <fairlogger/Logger.h>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.auto-resolution/PWGCF/Femto3D/TableProducer/Converters/singleTrackSelectorConverterV1.cxx b/.auto-resolution/PWGCF/Femto3D/TableProducer/Converters/singleTrackSelectorConverterV1.cxx
index 584760ce74a..a664b83e39d 100644
--- a/.auto-resolution/PWGCF/Femto3D/TableProducer/Converters/singleTrackSelectorConverterV1.cxx
+++ b/.auto-resolution/PWGCF/Femto3D/TableProducer/Converters/singleTrackSelectorConverterV1.cxx
@@ -13,11 +13,13 @@
 /// \author Sofia Tomassini, Gleb Romanenko, Nicolò Jacazio
 /// \since 03 May 2024
 
-#include <fairlogger/Logger.h>
 #include "PWGCF/Femto3D/DataModel/singletrackselector.h"
+
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
 
+#include <fairlogger/Logger.h>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.auto-resolution/PWGCF/Femto3D/TableProducer/singleTrackSelector.cxx b/.auto-resolution/PWGCF/Femto3D/TableProducer/singleTrackSelector.cxx
index 729538a1470..188aedb2077 100644
--- a/.auto-resolution/PWGCF/Femto3D/TableProducer/singleTrackSelector.cxx
+++ b/.auto-resolution/PWGCF/Femto3D/TableProducer/singleTrackSelector.cxx
@@ -13,32 +13,31 @@
 /// \author Sofia Tomassini, Gleb Romanenko, Nicolò Jacazio
 /// \since 31 May 2023
 
-#include <fairlogger/Logger.h>
-#include <Framework/AnalysisDataModel.h>
-
-#include <vector>
-#include <string>
-#include <utility>
+#include "PWGCF/Femto3D/DataModel/singletrackselector.h"
 
+#include "Common/CCDB/ctpRateFetcher.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/PIDResponseITS.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 #include "EventFiltering/Zorro.h"
 #include "EventFiltering/ZorroSummary.h"
 
-#include "PWGCF/Femto3D/DataModel/singletrackselector.h"
-
+#include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/Propagator.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/PIDResponseITS.h"
-#include "Common/CCDB/ctpRateFetcher.h"
+#include <Framework/AnalysisDataModel.h>
 
-#include "DetectorsBase/Propagator.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
+#include <fairlogger/Logger.h>
+
+#include <string>
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGCF/Femto3D/TableProducer/singleTrackSelectorExtra.cxx b/.auto-resolution/PWGCF/Femto3D/TableProducer/singleTrackSelectorExtra.cxx
index 0f065371ca8..6387eb2b450 100644
--- a/.auto-resolution/PWGCF/Femto3D/TableProducer/singleTrackSelectorExtra.cxx
+++ b/.auto-resolution/PWGCF/Femto3D/TableProducer/singleTrackSelectorExtra.cxx
@@ -15,13 +15,13 @@
 
 // this task produces a dummy "SingleCollExtras" table that is now required in the analysis tasks. Needed to have a compatibility with old der. data
 
-#include <fairlogger/Logger.h>
-#include <Framework/AnalysisDataModel.h>
-
 #include "PWGCF/Femto3D/DataModel/singletrackselector.h"
 
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
+#include <Framework/AnalysisDataModel.h>
+
+#include <fairlogger/Logger.h>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGCF/Femto3D/TableProducer/singleTrackSelectorPIDMaker.cxx b/.auto-resolution/PWGCF/Femto3D/TableProducer/singleTrackSelectorPIDMaker.cxx
index ebdc786469b..3bb5e025d7d 100644
--- a/.auto-resolution/PWGCF/Femto3D/TableProducer/singleTrackSelectorPIDMaker.cxx
+++ b/.auto-resolution/PWGCF/Femto3D/TableProducer/singleTrackSelectorPIDMaker.cxx
@@ -14,17 +14,17 @@
 /// \author Sofia Tomassini, Gleb Romanenko, Nicolò Jacazio
 /// \since 22 January 2025
 
-#include <fairlogger/Logger.h>
-#include <Framework/AnalysisDataModel.h>
-
-#include <vector>
-#include <string>
-#include <unordered_map>
-
 #include "PWGCF/Femto3D/DataModel/singletrackselector.h"
 
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
+#include <Framework/AnalysisDataModel.h>
+
+#include <fairlogger/Logger.h>
+
+#include <string>
+#include <unordered_map>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGCF/Femto3D/Tasks/femto3dPairTask.cxx b/.auto-resolution/PWGCF/Femto3D/Tasks/femto3dPairTask.cxx
index 83aa740795c..bf02d11da69 100644
--- a/.auto-resolution/PWGCF/Femto3D/Tasks/femto3dPairTask.cxx
+++ b/.auto-resolution/PWGCF/Femto3D/Tasks/femto3dPairTask.cxx
@@ -13,31 +13,34 @@
 /// \author Sofia Tomassini, Gleb Romanenko, Nicolò Jacazio
 /// \since 31 May 2023
 
-#include <ctime>
-#include <algorithm> // std::random_shuffle
-#include <random>
-#include <chrono>
-#include <vector>
-#include <map>
-#include <memory>
-#include <utility>
-#include <TParameter.h>
-#include <TH1F.h>
-
 #include "PWGCF/Femto3D/Core/femto3dPairTask.h"
+
 #include "PWGCF/Femto3D/DataModel/singletrackselector.h"
-#include "TLorentzVector.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
+#include "Common/DataModel/Multiplicity.h"
+
 #include "Framework/ASoA.h"
-#include "Framework/DataTypes.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/DataTypes.h"
 #include "Framework/Expressions.h"
+#include "Framework/HistogramRegistry.h"
 #include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
 #include "MathUtils/Utils.h"
-#include "Common/DataModel/Multiplicity.h"
+
+#include "TLorentzVector.h"
+#include <TH1F.h>
+#include <TParameter.h>
+
+#include <algorithm> // std::random_shuffle
+#include <chrono>
+#include <ctime>
+#include <map>
+#include <memory>
+#include <random>
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::soa;
diff --git a/.auto-resolution/PWGCF/Femto3D/Tasks/femto3dPairTaskMC.cxx b/.auto-resolution/PWGCF/Femto3D/Tasks/femto3dPairTaskMC.cxx
index b776d34e629..ecf9e90392d 100644
--- a/.auto-resolution/PWGCF/Femto3D/Tasks/femto3dPairTaskMC.cxx
+++ b/.auto-resolution/PWGCF/Femto3D/Tasks/femto3dPairTaskMC.cxx
@@ -13,27 +13,29 @@
 /// \author Sofia Tomassini, Gleb Romanenko, Nicolò Jacazio
 /// \since 31 May 2023
 
-#include <vector>
-#include <map>
-#include <memory>
-#include <utility>
-#include <TParameter.h>
-#include <TH1F.h>
-
 #include "PWGCF/Femto3D/Core/femto3dPairTask.h"
 #include "PWGCF/Femto3D/DataModel/singletrackselector.h"
-#include "TLorentzVector.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
+#include "Common/DataModel/Multiplicity.h"
+
 #include "Framework/ASoA.h"
-#include "Framework/DataTypes.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/DataTypes.h"
 #include "Framework/Expressions.h"
+#include "Framework/HistogramRegistry.h"
 #include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
 #include "MathUtils/Utils.h"
-#include "Common/DataModel/Multiplicity.h"
+
+#include "TLorentzVector.h"
+#include <TH1F.h>
+#include <TParameter.h>
+
+#include <map>
+#include <memory>
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::soa;
diff --git a/.auto-resolution/PWGCF/Femto3D/Tasks/femto3dQA.cxx b/.auto-resolution/PWGCF/Femto3D/Tasks/femto3dQA.cxx
index 64858324b48..dacc092da86 100644
--- a/.auto-resolution/PWGCF/Femto3D/Tasks/femto3dQA.cxx
+++ b/.auto-resolution/PWGCF/Femto3D/Tasks/femto3dQA.cxx
@@ -13,26 +13,27 @@
 /// \author Sofia Tomassini, Gleb Romanenko, Nicolò Jacazio
 /// \since 31 May 2023
 
-#include <vector>
-#include <memory>
-#include <utility>
+#include "PWGCF/Femto3D/Core/femto3dPairTask.h"
+#include "PWGCF/Femto3D/DataModel/singletrackselector.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include <TParameter.h>
-#include <TH1F.h>
+#include "Common/DataModel/Multiplicity.h"
 
 #include "Framework/ASoA.h"
-#include "MathUtils/Utils.h"
-#include "Framework/DataTypes.h"
-#include "Common/DataModel/Multiplicity.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/DataTypes.h"
 #include "Framework/Expressions.h"
-
+#include "Framework/HistogramRegistry.h"
 #include "Framework/StaticFor.h"
-#include "PWGCF/Femto3D/DataModel/singletrackselector.h"
-#include "PWGCF/Femto3D/Core/femto3dPairTask.h"
+#include "Framework/runDataProcessing.h"
+#include "MathUtils/Utils.h"
+
+#include <TH1F.h>
+#include <TParameter.h>
+
+#include <memory>
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::soa;
diff --git a/.auto-resolution/PWGCF/Femto3D/Tools/checkPacking.cxx b/.auto-resolution/PWGCF/Femto3D/Tools/checkPacking.cxx
index 51d26443200..e71c73ac2cb 100644
--- a/.auto-resolution/PWGCF/Femto3D/Tools/checkPacking.cxx
+++ b/.auto-resolution/PWGCF/Femto3D/Tools/checkPacking.cxx
@@ -17,8 +17,9 @@
 ///
 
 #include "PWGCF/Femto3D/DataModel/singletrackselector.h"
-#include "TH1F.h"
+
 #include "TCanvas.h"
+#include "TH1F.h"
 #include "TRandom.h"
 
 using namespace o2;
diff --git a/.auto-resolution/PWGCF/FemtoDream/Core/femtoDreamCascadeSelection.h b/.auto-resolution/PWGCF/FemtoDream/Core/femtoDreamCascadeSelection.h
index 2a07c851d09..a861036d640 100644
--- a/.auto-resolution/PWGCF/FemtoDream/Core/femtoDreamCascadeSelection.h
+++ b/.auto-resolution/PWGCF/FemtoDream/Core/femtoDreamCascadeSelection.h
@@ -22,20 +22,21 @@
 #ifndef PWGCF_FEMTODREAM_CORE_FEMTODREAMCASCADESELECTION_H_
 #define PWGCF_FEMTODREAM_CORE_FEMTODREAMCASCADESELECTION_H_
 
-#include <iostream>
-#include <string>
-#include <vector>
-
-#include <TDatabasePDG.h> // FIXME
-
 #include "PWGCF/FemtoDream/Core/femtoDreamObjectSelection.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamSelection.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamTrackSelection.h"
 
 #include "Common/Core/RecoDecay.h"
+
 #include "Framework/HistogramRegistry.h"
 #include "ReconstructionDataFormats/PID.h"
 
+#include <TDatabasePDG.h> // FIXME
+
+#include <iostream>
+#include <string>
+#include <vector>
+
 using namespace o2::framework;
 
 namespace o2::analysis::femtoDream
diff --git a/.auto-resolution/PWGCF/FemtoDream/Core/femtoDreamCollisionSelection.h b/.auto-resolution/PWGCF/FemtoDream/Core/femtoDreamCollisionSelection.h
index 8fe58ce9d7b..b0b56eaf92b 100644
--- a/.auto-resolution/PWGCF/FemtoDream/Core/femtoDreamCollisionSelection.h
+++ b/.auto-resolution/PWGCF/FemtoDream/Core/femtoDreamCollisionSelection.h
@@ -16,13 +16,15 @@
 #ifndef PWGCF_FEMTODREAM_CORE_FEMTODREAMCOLLISIONSELECTION_H_
 #define PWGCF_FEMTODREAM_CORE_FEMTODREAMCOLLISIONSELECTION_H_
 
-#include <string>
-#include <iostream>
 #include "Common/CCDB/TriggerAliases.h"
 #include "Common/DataModel/EventSelection.h"
+
 #include "Framework/HistogramRegistry.h"
 #include "Framework/Logger.h"
 
+#include <iostream>
+#include <string>
+
 using namespace o2::framework;
 
 namespace o2::analysis::femtoDream
diff --git a/.auto-resolution/PWGCF/FemtoDream/Core/femtoDreamContainer.h b/.auto-resolution/PWGCF/FemtoDream/Core/femtoDreamContainer.h
index 5e0222a4f07..78a25e29c08 100644
--- a/.auto-resolution/PWGCF/FemtoDream/Core/femtoDreamContainer.h
+++ b/.auto-resolution/PWGCF/FemtoDream/Core/femtoDreamContainer.h
@@ -19,18 +19,20 @@
 #ifndef PWGCF_FEMTODREAM_CORE_FEMTODREAMCONTAINER_H_
 #define PWGCF_FEMTODREAM_CORE_FEMTODREAMCONTAINER_H_
 
-#include <fairlogger/Logger.h>
-#include <vector>
-#include <string>
-
-#include "Framework/HistogramRegistry.h"
+#include "PWGCF/DataModel/FemtoDerived.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamMath.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
-#include "PWGCF/DataModel/FemtoDerived.h"
+
+#include "Framework/HistogramRegistry.h"
 
 #include "Math/Vector4D.h"
 #include "TMath.h"
 
+#include <fairlogger/Logger.h>
+
+#include <string>
+#include <vector>
+
 using namespace o2::framework;
 
 namespace o2::analysis::femtoDream
diff --git a/.auto-resolution/PWGCF/FemtoDream/Core/femtoDreamContainerThreeBody.h b/.auto-resolution/PWGCF/FemtoDream/Core/femtoDreamContainerThreeBody.h
index a6c60793060..fdfc05252b0 100644
--- a/.auto-resolution/PWGCF/FemtoDream/Core/femtoDreamContainerThreeBody.h
+++ b/.auto-resolution/PWGCF/FemtoDream/Core/femtoDreamContainerThreeBody.h
@@ -20,16 +20,18 @@
 #ifndef PWGCF_FEMTODREAM_CORE_FEMTODREAMCONTAINERTHREEBODY_H_
 #define PWGCF_FEMTODREAM_CORE_FEMTODREAMCONTAINERTHREEBODY_H_
 
-#include <fairlogger/Logger.h>
-#include <vector>
-#include <string>
+#include "PWGCF/FemtoDream/Core/femtoDreamMath.h"
 
 #include "Framework/HistogramRegistry.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamMath.h"
 
 #include "Math/Vector4D.h"
-#include "TMath.h"
 #include "TDatabasePDG.h"
+#include "TMath.h"
+
+#include <fairlogger/Logger.h>
+
+#include <string>
+#include <vector>
 
 using namespace o2::framework;
 
diff --git a/.auto-resolution/PWGCF/FemtoDream/Core/femtoDreamDetaDphiStar.h b/.auto-resolution/PWGCF/FemtoDream/Core/femtoDreamDetaDphiStar.h
index 58dc6c9ded4..23f35a9af9c 100644
--- a/.auto-resolution/PWGCF/FemtoDream/Core/femtoDreamDetaDphiStar.h
+++ b/.auto-resolution/PWGCF/FemtoDream/Core/femtoDreamDetaDphiStar.h
@@ -16,11 +16,13 @@
 #ifndef PWGCF_FEMTODREAM_CORE_FEMTODREAMDETADPHISTAR_H_
 #define PWGCF_FEMTODREAM_CORE_FEMTODREAMDETADPHISTAR_H_
 
+#include "PWGCF/DataModel/FemtoDerived.h"
+
+#include "Framework/HistogramRegistry.h"
+
 #include <memory>
 #include <string>
 #include <vector>
-#include "PWGCF/DataModel/FemtoDerived.h"
-#include "Framework/HistogramRegistry.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGCF/FemtoDream/Core/femtoDreamEventHisto.h b/.auto-resolution/PWGCF/FemtoDream/Core/femtoDreamEventHisto.h
index 2d668d15c58..23bbbccce64 100644
--- a/.auto-resolution/PWGCF/FemtoDream/Core/femtoDreamEventHisto.h
+++ b/.auto-resolution/PWGCF/FemtoDream/Core/femtoDreamEventHisto.h
@@ -17,6 +17,7 @@
 #define PWGCF_FEMTODREAM_CORE_FEMTODREAMEVENTHISTO_H_
 
 #include "PWGCF/DataModel/FemtoDerived.h"
+
 #include "Framework/HistogramRegistry.h"
 
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGCF/FemtoDream/Core/femtoDreamMath.h b/.auto-resolution/PWGCF/FemtoDream/Core/femtoDreamMath.h
index aba07f96c9c..7a895486cc0 100644
--- a/.auto-resolution/PWGCF/FemtoDream/Core/femtoDreamMath.h
+++ b/.auto-resolution/PWGCF/FemtoDream/Core/femtoDreamMath.h
@@ -16,13 +16,13 @@
 #ifndef PWGCF_FEMTODREAM_CORE_FEMTODREAMMATH_H_
 #define PWGCF_FEMTODREAM_CORE_FEMTODREAMMATH_H_
 
-#include <iostream>
-
-#include "Math/Vector4D.h"
 #include "Math/Boost.h"
+#include "Math/Vector4D.h"
 #include "TLorentzVector.h"
 #include "TMath.h"
 
+#include <iostream>
+
 namespace o2::analysis::femtoDream
 {
 
diff --git a/.auto-resolution/PWGCF/FemtoDream/Core/femtoDreamObjectSelection.h b/.auto-resolution/PWGCF/FemtoDream/Core/femtoDreamObjectSelection.h
index d01ce564f66..b89c87a2037 100644
--- a/.auto-resolution/PWGCF/FemtoDream/Core/femtoDreamObjectSelection.h
+++ b/.auto-resolution/PWGCF/FemtoDream/Core/femtoDreamObjectSelection.h
@@ -16,15 +16,16 @@
 #ifndef PWGCF_FEMTODREAM_CORE_FEMTODREAMOBJECTSELECTION_H_
 #define PWGCF_FEMTODREAM_CORE_FEMTODREAMOBJECTSELECTION_H_
 
+#include "PWGCF/DataModel/FemtoDerived.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamSelection.h"
+
+#include "Framework/HistogramRegistry.h"
+#include "ReconstructionDataFormats/PID.h"
+
 #include <algorithm>
 #include <string>
 #include <vector>
 
-#include "PWGCF/FemtoDream/Core/femtoDreamSelection.h"
-#include "ReconstructionDataFormats/PID.h"
-#include "Framework/HistogramRegistry.h"
-#include "PWGCF/DataModel/FemtoDerived.h"
-
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.auto-resolution/PWGCF/FemtoDream/Core/femtoDreamPairCleaner.h b/.auto-resolution/PWGCF/FemtoDream/Core/femtoDreamPairCleaner.h
index 3b248657b1f..ca58aa4c18e 100644
--- a/.auto-resolution/PWGCF/FemtoDream/Core/femtoDreamPairCleaner.h
+++ b/.auto-resolution/PWGCF/FemtoDream/Core/femtoDreamPairCleaner.h
@@ -17,6 +17,7 @@
 #define PWGCF_FEMTODREAM_CORE_FEMTODREAMPAIRCLEANER_H_
 
 #include "PWGCF/DataModel/FemtoDerived.h"
+
 #include "Framework/HistogramRegistry.h"
 
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h b/.auto-resolution/PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h
index 4148e8b3efc..3f771c48c1f 100644
--- a/.auto-resolution/PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h
+++ b/.auto-resolution/PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h
@@ -18,11 +18,14 @@
 #ifndef PWGCF_FEMTODREAM_CORE_FEMTODREAMPARTICLEHISTO_H_
 #define PWGCF_FEMTODREAM_CORE_FEMTODREAMPARTICLEHISTO_H_
 
-#include <TMath.h>
-#include <string>
 #include "PWGCF/DataModel/FemtoDerived.h"
-#include "Framework/HistogramRegistry.h"
+
 #include "CommonConstants/PhysicsConstants.h"
+#include "Framework/HistogramRegistry.h"
+
+#include <TMath.h>
+
+#include <string>
 
 using namespace o2::framework;
 
diff --git a/.auto-resolution/PWGCF/FemtoDream/Core/femtoDreamSelection.h b/.auto-resolution/PWGCF/FemtoDream/Core/femtoDreamSelection.h
index 0e3592bf650..d50d10e929c 100644
--- a/.auto-resolution/PWGCF/FemtoDream/Core/femtoDreamSelection.h
+++ b/.auto-resolution/PWGCF/FemtoDream/Core/femtoDreamSelection.h
@@ -16,10 +16,12 @@
 #ifndef PWGCF_FEMTODREAM_CORE_FEMTODREAMSELECTION_H_
 #define PWGCF_FEMTODREAM_CORE_FEMTODREAMSELECTION_H_
 
-#include <cmath>
-#include "Framework/HistogramRegistry.h"
 #include "PWGCF/DataModel/FemtoDerived.h"
 
+#include "Framework/HistogramRegistry.h"
+
+#include <cmath>
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.auto-resolution/PWGCF/FemtoDream/Core/femtoDreamTrackSelection.h b/.auto-resolution/PWGCF/FemtoDream/Core/femtoDreamTrackSelection.h
index 9cab0f9e78b..78cf91947eb 100644
--- a/.auto-resolution/PWGCF/FemtoDream/Core/femtoDreamTrackSelection.h
+++ b/.auto-resolution/PWGCF/FemtoDream/Core/femtoDreamTrackSelection.h
@@ -17,20 +17,22 @@
 #ifndef PWGCF_FEMTODREAM_CORE_FEMTODREAMTRACKSELECTION_H_
 #define PWGCF_FEMTODREAM_CORE_FEMTODREAMTRACKSELECTION_H_
 
-#include <string>
-#include <vector>
-#include <cmath>
-#include <iostream>
-
 #include "PWGCF/DataModel/FemtoDerived.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/PIDResponseITS.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamObjectSelection.h"
+
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamObjectSelection.h"
-#include "ReconstructionDataFormats/PID.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/PIDResponseITS.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/HistogramRegistry.h"
+#include "ReconstructionDataFormats/PID.h"
+
+#include <cmath>
+#include <iostream>
+#include <string>
+#include <vector>
 
 using namespace o2::framework;
 
diff --git a/.auto-resolution/PWGCF/FemtoDream/Core/femtoDreamUtils.h b/.auto-resolution/PWGCF/FemtoDream/Core/femtoDreamUtils.h
index c5db8dcc70e..b03de6e9f06 100644
--- a/.auto-resolution/PWGCF/FemtoDream/Core/femtoDreamUtils.h
+++ b/.auto-resolution/PWGCF/FemtoDream/Core/femtoDreamUtils.h
@@ -16,11 +16,13 @@
 #ifndef PWGCF_FEMTODREAM_CORE_FEMTODREAMUTILS_H_
 #define PWGCF_FEMTODREAM_CORE_FEMTODREAMUTILS_H_
 
-#include <vector>
-#include <string>
-#include "CommonConstants/PhysicsConstants.h"
 #include "PWGCF/DataModel/FemtoDerived.h"
 
+#include "CommonConstants/PhysicsConstants.h"
+
+#include <string>
+#include <vector>
+
 namespace o2::analysis::femtoDream
 {
 
diff --git a/.auto-resolution/PWGCF/FemtoDream/Core/femtoDreamV0Selection.h b/.auto-resolution/PWGCF/FemtoDream/Core/femtoDreamV0Selection.h
index 40158105a5b..fde9af93474 100644
--- a/.auto-resolution/PWGCF/FemtoDream/Core/femtoDreamV0Selection.h
+++ b/.auto-resolution/PWGCF/FemtoDream/Core/femtoDreamV0Selection.h
@@ -18,18 +18,19 @@
 #ifndef PWGCF_FEMTODREAM_CORE_FEMTODREAMV0SELECTION_H_
 #define PWGCF_FEMTODREAM_CORE_FEMTODREAMV0SELECTION_H_
 
-#include <iostream>
-#include <string>
-#include <vector>
-
 #include "PWGCF/FemtoDream/Core/femtoDreamObjectSelection.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamSelection.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamTrackSelection.h"
 
 #include "Common/Core/RecoDecay.h"
+
 #include "Framework/HistogramRegistry.h"
 #include "ReconstructionDataFormats/PID.h"
 
+#include <iostream>
+#include <string>
+#include <vector>
+
 using namespace o2::framework;
 
 namespace o2::analysis::femtoDream
diff --git a/.auto-resolution/PWGCF/FemtoDream/TableProducer/femtoDreamProducerReducedTask.cxx b/.auto-resolution/PWGCF/FemtoDream/TableProducer/femtoDreamProducerReducedTask.cxx
index a879a18517f..69a39e24b07 100644
--- a/.auto-resolution/PWGCF/FemtoDream/TableProducer/femtoDreamProducerReducedTask.cxx
+++ b/.auto-resolution/PWGCF/FemtoDream/TableProducer/femtoDreamProducerReducedTask.cxx
@@ -15,29 +15,33 @@
 /// \author Georgios Mantzaridis, TU München, georgios.mantzaridis@tum.de
 /// \author Anton Riedel, TU München, anton.riedel@tum.de
 
-#include <vector>
-#include "TMath.h"
-#include "CCDB/BasicCCDBManager.h"
+#include "PWGCF/DataModel/FemtoDerived.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamCollisionSelection.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamTrackSelection.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
-#include "PWGCF/DataModel/FemtoDerived.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/PIDResponseITS.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/PIDResponseITS.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+
 #include "Math/Vector4D.h"
+#include "TMath.h"
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis::femtoDream;
diff --git a/.auto-resolution/PWGCF/FemtoDream/TableProducer/femtoDreamProducerTask.cxx b/.auto-resolution/PWGCF/FemtoDream/TableProducer/femtoDreamProducerTask.cxx
index 7272382f357..a92292fafaa 100644
--- a/.auto-resolution/PWGCF/FemtoDream/TableProducer/femtoDreamProducerTask.cxx
+++ b/.auto-resolution/PWGCF/FemtoDream/TableProducer/femtoDreamProducerTask.cxx
@@ -13,35 +13,40 @@
 /// \brief Tasks that produces the track tables used for the pairing
 /// \author Laura Serksnyte, TU München, laura.serksnyte@tum.de
 
-#include <CCDB/BasicCCDBManager.h>
-#include <fairlogger/Logger.h>
-#include <vector>
-#include <string>
+#include "PWGCF/DataModel/FemtoDerived.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamCascadeSelection.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamCollisionSelection.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamTrackSelection.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamV0Selection.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/PIDResponseITS.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+#include "EventFiltering/Zorro.h"
+
 #include "DataFormatsParameters/GRPMagField.h"
 #include "DataFormatsParameters/GRPObject.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamCollisionSelection.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamTrackSelection.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamV0Selection.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamCascadeSelection.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
-#include "EventFiltering/Zorro.h"
-#include "PWGCF/DataModel/FemtoDerived.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "TMath.h"
+#include <CCDB/BasicCCDBManager.h>
+
 #include "Math/Vector4D.h"
+#include "TMath.h"
+
+#include <fairlogger/Logger.h>
+
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGCF/FemtoDream/TableProducer/femtoDreamProducerTaskWithCascades.cxx b/.auto-resolution/PWGCF/FemtoDream/TableProducer/femtoDreamProducerTaskWithCascades.cxx
index a7e02ec87e6..e76c0245622 100644
--- a/.auto-resolution/PWGCF/FemtoDream/TableProducer/femtoDreamProducerTaskWithCascades.cxx
+++ b/.auto-resolution/PWGCF/FemtoDream/TableProducer/femtoDreamProducerTaskWithCascades.cxx
@@ -13,35 +13,40 @@
 /// \brief Tasks that produces the track tables used for the pairing
 /// \author Laura Serksnyte, TU München, laura.serksnyte@tum.de
 
-#include <CCDB/BasicCCDBManager.h>
-#include <fairlogger/Logger.h>
-#include <vector>
-#include <string>
+#include "PWGCF/DataModel/FemtoDerived.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamCascadeSelection.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamCollisionSelection.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamTrackSelection.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamV0Selection.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/PIDResponseITS.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+#include "EventFiltering/Zorro.h"
+
 #include "DataFormatsParameters/GRPMagField.h"
 #include "DataFormatsParameters/GRPObject.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamCollisionSelection.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamTrackSelection.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamV0Selection.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamCascadeSelection.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
-#include "EventFiltering/Zorro.h"
-#include "PWGCF/DataModel/FemtoDerived.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "TMath.h"
+#include <CCDB/BasicCCDBManager.h>
+
 #include "Math/Vector4D.h"
+#include "TMath.h"
+
+#include <fairlogger/Logger.h>
+
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGCF/FemtoDream/Tasks/femtoDreamCollisionMasker.cxx b/.auto-resolution/PWGCF/FemtoDream/Tasks/femtoDreamCollisionMasker.cxx
index fddbee16a88..b0bfcf727c5 100644
--- a/.auto-resolution/PWGCF/FemtoDream/Tasks/femtoDreamCollisionMasker.cxx
+++ b/.auto-resolution/PWGCF/FemtoDream/Tasks/femtoDreamCollisionMasker.cxx
@@ -14,23 +14,24 @@
 /// \author Anton Riedel, TU München, anton.riedel@tum.de
 /// \author Laura Serksnyte, TU München, laura.serksnyte@tum.de
 
-#include <cstdint>
-#include <vector>
-#include <string>
-#include <bitset>
-#include <algorithm>
-#include <random>
-#include <chrono>
+#include "PWGCF/DataModel/FemtoDerived.h"
 
-#include "fairlogger/Logger.h"
-#include "Framework/Configurable.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
+#include "Framework/Configurable.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
 
-#include "PWGCF/DataModel/FemtoDerived.h"
+#include "fairlogger/Logger.h"
+
+#include <algorithm>
+#include <bitset>
+#include <chrono>
+#include <cstdint>
+#include <random>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.auto-resolution/PWGCF/FemtoDream/Tasks/femtoDreamDebugCascade.cxx b/.auto-resolution/PWGCF/FemtoDream/Tasks/femtoDreamDebugCascade.cxx
index 54324361ec0..47f77a2732a 100644
--- a/.auto-resolution/PWGCF/FemtoDream/Tasks/femtoDreamDebugCascade.cxx
+++ b/.auto-resolution/PWGCF/FemtoDream/Tasks/femtoDreamDebugCascade.cxx
@@ -14,23 +14,25 @@
 /// \author Luca Barioglio, TU München, luca.barioglio@cern.ch
 /// \author Georgios Mantzaridis, TU München, luca.barioglio@cern.ch
 
-#include <cstdint>
-#include <iostream>
-#include <vector>
+#include "PWGCF/DataModel/FemtoDerived.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamEventHisto.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamMath.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
+
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/runDataProcessing.h"
+
 #include "fairlogger/Logger.h"
 
-#include "PWGCF/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamEventHisto.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamMath.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
+#include <cstdint>
+#include <iostream>
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis::femtoDream;
diff --git a/.auto-resolution/PWGCF/FemtoDream/Tasks/femtoDreamDebugTrack.cxx b/.auto-resolution/PWGCF/FemtoDream/Tasks/femtoDreamDebugTrack.cxx
index 68fab988fb9..71fdcdb426c 100644
--- a/.auto-resolution/PWGCF/FemtoDream/Tasks/femtoDreamDebugTrack.cxx
+++ b/.auto-resolution/PWGCF/FemtoDream/Tasks/femtoDreamDebugTrack.cxx
@@ -13,7 +13,10 @@
 /// \brief Tasks that reads the particle tables and fills QA histograms for tracks
 /// \author Luca Barioglio, TU München, luca.barioglio@cern.ch
 
-#include <Framework/Expressions.h>
+#include "PWGCF/DataModel/FemtoDerived.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamEventHisto.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h"
+
 #include "DataFormatsParameters/GRPObject.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
@@ -21,10 +24,7 @@
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
 #include "Framework/runDataProcessing.h"
-
-#include "PWGCF/FemtoDream/Core/femtoDreamEventHisto.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h"
-#include "PWGCF/DataModel/FemtoDerived.h"
+#include <Framework/Expressions.h>
 
 using namespace o2;
 using namespace o2::analysis::femtoDream;
diff --git a/.auto-resolution/PWGCF/FemtoDream/Tasks/femtoDreamDebugV0.cxx b/.auto-resolution/PWGCF/FemtoDream/Tasks/femtoDreamDebugV0.cxx
index 91010d4368e..3dc0c5f9875 100644
--- a/.auto-resolution/PWGCF/FemtoDream/Tasks/femtoDreamDebugV0.cxx
+++ b/.auto-resolution/PWGCF/FemtoDream/Tasks/femtoDreamDebugV0.cxx
@@ -13,24 +13,25 @@
 /// \brief Tasks that reads the particle tables and fills QA histograms for V0s
 /// \author Luca Barioglio, TU München, luca.barioglio@cern.ch
 
-#include <cstdint>
-#include <iostream>
-#include <vector>
-
-#include "TVector3.h"
+#include "PWGCF/DataModel/FemtoDerived.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamEventHisto.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h"
 
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TVector3.h"
+
 #include "fairlogger/Logger.h"
 
-#include "PWGCF/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamEventHisto.h"
+#include <cstdint>
+#include <iostream>
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis::femtoDream;
diff --git a/.auto-resolution/PWGCF/FemtoDream/Tasks/femtoDreamHashTask.cxx b/.auto-resolution/PWGCF/FemtoDream/Tasks/femtoDreamHashTask.cxx
index fe0aa6c0e3d..00ecf5a4af1 100644
--- a/.auto-resolution/PWGCF/FemtoDream/Tasks/femtoDreamHashTask.cxx
+++ b/.auto-resolution/PWGCF/FemtoDream/Tasks/femtoDreamHashTask.cxx
@@ -15,10 +15,12 @@
 /// \author Andi Mathis, TU München, andreas.mathis@ph.tum.de
 
 #include "PWGCF/DataModel/FemtoDerived.h"
+
 #include "Common/Core/EventMixing.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "Framework/ASoAHelpers.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGCF/FemtoDream/Tasks/femtoDreamPairTaskTrackCascade.cxx b/.auto-resolution/PWGCF/FemtoDream/Tasks/femtoDreamPairTaskTrackCascade.cxx
index 05696761afa..cbf191e34cd 100644
--- a/.auto-resolution/PWGCF/FemtoDream/Tasks/femtoDreamPairTaskTrackCascade.cxx
+++ b/.auto-resolution/PWGCF/FemtoDream/Tasks/femtoDreamPairTaskTrackCascade.cxx
@@ -11,23 +11,26 @@
 /// \file femtoDreamPairTaskTrackTrack.cxx
 /// \brief Tasks that reads the track tables used for the pairing and builds pairs of two tracks
 /// \author Andi Mathis, TU München, andreas.mathis@ph.tum.de
-#include <sys/stat.h>
-#include <cstdint>
-#include <vector>
-#include <string>
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/Expressions.h"
 #include "PWGCF/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamEventHisto.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamPairCleaner.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamContainer.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamDetaDphiStar.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamEventHisto.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamPairCleaner.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/Expressions.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+
+#include <sys/stat.h>
+
+#include <cstdint>
+#include <string>
+#include <vector>
 using namespace o2;
 using namespace o2::aod;
 using namespace o2::soa;
diff --git a/.auto-resolution/PWGCF/FemtoDream/Tasks/femtoDreamPairTaskTrackTrack.cxx b/.auto-resolution/PWGCF/FemtoDream/Tasks/femtoDreamPairTaskTrackTrack.cxx
index 9f080fd2dd0..2e2eda2f68e 100644
--- a/.auto-resolution/PWGCF/FemtoDream/Tasks/femtoDreamPairTaskTrackTrack.cxx
+++ b/.auto-resolution/PWGCF/FemtoDream/Tasks/femtoDreamPairTaskTrackTrack.cxx
@@ -15,28 +15,30 @@
 /// \author Georgios Mantzaridis, TU München, georgios.mantzaridis@tum.de
 /// \author Anton Riedel, TU München, anton.riedel@tum.de
 
-#include <cstdint>
-#include <vector>
-#include <bitset>
-#include <string>
-#include "TRandom3.h"
+#include "PWGCF/DataModel/FemtoDerived.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamContainer.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamDetaDphiStar.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamEventHisto.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamPairCleaner.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
+#include "Framework/Configurable.h"
+#include "Framework/Expressions.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
+#include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "Framework/Configurable.h"
-#include "Framework/Expressions.h"
+#include "Framework/runDataProcessing.h"
 
-#include "PWGCF/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamEventHisto.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamPairCleaner.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamContainer.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamDetaDphiStar.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
+#include "TRandom3.h"
+
+#include <bitset>
+#include <cstdint>
+#include <string>
+#include <vector>
 
 using namespace o2::aod;
 using namespace o2::soa;
diff --git a/.auto-resolution/PWGCF/FemtoDream/Tasks/femtoDreamPairTaskTrackV0.cxx b/.auto-resolution/PWGCF/FemtoDream/Tasks/femtoDreamPairTaskTrackV0.cxx
index 7798f3d59c8..428375e1cf9 100644
--- a/.auto-resolution/PWGCF/FemtoDream/Tasks/femtoDreamPairTaskTrackV0.cxx
+++ b/.auto-resolution/PWGCF/FemtoDream/Tasks/femtoDreamPairTaskTrackV0.cxx
@@ -13,25 +13,27 @@
 /// \brief Tasks that reads the track tables used for the pairing and builds pairs of two tracks
 /// \author Andi Mathis, TU München, andreas.mathis@ph.tum.de
 
-#include <sys/stat.h>
-#include <cstdint>
-#include <vector>
-#include <string>
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/Expressions.h"
-
 #include "PWGCF/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamEventHisto.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamPairCleaner.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamContainer.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamDetaDphiStar.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamEventHisto.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamPairCleaner.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/Expressions.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+
+#include <sys/stat.h>
+
+#include <cstdint>
+#include <string>
+#include <vector>
+
 using namespace o2;
 using namespace o2::aod;
 using namespace o2::soa;
diff --git a/.auto-resolution/PWGCF/FemtoDream/Tasks/femtoDreamTripletTaskTrackTrackTrack.cxx b/.auto-resolution/PWGCF/FemtoDream/Tasks/femtoDreamTripletTaskTrackTrackTrack.cxx
index 899de5659b1..9542b6c364b 100644
--- a/.auto-resolution/PWGCF/FemtoDream/Tasks/femtoDreamTripletTaskTrackTrackTrack.cxx
+++ b/.auto-resolution/PWGCF/FemtoDream/Tasks/femtoDreamTripletTaskTrackTrackTrack.cxx
@@ -13,24 +13,26 @@
 /// \brief Tasks that reads the track tables and creates track triplets; only three identical particles can be used
 /// \author Laura Serksnyte, TU München, laura.serksnyte@tum.de
 
-#include <vector>
-#include <string>
+#include "PWGCF/DataModel/FemtoDerived.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamContainerThreeBody.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamDetaDphiStar.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamEventHisto.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamPairCleaner.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
+#include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TDatabasePDG.h"
 
-#include "PWGCF/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamEventHisto.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamPairCleaner.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamContainerThreeBody.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamDetaDphiStar.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis::femtoDream;
diff --git a/.auto-resolution/PWGCF/FemtoDream/Tasks/femtoDreamTripletTaskTrackTrackV0.cxx b/.auto-resolution/PWGCF/FemtoDream/Tasks/femtoDreamTripletTaskTrackTrackV0.cxx
index 136b8f9d5ff..a01e51ce3a8 100644
--- a/.auto-resolution/PWGCF/FemtoDream/Tasks/femtoDreamTripletTaskTrackTrackV0.cxx
+++ b/.auto-resolution/PWGCF/FemtoDream/Tasks/femtoDreamTripletTaskTrackTrackV0.cxx
@@ -13,25 +13,27 @@
 /// \brief Tasks that reads the track and V0 tables and creates triplets; only two identical tracks and a V0 can be used
 /// \author Laura Serksnyte, TU München, laura.serksnyte@tum.de
 
-#include <vector>
-#include <bitset>
-#include <string>
+#include "PWGCF/DataModel/FemtoDerived.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamContainerThreeBody.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamDetaDphiStar.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamEventHisto.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamPairCleaner.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
+#include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TDatabasePDG.h"
 
-#include "PWGCF/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamEventHisto.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamPairCleaner.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamContainerThreeBody.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamDetaDphiStar.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
+#include <bitset>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis::femtoDream;
diff --git a/.auto-resolution/PWGCF/FemtoDream/Utils/femtoDreamCutCulator.cxx b/.auto-resolution/PWGCF/FemtoDream/Utils/femtoDreamCutCulator.cxx
index d6aa862851f..a1a6653c799 100644
--- a/.auto-resolution/PWGCF/FemtoDream/Utils/femtoDreamCutCulator.cxx
+++ b/.auto-resolution/PWGCF/FemtoDream/Utils/femtoDreamCutCulator.cxx
@@ -13,13 +13,15 @@
 /// \brief Executable that encodes physical selection criteria in a bit-wise
 /// selection \author Andi Mathis, TU München, andreas.mathis@ph.tum.de
 
-#include <iostream>
-#include <random>
-#include <string>
 #include "PWGCF/FemtoDream/Utils/femtoDreamCutCulator.h"
+
+#include "PWGCF/DataModel/FemtoDerived.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamSelection.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamTrackSelection.h"
-#include "PWGCF/DataModel/FemtoDerived.h"
+
+#include <iostream>
+#include <random>
+#include <string>
 
 using namespace o2::analysis::femtoDream;
 
diff --git a/.auto-resolution/PWGCF/FemtoDream/Utils/femtoDreamCutCulator.h b/.auto-resolution/PWGCF/FemtoDream/Utils/femtoDreamCutCulator.h
index f54a9ff62a4..dea6efebb3a 100644
--- a/.auto-resolution/PWGCF/FemtoDream/Utils/femtoDreamCutCulator.h
+++ b/.auto-resolution/PWGCF/FemtoDream/Utils/femtoDreamCutCulator.h
@@ -18,21 +18,22 @@
 #ifndef PWGCF_FEMTODREAM_UTILS_FEMTODREAMCUTCULATOR_H_
 #define PWGCF_FEMTODREAM_UTILS_FEMTODREAMCUTCULATOR_H_
 
+#include "PWGCF/FemtoDream/Core/femtoDreamCascadeSelection.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamSelection.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamTrackSelection.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamV0Selection.h"
+
+#include <boost/property_tree/json_parser.hpp>
+#include <boost/property_tree/ptree.hpp>
+
+#include <algorithm>
 #include <bitset>
 #include <functional>
 #include <iostream>
+#include <iterator>
 #include <random>
 #include <string>
 #include <vector>
-#include <algorithm>
-#include <iterator>
-#include <boost/property_tree/json_parser.hpp>
-#include <boost/property_tree/ptree.hpp>
-
-#include "PWGCF/FemtoDream/Core/femtoDreamSelection.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamTrackSelection.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamV0Selection.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamCascadeSelection.h"
 
 namespace o2::analysis::femtoDream
 {
diff --git a/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniverse3DContainer.h b/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniverse3DContainer.h
index 864487cdcb0..4579ec9ffd7 100644
--- a/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniverse3DContainer.h
+++ b/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniverse3DContainer.h
@@ -17,15 +17,18 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSE3DCONTAINER_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSE3DCONTAINER_H_
 
-#include <fairlogger/Logger.h>
-#include <vector>
-#include <string>
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
 
 #include "Framework/HistogramRegistry.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
+
 #include "Math/Vector4D.h"
-#include "TMath.h"
 #include "TDatabasePDG.h"
+#include "TMath.h"
+
+#include <fairlogger/Logger.h>
+
+#include <string>
+#include <vector>
 
 using namespace o2::framework;
 
diff --git a/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniverseAngularContainer.h b/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniverseAngularContainer.h
index 4d267fb67d3..92a2359e497 100644
--- a/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniverseAngularContainer.h
+++ b/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniverseAngularContainer.h
@@ -20,17 +20,20 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEANGULARCONTAINER_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEANGULARCONTAINER_H_
 
-#include <fairlogger/Logger.h>
-#include <vector>
-#include <string>
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
 
-#include "Framework/HistogramRegistry.h"
 #include "Common/Core/RecoDecay.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
+
+#include "Framework/HistogramRegistry.h"
 
 #include "Math/Vector4D.h"
-#include "TMath.h"
 #include "TDatabasePDG.h"
+#include "TMath.h"
+
+#include <fairlogger/Logger.h>
+
+#include <string>
+#include <vector>
 
 using namespace o2::framework;
 
diff --git a/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniverseCascadeSelection.h b/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniverseCascadeSelection.h
index 3a389da705e..d5ddc7a1948 100644
--- a/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniverseCascadeSelection.h
+++ b/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniverseCascadeSelection.h
@@ -21,15 +21,18 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSECASCADESELECTION_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSECASCADESELECTION_H_
 
-#include <string>
-#include <vector>
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseObjectSelection.h"
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseSelection.h"
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
+
 #include "Common/Core/RecoDecay.h"
+
 #include "Framework/HistogramRegistry.h"
 #include "ReconstructionDataFormats/PID.h"
 
+#include <string>
+#include <vector>
+
 namespace o2::analysis::femto_universe
 {
 namespace femto_universe_cascade_selection
diff --git a/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniverseCollisionSelection.h b/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniverseCollisionSelection.h
index 633bba05760..ab47405cb9c 100644
--- a/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniverseCollisionSelection.h
+++ b/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniverseCollisionSelection.h
@@ -18,11 +18,13 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSECOLLISIONSELECTION_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSECOLLISIONSELECTION_H_
 
-#include <string>
 #include "Common/CCDB/TriggerAliases.h"
+
 #include "Framework/HistogramRegistry.h"
 #include "Framework/Logger.h"
 
+#include <string>
+
 using namespace o2::framework;
 
 namespace o2::analysis::femto_universe
diff --git a/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniverseCutculator.h b/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniverseCutculator.h
index 40b7c425e5c..58e278cdde7 100644
--- a/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniverseCutculator.h
+++ b/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniverseCutculator.h
@@ -18,19 +18,20 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSECUTCULATOR_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSECUTCULATOR_H_
 
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseSelection.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseV0Selection.h"
+
+#include <boost/property_tree/json_parser.hpp>
+#include <boost/property_tree/ptree.hpp>
+
+#include <algorithm>
 #include <bitset>
 #include <iostream>
+#include <iterator>
 #include <random>
 #include <string>
 #include <vector>
-#include <algorithm>
-#include <iterator>
-#include <boost/property_tree/json_parser.hpp>
-#include <boost/property_tree/ptree.hpp>
-
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseSelection.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseV0Selection.h"
 
 namespace o2::analysis::femto_universe
 {
diff --git a/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h b/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h
index e8941e7cbd9..d7a0d70f38a 100644
--- a/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h
+++ b/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h
@@ -19,16 +19,19 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEDETADPHISTAR_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEDETADPHISTAR_H_
 
-#include <memory>
-#include <string>
-#include <vector>
-#include "TMath.h"
-#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseFemtoContainer.h"
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseAngularContainer.h"
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseContainer.h"
-#include "Framework/HistogramRegistry.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseFemtoContainer.h"
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
+#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
+
+#include "Framework/HistogramRegistry.h"
+
+#include "TMath.h"
+
+#include <memory>
+#include <string>
+#include <vector>
 
 namespace o2::analysis
 {
diff --git a/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniverseEfficiencyCalculator.h b/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniverseEfficiencyCalculator.h
index a96b70180aa..da40cfbf4d3 100644
--- a/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniverseEfficiencyCalculator.h
+++ b/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniverseEfficiencyCalculator.h
@@ -16,15 +16,17 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEEFFICIENCYCALCULATOR_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEEFFICIENCYCALCULATOR_H_
 
-#include <vector>
-#include <map>
-#include <string>
-#include <algorithm>
+#include "FemtoUniverseParticleHisto.h"
 
-#include "Framework/Configurable.h"
-#include "CCDB/BasicCCDBManager.h"
 #include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
-#include "FemtoUniverseParticleHisto.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "Framework/Configurable.h"
+
+#include <algorithm>
+#include <map>
+#include <string>
+#include <vector>
 
 namespace o2::analysis::femto_universe::efficiency
 {
diff --git a/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h b/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h
index 03d4b5b1fb4..dfe2bd35d62 100644
--- a/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h
+++ b/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h
@@ -18,6 +18,7 @@
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEEVENTHISTO_H_
 
 #include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
+
 #include "Framework/HistogramRegistry.h"
 
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniverseFemtoContainer.h b/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniverseFemtoContainer.h
index 4719561ccf6..8f5954429cd 100644
--- a/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniverseFemtoContainer.h
+++ b/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniverseFemtoContainer.h
@@ -20,16 +20,18 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEFEMTOCONTAINER_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEFEMTOCONTAINER_H_
 
-#include <fairlogger/Logger.h>
-#include <vector>
-#include <string>
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
 
 #include "Framework/HistogramRegistry.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
 
 #include "Math/Vector4D.h"
-#include "TMath.h"
 #include "TDatabasePDG.h"
+#include "TMath.h"
+
+#include <fairlogger/Logger.h>
+
+#include <string>
+#include <vector>
 
 using namespace o2::framework;
 
diff --git a/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h b/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h
index ec40ea035e6..aee87f1a057 100644
--- a/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h
+++ b/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h
@@ -19,14 +19,14 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEMATH_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEMATH_H_
 
-#include <vector>
-#include <algorithm>
-
-#include "Math/Vector4D.h"
 #include "Math/Boost.h"
+#include "Math/Vector4D.h"
 #include "TLorentzVector.h"
 #include "TMath.h"
 
+#include <algorithm>
+#include <vector>
+
 namespace o2::analysis::femto_universe
 {
 
diff --git a/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniverseObjectSelection.h b/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniverseObjectSelection.h
index 07491f92c8f..f01de84b75d 100644
--- a/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniverseObjectSelection.h
+++ b/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniverseObjectSelection.h
@@ -17,15 +17,16 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEOBJECTSELECTION_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEOBJECTSELECTION_H_
 
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseSelection.h"
+#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
+
+#include "Framework/HistogramRegistry.h"
+#include "ReconstructionDataFormats/PID.h"
+
 #include <algorithm>
 #include <string>
 #include <vector>
 
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseSelection.h"
-#include "ReconstructionDataFormats/PID.h"
-#include "Framework/HistogramRegistry.h"
-#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
-
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniversePairAngularWithCentMultKt.h b/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniversePairAngularWithCentMultKt.h
index 31b256f43f7..b63455ee3cf 100644
--- a/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniversePairAngularWithCentMultKt.h
+++ b/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniversePairAngularWithCentMultKt.h
@@ -17,9 +17,10 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEPAIRANGULARWITHCENTMULTKT_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEPAIRANGULARWITHCENTMULTKT_H_
 
+#include "Framework/HistogramRegistry.h"
+
 #include <string>
 #include <vector>
-#include "Framework/HistogramRegistry.h"
 
 namespace o2::analysis::femto_universe
 {
diff --git a/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h b/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h
index b27d8e25abf..32da4810b85 100644
--- a/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h
+++ b/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h
@@ -20,6 +20,7 @@
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEPAIRCLEANER_H_
 
 #include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
+
 #include "Framework/HistogramRegistry.h"
 
 namespace o2::analysis::femto_universe
diff --git a/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniversePairSHCentMultKt.h b/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniversePairSHCentMultKt.h
index ea8626cbe32..5c33b6cf30e 100644
--- a/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniversePairSHCentMultKt.h
+++ b/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniversePairSHCentMultKt.h
@@ -16,11 +16,12 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEPAIRSHCENTMULTKT_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEPAIRSHCENTMULTKT_H_
 
-#include <vector>
-#include <string>
+#include "Framework/HistogramRegistry.h"
+
 #include <complex>
 #include <memory>
-#include "Framework/HistogramRegistry.h"
+#include <string>
+#include <vector>
 
 // using namespace o2::constants::physics;
 
diff --git a/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniversePairWithCentMultKt.h b/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniversePairWithCentMultKt.h
index 5cfef9c433f..1f2651ad2f6 100644
--- a/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniversePairWithCentMultKt.h
+++ b/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniversePairWithCentMultKt.h
@@ -17,9 +17,10 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEPAIRWITHCENTMULTKT_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEPAIRWITHCENTMULTKT_H_
 
+#include "Framework/HistogramRegistry.h"
+
 #include <string>
 #include <vector>
-#include "Framework/HistogramRegistry.h"
 
 namespace o2::analysis::femto_universe
 {
diff --git a/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h b/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h
index 865efa0f36d..b14edcb3aad 100644
--- a/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h
+++ b/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h
@@ -20,11 +20,13 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEPARTICLEHISTO_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEPARTICLEHISTO_H_
 
-#include <string>
-#include <optional>
 #include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
-#include "Framework/HistogramRegistry.h"
+
 #include "CommonConstants/MathConstants.h"
+#include "Framework/HistogramRegistry.h"
+
+#include <optional>
+#include <string>
 
 using namespace o2::framework; // o2-linter: disable=using-directive
 
diff --git a/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniversePhiSelection.h b/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniversePhiSelection.h
index 0ee0bfe4162..c43217ceb72 100644
--- a/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniversePhiSelection.h
+++ b/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniversePhiSelection.h
@@ -19,18 +19,20 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEPHISELECTION_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEPHISELECTION_H_
 
-#include <string>
-#include <vector>
-
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseObjectSelection.h"
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseSelection.h"
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
 
 #include "Common/Core/RecoDecay.h"
+
 #include "Framework/HistogramRegistry.h"
 #include "ReconstructionDataFormats/PID.h"
+
 #include "TLorentzVector.h"
 
+#include <string>
+#include <vector>
+
 namespace o2::analysis::femto_universe
 {
 namespace femto_universe_phi_selection
diff --git a/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniverseSHContainer.h b/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniverseSHContainer.h
index 558874133cb..25b875a0333 100644
--- a/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniverseSHContainer.h
+++ b/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniverseSHContainer.h
@@ -17,18 +17,21 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSESHCONTAINER_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSESHCONTAINER_H_
 
-#include <fairlogger/Logger.h>
-#include <vector>
-#include <string>
-#include <complex>
-#include <memory>
-
-#include "Framework/HistogramRegistry.h"
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseSpherHarMath.h"
+
+#include "Framework/HistogramRegistry.h"
+
 #include "Math/Vector4D.h"
-#include "TMath.h"
 #include "TDatabasePDG.h"
+#include "TMath.h"
+
+#include <fairlogger/Logger.h>
+
+#include <complex>
+#include <memory>
+#include <string>
+#include <vector>
 
 namespace o2::analysis::femto_universe
 {
diff --git a/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniverseSoftPionRemoval.h b/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniverseSoftPionRemoval.h
index 9631b5b3377..4a97c83865d 100644
--- a/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniverseSoftPionRemoval.h
+++ b/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniverseSoftPionRemoval.h
@@ -16,11 +16,12 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSESOFTPIONREMOVAL_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSESOFTPIONREMOVAL_H_
 
-#include <vector>
-
 #include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
+
 #include "Framework/HistogramRegistry.h"
 
+#include <vector>
+
 namespace o2::analysis::femto_universe
 {
 
diff --git a/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniverseSpherHarMath.h b/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniverseSpherHarMath.h
index d92560ceb72..0efa7593a9f 100644
--- a/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniverseSpherHarMath.h
+++ b/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniverseSpherHarMath.h
@@ -16,14 +16,14 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSESPHERHARMATH_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSESPHERHARMATH_H_
 
-#include <vector>
-#include <algorithm>
-
-#include "Math/Vector4D.h"
 #include "Math/Boost.h"
+#include "Math/Vector4D.h"
 #include "TLorentzVector.h"
 #include "TMath.h"
 
+#include <algorithm>
+#include <vector>
+
 namespace o2::analysis::femto_universe
 {
 
diff --git a/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h b/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h
index 75276f24a6d..51c711c8165 100644
--- a/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h
+++ b/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h
@@ -18,17 +18,19 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSETRACKSELECTION_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSETRACKSELECTION_H_
 
-#include <string>
-#include <vector>
-#include <cmath>
-
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseObjectSelection.h"
 #include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseObjectSelection.h"
-#include "ReconstructionDataFormats/PID.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/HistogramRegistry.h"
+#include "ReconstructionDataFormats/PID.h"
+
+#include <cmath>
+#include <string>
+#include <vector>
 
 // using namespace o2::framework;
 
diff --git a/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniverseV0Selection.h b/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniverseV0Selection.h
index 805da180cc3..8b45f664f15 100644
--- a/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniverseV0Selection.h
+++ b/.auto-resolution/PWGCF/FemtoUniverse/Core/FemtoUniverseV0Selection.h
@@ -19,17 +19,18 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEV0SELECTION_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEV0SELECTION_H_
 
-#include <string>
-#include <vector>
-
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseObjectSelection.h"
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseSelection.h"
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
 
 #include "Common/Core/RecoDecay.h"
+
 #include "Framework/HistogramRegistry.h"
 #include "ReconstructionDataFormats/PID.h"
 
+#include <string>
+#include <vector>
+
 namespace o2::analysis::femto_universe
 {
 namespace femto_universe_v0_selection
diff --git a/.auto-resolution/PWGCF/FemtoUniverse/Core/femtoUtils.h b/.auto-resolution/PWGCF/FemtoUniverse/Core/femtoUtils.h
index 70a02e98b8c..ddc1833c335 100644
--- a/.auto-resolution/PWGCF/FemtoUniverse/Core/femtoUtils.h
+++ b/.auto-resolution/PWGCF/FemtoUniverse/Core/femtoUtils.h
@@ -17,12 +17,14 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUTILS_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUTILS_H_
 
-#include <vector>
-#include <functional>
-#include <algorithm>
-#include "Framework/ASoAHelpers.h"
 #include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
 
+#include "Framework/ASoAHelpers.h"
+
+#include <algorithm>
+#include <functional>
+#include <vector>
+
 namespace o2::analysis::femto_universe
 {
 
diff --git a/.auto-resolution/PWGCF/FemtoUniverse/DataModel/FemtoDerived.h b/.auto-resolution/PWGCF/FemtoUniverse/DataModel/FemtoDerived.h
index c103b52791e..83bf3f7fd72 100644
--- a/.auto-resolution/PWGCF/FemtoUniverse/DataModel/FemtoDerived.h
+++ b/.auto-resolution/PWGCF/FemtoUniverse/DataModel/FemtoDerived.h
@@ -16,15 +16,17 @@
 #ifndef PWGCF_FEMTOUNIVERSE_DATAMODEL_FEMTODERIVED_H_
 #define PWGCF_FEMTOUNIVERSE_DATAMODEL_FEMTODERIVED_H_
 
-#include <cmath>
-#include "Framework/ASoA.h"
-#include "MathUtils/Utils.h"
-#include "Framework/DataTypes.h"
 #include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoA.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/DataTypes.h"
 #include "Framework/Expressions.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
+#include "MathUtils/Utils.h"
+
+#include <cmath>
 
 namespace o2::aod
 {
diff --git a/.auto-resolution/PWGCF/FemtoUniverse/Macros/calculateEfficiencyCorrection.cxx b/.auto-resolution/PWGCF/FemtoUniverse/Macros/calculateEfficiencyCorrection.cxx
index 3880661d9f7..3d3137abc4a 100644
--- a/.auto-resolution/PWGCF/FemtoUniverse/Macros/calculateEfficiencyCorrection.cxx
+++ b/.auto-resolution/PWGCF/FemtoUniverse/Macros/calculateEfficiencyCorrection.cxx
@@ -21,15 +21,16 @@
 #include <TH2F.h>
 #include <TH3F.h>
 #include <TSystem.h>
-#include <unistd.h>
 
 #include <cassert>
 #include <cmath>
 #include <filesystem> // NOLINT
-#include <iostream>
 #include <format>
+#include <iostream>
 #include <string>
 
+#include <unistd.h>
+
 namespace fs = std::filesystem;
 
 auto* getHistogram(TFile* file, const std::string& name)
diff --git a/.auto-resolution/PWGCF/FemtoUniverse/TableProducer/femtoUniverseProducerReducedTask.cxx b/.auto-resolution/PWGCF/FemtoUniverse/TableProducer/femtoUniverseProducerReducedTask.cxx
index 4ae5b3b01f2..9eee793ee74 100644
--- a/.auto-resolution/PWGCF/FemtoUniverse/TableProducer/femtoUniverseProducerReducedTask.cxx
+++ b/.auto-resolution/PWGCF/FemtoUniverse/TableProducer/femtoUniverseProducerReducedTask.cxx
@@ -16,29 +16,32 @@
 /// \author Anton Riedel, TU München, anton.riedel@tum.de
 /// \author Zuzanna Chochulska, WUT Warsaw & CTU Prague, zchochul@cern.ch
 
-#include <CCDB/BasicCCDBManager.h>
-#include <vector>
-
-#include "TMath.h"
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseCollisionSelection.h"
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
+#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
 #include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+#include <CCDB/BasicCCDBManager.h>
+
 #include "Math/Vector4D.h"
-#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
+#include "TMath.h"
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis::femto_universe;
diff --git a/.auto-resolution/PWGCF/FemtoUniverse/TableProducer/femtoUniverseProducerTaskV0Only.cxx b/.auto-resolution/PWGCF/FemtoUniverse/TableProducer/femtoUniverseProducerTaskV0Only.cxx
index 968d3fab7ba..d7da7c67b8c 100644
--- a/.auto-resolution/PWGCF/FemtoUniverse/TableProducer/femtoUniverseProducerTaskV0Only.cxx
+++ b/.auto-resolution/PWGCF/FemtoUniverse/TableProducer/femtoUniverseProducerTaskV0Only.cxx
@@ -13,30 +13,33 @@
 /// \author Andi Mathis, TU München, andreas.mathis@ph.tum.de
 /// \author Zuzanna Chochulska, WUT Warsaw & CTU Prague, zchochul@cern.ch
 
-#include <CCDB/BasicCCDBManager.h>
-#include <vector>
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseCollisionSelection.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseV0Selection.h"
+#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "DataFormatsParameters/GRPMagField.h"
 #include "DataFormatsParameters/GRPObject.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseCollisionSelection.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseV0Selection.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
-#include "Math/Vector4D.h"
-#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "ReconstructionDataFormats/Track.h"
+#include <CCDB/BasicCCDBManager.h>
+
+#include "Math/Vector4D.h"
 #include "TMath.h"
 
+#include <vector>
+
 using namespace o2;
 using namespace o2::analysis::femto_universe;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGCF/FemtoUniverse/Tasks/femtoUniverseCutCulator.cxx b/.auto-resolution/PWGCF/FemtoUniverse/Tasks/femtoUniverseCutCulator.cxx
index 6e5af4e8d52..bae1565238a 100644
--- a/.auto-resolution/PWGCF/FemtoUniverse/Tasks/femtoUniverseCutCulator.cxx
+++ b/.auto-resolution/PWGCF/FemtoUniverse/Tasks/femtoUniverseCutCulator.cxx
@@ -14,14 +14,16 @@
 /// \author Andi Mathis, TU München, andreas.mathis@ph.tum.de
 /// \author Zuzanna Chochulska, WUT Warsaw & CTU Prague, zchochul@cern.ch
 
-#include <filesystem>
-#include <iostream>
-#include <random>
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseCutculator.h"
+
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseSelection.h"
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
 #include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
 
+#include <filesystem>
+#include <iostream>
+#include <random>
+
 using namespace o2::analysis::femto_universe;
 
 /// The function takes the path to the dpl-config.json as a argument and the
diff --git a/.auto-resolution/PWGCF/FemtoUniverse/Tasks/femtoUniverseDebugTrack.cxx b/.auto-resolution/PWGCF/FemtoUniverse/Tasks/femtoUniverseDebugTrack.cxx
index 984ab7d973e..da9e59016d9 100644
--- a/.auto-resolution/PWGCF/FemtoUniverse/Tasks/femtoUniverseDebugTrack.cxx
+++ b/.auto-resolution/PWGCF/FemtoUniverse/Tasks/femtoUniverseDebugTrack.cxx
@@ -14,6 +14,12 @@
 /// \author Luca Barioglio, TU München, luca.barioglio@cern.ch
 /// \author Zuzanna Chochulska, WUT Warsaw & CTU Prague, zchochul@cern.ch
 
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
+#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
+#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
+
 #include "DataFormatsParameters/GRPObject.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
@@ -22,12 +28,6 @@
 #include "Framework/StepTHn.h"
 #include "Framework/runDataProcessing.h"
 
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
-#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
-#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
-
 using namespace o2;
 using namespace o2::analysis::femto_universe;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGCF/FemtoUniverse/Tasks/femtoUniverseDebugV0.cxx b/.auto-resolution/PWGCF/FemtoUniverse/Tasks/femtoUniverseDebugV0.cxx
index fe1bf2e7983..1207d1ff10f 100644
--- a/.auto-resolution/PWGCF/FemtoUniverse/Tasks/femtoUniverseDebugV0.cxx
+++ b/.auto-resolution/PWGCF/FemtoUniverse/Tasks/femtoUniverseDebugV0.cxx
@@ -14,24 +14,27 @@
 /// \author Luca Barioglio, TU München, luca.barioglio@cern.ch
 /// \author Zuzanna Chochulska, WUT Warsaw & CTU Prague, zchochul@cern.ch
 
-#include <fairlogger/Logger.h>
-#include <cstdint>
-#include <vector>
-#include <TDatabasePDG.h>
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
+#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
+#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
+
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
+#include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/runDataProcessing.h"
 
-#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
-#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
+#include <TDatabasePDG.h>
+
+#include <fairlogger/Logger.h>
+
+#include <cstdint>
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis::femto_universe;
diff --git a/.auto-resolution/PWGCF/FemtoUniverse/Tasks/femtoUniverseEfficiencyTask.cxx b/.auto-resolution/PWGCF/FemtoUniverse/Tasks/femtoUniverseEfficiencyTask.cxx
index fcd9c56d452..dd13cdcede2 100644
--- a/.auto-resolution/PWGCF/FemtoUniverse/Tasks/femtoUniverseEfficiencyTask.cxx
+++ b/.auto-resolution/PWGCF/FemtoUniverse/Tasks/femtoUniverseEfficiencyTask.cxx
@@ -17,20 +17,22 @@
 /// \author Zuzanna Chochulska, WUT Warsaw & CTU Prague, zchochul@cern.ch
 
 // O2 includes
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseCollisionSelection.h"
+#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
+#include "PWGLF/DataModel/LFResonanceTables.h"
+
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/Core/trackUtilities.h"
+
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseCollisionSelection.h"
-#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
-#include "Framework/O2DatabasePDGPlugin.h"
 
 #include "TPDGCode.h"
 
diff --git a/.auto-resolution/PWGCF/FemtoUniverse/Tasks/femtoUniverseHashTask.cxx b/.auto-resolution/PWGCF/FemtoUniverse/Tasks/femtoUniverseHashTask.cxx
index 6f7a7d5db2b..0ec405b26ff 100644
--- a/.auto-resolution/PWGCF/FemtoUniverse/Tasks/femtoUniverseHashTask.cxx
+++ b/.auto-resolution/PWGCF/FemtoUniverse/Tasks/femtoUniverseHashTask.cxx
@@ -15,10 +15,12 @@
 /// \author Zuzanna Chochulska, WUT Warsaw & CTU Prague, zchochul@cern.ch
 
 #include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
+
 #include "Common/Core/EventMixing.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "Framework/ASoAHelpers.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackCascadeExtended.cxx b/.auto-resolution/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackCascadeExtended.cxx
index dd019a046db..e2e06229f40 100644
--- a/.auto-resolution/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackCascadeExtended.cxx
+++ b/.auto-resolution/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackCascadeExtended.cxx
@@ -14,22 +14,24 @@
 /// \author Barbara Chytla, WUT Warsaw, barbara.chytla@cern.ch
 /// \author Shirajum Monira, WUT Warsaw, shirajum.monira@cern.ch
 
-#include <vector>
-#include <set>
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/StepTHn.h"
-#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseContainer.h"
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
 #include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
+#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
+
+#include <set>
+#include <vector>
 
 using namespace o2;
 using namespace o2::soa;
diff --git a/.auto-resolution/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackD0.cxx b/.auto-resolution/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackD0.cxx
index 3e68a275452..7e28f498fbb 100644
--- a/.auto-resolution/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackD0.cxx
+++ b/.auto-resolution/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackD0.cxx
@@ -17,38 +17,37 @@
 /// \author Zuzanna Chochulska, WUT Warsaw & CTU Prague, zchochul@cern.ch
 /// \author Katarzyna Gwiździel, WUT Warsaw, katarzyna.gwizdziel@cern.ch
 
-#include <vector>
-#include <string>
-
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "ReconstructionDataFormats/PID.h"
-
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/RecoDecay.h"
-
-#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseFemtoContainer.h"
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseAngularContainer.h"
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h"
-#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseSoftPionRemoval.h"
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseEfficiencyCalculator.h"
-
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseFemtoContainer.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseSoftPionRemoval.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
+#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
+#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
 #include "PWGHF/Core/HfHelper.h"
 #include "PWGHF/Core/SelectorCuts.h"
 #include "PWGHF/DataModel/CandidateReconstructionTables.h"
 #include "PWGHF/DataModel/CandidateSelectionTables.h"
 
+#include "Common/Core/RecoDecay.h"
+#include "Common/DataModel/PIDResponse.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/PID.h"
+
+#include <string>
+#include <vector>
+
 using namespace o2;
 using namespace o2::analysis;
 using namespace o2::analysis::femto_universe;
diff --git a/.auto-resolution/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackNucleus.cxx b/.auto-resolution/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackNucleus.cxx
index f5fe1dc91a4..8c4462f3973 100644
--- a/.auto-resolution/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackNucleus.cxx
+++ b/.auto-resolution/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackNucleus.cxx
@@ -18,29 +18,31 @@
 /// \author Alicja Płachta, WUT Warsaw, alicja.plachta.stud@pw.edu.pl
 /// \author Anna-Mariia Andrushko, WUT Warsaw, anna-mariia.andrushko@cern.ch
 
-#include <vector>
-#include <string>
-#include <cmath>
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseFemtoContainer.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairWithCentMultKt.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
+#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
+#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
+
+#include "Common/DataModel/PIDResponse.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
+#include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/PID.h"
-#include "Common/DataModel/PIDResponse.h"
 
-#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseFemtoContainer.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h"
-#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairWithCentMultKt.h"
+#include <cmath>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis::femto_universe;
diff --git a/.auto-resolution/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrack.cxx b/.auto-resolution/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrack.cxx
index f4eb45752dc..1d623d6ec24 100644
--- a/.auto-resolution/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrack.cxx
+++ b/.auto-resolution/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrack.cxx
@@ -16,24 +16,25 @@
 /// \author Anton Riedel, TU München, anton.riedel@tum.de
 /// \author Zuzanna Chochulska, WUT Warsaw & CTU Prague, zchochul@cern.ch
 
-#include <vector>
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseAngularContainer.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseFemtoContainer.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
+#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
+#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
+#include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 
-#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseFemtoContainer.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseAngularContainer.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h"
-#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis::femto_universe;
diff --git a/.auto-resolution/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrack3DMultKtExtended.cxx b/.auto-resolution/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrack3DMultKtExtended.cxx
index f5c6242f456..4cb264949b1 100644
--- a/.auto-resolution/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrack3DMultKtExtended.cxx
+++ b/.auto-resolution/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrack3DMultKtExtended.cxx
@@ -14,30 +14,33 @@
 /// \remark This file is inherited from ~/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackMultKtExtended.cxx on 10/01/2024
 /// \author Pritam Chakraborty, WUT Warsaw, pritam.chakraborty@pw.edu.pl
 
-#include <vector>
-#include <string>
-#include "TRandom2.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverse3DContainer.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseContainer.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairWithCentMultKt.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
+#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
+#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
+
+#include "Common/DataModel/PIDResponse.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
+#include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/PID.h"
-#include "Common/DataModel/PIDResponse.h"
 
-#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverse3DContainer.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseContainer.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h"
-#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairWithCentMultKt.h"
+#include "TRandom2.h"
+
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis::femto_universe;
diff --git a/.auto-resolution/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackExtended.cxx b/.auto-resolution/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackExtended.cxx
index 06665491396..7760a8f2451 100644
--- a/.auto-resolution/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackExtended.cxx
+++ b/.auto-resolution/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackExtended.cxx
@@ -16,24 +16,24 @@
 /// \author Anton Riedel, TU München, anton.riedel@tum.de
 /// \author Zuzanna Chochulska, WUT Warsaw & CTU Prague, zchochul@cern.ch
 
-#include <Framework/O2DatabasePDGPlugin.h>
-#include <string>
-#include <vector>
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseContainer.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEfficiencyCorrection.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
+#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
 
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/PID.h"
+#include <Framework/O2DatabasePDGPlugin.h>
 
-#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseContainer.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEfficiencyCorrection.h"
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis::femto_universe;
diff --git a/.auto-resolution/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackMC.cxx b/.auto-resolution/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackMC.cxx
index 5b74f18a31e..66214ba9fd2 100644
--- a/.auto-resolution/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackMC.cxx
+++ b/.auto-resolution/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackMC.cxx
@@ -17,28 +17,31 @@
 /// \author Zuzanna Chochulska, WUT Warsaw, zuzanna.chochulska.stud@pw.edu.pl
 /// \author Zuzanna Chochulska, WUT Warsaw & CTU Prague, zchochul@cern.ch
 
-#include <vector>
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseContainer.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairAngularWithCentMultKt.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
+#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
+#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
+
+#include "Common/DataModel/PIDResponse.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
+#include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "TDatabasePDG.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/PID.h"
-#include "Common/DataModel/PIDResponse.h"
 
-#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseContainer.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h"
-#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairAngularWithCentMultKt.h"
+#include "TDatabasePDG.h"
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis::femto_universe;
diff --git a/.auto-resolution/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackMcTruth.cxx b/.auto-resolution/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackMcTruth.cxx
index d74b76ab237..804dc30e9d7 100644
--- a/.auto-resolution/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackMcTruth.cxx
+++ b/.auto-resolution/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackMcTruth.cxx
@@ -14,24 +14,26 @@
 /// \author Malgorzata Janik, WUT, majanik@cern.ch
 /// \author Zuzanna Chochulska, WUT Warsaw & CTU Prague, zchochul@cern.ch
 
-#include <vector>
-#include <random>
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseContainer.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
+#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
+#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
+#include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TDatabasePDG.h"
 
-#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseContainer.h"
-#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
+#include <random>
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis::femto_universe;
diff --git a/.auto-resolution/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackMultKtExtended.cxx b/.auto-resolution/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackMultKtExtended.cxx
index 76487c59269..23b0bab4057 100644
--- a/.auto-resolution/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackMultKtExtended.cxx
+++ b/.auto-resolution/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackMultKtExtended.cxx
@@ -17,29 +17,32 @@
 /// \author Zuzanna Chochulska, WUT Warsaw & CTU Prague, zchochul@cern.ch
 /// \author Alicja Płachta, WUT Warsaw, alicja.plachta.stud@pw.edu.pl
 
-#include <vector>
-#include <string>
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseFemtoContainer.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairWithCentMultKt.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
+#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
+#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
+
+#include "Common/DataModel/PIDResponse.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
+#include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "TDatabasePDG.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/PID.h"
-#include "Common/DataModel/PIDResponse.h"
 
-#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseFemtoContainer.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h"
-#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairWithCentMultKt.h"
+#include "TDatabasePDG.h"
+
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis::femto_universe;
diff --git a/.auto-resolution/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackSpherHarMultKtExtended.cxx b/.auto-resolution/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackSpherHarMultKtExtended.cxx
index 05c910b0b24..ccb74fb5600 100644
--- a/.auto-resolution/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackSpherHarMultKtExtended.cxx
+++ b/.auto-resolution/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackSpherHarMultKtExtended.cxx
@@ -14,29 +14,32 @@
 /// \remark This file is inherited from ~/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrack3DMultKtExtended.cxx on 17/06/2024
 /// \author Pritam Chakraborty, WUT Warsaw, pritam.chakraborty@pw.edu.pl
 
-#include <vector>
-#include <string>
-#include "TRandom2.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairSHCentMultKt.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseSHContainer.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
+#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
+#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
+
+#include "Common/DataModel/PIDResponse.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
+#include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/PID.h"
-#include "Common/DataModel/PIDResponse.h"
 
-#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseSHContainer.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h"
-#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairSHCentMultKt.h"
+#include "TRandom2.h"
+
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis::femto_universe;
diff --git a/.auto-resolution/PWGCF/FemtoWorld/Core/FemtoWorldCollisionSelection.h b/.auto-resolution/PWGCF/FemtoWorld/Core/FemtoWorldCollisionSelection.h
index d2404f3e214..d581dcaa4ee 100644
--- a/.auto-resolution/PWGCF/FemtoWorld/Core/FemtoWorldCollisionSelection.h
+++ b/.auto-resolution/PWGCF/FemtoWorld/Core/FemtoWorldCollisionSelection.h
@@ -17,13 +17,14 @@
 #ifndef PWGCF_FEMTOWORLD_CORE_FEMTOWORLDCOLLISIONSELECTION_H_
 #define PWGCF_FEMTOWORLD_CORE_FEMTOWORLDCOLLISIONSELECTION_H_
 
-#include <string>
-#include <iostream>
-
 #include "Common/CCDB/TriggerAliases.h"
+
 #include "Framework/HistogramRegistry.h"
 #include "Framework/Logger.h"
 
+#include <iostream>
+#include <string>
+
 using namespace o2::framework;
 
 namespace o2::analysis::femtoWorld
diff --git a/.auto-resolution/PWGCF/FemtoWorld/Core/FemtoWorldContainer.h b/.auto-resolution/PWGCF/FemtoWorld/Core/FemtoWorldContainer.h
index a80af060d56..5bf2a122062 100644
--- a/.auto-resolution/PWGCF/FemtoWorld/Core/FemtoWorldContainer.h
+++ b/.auto-resolution/PWGCF/FemtoWorld/Core/FemtoWorldContainer.h
@@ -18,19 +18,20 @@
 #ifndef PWGCF_FEMTOWORLD_CORE_FEMTOWORLDCONTAINER_H_
 #define PWGCF_FEMTOWORLD_CORE_FEMTOWORLDCONTAINER_H_
 
-#include <vector>
-#include <string>
-#include "Framework/HistogramRegistry.h"
 #include "PWGCF/FemtoWorld/Core/FemtoWorldMath.h"
 
+#include "CommonConstants/MathConstants.h"
+#include "Framework/HistogramRegistry.h"
+
 #include "Math/Vector4D.h"
-#include "TMath.h"
 #include "TDatabasePDG.h"
-
 #include "TLorentzVector.h"
-#include "CommonConstants/MathConstants.h"
+#include "TMath.h"
 #include "TRandom.h"
 
+#include <string>
+#include <vector>
+
 using namespace o2::framework;
 
 namespace o2::analysis::femtoWorld
diff --git a/.auto-resolution/PWGCF/FemtoWorld/Core/FemtoWorldDetaDphiStar.h b/.auto-resolution/PWGCF/FemtoWorld/Core/FemtoWorldDetaDphiStar.h
index f7262481a77..c7085de74ce 100644
--- a/.auto-resolution/PWGCF/FemtoWorld/Core/FemtoWorldDetaDphiStar.h
+++ b/.auto-resolution/PWGCF/FemtoWorld/Core/FemtoWorldDetaDphiStar.h
@@ -17,13 +17,14 @@
 #ifndef PWGCF_FEMTOWORLD_CORE_FEMTOWORLDDETADPHISTAR_H_
 #define PWGCF_FEMTOWORLD_CORE_FEMTOWORLDDETADPHISTAR_H_
 
-#include <string>
-#include <memory>
-#include <vector>
-
 #include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
+
 #include "Framework/HistogramRegistry.h"
 
+#include <memory>
+#include <string>
+#include <vector>
+
 namespace o2::analysis
 {
 namespace femtoWorld
diff --git a/.auto-resolution/PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h b/.auto-resolution/PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h
index fade16ebb00..c7c1c672816 100644
--- a/.auto-resolution/PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h
+++ b/.auto-resolution/PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h
@@ -18,6 +18,7 @@
 #define FEMTOWORLDEVENTHISTO_H_
 
 #include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
+
 #include "Framework/HistogramRegistry.h"
 
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGCF/FemtoWorld/Core/FemtoWorldMath.h b/.auto-resolution/PWGCF/FemtoWorld/Core/FemtoWorldMath.h
index 6eff2f212b8..921b34aa8f5 100644
--- a/.auto-resolution/PWGCF/FemtoWorld/Core/FemtoWorldMath.h
+++ b/.auto-resolution/PWGCF/FemtoWorld/Core/FemtoWorldMath.h
@@ -17,8 +17,8 @@
 #ifndef FEMTOWORLDMATH_H_
 #define FEMTOWORLDMATH_H_
 
-#include "Math/Vector4D.h"
 #include "Math/Boost.h"
+#include "Math/Vector4D.h"
 #include "TLorentzVector.h"
 #include "TMath.h"
 
diff --git a/.auto-resolution/PWGCF/FemtoWorld/Core/FemtoWorldObjectSelection.h b/.auto-resolution/PWGCF/FemtoWorld/Core/FemtoWorldObjectSelection.h
index d940f9d13ef..2ab9c7a05f2 100644
--- a/.auto-resolution/PWGCF/FemtoWorld/Core/FemtoWorldObjectSelection.h
+++ b/.auto-resolution/PWGCF/FemtoWorld/Core/FemtoWorldObjectSelection.h
@@ -18,8 +18,8 @@
 
 #include "PWGCF/FemtoWorld/Core/FemtoWorldSelection.h"
 
-#include "ReconstructionDataFormats/PID.h"
 #include "Framework/HistogramRegistry.h"
+#include "ReconstructionDataFormats/PID.h"
 
 using namespace o2::framework;
 
diff --git a/.auto-resolution/PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h b/.auto-resolution/PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h
index 5c20af3813e..f0f6b24dead 100644
--- a/.auto-resolution/PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h
+++ b/.auto-resolution/PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h
@@ -18,6 +18,7 @@
 #define PWGCF_FEMTOWORLD_CORE_FEMTOWORLDPAIRCLEANER_H_
 
 #include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
+
 #include "Framework/HistogramRegistry.h"
 
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGCF/FemtoWorld/Core/FemtoWorldPairWithCentrality.h b/.auto-resolution/PWGCF/FemtoWorld/Core/FemtoWorldPairWithCentrality.h
index 2a2548b5d5b..fee7b1aed33 100644
--- a/.auto-resolution/PWGCF/FemtoWorld/Core/FemtoWorldPairWithCentrality.h
+++ b/.auto-resolution/PWGCF/FemtoWorld/Core/FemtoWorldPairWithCentrality.h
@@ -13,10 +13,11 @@
 #ifndef PWGCF_FEMTOWORLD_CORE_FEMTOWORLDPAIRWITHCENTRALITY_H_
 #define PWGCF_FEMTOWORLD_CORE_FEMTOWORLDPAIRWITHCENTRALITY_H_
 
-#include <string>
+#include "Framework/HistogramRegistry.h"
+
 #include <iostream>
+#include <string>
 #include <vector>
-#include "Framework/HistogramRegistry.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h b/.auto-resolution/PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h
index 0671c267200..574fa371ae8 100644
--- a/.auto-resolution/PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h
+++ b/.auto-resolution/PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h
@@ -17,10 +17,12 @@
 #ifndef PWGCF_FEMTOWORLD_CORE_FEMTOWORLDPARTICLEHISTO_H_
 #define PWGCF_FEMTOWORLD_CORE_FEMTOWORLDPARTICLEHISTO_H_
 
-#include <string>
 #include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
+
 #include "Framework/HistogramRegistry.h"
 
+#include <string>
+
 using namespace o2::framework;
 // using namespace o2::aod::o2::aod;
 
diff --git a/.auto-resolution/PWGCF/FemtoWorld/Core/FemtoWorldPhiSelection.h b/.auto-resolution/PWGCF/FemtoWorld/Core/FemtoWorldPhiSelection.h
index 39040d70ec0..52ed3db69ed 100644
--- a/.auto-resolution/PWGCF/FemtoWorld/Core/FemtoWorldPhiSelection.h
+++ b/.auto-resolution/PWGCF/FemtoWorld/Core/FemtoWorldPhiSelection.h
@@ -19,19 +19,20 @@
 #ifndef PWGCF_FEMTOWORLD_CORE_FEMTOWORLDPHISELECTION_H_
 #define PWGCF_FEMTOWORLD_CORE_FEMTOWORLDPHISELECTION_H_
 
-#include <string>
-#include <vector>
-
-#include <TDatabasePDG.h> // FIXME
-
 #include "PWGCF/FemtoWorld/Core/FemtoWorldObjectSelection.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldTrackSelection.h"
 #include "PWGCF/FemtoWorld/Core/FemtoWorldSelection.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldTrackSelection.h"
 
-#include "ReconstructionDataFormats/PID.h"
 #include "Common/Core/RecoDecay.h"
+
 #include "Framework/HistogramRegistry.h"
+#include "ReconstructionDataFormats/PID.h"
+
 #include "TLorentzVector.h"
+#include <TDatabasePDG.h> // FIXME
+
+#include <string>
+#include <vector>
 
 using namespace o2::framework;
 
diff --git a/.auto-resolution/PWGCF/FemtoWorld/Core/FemtoWorldPionContainer.h b/.auto-resolution/PWGCF/FemtoWorld/Core/FemtoWorldPionContainer.h
index 9c68ac7c76e..fe4641b9463 100644
--- a/.auto-resolution/PWGCF/FemtoWorld/Core/FemtoWorldPionContainer.h
+++ b/.auto-resolution/PWGCF/FemtoWorld/Core/FemtoWorldPionContainer.h
@@ -18,19 +18,20 @@
 #ifndef PWGCF_FEMTOWORLD_CORE_FEMTOWORLDPIONCONTAINER_H_
 #define PWGCF_FEMTOWORLD_CORE_FEMTOWORLDPIONCONTAINER_H_
 
-#include <vector>
-#include <string>
-#include "Framework/HistogramRegistry.h"
 #include "PWGCF/FemtoWorld/Core/FemtoWorldMath.h"
 
+#include "CommonConstants/MathConstants.h"
+#include "Framework/HistogramRegistry.h"
+
 #include "Math/Vector4D.h"
-#include "TMath.h"
 #include "TDatabasePDG.h"
-
 #include "TLorentzVector.h"
-#include "CommonConstants/MathConstants.h"
+#include "TMath.h"
 #include "TRandom.h"
 
+#include <string>
+#include <vector>
+
 using namespace o2::framework;
 
 namespace o2::analysis::femtoWorld
diff --git a/.auto-resolution/PWGCF/FemtoWorld/Core/FemtoWorldTrackSelection.h b/.auto-resolution/PWGCF/FemtoWorld/Core/FemtoWorldTrackSelection.h
index 1853be4bd3c..ea06a1433a4 100644
--- a/.auto-resolution/PWGCF/FemtoWorld/Core/FemtoWorldTrackSelection.h
+++ b/.auto-resolution/PWGCF/FemtoWorld/Core/FemtoWorldTrackSelection.h
@@ -18,14 +18,16 @@
 #ifndef FEMTOWORLDTRACKSELECTION_H_
 #define FEMTOWORLDTRACKSELECTION_H_
 
+#include "PWGCF/FemtoWorld/Core/FemtoWorldObjectSelection.h"
 #include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldObjectSelection.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "ReconstructionDataFormats/PID.h"
 #include "Framework/HistogramRegistry.h"
+#include "ReconstructionDataFormats/PID.h"
+
 #include <cmath>
 #include <iostream>
 
@@ -278,7 +280,7 @@ class FemtoWorldTrackSelection : public FemtoWorldObjectSelection<float, femtoWo
                                                                           "Maximal DCA_z (cm)",
                                                                           "Minimal DCA (cm)",
                                                                           "Maximal PID (nSigma)"}; ///< Helper information for the different selections
-};                                                                                                 // namespace femtoWorld
+}; // namespace femtoWorld
 
 template <o2::aod::femtoworldparticle::ParticleType part, o2::aod::femtoworldparticle::TrackType tracktype, typename cutContainerType>
 void FemtoWorldTrackSelection::init(HistogramRegistry* registry)
diff --git a/.auto-resolution/PWGCF/FemtoWorld/Core/FemtoWorldUtils.h b/.auto-resolution/PWGCF/FemtoWorld/Core/FemtoWorldUtils.h
index 6f7ae6e31e3..a918e674e45 100644
--- a/.auto-resolution/PWGCF/FemtoWorld/Core/FemtoWorldUtils.h
+++ b/.auto-resolution/PWGCF/FemtoWorld/Core/FemtoWorldUtils.h
@@ -18,8 +18,9 @@
 #ifndef FEMTOWORLD_UTILS_H_
 #define FEMTOWORLD_UTILS_H_
 
-#include "Framework/ASoAHelpers.h"
 #include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
+
+#include "Framework/ASoAHelpers.h"
 #include <CCDB/BasicCCDBManager.h>
 
 #include <vector>
diff --git a/.auto-resolution/PWGCF/FemtoWorld/Core/FemtoWorldV0Selection.h b/.auto-resolution/PWGCF/FemtoWorld/Core/FemtoWorldV0Selection.h
index b86171502e8..e5202efbc65 100644
--- a/.auto-resolution/PWGCF/FemtoWorld/Core/FemtoWorldV0Selection.h
+++ b/.auto-resolution/PWGCF/FemtoWorld/Core/FemtoWorldV0Selection.h
@@ -20,12 +20,13 @@
 #define FEMTOWORLDV0SELECTION_H_
 
 #include "PWGCF/FemtoWorld/Core/FemtoWorldObjectSelection.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldTrackSelection.h"
 #include "PWGCF/FemtoWorld/Core/FemtoWorldSelection.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldTrackSelection.h"
 
-#include "ReconstructionDataFormats/PID.h"
 #include "Common/Core/RecoDecay.h"
+
 #include "Framework/HistogramRegistry.h"
+#include "ReconstructionDataFormats/PID.h"
 
 using namespace o2::framework;
 
diff --git a/.auto-resolution/PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h b/.auto-resolution/PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h
index d112f11c2ab..4d3071b5575 100644
--- a/.auto-resolution/PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h
+++ b/.auto-resolution/PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h
@@ -12,16 +12,18 @@
 #ifndef PWGCF_FEMTOWORLD_DATAMODEL_FEMTOWORLDDERIVED_H_
 #define PWGCF_FEMTOWORLD_DATAMODEL_FEMTOWORLDDERIVED_H_
 
-#include <cmath>
-#include "Framework/ASoA.h"
-#include "MathUtils/Utils.h"
-#include "Framework/DataTypes.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoA.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/DataTypes.h"
 #include "Framework/Expressions.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Centrality.h"
+#include "MathUtils/Utils.h"
+
+#include <cmath>
 
 namespace o2::aod
 {
diff --git a/.auto-resolution/PWGCF/FemtoWorld/TableProducer/femtoWorldProducerReducedTask.cxx b/.auto-resolution/PWGCF/FemtoWorld/TableProducer/femtoWorldProducerReducedTask.cxx
index 06bb8dff109..c6380dd97d2 100644
--- a/.auto-resolution/PWGCF/FemtoWorld/TableProducer/femtoWorldProducerReducedTask.cxx
+++ b/.auto-resolution/PWGCF/FemtoWorld/TableProducer/femtoWorldProducerReducedTask.cxx
@@ -16,23 +16,25 @@
 #include "PWGCF/FemtoWorld/Core/FemtoWorldCollisionSelection.h"
 #include "PWGCF/FemtoWorld/Core/FemtoWorldTrackSelection.h"
 #include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "DataFormatsParameters/GRPObject.h"
+#include <CCDB/BasicCCDBManager.h>
+
 #include "Math/Vector4D.h"
 #include "TMath.h"
-#include <CCDB/BasicCCDBManager.h>
 
 using namespace o2;
 using namespace o2::analysis::femtoWorld;
diff --git a/.auto-resolution/PWGCF/FemtoWorld/TableProducer/femtoWorldProducerTask.cxx b/.auto-resolution/PWGCF/FemtoWorld/TableProducer/femtoWorldProducerTask.cxx
index ce5b415b275..861e7ff8005 100644
--- a/.auto-resolution/PWGCF/FemtoWorld/TableProducer/femtoWorldProducerTask.cxx
+++ b/.auto-resolution/PWGCF/FemtoWorld/TableProducer/femtoWorldProducerTask.cxx
@@ -14,38 +14,38 @@
 /// \author Andi Mathis, TU München, andreas.mathis@ph.tum.de
 /// \author Zuzanna Chochulska, WUT Warsaw, zchochul@cern.ch
 
-#include <TDatabasePDG.h> // FIXME
-
-#include "CCDB/BasicCCDBManager.h"
 #include "PWGCF/FemtoWorld/Core/FemtoWorldCollisionSelection.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldPhiSelection.h"
 #include "PWGCF/FemtoWorld/Core/FemtoWorldTrackSelection.h"
 #include "PWGCF/FemtoWorld/Core/FemtoWorldV0Selection.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldPhiSelection.h"
 #include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h"
-
 #include "PWGHF/Core/HfHelper.h"
 #include "PWGHF/DataModel/CandidateReconstructionTables.h"
 #include "PWGHF/DataModel/CandidateSelectionTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "TLorentzVector.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsParameters/GRPMagField.h"
 #include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
 #include "Math/Vector4D.h"
+#include "TLorentzVector.h"
 #include "TMath.h"
+#include <TDatabasePDG.h> // FIXME
 
 using namespace o2;
 using namespace o2::analysis::femtoWorld;
diff --git a/.auto-resolution/PWGCF/FemtoWorld/TableProducer/femtoWorldProducerTaskV0Only.cxx b/.auto-resolution/PWGCF/FemtoWorld/TableProducer/femtoWorldProducerTaskV0Only.cxx
index b576f2c125b..0e635dc97ee 100644
--- a/.auto-resolution/PWGCF/FemtoWorld/TableProducer/femtoWorldProducerTaskV0Only.cxx
+++ b/.auto-resolution/PWGCF/FemtoWorld/TableProducer/femtoWorldProducerTaskV0Only.cxx
@@ -17,23 +17,25 @@
 #include "PWGCF/FemtoWorld/Core/FemtoWorldTrackSelection.h"
 #include "PWGCF/FemtoWorld/Core/FemtoWorldV0Selection.h"
 #include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "DataFormatsParameters/GRPObject.h"
+#include <CCDB/BasicCCDBManager.h>
+
 #include "Math/Vector4D.h"
 #include "TMath.h"
-#include <CCDB/BasicCCDBManager.h>
 
 using namespace o2;
 using namespace o2::analysis::femtoWorld;
diff --git a/.auto-resolution/PWGCF/FemtoWorld/Tasks/femtoWorldDebugTrack.cxx b/.auto-resolution/PWGCF/FemtoWorld/Tasks/femtoWorldDebugTrack.cxx
index cb5fd945b3c..a0f158df070 100644
--- a/.auto-resolution/PWGCF/FemtoWorld/Tasks/femtoWorldDebugTrack.cxx
+++ b/.auto-resolution/PWGCF/FemtoWorld/Tasks/femtoWorldDebugTrack.cxx
@@ -13,18 +13,18 @@
 /// \brief Tasks that reads the particle tables and fills QA histograms for tracks
 /// \author Luca Barioglio, TU München, luca.barioglio@cern.ch
 
+#include "PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldUtils.h"
+#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
+
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-#include "DataFormatsParameters/GRPObject.h"
-
-#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldUtils.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::analysis::femtoWorld;
diff --git a/.auto-resolution/PWGCF/FemtoWorld/Tasks/femtoWorldDebugV0.cxx b/.auto-resolution/PWGCF/FemtoWorld/Tasks/femtoWorldDebugV0.cxx
index b2080ba4789..31c37c84772 100644
--- a/.auto-resolution/PWGCF/FemtoWorld/Tasks/femtoWorldDebugV0.cxx
+++ b/.auto-resolution/PWGCF/FemtoWorld/Tasks/femtoWorldDebugV0.cxx
@@ -13,18 +13,18 @@
 /// \brief Tasks that reads the particle tables and fills QA histograms for V0s
 /// \author Luca Barioglio, TU München, luca.barioglio@cern.ch
 
+#include "PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldUtils.h"
+#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
+
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-#include "DataFormatsParameters/GRPObject.h"
-
-#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldUtils.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::analysis::femtoWorld;
diff --git a/.auto-resolution/PWGCF/FemtoWorld/Tasks/femtoWorldEfficiencyTask.cxx b/.auto-resolution/PWGCF/FemtoWorld/Tasks/femtoWorldEfficiencyTask.cxx
index 9cad450302f..a4fb0717a75 100644
--- a/.auto-resolution/PWGCF/FemtoWorld/Tasks/femtoWorldEfficiencyTask.cxx
+++ b/.auto-resolution/PWGCF/FemtoWorld/Tasks/femtoWorldEfficiencyTask.cxx
@@ -16,20 +16,22 @@
 /// \author Barbara Chytla, WUT Warsaw, barbara.chytla@cern.ch
 
 // O2 includes
+#include "PWGCF/FemtoWorld/Core/FemtoWorldCollisionSelection.h"
+#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
+#include "PWGLF/DataModel/LFResonanceTables.h"
+
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/Core/trackUtilities.h"
+
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldCollisionSelection.h"
-#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
-#include "Framework/O2DatabasePDGPlugin.h"
 
 #include "TPDGCode.h"
 
diff --git a/.auto-resolution/PWGCF/FemtoWorld/Tasks/femtoWorldEfficiencyTaskDe.cxx b/.auto-resolution/PWGCF/FemtoWorld/Tasks/femtoWorldEfficiencyTaskDe.cxx
index b0108b37a2b..cd0d2e4b247 100644
--- a/.auto-resolution/PWGCF/FemtoWorld/Tasks/femtoWorldEfficiencyTaskDe.cxx
+++ b/.auto-resolution/PWGCF/FemtoWorld/Tasks/femtoWorldEfficiencyTaskDe.cxx
@@ -16,19 +16,21 @@
 /// \author Barbara Chytla, WUT Warsaw, barbara.chytla@cern.ch
 
 // O2 includes
+#include "PWGCF/FemtoWorld/Core/FemtoWorldCollisionSelection.h"
+#include "PWGLF/DataModel/LFResonanceTables.h"
+
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/Core/trackUtilities.h"
+
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldCollisionSelection.h"
-#include "Framework/O2DatabasePDGPlugin.h"
 
 #include "TPDGCode.h"
 
diff --git a/.auto-resolution/PWGCF/FemtoWorld/Tasks/femtoWorldHashTask.cxx b/.auto-resolution/PWGCF/FemtoWorld/Tasks/femtoWorldHashTask.cxx
index 4a6bdac3a2b..a990af3bf9e 100644
--- a/.auto-resolution/PWGCF/FemtoWorld/Tasks/femtoWorldHashTask.cxx
+++ b/.auto-resolution/PWGCF/FemtoWorld/Tasks/femtoWorldHashTask.cxx
@@ -16,11 +16,12 @@
 /// \author Zuzanna Chochulska, WUT Warsaw, zchochul@cern.ch
 
 #include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
+
 #include "Common/Core/EventMixing.h"
-#include "Framework/AnalysisTask.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "Framework/ASoAHelpers.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskPionPion.cxx b/.auto-resolution/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskPionPion.cxx
index a2d061ed1f4..07185918140 100644
--- a/.auto-resolution/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskPionPion.cxx
+++ b/.auto-resolution/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskPionPion.cxx
@@ -15,20 +15,20 @@
 /// \author Zuzanna Chochulska, WUT Warsaw, zchochul@cern.ch
 /// \author Alicja Plachta, WUT Warsaw
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/StepTHn.h"
-
-#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldDetaDphiStar.h"
 #include "PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h"
 #include "PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h"
 #include "PWGCF/FemtoWorld/Core/FemtoWorldPionContainer.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldDetaDphiStar.h"
 #include "PWGCF/FemtoWorld/Core/FemtoWorldUtils.h"
+#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::analysis::femtoWorld;
diff --git a/.auto-resolution/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskProtonAntiproton.cxx b/.auto-resolution/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskProtonAntiproton.cxx
index 066307a91d4..46f6f802ae6 100644
--- a/.auto-resolution/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskProtonAntiproton.cxx
+++ b/.auto-resolution/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskProtonAntiproton.cxx
@@ -15,20 +15,20 @@
 /// \author Zuzanna Chochulska, WUT Warsaw, zchochul@cern.ch
 /// \author Barbara Chytła, WUT Warsaw, barbara.chytla.stud@pw.edu.pl
 
+#include "PWGCF/FemtoWorld/Core/FemtoWorldContainer.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldDetaDphiStar.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldUtils.h"
+#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-
-#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldContainer.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldDetaDphiStar.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldUtils.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::analysis::femtoWorld;
diff --git a/.auto-resolution/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskTrackD0.cxx b/.auto-resolution/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskTrackD0.cxx
index 8f1452c1c49..6a1fa8331c6 100644
--- a/.auto-resolution/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskTrackD0.cxx
+++ b/.auto-resolution/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskTrackD0.cxx
@@ -14,24 +14,23 @@
 /// \author Andi Mathis, TU München, andreas.mathis@ph.tum.de
 /// \author Zuzanna Chochulska, WUT Warsaw, zchochul@cern.ch
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/StepTHn.h"
-
-#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h"
 #include "PWGCF/FemtoWorld/Core/FemtoWorldContainer.h"
 #include "PWGCF/FemtoWorld/Core/FemtoWorldDetaDphiStar.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h"
 #include "PWGCF/FemtoWorld/Core/FemtoWorldUtils.h"
-
+#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
 #include "PWGHF/DataModel/CandidateReconstructionTables.h"
 #include "PWGHF/DataModel/CandidateSelectionTables.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::analysis::femtoWorld;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskTrackPhi.cxx b/.auto-resolution/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskTrackPhi.cxx
index e5201b379d5..3e6c1a066bb 100644
--- a/.auto-resolution/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskTrackPhi.cxx
+++ b/.auto-resolution/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskTrackPhi.cxx
@@ -14,20 +14,20 @@
 /// \author Andi Mathis, TU München, andreas.mathis@ph.tum.de
 /// \author Zuzanna Chochulska, WUT Warsaw, zchochul@cern.ch
 
+#include "PWGCF/FemtoWorld/Core/FemtoWorldContainer.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldDetaDphiStar.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldUtils.h"
+#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-
-#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldContainer.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldDetaDphiStar.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldUtils.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::analysis::femtoWorld;
diff --git a/.auto-resolution/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskTrackTrack.cxx b/.auto-resolution/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskTrackTrack.cxx
index 4037bd991e0..1cacc212d47 100644
--- a/.auto-resolution/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskTrackTrack.cxx
+++ b/.auto-resolution/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskTrackTrack.cxx
@@ -14,20 +14,20 @@
 /// \author Andi Mathis, TU München, andreas.mathis@ph.tum.de
 /// \author Zuzanna Chochulska, WUT Warsaw, zchochul@cern.ch
 
+#include "PWGCF/FemtoWorld/Core/FemtoWorldContainer.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldDetaDphiStar.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldUtils.h"
+#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-
-#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldContainer.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldDetaDphiStar.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldUtils.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::analysis::femtoWorld;
diff --git a/.auto-resolution/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskTrackV0.cxx b/.auto-resolution/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskTrackV0.cxx
index 36094a0f16a..2d8be41c0c1 100644
--- a/.auto-resolution/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskTrackV0.cxx
+++ b/.auto-resolution/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskTrackV0.cxx
@@ -13,20 +13,20 @@
 /// \brief Tasks that reads the track tables used for the pairing and builds pairs of two tracks
 /// \author Andi Mathis, TU München, andreas.mathis@ph.tum.de
 
+#include "PWGCF/FemtoWorld/Core/FemtoWorldContainer.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldDetaDphiStar.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldUtils.h"
+#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-
-#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldContainer.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldDetaDphiStar.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldUtils.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::analysis::femtoWorld;
diff --git a/.auto-resolution/PWGCF/FemtoWorld/Tasks/femtoWorldPionAllPairTask.cxx b/.auto-resolution/PWGCF/FemtoWorld/Tasks/femtoWorldPionAllPairTask.cxx
index 44278d89471..ba41e02a12d 100644
--- a/.auto-resolution/PWGCF/FemtoWorld/Tasks/femtoWorldPionAllPairTask.cxx
+++ b/.auto-resolution/PWGCF/FemtoWorld/Tasks/femtoWorldPionAllPairTask.cxx
@@ -15,23 +15,24 @@
 /// \author Zuzanna Chochulska, WUT Warsaw, zchochul@cern.ch
 /// \author Deependra Sharma, IITB, deependra.sharma@cern.ch
 
+#include "PWGCF/FemtoWorld/Core/FemtoWorldContainer.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldDetaDphiStar.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldMath.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldPairWithCentrality.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldUtils.h"
+#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-#include "TDatabasePDG.h"
+#include "Framework/runDataProcessing.h"
 
-#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldContainer.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldDetaDphiStar.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldUtils.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldMath.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldPairWithCentrality.h"
+#include "TDatabasePDG.h"
 
 using namespace o2;
 using namespace o2::analysis::femtoWorld;
diff --git a/.auto-resolution/PWGCF/FemtoWorld/Tasks/femtoWorldPionPairTaskTrackTrack.cxx b/.auto-resolution/PWGCF/FemtoWorld/Tasks/femtoWorldPionPairTaskTrackTrack.cxx
index 9d83c1ca3ec..3bba47662c9 100644
--- a/.auto-resolution/PWGCF/FemtoWorld/Tasks/femtoWorldPionPairTaskTrackTrack.cxx
+++ b/.auto-resolution/PWGCF/FemtoWorld/Tasks/femtoWorldPionPairTaskTrackTrack.cxx
@@ -15,20 +15,20 @@
 /// \author Zuzanna Chochulska, WUT Warsaw, zchochul@cern.ch
 /// \author Deependra Sharma, IITB, deependra.sharma@cern.ch
 
+#include "PWGCF/FemtoWorld/Core/FemtoWorldContainer.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldDetaDphiStar.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldUtils.h"
+#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-
-#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldContainer.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldDetaDphiStar.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldUtils.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::analysis::femtoWorld;
diff --git a/.auto-resolution/PWGCF/Flow/TableProducer/zdcQVectors.cxx b/.auto-resolution/PWGCF/Flow/TableProducer/zdcQVectors.cxx
index c748b1f51ec..095bc857326 100644
--- a/.auto-resolution/PWGCF/Flow/TableProducer/zdcQVectors.cxx
+++ b/.auto-resolution/PWGCF/Flow/TableProducer/zdcQVectors.cxx
@@ -14,47 +14,48 @@
 /// \since  11/2024
 /// \brief  In this task the energy calibration and recentring of Q-vectors constructed in the ZDCs will be done
 
-#include <stdlib.h>
-#include <cmath>
-#include <algorithm>
-#include <numeric>
-#include <vector>
-#include <typeinfo>
-#include <memory>
-#include <string>
+#include "PWGCF/DataModel/SPTableZDC.h"
 
-#include "CCDB/BasicCCDBManager.h"
 #include "Common/CCDB/EventSelectionParams.h"
 #include "Common/CCDB/TriggerAliases.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "Framework/AnalysisTask.h"
+#include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StaticFor.h"
-
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/GlobalTrackID.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "PWGCF/DataModel/SPTableZDC.h"
 
+#include "TCanvas.h"
+#include "TF1.h"
+#include "TFitResult.h"
 #include "TH1F.h"
 #include "TH2F.h"
-#include "TProfile.h"
 #include "TObjArray.h"
-#include "TF1.h"
-#include "TFitResult.h"
-#include "TCanvas.h"
-#include "TSystem.h"
+#include "TProfile.h"
 #include "TROOT.h"
+#include "TSystem.h"
+
+#include <algorithm>
+#include <cmath>
+#include <memory>
+#include <numeric>
+#include <string>
+#include <typeinfo>
+#include <vector>
+
+#include <stdlib.h>
 
 #define O2_DEFINE_CONFIGURABLE(NAME, TYPE, DEFAULT, HELP) Configurable<TYPE> NAME{#NAME, DEFAULT, HELP};
 
@@ -80,7 +81,7 @@ std::vector<double> pyZDC = {-1.75, -1.75, 1.75, 1.75};
 double alphaZDC = 0.395;
 
 // q-vectors before (q) and after (qRec) recentering.
-std::vector<double> q(4); // start values of [QxA, QyA, QxC, QyC]
+std::vector<double> q(4);     // start values of [QxA, QyA, QxC, QyC]
 std::vector<double> qNoEq(4); // start values of [QxA, QyA, QxC, QyC]
 
 // for energy calibration
diff --git a/.auto-resolution/PWGCF/Flow/Tasks/flowAnalysisGF.cxx b/.auto-resolution/PWGCF/Flow/Tasks/flowAnalysisGF.cxx
index 08e223befb6..38b5ddf9eb7 100644
--- a/.auto-resolution/PWGCF/Flow/Tasks/flowAnalysisGF.cxx
+++ b/.auto-resolution/PWGCF/Flow/Tasks/flowAnalysisGF.cxx
@@ -9,35 +9,36 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <CCDB/BasicCCDBManager.h>
-#include <DataFormatsParameters/GRPObject.h>
-#include <DataFormatsParameters/GRPMagField.h>
-#include <algorithm>
-#include <numeric>
-#include <vector>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/HistogramRegistry.h"
-
-#include "Common/DataModel/EventSelection.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-
-#include "GFWPowerArray.h"
-#include "GFW.h"
-#include "GFWCumulant.h"
 #include "FlowContainer.h"
 #include "FlowPtContainer.h"
+#include "GFW.h"
 #include "GFWConfig.h"
+#include "GFWCumulant.h"
+#include "GFWPowerArray.h"
 #include "GFWWeights.h"
+
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include <CCDB/BasicCCDBManager.h>
+#include <DataFormatsParameters/GRPMagField.h>
+#include <DataFormatsParameters/GRPObject.h>
+
+#include <TF1.h>
 #include <TProfile.h>
 #include <TRandom3.h>
-#include <TF1.h>
+
+#include <algorithm>
+#include <numeric>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGCF/Flow/Tasks/flowEfficiencyCasc.cxx b/.auto-resolution/PWGCF/Flow/Tasks/flowEfficiencyCasc.cxx
index 25e23838586..e47d25cc6bf 100644
--- a/.auto-resolution/PWGCF/Flow/Tasks/flowEfficiencyCasc.cxx
+++ b/.auto-resolution/PWGCF/Flow/Tasks/flowEfficiencyCasc.cxx
@@ -14,23 +14,27 @@
 /// \since  Feb/21/2025
 /// \brief  This task is to calculate V0s and cascades local density efficiency
 
-#include <vector>
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
+#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/DataModel/cascqaanalysis.h"
+
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGLF/DataModel/cascqaanalysis.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 #include <TPDGCode.h>
 
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.auto-resolution/PWGCF/Flow/Tasks/flowEsePHe3.cxx b/.auto-resolution/PWGCF/Flow/Tasks/flowEsePHe3.cxx
index 2a4955c1419..1577b36037e 100644
--- a/.auto-resolution/PWGCF/Flow/Tasks/flowEsePHe3.cxx
+++ b/.auto-resolution/PWGCF/Flow/Tasks/flowEsePHe3.cxx
@@ -14,41 +14,41 @@
 /// \brief  task to calculate the P He3 flow correlation.
 // C++/ROOT includes.
 #include <CCDB/BasicCCDBManager.h>
-#include <chrono>
-#include <string>
-#include <vector>
-#include <utility>
-#include <memory>
-#include <TF1.h>
+
 #include <TComplex.h>
+#include <TF1.h>
 #include <TH1F.h>
 #include <TH2D.h>
 #include <TMath.h>
 #include <TVector2.h>
 
-// o2Physics includes.
-#include "Framework/ASoA.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/StaticFor.h"
-
-#include "DataFormatsTPC/BetheBlochAleph.h"
+#include <chrono>
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
 
-#include "Common/DataModel/Qvectors.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Multiplicity.h"
+// o2Physics includes.
 #include "Common/Core/EventPlaneHelper.h"
 #include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/PIDResponseITS.h"
+#include "Common/DataModel/Qvectors.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
 #include "CommonConstants/PhysicsConstants.h"
+#include "DataFormatsTPC/BetheBlochAleph.h"
+#include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGCF/Flow/Tasks/flowGfwOmegaXi.cxx b/.auto-resolution/PWGCF/Flow/Tasks/flowGfwOmegaXi.cxx
index 741f4b5b33a..0dbc93d8bdd 100644
--- a/.auto-resolution/PWGCF/Flow/Tasks/flowGfwOmegaXi.cxx
+++ b/.auto-resolution/PWGCF/Flow/Tasks/flowGfwOmegaXi.cxx
@@ -196,7 +196,7 @@ struct FlowGfwOmegaXi {
 
   using TracksPID = soa::Join<aod::pidTPCPi, aod::pidTPCKa, aod::pidTPCPr, aod::pidTOFPi, aod::pidTOFKa, aod::pidTOFPr>;
   using AodTracks = soa::Filtered<soa::Join<aod::Tracks, aod::TrackSelection, o2::aod::TrackSelectionExtension, aod::TracksExtra, TracksPID, aod::TracksIU>>; // tracks filter
-  using AodCollisions = soa::Filtered<soa::Join<aod::Collisions, aod::EvSels, aod::CentFT0Cs, aod::Mults>>;  // collisions filter
+  using AodCollisions = soa::Filtered<soa::Join<aod::Collisions, aod::EvSels, aod::CentFT0Cs, aod::Mults>>;                                                   // collisions filter
   using DaughterTracks = soa::Join<aod::Tracks, aod::TracksExtra, aod::TracksDCA, TracksPID, aod::TrackSelection, o2::aod::TrackSelectionExtension>;
 
   // Connect to ccdb
diff --git a/.auto-resolution/PWGCF/Flow/Tasks/flowGfwTask.cxx b/.auto-resolution/PWGCF/Flow/Tasks/flowGfwTask.cxx
index e5854dcf43b..9e2d03f41d1 100644
--- a/.auto-resolution/PWGCF/Flow/Tasks/flowGfwTask.cxx
+++ b/.auto-resolution/PWGCF/Flow/Tasks/flowGfwTask.cxx
@@ -14,40 +14,41 @@
 /// \since  Mar 28, 2024
 /// \brief  Multiparticle flow measurements with FT0 and ZDC
 
-#include <CCDB/BasicCCDBManager.h>
-#include <DataFormatsParameters/GRPMagField.h>
-#include <cmath>
-#include <vector>
-#include <string>
-#include <memory>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/AnalysisDataModel.h"
+#include "FlowContainer.h"
+#include "GFW.h"
+#include "GFWCumulant.h"
+#include "GFWPowerArray.h"
+#include "GFWWeights.h"
 
-#include "Common/DataModel/EventSelection.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/GlobalTrackID.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "TPDGCode.h"
+#include <CCDB/BasicCCDBManager.h>
+#include <DataFormatsParameters/GRPMagField.h>
 
-#include "GFWPowerArray.h"
-#include "GFW.h"
-#include "GFWCumulant.h"
-#include "GFWWeights.h"
-#include "FlowContainer.h"
 #include "TList.h"
+#include "TPDGCode.h"
+#include <TF1.h>
 #include <TProfile.h>
 #include <TRandom3.h>
-#include <TF1.h>
+
+#include <cmath>
+#include <memory>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGCF/Flow/Tasks/flowMc.cxx b/.auto-resolution/PWGCF/Flow/Tasks/flowMc.cxx
index b310096ef40..81ed7e3f95b 100644
--- a/.auto-resolution/PWGCF/Flow/Tasks/flowMc.cxx
+++ b/.auto-resolution/PWGCF/Flow/Tasks/flowMc.cxx
@@ -14,34 +14,39 @@
 /// \since  Feb/5/2025
 /// \brief  QC of synthetic flow exercise
 
-#include <CCDB/BasicCCDBManager.h>
-#include <vector>
-#include <string>
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "FlowContainer.h"
+#include "GFW.h"
+#include "GFWCumulant.h"
+#include "GFWPowerArray.h"
+#include "GFWWeights.h"
+
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGMM/Mult/DataModel/Index.h" // for Particles2Tracks table
+
 #include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
 #include "Common/Core/trackUtilities.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "DataFormatsParameters/GRPObject.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "DataFormatsParameters/GRPMagField.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGMM/Mult/DataModel/Index.h" // for Particles2Tracks table
-#include "GFWPowerArray.h"
-#include "GFW.h"
-#include "GFWCumulant.h"
-#include "GFWWeights.h"
-#include "FlowContainer.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+#include <CCDB/BasicCCDBManager.h>
+
+#include <TF1.h>
+#include <TPDGCode.h>
 #include <TProfile.h>
 #include <TRandom3.h>
-#include <TPDGCode.h>
-#include <TF1.h>
+
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGCF/Flow/Tasks/flowPidCme.cxx b/.auto-resolution/PWGCF/Flow/Tasks/flowPidCme.cxx
index bd91bdc4450..0248af750d6 100644
--- a/.auto-resolution/PWGCF/Flow/Tasks/flowPidCme.cxx
+++ b/.auto-resolution/PWGCF/Flow/Tasks/flowPidCme.cxx
@@ -14,39 +14,40 @@
 /// \brief  task to calculate the pikp cme signal and bacground.
 // C++/ROOT includes.
 #include <CCDB/BasicCCDBManager.h>
-#include <chrono>
-#include <string>
-#include <vector>
-#include <utility>
-#include <memory>
-#include <TF1.h>
+
 #include <TComplex.h>
+#include <TF1.h>
 #include <TH1F.h>
 #include <TH2D.h>
 #include <TMath.h>
 #include <TVector2.h>
 
-// o2Physics includes.
-#include "Framework/ASoA.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/StaticFor.h"
+#include <chrono>
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
 
-#include "Common/DataModel/Qvectors.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Multiplicity.h"
+// o2Physics includes.
 #include "Common/Core/EventPlaneHelper.h"
 #include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/PIDResponseITS.h"
+#include "Common/DataModel/Qvectors.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
 #include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
 
 // o2 includes.
 
diff --git a/.auto-resolution/PWGCF/Flow/Tasks/flowPtEfficiency.cxx b/.auto-resolution/PWGCF/Flow/Tasks/flowPtEfficiency.cxx
index 217b6f7fb36..a66de51e212 100644
--- a/.auto-resolution/PWGCF/Flow/Tasks/flowPtEfficiency.cxx
+++ b/.auto-resolution/PWGCF/Flow/Tasks/flowPtEfficiency.cxx
@@ -14,29 +14,31 @@
 /// \since  Jun/08/2023
 /// \brief  a task to calculate the pt efficiency
 
-#include <CCDB/BasicCCDBManager.h>
-#include <vector>
-#include <string>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/HistogramRegistry.h"
+#include "FlowContainer.h"
+#include "GFW.h"
+#include "GFWCumulant.h"
+#include "GFWPowerArray.h"
+#include "GFWWeights.h"
 
 #include "Common/Core/RecoDecay.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
-#include "GFWPowerArray.h"
-#include "GFW.h"
-#include "GFWCumulant.h"
-#include "GFWWeights.h"
-#include "FlowContainer.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include <CCDB/BasicCCDBManager.h>
+
+#include <TPDGCode.h>
 #include <TProfile.h>
 #include <TRandom3.h>
-#include <TPDGCode.h>
+
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGCF/Flow/Tasks/flowQa.cxx b/.auto-resolution/PWGCF/Flow/Tasks/flowQa.cxx
index 1eaa6d8437d..3d52e9ec429 100644
--- a/.auto-resolution/PWGCF/Flow/Tasks/flowQa.cxx
+++ b/.auto-resolution/PWGCF/Flow/Tasks/flowQa.cxx
@@ -14,36 +14,38 @@
 /// \since  Feb/23/2025
 /// \brief  jira: PWGCF-254, QA for flow analysis
 
-#include <CCDB/BasicCCDBManager.h>
-#include <cmath>
-#include <vector>
-#include <unordered_map>
-#include <string>
-#include <memory>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/HistogramRegistry.h"
+#include "FlowContainer.h"
+#include "GFW.h"
+#include "GFWCumulant.h"
+#include "GFWPowerArray.h"
+#include "GFWWeights.h"
 
-#include "Common/DataModel/EventSelection.h"
+#include "Common/CCDB/ctpRateFetcher.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/CCDB/ctpRateFetcher.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include <CCDB/BasicCCDBManager.h>
 
-#include "GFWPowerArray.h"
-#include "GFW.h"
-#include "GFWCumulant.h"
-#include "GFWWeights.h"
-#include "FlowContainer.h"
 #include "TList.h"
+#include <TF1.h>
+#include <TObjArray.h>
 #include <TProfile.h>
 #include <TRandom3.h>
-#include <TObjArray.h>
-#include <TF1.h>
+
+#include <cmath>
+#include <memory>
+#include <string>
+#include <unordered_map>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGCF/Flow/Tasks/flowRunbyRun.cxx b/.auto-resolution/PWGCF/Flow/Tasks/flowRunbyRun.cxx
index 620063e1d5d..b0221c34c3c 100644
--- a/.auto-resolution/PWGCF/Flow/Tasks/flowRunbyRun.cxx
+++ b/.auto-resolution/PWGCF/Flow/Tasks/flowRunbyRun.cxx
@@ -15,36 +15,38 @@
 /// \since  Oct/30/2024
 /// \brief  jira: PWGCF-254, produce Run-by-Run QA plots and flow analysis for Run3
 
-#include <CCDB/BasicCCDBManager.h>
-#include <cmath>
-#include <vector>
-#include <unordered_map>
-#include <map>
-#include <string>
-#include <memory>
-#include <utility>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/HistogramRegistry.h"
+#include "FlowContainer.h"
+#include "GFW.h"
+#include "GFWCumulant.h"
+#include "GFWPowerArray.h"
+#include "GFWWeights.h"
 
-#include "Common/DataModel/EventSelection.h"
+#include "Common/CCDB/ctpRateFetcher.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/CCDB/ctpRateFetcher.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include <CCDB/BasicCCDBManager.h>
 
-#include "GFWPowerArray.h"
-#include "GFW.h"
-#include "GFWCumulant.h"
-#include "GFWWeights.h"
-#include "FlowContainer.h"
 #include "TList.h"
+#include <TF1.h>
 #include <TProfile.h>
 #include <TRandom3.h>
-#include <TF1.h>
+
+#include <cmath>
+#include <map>
+#include <memory>
+#include <string>
+#include <unordered_map>
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGCF/Flow/Tasks/flowSP.cxx b/.auto-resolution/PWGCF/Flow/Tasks/flowSP.cxx
index f37c15eac01..cc3f51e91d0 100644
--- a/.auto-resolution/PWGCF/Flow/Tasks/flowSP.cxx
+++ b/.auto-resolution/PWGCF/Flow/Tasks/flowSP.cxx
@@ -14,35 +14,37 @@
 /// \since  01/12/2024
 /// \brief  task to evaluate flow with respect to spectator plane.
 
-#include <CCDB/BasicCCDBManager.h>
-#include <DataFormatsParameters/GRPObject.h>
-#include <DataFormatsParameters/GRPMagField.h>
-#include <algorithm>
-#include <numeric>
-#include <vector>
-#include <string>
-#include <unordered_map>
+#include "GFWWeights.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/O2DatabasePDGPlugin.h"
+#include "PWGCF/DataModel/SPTableZDC.h"
 
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/Centrality.h"
-#include "Common/Core/RecoDecay.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include <CCDB/BasicCCDBManager.h>
+#include <DataFormatsParameters/GRPMagField.h>
+#include <DataFormatsParameters/GRPObject.h>
 
-#include "PWGCF/DataModel/SPTableZDC.h"
-#include "GFWWeights.h"
 #include "TF1.h"
 #include "TPDGCode.h"
 
+#include <algorithm>
+#include <numeric>
+#include <string>
+#include <unordered_map>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.auto-resolution/PWGCF/Flow/Tasks/flowTask.cxx b/.auto-resolution/PWGCF/Flow/Tasks/flowTask.cxx
index 9ebe74d1f76..bb6d1749e5d 100644
--- a/.auto-resolution/PWGCF/Flow/Tasks/flowTask.cxx
+++ b/.auto-resolution/PWGCF/Flow/Tasks/flowTask.cxx
@@ -14,36 +14,38 @@
 /// \since  Dec/10/2023
 /// \brief  jira: PWGCF-254, task to measure flow observables with cumulant method
 
-#include <CCDB/BasicCCDBManager.h>
-#include <cmath>
-#include <vector>
-#include <unordered_map>
-#include <string>
-#include <memory>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/HistogramRegistry.h"
+#include "FlowContainer.h"
+#include "GFW.h"
+#include "GFWCumulant.h"
+#include "GFWPowerArray.h"
+#include "GFWWeights.h"
 
-#include "Common/DataModel/EventSelection.h"
+#include "Common/CCDB/ctpRateFetcher.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/CCDB/ctpRateFetcher.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include <CCDB/BasicCCDBManager.h>
 
-#include "GFWPowerArray.h"
-#include "GFW.h"
-#include "GFWCumulant.h"
-#include "GFWWeights.h"
-#include "FlowContainer.h"
 #include "TList.h"
+#include <TF1.h>
+#include <TObjArray.h>
 #include <TProfile.h>
 #include <TRandom3.h>
-#include <TObjArray.h>
-#include <TF1.h>
+
+#include <cmath>
+#include <memory>
+#include <string>
+#include <unordered_map>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGCF/GenericFramework/Core/BootstrapProfile.h b/.auto-resolution/PWGCF/GenericFramework/Core/BootstrapProfile.h
index 829c58cc11a..e7d0b62e45e 100644
--- a/.auto-resolution/PWGCF/GenericFramework/Core/BootstrapProfile.h
+++ b/.auto-resolution/PWGCF/GenericFramework/Core/BootstrapProfile.h
@@ -16,11 +16,11 @@
 #ifndef PWGCF_GENERICFRAMEWORK_CORE_BOOTSTRAPPROFILE_H_
 #define PWGCF_GENERICFRAMEWORK_CORE_BOOTSTRAPPROFILE_H_
 
-#include "TProfile.h"
-#include "TList.h"
-#include "TString.h"
 #include "TCollection.h"
+#include "TList.h"
 #include "TMath.h"
+#include "TProfile.h"
+#include "TString.h"
 
 class BootstrapProfile : public TProfile
 {
diff --git a/.auto-resolution/PWGCF/GenericFramework/Core/FlowContainer.h b/.auto-resolution/PWGCF/GenericFramework/Core/FlowContainer.h
index bb330c049b6..5cba4eed279 100644
--- a/.auto-resolution/PWGCF/GenericFramework/Core/FlowContainer.h
+++ b/.auto-resolution/PWGCF/GenericFramework/Core/FlowContainer.h
@@ -15,23 +15,24 @@
 
 #ifndef PWGCF_GENERICFRAMEWORK_CORE_FLOWCONTAINER_H_
 #define PWGCF_GENERICFRAMEWORK_CORE_FLOWCONTAINER_H_
-#include <vector>
-#include "TH3F.h"
-#include "TProfile2D.h"
-#include "TProfile.h"
-#include "TNamed.h"
+#include "ProfileSubset.h"
+
+#include "Framework/HistogramSpec.h"
+
+#include "TAxis.h"
+#include "TCollection.h"
+#include "TFile.h"
 #include "TH1.h"
+#include "TH3F.h"
 #include "TMath.h"
-#include "TFile.h"
-#include "TAxis.h"
-#include "TString.h"
+#include "TNamed.h"
 #include "TObjArray.h"
+#include "TProfile.h"
+#include "TProfile2D.h"
 #include "TRandom.h"
 #include "TString.h"
-#include "TCollection.h"
-#include "TAxis.h"
-#include "ProfileSubset.h"
-#include "Framework/HistogramSpec.h"
+
+#include <vector>
 
 class FlowContainer : public TNamed
 {
diff --git a/.auto-resolution/PWGCF/GenericFramework/Core/FlowPtContainer.cxx b/.auto-resolution/PWGCF/GenericFramework/Core/FlowPtContainer.cxx
index 33f2e303711..5e3e3a45306 100644
--- a/.auto-resolution/PWGCF/GenericFramework/Core/FlowPtContainer.cxx
+++ b/.auto-resolution/PWGCF/GenericFramework/Core/FlowPtContainer.cxx
@@ -14,9 +14,10 @@
 /// \author Emil Gorm Nielsen, NBI, emil.gorm.nielsen@cern.ch
 
 #include "FlowPtContainer.h"
+
 #include <algorithm>
-#include <vector>
 #include <cstdio>
+#include <vector>
 
 FlowPtContainer::FlowPtContainer() : fCMTermList(0),
                                      fCorrList(0),
diff --git a/.auto-resolution/PWGCF/GenericFramework/Core/FlowPtContainer.h b/.auto-resolution/PWGCF/GenericFramework/Core/FlowPtContainer.h
index 207e1a36fe7..b0bd6b6a72c 100644
--- a/.auto-resolution/PWGCF/GenericFramework/Core/FlowPtContainer.h
+++ b/.auto-resolution/PWGCF/GenericFramework/Core/FlowPtContainer.h
@@ -16,18 +16,21 @@
 #ifndef PWGCF_GENERICFRAMEWORK_CORE_FLOWPTCONTAINER_H_
 #define PWGCF_GENERICFRAMEWORK_CORE_FLOWPTCONTAINER_H_
 
-#include <algorithm>
-#include <vector>
-#include <complex>
-#include <variant>
 #include "BootstrapProfile.h"
-#include "TNamed.h"
-#include "TList.h"
-#include "TCollection.h"
-#include "Framework/HistogramSpec.h"
 #include "GFW.h"
 #include "GFWConfig.h"
 
+#include "Framework/HistogramSpec.h"
+
+#include "TCollection.h"
+#include "TList.h"
+#include "TNamed.h"
+
+#include <algorithm>
+#include <complex>
+#include <variant>
+#include <vector>
+
 namespace o2::analysis::genericframework::eventweight
 {
 enum EventWeight {
diff --git a/.auto-resolution/PWGCF/GenericFramework/Core/GFWConfig.h b/.auto-resolution/PWGCF/GenericFramework/Core/GFWConfig.h
index 779d06b604e..949a16e23d1 100644
--- a/.auto-resolution/PWGCF/GenericFramework/Core/GFWConfig.h
+++ b/.auto-resolution/PWGCF/GenericFramework/Core/GFWConfig.h
@@ -12,13 +12,15 @@
 #ifndef PWGCF_GENERICFRAMEWORK_CORE_GFWCONFIG_H_
 #define PWGCF_GENERICFRAMEWORK_CORE_GFWCONFIG_H_
 
+#include "GFW.h"
+
+#include <TMath.h>
+#include <TObject.h>
+
 #include <algorithm>
+#include <string>
 #include <utility>
 #include <vector>
-#include <string>
-#include <TObject.h>
-#include <TMath.h>
-#include "GFW.h"
 
 namespace o2
 {
diff --git a/.auto-resolution/PWGCF/GenericFramework/Core/GFWPowerArray.h b/.auto-resolution/PWGCF/GenericFramework/Core/GFWPowerArray.h
index ba38f2fcc54..8b0a5eca32c 100644
--- a/.auto-resolution/PWGCF/GenericFramework/Core/GFWPowerArray.h
+++ b/.auto-resolution/PWGCF/GenericFramework/Core/GFWPowerArray.h
@@ -16,9 +16,9 @@
 #ifndef PWGCF_GENERICFRAMEWORK_CORE_GFWPOWERARRAY_H_
 #define PWGCF_GENERICFRAMEWORK_CORE_GFWPOWERARRAY_H_
 
-#include <vector>
 #include <cmath>
 #include <string>
+#include <vector>
 
 typedef std::vector<int> HarSet;
 class GFWPowerArray
diff --git a/.auto-resolution/PWGCF/GenericFramework/Core/GFWWeights.cxx b/.auto-resolution/PWGCF/GenericFramework/Core/GFWWeights.cxx
index 4d2d41cd85d..b729213d80d 100644
--- a/.auto-resolution/PWGCF/GenericFramework/Core/GFWWeights.cxx
+++ b/.auto-resolution/PWGCF/GenericFramework/Core/GFWWeights.cxx
@@ -10,7 +10,9 @@
 // or submit itself to any jurisdiction.
 
 #include "GFWWeights.h"
+
 #include "TMath.h"
+
 #include <cstdio>
 
 GFWWeights::GFWWeights() : TNamed("", ""),
diff --git a/.auto-resolution/PWGCF/GenericFramework/Core/GFWWeights.h b/.auto-resolution/PWGCF/GenericFramework/Core/GFWWeights.h
index f60783ccec8..c0be3f7caeb 100644
--- a/.auto-resolution/PWGCF/GenericFramework/Core/GFWWeights.h
+++ b/.auto-resolution/PWGCF/GenericFramework/Core/GFWWeights.h
@@ -18,13 +18,13 @@
 
 #include "Framework/Logger.h"
 
-#include "TObjArray.h"
-#include "TNamed.h"
-#include "TH3D.h"
-#include "TH2D.h"
-#include "TH1D.h"
-#include "TFile.h"
 #include "TCollection.h"
+#include "TFile.h"
+#include "TH1D.h"
+#include "TH2D.h"
+#include "TH3D.h"
+#include "TNamed.h"
+#include "TObjArray.h"
 #include "TString.h"
 
 class GFWWeights : public TNamed
diff --git a/.auto-resolution/PWGCF/GenericFramework/Core/GFWWeightsList.cxx b/.auto-resolution/PWGCF/GenericFramework/Core/GFWWeightsList.cxx
index 11a6ffe3159..104c6c77907 100644
--- a/.auto-resolution/PWGCF/GenericFramework/Core/GFWWeightsList.cxx
+++ b/.auto-resolution/PWGCF/GenericFramework/Core/GFWWeightsList.cxx
@@ -14,9 +14,10 @@
 /// \since  Dec/25/2024
 /// \brief  one object to hold a list of GFWWeights objects,
 
-#include <utility>
 #include "GFWWeightsList.h"
 
+#include <utility>
+
 GFWWeightsList::GFWWeightsList() : TNamed("", ""), list(0)
 {
   runNumberMap.clear();
diff --git a/.auto-resolution/PWGCF/GenericFramework/Core/GFWWeightsList.h b/.auto-resolution/PWGCF/GenericFramework/Core/GFWWeightsList.h
index c0f208a7088..dab5b345fa0 100644
--- a/.auto-resolution/PWGCF/GenericFramework/Core/GFWWeightsList.h
+++ b/.auto-resolution/PWGCF/GenericFramework/Core/GFWWeightsList.h
@@ -16,15 +16,16 @@
 
 #ifndef PWGCF_GENERICFRAMEWORK_CORE_GFWWEIGHTSLIST_H_
 #define PWGCF_GENERICFRAMEWORK_CORE_GFWWEIGHTSLIST_H_
-#include <map>
-#include <cstdio>
-#include <string>
-#include <vector>
+#include "GFWWeights.h"
 
 #include "Framework/Logger.h"
 
 #include "TObjArray.h"
-#include "GFWWeights.h"
+
+#include <cstdio>
+#include <map>
+#include <string>
+#include <vector>
 
 class GFWWeightsList : public TNamed
 {
diff --git a/.auto-resolution/PWGCF/GenericFramework/Core/ProfileSubset.cxx b/.auto-resolution/PWGCF/GenericFramework/Core/ProfileSubset.cxx
index 66969f699af..333f1eea5e0 100644
--- a/.auto-resolution/PWGCF/GenericFramework/Core/ProfileSubset.cxx
+++ b/.auto-resolution/PWGCF/GenericFramework/Core/ProfileSubset.cxx
@@ -10,6 +10,7 @@
 // or submit itself to any jurisdiction.
 
 #include "ProfileSubset.h"
+
 #include "TProfile2D.h"
 
 TProfile* ProfileSubset::GetSubset(bool onX, const char* name, int firstbin, int lastbin, int l_nbins, double* l_binarray)
diff --git a/.auto-resolution/PWGCF/GenericFramework/Core/ProfileSubset.h b/.auto-resolution/PWGCF/GenericFramework/Core/ProfileSubset.h
index fc920b898c4..f2b09d1a640 100644
--- a/.auto-resolution/PWGCF/GenericFramework/Core/ProfileSubset.h
+++ b/.auto-resolution/PWGCF/GenericFramework/Core/ProfileSubset.h
@@ -16,9 +16,9 @@
 #ifndef PWGCF_GENERICFRAMEWORK_CORE_PROFILESUBSET_H_
 #define PWGCF_GENERICFRAMEWORK_CORE_PROFILESUBSET_H_
 
+#include "TError.h"
 #include "TProfile.h"
 #include "TProfile2D.h"
-#include "TError.h"
 
 class ProfileSubset : public TProfile2D
 {
diff --git a/.auto-resolution/PWGCF/GenericFramework/Tasks/flowGenericFramework.cxx b/.auto-resolution/PWGCF/GenericFramework/Tasks/flowGenericFramework.cxx
index 79e56fbcff6..31aa9d9e194 100644
--- a/.auto-resolution/PWGCF/GenericFramework/Tasks/flowGenericFramework.cxx
+++ b/.auto-resolution/PWGCF/GenericFramework/Tasks/flowGenericFramework.cxx
@@ -13,42 +13,43 @@
 /// \brief Task to analyse angular and transverse momentum correlations with GFW
 /// \author Emil Gorm Nielsen, NBI, emil.gorm.nielsen@cern.ch
 
-#include <CCDB/BasicCCDBManager.h>
-#include <DataFormatsParameters/GRPObject.h>
-#include <DataFormatsParameters/GRPMagField.h>
-#include <algorithm>
-#include <numeric>
-#include <vector>
-#include <complex>
-#include <string>
-#include <map>
-#include <utility>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/HistogramRegistry.h"
-
-#include "Common/DataModel/EventSelection.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/PIDResponse.h"
-
-#include "GFWPowerArray.h"
-#include "GFW.h"
-#include "GFWCumulant.h"
 #include "FlowContainer.h"
 #include "FlowPtContainer.h"
+#include "GFW.h"
 #include "GFWConfig.h"
+#include "GFWCumulant.h"
+#include "GFWPowerArray.h"
 #include "GFWWeights.h"
 #include "GFWWeightsList.h"
-#include <TProfile.h>
-#include <TRandom3.h>
+
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include <CCDB/BasicCCDBManager.h>
+#include <DataFormatsParameters/GRPMagField.h>
+#include <DataFormatsParameters/GRPObject.h>
+
 #include <TF1.h>
 #include <TPDGCode.h>
+#include <TProfile.h>
+#include <TRandom3.h>
+
+#include <algorithm>
+#include <complex>
+#include <map>
+#include <numeric>
+#include <string>
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGCF/JCorran/Core/FlowJHistManager.cxx b/.auto-resolution/PWGCF/JCorran/Core/FlowJHistManager.cxx
index 880ec409dbd..4a13ac5f31d 100644
--- a/.auto-resolution/PWGCF/JCorran/Core/FlowJHistManager.cxx
+++ b/.auto-resolution/PWGCF/JCorran/Core/FlowJHistManager.cxx
@@ -16,6 +16,7 @@
 
 // O2 Physics headers.
 #include "PWGCF/JCorran/Core/FlowJHistManager.h"
+
 #include "CommonConstants/MathConstants.h"
 
 // Namespaces.
diff --git a/.auto-resolution/PWGCF/JCorran/Core/FlowJHistManager.h b/.auto-resolution/PWGCF/JCorran/Core/FlowJHistManager.h
index e067a9f00b5..3c7b1773eac 100644
--- a/.auto-resolution/PWGCF/JCorran/Core/FlowJHistManager.h
+++ b/.auto-resolution/PWGCF/JCorran/Core/FlowJHistManager.h
@@ -16,16 +16,17 @@
 #define PWGCF_JCORRAN_CORE_FLOWJHISTMANAGER_H_
 
 /* Header files. */
-#include <vector>
-#include <array>
-#include <string>
-#include <string_view>
 #include "TH1.h"
 #include "TH2.h"
 #include "TH3.h"
 #include "TProfile.h"
 #include "TProfile2D.h"
 
+#include <array>
+#include <string>
+#include <string_view>
+#include <vector>
+
 // O2 headers. //
 #include "Framework/HistogramRegistry.h"
 
diff --git a/.auto-resolution/PWGCF/JCorran/Core/FlowJSPCAnalysis.h b/.auto-resolution/PWGCF/JCorran/Core/FlowJSPCAnalysis.h
index ba584d1e1eb..d1bd45354ec 100644
--- a/.auto-resolution/PWGCF/JCorran/Core/FlowJSPCAnalysis.h
+++ b/.auto-resolution/PWGCF/JCorran/Core/FlowJSPCAnalysis.h
@@ -16,15 +16,17 @@
 #define PWGCF_JCORRAN_CORE_FLOWJSPCANALYSIS_H_
 
 /* Header files. */
-#include <array>
-#include <vector>
 #include <TComplex.h>
 #include <TProfile.h>
 
+#include <array>
+#include <vector>
+
 // O2 headers. //
-#include "Framework/HistogramRegistry.h"
 #include "PWGCF/JCorran/Core/JQVectors.h"
+
 #include "CommonConstants/MathConstants.h"
+#include "Framework/HistogramRegistry.h"
 
 class FlowJSPCAnalysis
 {
diff --git a/.auto-resolution/PWGCF/JCorran/Core/JFFlucAnalysis.cxx b/.auto-resolution/PWGCF/JCorran/Core/JFFlucAnalysis.cxx
index 9dc4189a810..4c3b01adeca 100644
--- a/.auto-resolution/PWGCF/JCorran/Core/JFFlucAnalysis.cxx
+++ b/.auto-resolution/PWGCF/JCorran/Core/JFFlucAnalysis.cxx
@@ -12,10 +12,12 @@
 /// \author Jasper Parkkila (jparkkil@cern.ch)
 /// \since Sep 2022
 
-#include <TMath.h>
+#include "JFFlucAnalysis.h"
+
 #include <TComplex.h>
+#include <TMath.h>
+
 #include <algorithm>
-#include "JFFlucAnalysis.h"
 
 JFFlucAnalysis::JFFlucAnalysis() : TNamed(),
                                    fVertex(0),
diff --git a/.auto-resolution/PWGCF/JCorran/Core/JFFlucAnalysis.h b/.auto-resolution/PWGCF/JCorran/Core/JFFlucAnalysis.h
index 01589a09849..039dc51d421 100644
--- a/.auto-resolution/PWGCF/JCorran/Core/JFFlucAnalysis.h
+++ b/.auto-resolution/PWGCF/JCorran/Core/JFFlucAnalysis.h
@@ -15,13 +15,15 @@
 #ifndef PWGCF_JCORRAN_CORE_JFFLUCANALYSIS_H_
 #define PWGCF_JCORRAN_CORE_JFFLUCANALYSIS_H_
 
-#include <experimental/type_traits>
 #include "JQVectors.h"
+
 #include <TComplex.h>
-#include <TNamed.h>
 #include <TH1.h>
 #include <THn.h>
 #include <THnSparse.h>
+#include <TNamed.h>
+
+#include <experimental/type_traits>
 
 class JFFlucAnalysis : public TNamed
 {
diff --git a/.auto-resolution/PWGCF/JCorran/Core/JFFlucAnalysisO2Hist.cxx b/.auto-resolution/PWGCF/JCorran/Core/JFFlucAnalysisO2Hist.cxx
index b3419ff7dc8..55520ba8158 100644
--- a/.auto-resolution/PWGCF/JCorran/Core/JFFlucAnalysisO2Hist.cxx
+++ b/.auto-resolution/PWGCF/JCorran/Core/JFFlucAnalysisO2Hist.cxx
@@ -12,10 +12,12 @@
 /// \since Sep 2024
 
 #include "JFFlucAnalysisO2Hist.h"
-#include <vector>
-#include <memory>
+
 #include "CommonConstants/MathConstants.h"
 
+#include <memory>
+#include <vector>
+
 using namespace o2;
 
 JFFlucAnalysisO2Hist::JFFlucAnalysisO2Hist(HistogramRegistry& registry, AxisSpec& axisMultiplicity, AxisSpec& phiAxis, AxisSpec& etaAxis, AxisSpec& zvtAxis, AxisSpec& ptAxis, AxisSpec& massAxis, const TString& folder) : JFFlucAnalysis()
diff --git a/.auto-resolution/PWGCF/JCorran/Core/JFFlucAnalysisO2Hist.h b/.auto-resolution/PWGCF/JCorran/Core/JFFlucAnalysisO2Hist.h
index a9de2fd7864..1c65334d607 100644
--- a/.auto-resolution/PWGCF/JCorran/Core/JFFlucAnalysisO2Hist.h
+++ b/.auto-resolution/PWGCF/JCorran/Core/JFFlucAnalysisO2Hist.h
@@ -15,6 +15,7 @@
 #define PWGCF_JCORRAN_CORE_JFFLUCANALYSISO2HIST_H_
 
 #include "JFFlucAnalysis.h"
+
 #include "Framework/HistogramRegistry.h"
 
 using namespace o2;
diff --git a/.auto-resolution/PWGCF/JCorran/Core/JQVectors.h b/.auto-resolution/PWGCF/JCorran/Core/JQVectors.h
index c96aac454b7..210968d23ec 100644
--- a/.auto-resolution/PWGCF/JCorran/Core/JQVectors.h
+++ b/.auto-resolution/PWGCF/JCorran/Core/JQVectors.h
@@ -15,9 +15,10 @@
 #ifndef PWGCF_JCORRAN_CORE_JQVECTORS_H_
 #define PWGCF_JCORRAN_CORE_JQVECTORS_H_
 
-#include <experimental/type_traits>
 #include <TMath.h>
 
+#include <experimental/type_traits>
+
 template <class Q, UInt_t nh, UInt_t nk>
 class JQVectorsGapBase
 {
diff --git a/.auto-resolution/PWGCF/JCorran/TableProducer/JCatalyst.cxx b/.auto-resolution/PWGCF/JCorran/TableProducer/JCatalyst.cxx
index e0cb26994e3..7b354a1541e 100644
--- a/.auto-resolution/PWGCF/JCorran/TableProducer/JCatalyst.cxx
+++ b/.auto-resolution/PWGCF/JCorran/TableProducer/JCatalyst.cxx
@@ -12,28 +12,29 @@
 /// \author Dong Jo Kim (djkim@jyu.fi)
 /// \since Sep 2022
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
 #include <CCDB/BasicCCDBManager.h>
-#include <Math/Vector4D.h>
+
 #include <Math/LorentzVector.h>
+#include <Math/Vector4D.h>
 #include <TRandom.h>
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/ASoAHelpers.h"
-
 // centrality
-#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Centrality.h"
 
 ////TODO: remove redundant:
-#include "Framework/HistogramRegistry.h"
-
-#include "DCAFitter/DCAFitterN.h"
 #include "PWGHF/DataModel/CandidateReconstructionTables.h"
+
 #include "Common/Core/trackUtilities.h"
+
+#include "DCAFitter/DCAFitterN.h"
+#include "Framework/HistogramRegistry.h"
 #include "ReconstructionDataFormats/DCA.h"
 #include "ReconstructionDataFormats/V0.h"
 ////
diff --git a/.auto-resolution/PWGCF/JCorran/Tasks/flowJNUACreation.cxx b/.auto-resolution/PWGCF/JCorran/Tasks/flowJNUACreation.cxx
index 31edc2a7c3d..ab4fef15591 100644
--- a/.auto-resolution/PWGCF/JCorran/Tasks/flowJNUACreation.cxx
+++ b/.auto-resolution/PWGCF/JCorran/Tasks/flowJNUACreation.cxx
@@ -13,31 +13,31 @@
 // \author  Maxim Virta (maxim.virta@cern.ch)
 
 // Standard headers.
+#include <TRandom3.h>
+
 #include <chrono>
 #include <string>
 #include <vector>
-#include <TRandom3.h>
 
 // O2 headers. //
 // The first two are mandatory.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
 #include "CCDB/BasicCCDBManager.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 
 // O2 Physics headers. //
+#include "PWGCF/JCorran/Core/FlowJHistManager.h"
+
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/FT0Corrected.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/Core/TrackSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
-#include "PWGCF/JCorran/Core/FlowJHistManager.h"
-
 // Namespaces and definitions.
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGCF/JCorran/Tasks/flowJSPCAnalysis.cxx b/.auto-resolution/PWGCF/JCorran/Tasks/flowJSPCAnalysis.cxx
index 2ce4568348f..ad7a05b7a07 100644
--- a/.auto-resolution/PWGCF/JCorran/Tasks/flowJSPCAnalysis.cxx
+++ b/.auto-resolution/PWGCF/JCorran/Tasks/flowJSPCAnalysis.cxx
@@ -13,34 +13,34 @@
 // \author  Maxim Virta (maxim.virta@cern.ch), Cindy Mordasini (cindy.mordasini@cern.ch)
 
 // Standard headers.
+#include <TRandom3.h>
+
 #include <chrono>
 #include <string>
 #include <vector>
-#include <TRandom3.h>
 
 // O2 headers. //
 // The first two are mandatory.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 
 // O2 Physics headers. //
+#include "PWGCF/DataModel/CorrelationsDerived.h"
+#include "PWGCF/JCorran/Core/FlowJHistManager.h"
+#include "PWGCF/JCorran/Core/FlowJSPCAnalysis.h"
+#include "PWGCF/JCorran/Core/FlowJSPCObservables.h"
+#include "PWGCF/JCorran/DataModel/JCatalyst.h"
+
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/FT0Corrected.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/Core/TrackSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
-#include "PWGCF/DataModel/CorrelationsDerived.h"
-#include "PWGCF/JCorran/DataModel/JCatalyst.h"
-#include "PWGCF/JCorran/Core/FlowJSPCAnalysis.h"
-#include "PWGCF/JCorran/Core/FlowJSPCObservables.h"
-#include "PWGCF/JCorran/Core/FlowJHistManager.h"
-
 // Namespaces and definitions.
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGCF/JCorran/Tasks/jEPDzeroFlowAnalysis.cxx b/.auto-resolution/PWGCF/JCorran/Tasks/jEPDzeroFlowAnalysis.cxx
index be132b44684..2fe4adb49ca 100644
--- a/.auto-resolution/PWGCF/JCorran/Tasks/jEPDzeroFlowAnalysis.cxx
+++ b/.auto-resolution/PWGCF/JCorran/Tasks/jEPDzeroFlowAnalysis.cxx
@@ -11,52 +11,47 @@
 /// \author junlee.kim@cern.ch
 /// \since Jul 2024
 
-#include <experimental/type_traits>
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <chrono>
-#include <string>
-#include <vector>
-
-#include "TLorentzVector.h"
-#include "TRandom3.h"
-#include "TF1.h"
-#include "TVector2.h"
-#include "Math/Vector3D.h"
-#include "Math/Vector4D.h"
-#include "Math/GenVector/Boost.h"
-#include <TMath.h>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/StaticFor.h"
+#include "PWGCF/DataModel/CorrelationsDerived.h"
 
+#include "Common/Core/EventPlaneHelper.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Qvectors.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "Common/Core/trackUtilities.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/Core/EventPlaneHelper.h"
-
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
 #include "CommonConstants/PhysicsConstants.h"
-
-#include "ReconstructionDataFormats/Track.h"
-
-#include "DataFormatsParameters/GRPObject.h"
 #include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/StaticFor.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
-#include "CCDB/CcdbApi.h"
-#include "CCDB/BasicCCDBManager.h"
+#include "Math/GenVector/Boost.h"
+#include "Math/Vector3D.h"
+#include "Math/Vector4D.h"
+#include "TF1.h"
+#include "TLorentzVector.h"
+#include "TRandom3.h"
+#include "TVector2.h"
+#include <TMath.h>
 
-#include "PWGCF/DataModel/CorrelationsDerived.h"
+#include <array>
+#include <chrono>
+#include <cmath>
+#include <cstdlib>
+#include <experimental/type_traits>
+#include <string>
+#include <vector>
 
 using namespace std;
 using namespace o2;
diff --git a/.auto-resolution/PWGCF/JCorran/Tasks/jEPFlowAnalysis.cxx b/.auto-resolution/PWGCF/JCorran/Tasks/jEPFlowAnalysis.cxx
index f3f43744f19..fc36ab43d35 100644
--- a/.auto-resolution/PWGCF/JCorran/Tasks/jEPFlowAnalysis.cxx
+++ b/.auto-resolution/PWGCF/JCorran/Tasks/jEPFlowAnalysis.cxx
@@ -11,20 +11,20 @@
 /// \author Maxim Virta (maxim.virta@cern.ch)
 /// \since Jul 2024
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/HistogramRegistry.h"
+#include "JEPFlowAnalysis.h"
 
-#include "Common/DataModel/EventSelection.h"
-#include "Common/Core/TrackSelection.h"
-#include "Framework/runDataProcessing.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "FlowJHistManager.h"
 
-#include "Common/DataModel/Qvectors.h"
 #include "Common/Core/EventPlaneHelper.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Qvectors.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "FlowJHistManager.h"
-#include "JEPFlowAnalysis.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGCF/JCorran/Tasks/jFlucEfficiencyTask.cxx b/.auto-resolution/PWGCF/JCorran/Tasks/jFlucEfficiencyTask.cxx
index 59ca8b18903..e50baa4c1cb 100644
--- a/.auto-resolution/PWGCF/JCorran/Tasks/jFlucEfficiencyTask.cxx
+++ b/.auto-resolution/PWGCF/JCorran/Tasks/jFlucEfficiencyTask.cxx
@@ -14,20 +14,23 @@
 /// \author DongJo Kim, Jasper Parkkila, Bong-Hwi Lim (djkim@cern.ch, jparkkil@cern.ch, bong-hwi.lim@cern.ch)
 /// \since March 2024
 
-#include <vector>
-#include <string>
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/O2DatabasePDGPlugin.h"
+#include "PWGCF/DataModel/CorrelationsDerived.h"
+#include "PWGLF/Utils/collisionCuts.h"
+
 #include "Common/Core/TrackSelection.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "PWGCF/DataModel/CorrelationsDerived.h"
-#include "PWGLF/Utils/collisionCuts.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGCF/JCorran/Tasks/jflucAnalysisTask.cxx b/.auto-resolution/PWGCF/JCorran/Tasks/jflucAnalysisTask.cxx
index 6e0ba68d2df..12e2a599f55 100644
--- a/.auto-resolution/PWGCF/JCorran/Tasks/jflucAnalysisTask.cxx
+++ b/.auto-resolution/PWGCF/JCorran/Tasks/jflucAnalysisTask.cxx
@@ -12,25 +12,27 @@
 /// \author Dong Jo Kim (djkim@jyu.fi)
 /// \since Sep 2022
 
-#include <deque>
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "Framework/AnalysisTask.h"
 #include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-
-#include "Common/DataModel/EventSelection.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Centrality.h"
+#include "Framework/RunningWorkflowInfo.h"
 #include "ReconstructionDataFormats/V0.h"
 
+#include <deque>
+
 // #include "CCDB/BasicCCDBManager.h"
 
-#include "PWGCF/JCorran/DataModel/JCatalyst.h"
-#include "PWGCF/DataModel/CorrelationsDerived.h"
 #include "JFFlucAnalysis.h"
 #include "JFFlucAnalysisO2Hist.h"
+
+#include "PWGCF/DataModel/CorrelationsDerived.h"
+#include "PWGCF/JCorran/DataModel/JCatalyst.h"
+
 #include "Framework/runDataProcessing.h"
 
 using namespace o2;
diff --git a/.auto-resolution/PWGCF/JCorran/Tasks/jflucWeightsLoader.cxx b/.auto-resolution/PWGCF/JCorran/Tasks/jflucWeightsLoader.cxx
index 244035fd310..438a73d4bbf 100644
--- a/.auto-resolution/PWGCF/JCorran/Tasks/jflucWeightsLoader.cxx
+++ b/.auto-resolution/PWGCF/JCorran/Tasks/jflucWeightsLoader.cxx
@@ -12,27 +12,27 @@
 /// \since May 2024
 // o2-linter: disable='doc/file'
 
-#include <experimental/type_traits>
-#include <string>
-#include <TFile.h>
-#include <THn.h>
-
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/HistogramRegistry.h"
+#include "PWGCF/DataModel/CorrelationsDerived.h"
+#include "PWGCF/JCorran/DataModel/JCatalyst.h"
 
-#include "Common/DataModel/EventSelection.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/Centrality.h"
-#include "ReconstructionDataFormats/V0.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
 #include "CCDB/BasicCCDBManager.h"
-
-#include "PWGCF/JCorran/DataModel/JCatalyst.h"
-#include "PWGCF/DataModel/CorrelationsDerived.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
 #include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/V0.h"
+
+#include <TFile.h>
+#include <THn.h>
+
+#include <experimental/type_traits>
+#include <string>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGCF/MultiparticleCorrelations/Tasks/multiparticle-correlations-ar.cxx b/.auto-resolution/PWGCF/MultiparticleCorrelations/Tasks/multiparticle-correlations-ar.cxx
index 5b1539deb9e..fb891b91365 100644
--- a/.auto-resolution/PWGCF/MultiparticleCorrelations/Tasks/multiparticle-correlations-ar.cxx
+++ b/.auto-resolution/PWGCF/MultiparticleCorrelations/Tasks/multiparticle-correlations-ar.cxx
@@ -13,23 +13,27 @@
 /// \brief multiparticle-correlations-ar - Task belonging to Anton Riedel for computing multiparticle correlations
 /// \author Anton Riedel, TU München, anton.riedel@tum.de
 
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/Expressions.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TComplex.h"
 #include <TMath.h>
+
 #include "fairlogger/Logger.h"
+
 #include <algorithm>
+#include <array>
 #include <cstdint>
 #include <iostream>
-#include <string_view>
+#include <numeric>
 #include <string>
+#include <string_view>
 #include <vector>
-#include <array>
-#include <numeric>
-#include "TComplex.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/Expressions.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGCF/MultiparticleCorrelations/Tasks/threeParticleCorrelations.cxx b/.auto-resolution/PWGCF/MultiparticleCorrelations/Tasks/threeParticleCorrelations.cxx
index 299867abfd7..02fe0addf20 100644
--- a/.auto-resolution/PWGCF/MultiparticleCorrelations/Tasks/threeParticleCorrelations.cxx
+++ b/.auto-resolution/PWGCF/MultiparticleCorrelations/Tasks/threeParticleCorrelations.cxx
@@ -13,20 +13,23 @@
 /// \brief Task for producing particle correlations
 /// \author Joey Staa <joey.staa@fysik.lu.se>
 
-#include <algorithm>
+#include "RecoDecay.h"
+
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "CCDB/BasicCCDBManager.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/McCollisionExtra.h"
 #include "Common/DataModel/PIDResponse.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
-#include "RecoDecay.h"
 #include "TPDGCode.h"
 
+#include <algorithm>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.auto-resolution/PWGCF/TableProducer/dptDptFilter.cxx b/.auto-resolution/PWGCF/TableProducer/dptDptFilter.cxx
index 30f55cf3c3f..c55cec45f1e 100644
--- a/.auto-resolution/PWGCF/TableProducer/dptDptFilter.cxx
+++ b/.auto-resolution/PWGCF/TableProducer/dptDptFilter.cxx
@@ -13,40 +13,43 @@
 /// \brief Filters collisions and tracks according to selection criteria
 /// \author victor.gonzalez.sebastian@gmail.com
 
-#include <cmath>
-#include <algorithm>
-#include <string>
-#include <vector>
+#include "PWGCF/TableProducer/dptDptFilter.h"
+
+#include "PWGCF/Core/AnalysisConfigurableCuts.h"
+#include "PWGCF/DataModel/DptDptFiltered.h"
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
 #include "Common/Core/TableHelper.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/CollisionAssociationTables.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGCF/Core/AnalysisConfigurableCuts.h"
-#include "PWGCF/DataModel/DptDptFiltered.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/CollisionAssociationTables.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/RunningWorkflowInfo.h"
-#include <TROOT.h>
-#include <TPDGCode.h>
-#include <TParameter.h>
-#include <TList.h>
+#include "Framework/runDataProcessing.h"
+
 #include <TDirectory.h>
 #include <TFolder.h>
 #include <TH1.h>
 #include <TH2.h>
 #include <TH3.h>
+#include <TList.h>
+#include <TPDGCode.h>
+#include <TParameter.h>
 #include <TProfile3D.h>
+#include <TROOT.h>
 
-#include "PWGCF/TableProducer/dptDptFilter.h"
+#include <algorithm>
+#include <cmath>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGCF/TableProducer/dptDptFilter.h b/.auto-resolution/PWGCF/TableProducer/dptDptFilter.h
index 18076266f1a..b107156d5f3 100644
--- a/.auto-resolution/PWGCF/TableProducer/dptDptFilter.h
+++ b/.auto-resolution/PWGCF/TableProducer/dptDptFilter.h
@@ -16,33 +16,36 @@
 #ifndef PWGCF_TABLEPRODUCER_DPTDPTFILTER_H_
 #define PWGCF_TABLEPRODUCER_DPTDPTFILTER_H_
 
+#include "PWGCF/Core/AnalysisConfigurableCuts.h"
+
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "ReconstructionDataFormats/PID.h"
 #include <CCDB/BasicCCDBManager.h>
-#include <TPDGCode.h>
-#include <TMCProcess.h>
+
 #include <TF1.h>
 #include <TList.h>
-#include <vector>
+#include <TMCProcess.h>
+#include <TPDGCode.h>
+
 #include <bitset>
-#include <string>
-#include <iomanip>
 #include <fstream>
-#include <locale>
-#include <sstream>
-#include <ranges>
 #include <functional>
+#include <iomanip>
+#include <locale>
 #include <map>
-
-#include "ReconstructionDataFormats/PID.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/Core/TrackSelectionDefaults.h"
-#include "PWGCF/Core/AnalysisConfigurableCuts.h"
+#include <ranges>
+#include <sstream>
+#include <string>
+#include <vector>
 
 namespace o2
 {
diff --git a/.auto-resolution/PWGCF/Tasks/dptDptCorrelations.cxx b/.auto-resolution/PWGCF/Tasks/dptDptCorrelations.cxx
index 065e4be286f..33b64e32bdc 100644
--- a/.auto-resolution/PWGCF/Tasks/dptDptCorrelations.cxx
+++ b/.auto-resolution/PWGCF/Tasks/dptDptCorrelations.cxx
@@ -13,7 +13,26 @@
 /// \brief implements two-particle correlations base data collection
 /// \author victor.gonzalez.sebastian@gmail.com
 
+#include "PWGCF/Core/AnalysisConfigurableCuts.h"
+#include "PWGCF/Core/PairCuts.h"
+#include "PWGCF/DataModel/DptDptFiltered.h"
+#include "PWGCF/TableProducer/dptDptFilter.h"
+
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/TableHelper.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
 #include <CCDB/BasicCCDBManager.h>
+
 #include <TDirectory.h>
 #include <TFolder.h>
 #include <TH1.h>
@@ -24,28 +43,12 @@
 #include <TProfile3D.h>
 #include <TROOT.h>
 #include <TVector2.h>
+
+#include <cmath>
 #include <cstdio>
+#include <ctime>
 #include <string>
 #include <vector>
-#include <cmath>
-#include <ctime>
-
-#include "Common/Core/TrackSelection.h"
-#include "Common/Core/TableHelper.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "PWGCF/Core/AnalysisConfigurableCuts.h"
-#include "PWGCF/Core/PairCuts.h"
-#include "PWGCF/DataModel/DptDptFiltered.h"
-#include "PWGCF/TableProducer/dptDptFilter.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGCF/Tasks/dptDptFilterQa.cxx b/.auto-resolution/PWGCF/Tasks/dptDptFilterQa.cxx
index 85dee751438..876fd8ccb5e 100644
--- a/.auto-resolution/PWGCF/Tasks/dptDptFilterQa.cxx
+++ b/.auto-resolution/PWGCF/Tasks/dptDptFilterQa.cxx
@@ -13,15 +13,16 @@
 /// \brief basic checks for the behavior of the filter task
 /// \author victor.gonzalez.sebastian@gmail.com
 
-#include <cmath>
-#include <string>
+#include "PWGCF/DataModel/DptDptFiltered.h"
+#include "PWGCF/TableProducer/dptDptFilter.h"
 
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGCF/DataModel/DptDptFiltered.h"
-#include "PWGCF/TableProducer/dptDptFilter.h"
+
+#include <cmath>
+#include <string>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGCF/Tasks/matchRecoGen.cxx b/.auto-resolution/PWGCF/Tasks/matchRecoGen.cxx
index 57ab00301b7..1881b17b268 100644
--- a/.auto-resolution/PWGCF/Tasks/matchRecoGen.cxx
+++ b/.auto-resolution/PWGCF/Tasks/matchRecoGen.cxx
@@ -13,25 +13,24 @@
 /// \brief basic check for the matching between generator level and detector level
 /// \author victor.gonzalez.sebastian@gmail.com
 
-#include <cmath>
-#include <string>
-#include <vector>
+#include "PWGCF/Core/AnalysisConfigurableCuts.h"
+#include "PWGCF/DataModel/DptDptFiltered.h"
+#include "PWGCF/TableProducer/dptDptFilter.h"
 
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGCF/Core/AnalysisConfigurableCuts.h"
-#include "PWGCF/DataModel/DptDptFiltered.h"
-#include "PWGCF/TableProducer/dptDptFilter.h"
+
 #include <TDirectory.h>
 #include <TFolder.h>
 #include <TH1.h>
@@ -42,6 +41,10 @@
 #include <TProfile3D.h>
 #include <TROOT.h>
 
+#include <cmath>
+#include <string>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::soa;
diff --git a/.auto-resolution/PWGCF/Tutorial/CFTutorialTask1.cxx b/.auto-resolution/PWGCF/Tutorial/CFTutorialTask1.cxx
index f79eb1871c2..14a541f45e1 100644
--- a/.auto-resolution/PWGCF/Tutorial/CFTutorialTask1.cxx
+++ b/.auto-resolution/PWGCF/Tutorial/CFTutorialTask1.cxx
@@ -12,12 +12,13 @@
 /// \author Luca Barioglio
 
 // O2 includes
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.auto-resolution/PWGCF/Tutorial/CFTutorialTask2.cxx b/.auto-resolution/PWGCF/Tutorial/CFTutorialTask2.cxx
index bf40ce17353..ae0bc6d6ae1 100644
--- a/.auto-resolution/PWGCF/Tutorial/CFTutorialTask2.cxx
+++ b/.auto-resolution/PWGCF/Tutorial/CFTutorialTask2.cxx
@@ -12,12 +12,13 @@
 /// \author Luca Barioglio
 
 // O2 includes
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.auto-resolution/PWGCF/Tutorial/CFTutorialTask3.cxx b/.auto-resolution/PWGCF/Tutorial/CFTutorialTask3.cxx
index 42b76f9f0db..d04fbe969ac 100644
--- a/.auto-resolution/PWGCF/Tutorial/CFTutorialTask3.cxx
+++ b/.auto-resolution/PWGCF/Tutorial/CFTutorialTask3.cxx
@@ -12,12 +12,13 @@
 /// \author Luca Barioglio
 
 // O2 includes
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.auto-resolution/PWGCF/Tutorial/CFTutorialTask4.cxx b/.auto-resolution/PWGCF/Tutorial/CFTutorialTask4.cxx
index a21f1ff7949..46790dca80f 100644
--- a/.auto-resolution/PWGCF/Tutorial/CFTutorialTask4.cxx
+++ b/.auto-resolution/PWGCF/Tutorial/CFTutorialTask4.cxx
@@ -12,12 +12,13 @@
 /// \author Luca Barioglio
 
 // O2 includes
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
+
 #include "CommonConstants/PhysicsConstants.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 #include "TLorentzVector.h"
 
diff --git a/.auto-resolution/PWGCF/Tutorial/CFTutorialTask5.cxx b/.auto-resolution/PWGCF/Tutorial/CFTutorialTask5.cxx
index 5357950aab1..a9f30b5db71 100644
--- a/.auto-resolution/PWGCF/Tutorial/CFTutorialTask5.cxx
+++ b/.auto-resolution/PWGCF/Tutorial/CFTutorialTask5.cxx
@@ -12,12 +12,13 @@
 /// \author Luca Barioglio
 
 // O2 includes
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
+
 #include "CommonConstants/PhysicsConstants.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 #include "TLorentzVector.h"
 
diff --git a/.auto-resolution/PWGCF/Tutorial/post-config.json b/.auto-resolution/PWGCF/Tutorial/post-config.json
index 4b484b32088..4c7a012c0fe 100644
--- a/.auto-resolution/PWGCF/Tutorial/post-config.json
+++ b/.auto-resolution/PWGCF/Tutorial/post-config.json
@@ -1,128 +1,128 @@
 {
-  "internal-dpl-clock": "",
-  "internal-dpl-aod-reader": {
-    "time-limit": "0",
-    "orbit-offset-enumeration": "0",
-    "orbit-multiplier-enumeration": "0",
-    "start-value-enumeration": "0",
-    "end-value-enumeration": "-1",
-    "step-value-enumeration": "1",
-    "aod-file": "FemtoAO2D.root"
-  },
-  "femto-dream-debug-track": {
-    "cfgCutTable": {
-      "labels_rows": "",
-      "labels_cols": [
-        "MaxPt",
-        "PIDthr",
-        "nSigmaTPC",
-        "nSigmaTPCTOF",
-        "MaxP"
-      ],
-      "values": [
-        [
-          "4.05",
-          "1",
-          "3.5",
-          "3.5",
-          "1"
-        ]
-      ]
+    "internal-dpl-clock": "",
+    "internal-dpl-aod-reader": {
+        "time-limit": "0",
+        "orbit-offset-enumeration": "0",
+        "orbit-multiplier-enumeration": "0",
+        "start-value-enumeration": "0",
+        "end-value-enumeration": "-1",
+        "step-value-enumeration": "1",
+        "aod-file": "FemtoAO2D.root"
     },
-    "ccfgNspecies": "1",
-    "ConfPDGCodePartOne": "2212",
-    "ConfCutPartOne": "168072266",
-    "ConfPIDPartOne": {
-      "values": [
-        "0"
-      ]
-    }
-  },
-  "femto-dream-pair-task-track-track": {
-    "cfgCutTable": {
-      "labels_rows": [
-        "PartOne",
-        "PartTwo"
-      ],
-      "labels_cols": [
-        "MaxPt",
-        "PIDthr",
-        "nSigmaTPC",
-        "nSigmaTPCTOF",
-        "MaxP"
-      ],
-      "values": [
-        [
-          "4.05",
-          "1",
-          "3",
-          "3",
-          "1"
-        ],
-        [
-          "4.05",
-          "1",
-          "3",
-          "3",
-          "1"
-        ]
-      ]
+    "femto-dream-debug-track": {
+        "cfgCutTable": {
+            "labels_rows": "",
+            "labels_cols": [
+                "MaxPt",
+                "PIDthr",
+                "nSigmaTPC",
+                "nSigmaTPCTOF",
+                "MaxP"
+            ],
+            "values": [
+                [
+                    "4.05",
+                    "1",
+                    "3.5",
+                    "3.5",
+                    "1"
+                ]
+            ]
+        },
+        "ccfgNspecies": "1",
+        "ConfPDGCodePartOne": "2212",
+        "ConfCutPartOne": "168072266",
+        "ConfPIDPartOne": {
+            "values": [
+                "0"
+            ]
+        }
     },
-    "ccfgNspecies": "1",
-    "ConfPDGCodePartOne": "2212",
-    "ConfCutPartOne": "168072266",
-    "ConfPIDPartOne": {
-      "values": [
-        "0"
-      ]
+    "femto-dream-pair-task-track-track": {
+        "cfgCutTable": {
+            "labels_rows": [
+                "PartOne",
+                "PartTwo"
+            ],
+            "labels_cols": [
+                "MaxPt",
+                "PIDthr",
+                "nSigmaTPC",
+                "nSigmaTPCTOF",
+                "MaxP"
+            ],
+            "values": [
+                [
+                    "4.05",
+                    "1",
+                    "3",
+                    "3",
+                    "1"
+                ],
+                [
+                    "4.05",
+                    "1",
+                    "3",
+                    "3",
+                    "1"
+                ]
+            ]
+        },
+        "ccfgNspecies": "1",
+        "ConfPDGCodePartOne": "2212",
+        "ConfCutPartOne": "168072266",
+        "ConfPIDPartOne": {
+            "values": [
+                "0"
+            ]
+        },
+        "ConfIsSame": "false",
+        "ConfPDGCodePartTwo": "2212",
+        "ConfCutPartTwo": "168072266",
+        "ConfPIDPartTwo": {
+            "values": [
+                "0"
+            ]
+        },
+        "CfgMultBins": {
+            "values": [
+                "0",
+                "0",
+                "20",
+                "40",
+                "60",
+                "80",
+                "100",
+                "200",
+                "99999"
+            ]
+        },
+        "CfgkstarBins": {
+            "values": [
+                "1500",
+                "0",
+                "6"
+            ]
+        },
+        "CfgkTBins": {
+            "values": [
+                "150",
+                "0",
+                "9"
+            ]
+        },
+        "CfgmTBins": {
+            "values": [
+                "225",
+                "0",
+                "7.5"
+            ]
+        },
+        "ConfNEventsMix": "5",
+        "ConfIsCPR": "true",
+        "processSameEvent": "true",
+        "processMixedEvent": "true"
     },
-    "ConfIsSame": "false",
-    "ConfPDGCodePartTwo": "2212",
-    "ConfCutPartTwo": "168072266",
-    "ConfPIDPartTwo": {
-      "values": [
-        "0"
-      ]
-    },
-    "CfgMultBins": {
-      "values": [
-        "0",
-        "0",
-        "20",
-        "40",
-        "60",
-        "80",
-        "100",
-        "200",
-        "99999"
-      ]
-    },
-    "CfgkstarBins": {
-      "values": [
-        "1500",
-        "0",
-        "6"
-      ]
-    },
-    "CfgkTBins": {
-      "values": [
-        "150",
-        "0",
-        "9"
-      ]
-    },
-    "CfgmTBins": {
-      "values": [
-        "225",
-        "0",
-        "7.5"
-      ]
-    },
-    "ConfNEventsMix": "5",
-    "ConfIsCPR": "true",
-    "processSameEvent": "true",
-    "processMixedEvent": "true"
-  },
-  "internal-dpl-injected-dummy-sink": "",
-  "internal-dpl-aod-global-analysis-file-sink": ""
+    "internal-dpl-injected-dummy-sink": "",
+    "internal-dpl-aod-global-analysis-file-sink": ""
 }
diff --git a/.auto-resolution/PWGCF/Tutorial/prod-config.json b/.auto-resolution/PWGCF/Tutorial/prod-config.json
index 8be00067d90..934b219a50a 100644
--- a/.auto-resolution/PWGCF/Tutorial/prod-config.json
+++ b/.auto-resolution/PWGCF/Tutorial/prod-config.json
@@ -1,47 +1,47 @@
 {
-  "internal-dpl-clock": "",
-  "internal-dpl-aod-reader": {
-    "time-limit": "0",
-    "orbit-offset-enumeration": "0",
-    "orbit-multiplier-enumeration": "0",
-    "start-value-enumeration": "0",
-    "end-value-enumeration": "-1",
-    "step-value-enumeration": "1",
-    "aod-file": "AO2D.root"
-  },
-  "internal-dpl-aod-index-builder": "",
-  "internal-dpl-aod-spawner": "",
-  "fdd-converter": "",
-  "timestamp-task": {
-    "verbose": "false",
-    "rct-path": "RCT/RunInformation/",
-    "start-orbit-path": "GRP/StartOrbit",
-    "ccdb-url": "http://alice-ccdb.cern.ch",
-    "isRun2MC": "false"
-  },
-  "tpc-pid": {
-    "param-file": "",
-    "param-signal": "BetheBloch",
-    "param-sigma": "TPCReso",
-    "ccdb-url": "http://alice-ccdb.cern.ch",
-    "ccdbPath": "Analysis/PID/TPC/Response",
-    "ccdb-timestamp": "-1",
-    "pid-el": "-1",
-    "pid-mu": "-1",
-    "pid-pi": "-1",
-    "pid-ka": "-1",
-    "pid-pr": "-1",
-    "pid-de": "-1",
-    "pid-tr": "-1",
-    "pid-he": "-1",
-    "pid-al": "-1"
-  },
-  "bc-selection-task": {
-    "processRun2": "false",
-    "processRun3": "true"
-  },
-  "tof-signal": "",
-  "track-propagation": {
+    "internal-dpl-clock": "",
+    "internal-dpl-aod-reader": {
+        "time-limit": "0",
+        "orbit-offset-enumeration": "0",
+        "orbit-multiplier-enumeration": "0",
+        "start-value-enumeration": "0",
+        "end-value-enumeration": "-1",
+        "step-value-enumeration": "1",
+        "aod-file": "AO2D.root"
+    },
+    "internal-dpl-aod-index-builder": "",
+    "internal-dpl-aod-spawner": "",
+    "fdd-converter": "",
+    "timestamp-task": {
+        "verbose": "false",
+        "rct-path": "RCT/RunInformation/",
+        "start-orbit-path": "GRP/StartOrbit",
+        "ccdb-url": "http://alice-ccdb.cern.ch",
+        "isRun2MC": "false"
+    },
+    "tpc-pid": {
+        "param-file": "",
+        "param-signal": "BetheBloch",
+        "param-sigma": "TPCReso",
+        "ccdb-url": "http://alice-ccdb.cern.ch",
+        "ccdbPath": "Analysis/PID/TPC/Response",
+        "ccdb-timestamp": "-1",
+        "pid-el": "-1",
+        "pid-mu": "-1",
+        "pid-pi": "-1",
+        "pid-ka": "-1",
+        "pid-pr": "-1",
+        "pid-de": "-1",
+        "pid-tr": "-1",
+        "pid-he": "-1",
+        "pid-al": "-1"
+    },
+    "bc-selection-task": {
+        "processRun2": "false",
+        "processRun3": "true"
+    },
+    "tof-signal": "",
+    "track-propagation": {
         "ccdb-url": "http://alice-ccdb.cern.ch",
         "lutPath": "GLO/Param/MatLUT",
         "geoPath": "GLO/Config/GeometryAligned",
@@ -50,196 +50,196 @@
         "processStandard": "true",
         "processCovariance": "false"
     },
-  "tof-pid-base": {},
-  "tof-pid": {
-    "param-file": "",
-    "param-sigma": "TOFResoParams",
-    "ccdb-url": "http://alice-ccdb.cern.ch",
-    "ccdbPath": "Analysis/PID/TOF",
-    "ccdb-timestamp": "-1",
-    "pid-el": "-1",
-    "pid-mu": "-1",
-    "pid-pi": "-1",
-    "pid-ka": "-1",
-    "pid-pr": "-1",
-    "pid-de": "-1",
-    "pid-tr": "-1",
-    "pid-he": "-1",
-    "pid-al": "-1",
-    "processEvTime": "true",
-    "processNoEvTime": "false"
-  },
-  "lambdakzero-builder": {
-    "dcanegtopv": "0.1",
-    "dcapostopv": "0.1",
-    "mincrossedrows": "70",
-    "isRun2": "1",
-    "v0cospa": "0.995",
-    "dcav0dau": "1",
-    "v0radius": "5",
-    "useMatCorrType": "0",
-    "rejDiffCollTracks": "0",
+    "tof-pid-base": {},
+    "tof-pid": {
+        "param-file": "",
+        "param-sigma": "TOFResoParams",
+        "ccdb-url": "http://alice-ccdb.cern.ch",
+        "ccdbPath": "Analysis/PID/TOF",
+        "ccdb-timestamp": "-1",
+        "pid-el": "-1",
+        "pid-mu": "-1",
+        "pid-pi": "-1",
+        "pid-ka": "-1",
+        "pid-pr": "-1",
+        "pid-de": "-1",
+        "pid-tr": "-1",
+        "pid-he": "-1",
+        "pid-al": "-1",
+        "processEvTime": "true",
+        "processNoEvTime": "false"
+    },
+    "lambdakzero-builder": {
+        "dcanegtopv": "0.1",
+        "dcapostopv": "0.1",
+        "mincrossedrows": "70",
+        "isRun2": "1",
+        "v0cospa": "0.995",
+        "dcav0dau": "1",
+        "v0radius": "5",
+        "useMatCorrType": "0",
+        "rejDiffCollTracks": "0",
         "processRun2": "false",
         "processRun3": "true"
-  },
-  "event-selection-task": {
-    "syst": "pp",
-    "muonSelection": "0",
-    "customDeltaBC": "300",
-    "isMC": "false",
-    "processRun2": "false",
-    "processRun3": "true"
-  },
-  "multiplicity-table": {
-    "processRun2": "false",
-    "processRun3": "true"
-  },
-  "femto-dream-producer-task": {
-    "ConfDebugOutput": "true",
-    "ConfIsTrigger": "false",
-    "ConfIsRun3": "true",
-    "ConfEvtZvtx": "10",
-    "ConfEvtTriggerCheck": "true",
-    "ConfEvtTriggerSel": "0",
-    "ConfEvtOfflineCheck": "true",
-    "ConfStoreV0": "true",
-    "ConfTrkSign": {
-      "values": [
-        "-1",
-        "1"
-      ]
-    },
-    "ConfTrkPtMin": {
-      "values": [
-        "0.4",
-        "0.6",
-        "0.5"
-      ]
-    },
-    "ConfTrkEtaMax": {
-      "values": [
-        "0.8",
-        "0.7",
-        "0.9"
-      ]
-    },
-    "ConfTrkTPCnClsMin": {
-      "values": [
-        "80",
-        "70",
-        "60"
-      ]
-    },
-    "ConfTrkTPCfClsMin": {
-      "values": [
-        "0.7",
-        "0.8",
-        "0.9"
-      ]
-    },
-    "ConfTrkTPCcRowsMin": {
-      "values": [
-        "70",
-        "60",
-        "80"
-      ]
-    },
-    "ConfTrkTPCsClsMax": {
-      "values": [
-        "0.1",
-        "160"
-      ]
-    },
-    "ConfTrkITSnClsMin": {
-      "values": [
-        "-1",
-        "2",
-        "4"
-      ]
-    },
-    "ConfTrkITSnClsIbMin": {
-      "values": [
-        "-1",
-        "1"
-      ]
     },
-    "ConfTrkDCAxyMax": {
-      "values": [
-        "0.1",
-        "3.5"
-      ]
-    },
-    "ConfTrkDCAzMax": {
-      "values": [
-        "0.2",
-        "3.5"
-      ]
-    },
-    "ConfTrkPIDnSigmaMax": {
-      "values": [
-        "3.5",
-        "3",
-        "2.5"
-      ]
-    },
-    "ConfTrkTPIDspecies": {
-      "values": [
-        "2",
-        "4"
-      ]
-    },
-    "ConfV0Sign": {
-      "values": [
-        "-1",
-        "1"
-      ]
-    },
-    "ConfV0PtMin": {
-      "values": [
-        "0.3",
-        "0.4",
-        "0.5"
-      ]
-    },
-    "ConfV0DCAdaughMax": {
-      "values": [
-        "1.2",
-        "1.5"
-      ]
-    },
-    "ConfV0CPAMin": {
-      "values": [
-        "0.90",
-        "0.995"
-      ]
-    },
-    "ConfV0TranRadMin": {
-      "values": [
-        "0.2"
-      ]
-    },
-    "ConfV0TranRadMax": {
-      "values": [
-        "100"
-      ]
-    },
-    "ConfV0DecVecMax": {
-      "values": [
-        "100"
-      ]
+    "event-selection-task": {
+        "syst": "pp",
+        "muonSelection": "0",
+        "customDeltaBC": "300",
+        "isMC": "false",
+        "processRun2": "false",
+        "processRun3": "true"
     },
-    "ConfV0DaughTPIDspecies": {
-      "values": [
-        "2",
-        "4"
-      ]
+    "multiplicity-table": {
+        "processRun2": "false",
+        "processRun3": "true"
     },
-    "ConfInvMassLowLimit": "0",
-    "ConfInvMassUpLimit": "100"
-  },
-  "track-selection": {
-    "isRun3": "true"
-  },
-  "internal-dpl-aod-global-analysis-file-sink": "",
-  "internal-dpl-aod-writer": ""
+    "femto-dream-producer-task": {
+        "ConfDebugOutput": "true",
+        "ConfIsTrigger": "false",
+        "ConfIsRun3": "true",
+        "ConfEvtZvtx": "10",
+        "ConfEvtTriggerCheck": "true",
+        "ConfEvtTriggerSel": "0",
+        "ConfEvtOfflineCheck": "true",
+        "ConfStoreV0": "true",
+        "ConfTrkSign": {
+            "values": [
+                "-1",
+                "1"
+            ]
+        },
+        "ConfTrkPtMin": {
+            "values": [
+                "0.4",
+                "0.6",
+                "0.5"
+            ]
+        },
+        "ConfTrkEtaMax": {
+            "values": [
+                "0.8",
+                "0.7",
+                "0.9"
+            ]
+        },
+        "ConfTrkTPCnClsMin": {
+            "values": [
+                "80",
+                "70",
+                "60"
+            ]
+        },
+        "ConfTrkTPCfClsMin": {
+            "values": [
+                "0.7",
+                "0.8",
+                "0.9"
+            ]
+        },
+        "ConfTrkTPCcRowsMin": {
+            "values": [
+                "70",
+                "60",
+                "80"
+            ]
+        },
+        "ConfTrkTPCsClsMax": {
+            "values": [
+                "0.1",
+                "160"
+            ]
+        },
+        "ConfTrkITSnClsMin": {
+            "values": [
+                "-1",
+                "2",
+                "4"
+            ]
+        },
+        "ConfTrkITSnClsIbMin": {
+            "values": [
+                "-1",
+                "1"
+            ]
+        },
+        "ConfTrkDCAxyMax": {
+            "values": [
+                "0.1",
+                "3.5"
+            ]
+        },
+        "ConfTrkDCAzMax": {
+            "values": [
+                "0.2",
+                "3.5"
+            ]
+        },
+        "ConfTrkPIDnSigmaMax": {
+            "values": [
+                "3.5",
+                "3",
+                "2.5"
+            ]
+        },
+        "ConfTrkTPIDspecies": {
+            "values": [
+                "2",
+                "4"
+            ]
+        },
+        "ConfV0Sign": {
+            "values": [
+                "-1",
+                "1"
+            ]
+        },
+        "ConfV0PtMin": {
+            "values": [
+                "0.3",
+                "0.4",
+                "0.5"
+            ]
+        },
+        "ConfV0DCAdaughMax": {
+            "values": [
+                "1.2",
+                "1.5"
+            ]
+        },
+        "ConfV0CPAMin": {
+            "values": [
+                "0.90",
+                "0.995"
+            ]
+        },
+        "ConfV0TranRadMin": {
+            "values": [
+                "0.2"
+            ]
+        },
+        "ConfV0TranRadMax": {
+            "values": [
+                "100"
+            ]
+        },
+        "ConfV0DecVecMax": {
+            "values": [
+                "100"
+            ]
+        },
+        "ConfV0DaughTPIDspecies": {
+            "values": [
+                "2",
+                "4"
+            ]
+        },
+        "ConfInvMassLowLimit": "0",
+        "ConfInvMassUpLimit": "100"
+    },
+    "track-selection": {
+        "isRun3": "true"
+    },
+    "internal-dpl-aod-global-analysis-file-sink": "",
+    "internal-dpl-aod-writer": ""
 }
diff --git a/.auto-resolution/PWGCF/Tutorial/run-config.json b/.auto-resolution/PWGCF/Tutorial/run-config.json
index 424db80fbb8..1c7c55db103 100644
--- a/.auto-resolution/PWGCF/Tutorial/run-config.json
+++ b/.auto-resolution/PWGCF/Tutorial/run-config.json
@@ -1,135 +1,135 @@
 {
-  "internal-dpl-clock": "",
-  "internal-dpl-aod-reader": {
-    "time-limit": "0",
-    "orbit-offset-enumeration": "0",
-    "orbit-multiplier-enumeration": "0",
-    "start-value-enumeration": "0",
-    "end-value-enumeration": "-1",
-    "step-value-enumeration": "1",
-    "aod-file": "AO2D.root"
-  },
-  "internal-dpl-aod-index-builder": "",
-  "internal-dpl-aod-spawner": "",
-  "fdd-converter": "",
-  "timestamp-task": {
-    "verbose": "false",
-    "rct-path": "RCT/RunInformation/",
-    "start-orbit-path": "GRP/StartOrbit",
-    "ccdb-url": "http://alice-ccdb.cern.ch",
-    "isRun2MC": "false"
-  },
-  "tpc-pid": {
-    "param-file": "",
-    "param-signal": "BetheBloch",
-    "param-sigma": "TPCReso",
-    "ccdb-url": "http://alice-ccdb.cern.ch",
-    "ccdbPath": "Analysis/PID/TPC/Response",
-    "ccdb-timestamp": "-1",
-    "pid-el": "-1",
-    "pid-mu": "-1",
-    "pid-pi": "-1",
-    "pid-ka": "-1",
-    "pid-pr": "-1",
-    "pid-de": "-1",
-    "pid-tr": "-1",
-    "pid-he": "-1",
-    "pid-al": "-1"
-  },
-  "bc-selection-task": {
-    "processRun2": "false",
-    "processRun3": "true"
-  },
-  "tof-signal": "",
-  "track-propagation": {
-    "ccdb-url": "http://alice-ccdb.cern.ch",
-    "lutPath": "GLO/Param/MatLUT",
-    "geoPath": "GLO/Config/GeometryAligned",
-    "grpPath": "GLO/GRP/GRP",
-    "mVtxPath": "GLO/Calib/MeanVertex",
-    "processStandard": "true",
-    "processCovariance": "false"
-  },
-  "event-selection-task": {
-    "syst": "pp",
-    "muonSelection": "0",
-    "customDeltaBC": "300",
-    "isMC": "false",
-    "processRun2": "false",
-    "processRun3": "true"
-  },
-  "multiplicity-table": {
-    "processRun2": "false",
-    "processRun3": "true"
-  },
-  "track-selection": {
-    "isRun3": "true"
-  },
-  "c-f-tutorial-task0": "",
-  "c-f-tutorial-task1": "",
-  "c-f-tutorial-task2": {
-    "ConfZvtxCut": "10",
-    "ConfEtaCut": "0.8",
-    "ConfMaxPtCut": "3",
-    "ConfMinPtCut": "0.5",
-    "ConfMinNSigmaTPCCut": "3"
-  },
-  "c-f-tutorial-task3": {
-    "ConfZvtxCut": "10",
-    "ConfEtaCut": "0.8",
-    "ConfMaxPtCut": "3",
-    "ConfMinPtCut": "0.5",
-    "ConfMinNSigmaTPCCut": "3",
-    "ConfChargeCut": "0"
-  },
-  "c-f-tutorial-task4": {
-    "ConfZvtxCut": "10",
-    "ConfEtaCut": "0.8",
-    "ConfMaxPtCut": "3",
-    "ConfMinPtCut": "0.5",
-    "ConfMinNSigmaTPCCut": "3",
-    "ConfChargeCut": "0"
-  },
-  "c-f-tutorial-task5": {
-    "ConfZvtxCut": "10",
-    "ConfEtaCut": "0.8",
-    "ConfMaxPtCut": "3",
-    "ConfMinPtCut": "0.5",
-    "ConfMinNSigmaTPCCut": "3",
-    "ConfChargeCut": "0",
-    "ConfMultBins": {
-      "values": [
-        "0",
-        "0",
-        "20",
-        "40",
-        "60",
-        "80",
-        "100",
-        "200",
-        "99999"
-      ]
+    "internal-dpl-clock": "",
+    "internal-dpl-aod-reader": {
+        "time-limit": "0",
+        "orbit-offset-enumeration": "0",
+        "orbit-multiplier-enumeration": "0",
+        "start-value-enumeration": "0",
+        "end-value-enumeration": "-1",
+        "step-value-enumeration": "1",
+        "aod-file": "AO2D.root"
     },
-    "ConfVtxBins": {
-      "values": [
-        "0",
-        "-10",
-        "-8",
-        "-6",
-        "-4",
-        "-2",
-        "0",
-        "2",
-        "4",
-        "6",
-        "8",
-        "10"
-      ]
+    "internal-dpl-aod-index-builder": "",
+    "internal-dpl-aod-spawner": "",
+    "fdd-converter": "",
+    "timestamp-task": {
+        "verbose": "false",
+        "rct-path": "RCT/RunInformation/",
+        "start-orbit-path": "GRP/StartOrbit",
+        "ccdb-url": "http://alice-ccdb.cern.ch",
+        "isRun2MC": "false"
     },
-    "processSame": "true",
-    "processMixed": "true",
-    "processMixedEventInterface": "true"
-  },
-  "internal-dpl-aod-global-analysis-file-sink": "",
-  "internal-dpl-aod-writer": ""
+    "tpc-pid": {
+        "param-file": "",
+        "param-signal": "BetheBloch",
+        "param-sigma": "TPCReso",
+        "ccdb-url": "http://alice-ccdb.cern.ch",
+        "ccdbPath": "Analysis/PID/TPC/Response",
+        "ccdb-timestamp": "-1",
+        "pid-el": "-1",
+        "pid-mu": "-1",
+        "pid-pi": "-1",
+        "pid-ka": "-1",
+        "pid-pr": "-1",
+        "pid-de": "-1",
+        "pid-tr": "-1",
+        "pid-he": "-1",
+        "pid-al": "-1"
+    },
+    "bc-selection-task": {
+        "processRun2": "false",
+        "processRun3": "true"
+    },
+    "tof-signal": "",
+    "track-propagation": {
+        "ccdb-url": "http://alice-ccdb.cern.ch",
+        "lutPath": "GLO/Param/MatLUT",
+        "geoPath": "GLO/Config/GeometryAligned",
+        "grpPath": "GLO/GRP/GRP",
+        "mVtxPath": "GLO/Calib/MeanVertex",
+        "processStandard": "true",
+        "processCovariance": "false"
+    },
+    "event-selection-task": {
+        "syst": "pp",
+        "muonSelection": "0",
+        "customDeltaBC": "300",
+        "isMC": "false",
+        "processRun2": "false",
+        "processRun3": "true"
+    },
+    "multiplicity-table": {
+        "processRun2": "false",
+        "processRun3": "true"
+    },
+    "track-selection": {
+        "isRun3": "true"
+    },
+    "c-f-tutorial-task0": "",
+    "c-f-tutorial-task1": "",
+    "c-f-tutorial-task2": {
+        "ConfZvtxCut": "10",
+        "ConfEtaCut": "0.8",
+        "ConfMaxPtCut": "3",
+        "ConfMinPtCut": "0.5",
+        "ConfMinNSigmaTPCCut": "3"
+    },
+    "c-f-tutorial-task3": {
+        "ConfZvtxCut": "10",
+        "ConfEtaCut": "0.8",
+        "ConfMaxPtCut": "3",
+        "ConfMinPtCut": "0.5",
+        "ConfMinNSigmaTPCCut": "3",
+        "ConfChargeCut": "0"
+    },
+    "c-f-tutorial-task4": {
+        "ConfZvtxCut": "10",
+        "ConfEtaCut": "0.8",
+        "ConfMaxPtCut": "3",
+        "ConfMinPtCut": "0.5",
+        "ConfMinNSigmaTPCCut": "3",
+        "ConfChargeCut": "0"
+    },
+    "c-f-tutorial-task5": {
+        "ConfZvtxCut": "10",
+        "ConfEtaCut": "0.8",
+        "ConfMaxPtCut": "3",
+        "ConfMinPtCut": "0.5",
+        "ConfMinNSigmaTPCCut": "3",
+        "ConfChargeCut": "0",
+        "ConfMultBins": {
+            "values": [
+                "0",
+                "0",
+                "20",
+                "40",
+                "60",
+                "80",
+                "100",
+                "200",
+                "99999"
+            ]
+        },
+        "ConfVtxBins": {
+            "values": [
+                "0",
+                "-10",
+                "-8",
+                "-6",
+                "-4",
+                "-2",
+                "0",
+                "2",
+                "4",
+                "6",
+                "8",
+                "10"
+            ]
+        },
+        "processSame": "true",
+        "processMixed": "true",
+        "processMixedEventInterface": "true"
+    },
+    "internal-dpl-aod-global-analysis-file-sink": "",
+    "internal-dpl-aod-writer": ""
 }
diff --git a/.auto-resolution/PWGCF/TwoParticleCorrelations/Core/EventSelectionFilterAndAnalysis.cxx b/.auto-resolution/PWGCF/TwoParticleCorrelations/Core/EventSelectionFilterAndAnalysis.cxx
index 57a65059663..cb2ca3398b2 100644
--- a/.auto-resolution/PWGCF/TwoParticleCorrelations/Core/EventSelectionFilterAndAnalysis.cxx
+++ b/.auto-resolution/PWGCF/TwoParticleCorrelations/Core/EventSelectionFilterAndAnalysis.cxx
@@ -9,11 +9,13 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <boost/regex.hpp>
-#include <TObjArray.h>
+#include "EventSelectionFilterAndAnalysis.h"
 
 #include "Framework/AnalysisTask.h"
-#include "EventSelectionFilterAndAnalysis.h"
+
+#include <TObjArray.h>
+
+#include <boost/regex.hpp>
 
 using namespace o2;
 using namespace o2::analysis::PWGCF;
diff --git a/.auto-resolution/PWGCF/TwoParticleCorrelations/Core/EventSelectionFilterAndAnalysis.h b/.auto-resolution/PWGCF/TwoParticleCorrelations/Core/EventSelectionFilterAndAnalysis.h
index 72e8d6672c0..63a10c2bd78 100644
--- a/.auto-resolution/PWGCF/TwoParticleCorrelations/Core/EventSelectionFilterAndAnalysis.h
+++ b/.auto-resolution/PWGCF/TwoParticleCorrelations/Core/EventSelectionFilterAndAnalysis.h
@@ -11,15 +11,17 @@
 #ifndef EVENTSELECTIONFILTERANDANALYSIS_H
 #define EVENTSELECTIONFILTERANDANALYSIS_H
 
-#include <Rtypes.h>
-#include <TString.h>
-#include <TObject.h>
-#include <TNamed.h>
+#include "SelectionFilterAndAnalysis.h"
+#include "SkimmingConfigurableCuts.h"
+
 #include <TList.h>
+#include <TNamed.h>
+#include <TObject.h>
+#include <TString.h>
 
 #include <fairlogger/Logger.h>
-#include "SkimmingConfigurableCuts.h"
-#include "SelectionFilterAndAnalysis.h"
+
+#include <Rtypes.h>
 
 namespace o2
 {
diff --git a/.auto-resolution/PWGCF/TwoParticleCorrelations/Core/FilterAndAnalysisFramework.cxx b/.auto-resolution/PWGCF/TwoParticleCorrelations/Core/FilterAndAnalysisFramework.cxx
index ba83f4aa2ed..40c4cebf8c8 100644
--- a/.auto-resolution/PWGCF/TwoParticleCorrelations/Core/FilterAndAnalysisFramework.cxx
+++ b/.auto-resolution/PWGCF/TwoParticleCorrelations/Core/FilterAndAnalysisFramework.cxx
@@ -9,14 +9,16 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
+#include "FilterAndAnalysisFramework.h"
+
+#include <TList.h>
+#include <TObjString.h>
+
 #include <fairlogger/Logger.h>
+
 #include <iomanip>
 #include <map>
 #include <string>
-#include <TList.h>
-#include <TObjString.h>
-
-#include "FilterAndAnalysisFramework.h"
 
 using namespace o2;
 using namespace o2::analysis::PWGCF;
diff --git a/.auto-resolution/PWGCF/TwoParticleCorrelations/Core/FilterAndAnalysisFramework.h b/.auto-resolution/PWGCF/TwoParticleCorrelations/Core/FilterAndAnalysisFramework.h
index fa3b7aaeb6e..54d1656ad3d 100644
--- a/.auto-resolution/PWGCF/TwoParticleCorrelations/Core/FilterAndAnalysisFramework.h
+++ b/.auto-resolution/PWGCF/TwoParticleCorrelations/Core/FilterAndAnalysisFramework.h
@@ -11,18 +11,21 @@
 #ifndef PWGCF_TWOPARTICLECORRELATIONS_CORE_FILTERANDANALYSISFRAMEWORK_H_
 #define PWGCF_TWOPARTICLECORRELATIONS_CORE_FILTERANDANALYSISFRAMEWORK_H_
 
+#include "PWGCF/TwoParticleCorrelations/Core/EventSelectionFilterAndAnalysis.h"
+#include "PWGCF/TwoParticleCorrelations/Core/PIDSelectionFilterAndAnalysis.h"
+#include "PWGCF/TwoParticleCorrelations/Core/TrackSelectionFilterAndAnalysis.h"
+
 #include <CCDB/BasicCCDBManager.h>
-#include <vector>
-#include <string>
-#include <Rtypes.h>
-#include <TString.h>
-#include <TObject.h>
-#include <TNamed.h>
+
 #include <TList.h>
+#include <TNamed.h>
+#include <TObject.h>
+#include <TString.h>
 
-#include "PWGCF/TwoParticleCorrelations/Core/EventSelectionFilterAndAnalysis.h"
-#include "PWGCF/TwoParticleCorrelations/Core/TrackSelectionFilterAndAnalysis.h"
-#include "PWGCF/TwoParticleCorrelations/Core/PIDSelectionFilterAndAnalysis.h"
+#include <Rtypes.h>
+
+#include <string>
+#include <vector>
 
 namespace o2
 {
diff --git a/.auto-resolution/PWGCF/TwoParticleCorrelations/Core/PIDSelectionFilterAndAnalysis.cxx b/.auto-resolution/PWGCF/TwoParticleCorrelations/Core/PIDSelectionFilterAndAnalysis.cxx
index bfe06121f9e..519b3a825e1 100644
--- a/.auto-resolution/PWGCF/TwoParticleCorrelations/Core/PIDSelectionFilterAndAnalysis.cxx
+++ b/.auto-resolution/PWGCF/TwoParticleCorrelations/Core/PIDSelectionFilterAndAnalysis.cxx
@@ -9,14 +9,17 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <boost/regex.hpp>
-#include <TObjArray.h>
+#include "PIDSelectionFilterAndAnalysis.h"
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PIDSelectionFilterAndAnalysis.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+
+#include <TObjArray.h>
+
+#include <boost/regex.hpp>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGCF/TwoParticleCorrelations/Core/PIDSelectionFilterAndAnalysis.h b/.auto-resolution/PWGCF/TwoParticleCorrelations/Core/PIDSelectionFilterAndAnalysis.h
index 1d8645b351c..530a2f95658 100644
--- a/.auto-resolution/PWGCF/TwoParticleCorrelations/Core/PIDSelectionFilterAndAnalysis.h
+++ b/.auto-resolution/PWGCF/TwoParticleCorrelations/Core/PIDSelectionFilterAndAnalysis.h
@@ -11,14 +11,15 @@
 #ifndef PIDSELECTIONFILTERANDANALYSIS_H
 #define PIDSELECTIONFILTERANDANALYSIS_H
 
-#include <Rtypes.h>
-#include <TString.h>
-#include <TObject.h>
-#include <TNamed.h>
+#include "SelectionFilterAndAnalysis.h"
+#include "SkimmingConfigurableCuts.h"
+
 #include <TList.h>
+#include <TNamed.h>
+#include <TObject.h>
+#include <TString.h>
 
-#include "SkimmingConfigurableCuts.h"
-#include "SelectionFilterAndAnalysis.h"
+#include <Rtypes.h>
 
 #undef INCORPORATEBAYESIANPID
 
diff --git a/.auto-resolution/PWGCF/TwoParticleCorrelations/Core/SelectionFilterAndAnalysis.cxx b/.auto-resolution/PWGCF/TwoParticleCorrelations/Core/SelectionFilterAndAnalysis.cxx
index 1c816268063..eb15706406d 100644
--- a/.auto-resolution/PWGCF/TwoParticleCorrelations/Core/SelectionFilterAndAnalysis.cxx
+++ b/.auto-resolution/PWGCF/TwoParticleCorrelations/Core/SelectionFilterAndAnalysis.cxx
@@ -9,13 +9,15 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <boost/regex.hpp>
-#include <TObjArray.h>
+#include "SelectionFilterAndAnalysis.h"
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
-#include "SelectionFilterAndAnalysis.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+
+#include <TObjArray.h>
+
+#include <boost/regex.hpp>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGCF/TwoParticleCorrelations/Core/SelectionFilterAndAnalysis.h b/.auto-resolution/PWGCF/TwoParticleCorrelations/Core/SelectionFilterAndAnalysis.h
index f3680d188f4..ea88f12edca 100644
--- a/.auto-resolution/PWGCF/TwoParticleCorrelations/Core/SelectionFilterAndAnalysis.h
+++ b/.auto-resolution/PWGCF/TwoParticleCorrelations/Core/SelectionFilterAndAnalysis.h
@@ -11,11 +11,12 @@
 #ifndef SELECTIONFILTERANDANALYSIS_H
 #define SELECTIONFILTERANDANALYSIS_H
 
-#include <Rtypes.h>
-#include <TString.h>
-#include <TObject.h>
-#include <TNamed.h>
 #include <TList.h>
+#include <TNamed.h>
+#include <TObject.h>
+#include <TString.h>
+
+#include <Rtypes.h>
 
 namespace o2
 {
diff --git a/.auto-resolution/PWGCF/TwoParticleCorrelations/Core/SkimmingConfigurableCuts.cxx b/.auto-resolution/PWGCF/TwoParticleCorrelations/Core/SkimmingConfigurableCuts.cxx
index 81436952bd0..9c9c131e768 100644
--- a/.auto-resolution/PWGCF/TwoParticleCorrelations/Core/SkimmingConfigurableCuts.cxx
+++ b/.auto-resolution/PWGCF/TwoParticleCorrelations/Core/SkimmingConfigurableCuts.cxx
@@ -9,11 +9,13 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <regex>
+#include "PWGCF/TwoParticleCorrelations/Core/SkimmingConfigurableCuts.h"
+
 #include <TObjArray.h>
 
 #include <fairlogger/Logger.h>
-#include "PWGCF/TwoParticleCorrelations/Core/SkimmingConfigurableCuts.h"
+
+#include <regex>
 
 using namespace o2;
 using namespace o2::analysis::PWGCF;
diff --git a/.auto-resolution/PWGCF/TwoParticleCorrelations/Core/SkimmingConfigurableCuts.h b/.auto-resolution/PWGCF/TwoParticleCorrelations/Core/SkimmingConfigurableCuts.h
index 53e1c56dcaa..823f6a848ac 100644
--- a/.auto-resolution/PWGCF/TwoParticleCorrelations/Core/SkimmingConfigurableCuts.h
+++ b/.auto-resolution/PWGCF/TwoParticleCorrelations/Core/SkimmingConfigurableCuts.h
@@ -11,20 +11,23 @@
 #ifndef SKIMMING_CONFIGURABLE_CUTS_CLASSES_H
 #define SKIMMING_CONFIGURABLE_CUTS_CLASSES_H
 
-#include <Rtypes.h>
-#include <TString.h>
-#include <TObject.h>
-#include <TNamed.h>
-#include <TMath.h>
-#include <TList.h>
+#include "Framework/DataTypes.h"
+
 #include <TF1.h>
-#include <set>
-#include <vector>
-#include <regex>
+#include <TList.h>
+#include <TMath.h>
+#include <TNamed.h>
 #include <TObjArray.h>
+#include <TObject.h>
+#include <TString.h>
 
 #include <fairlogger/Logger.h>
-#include "Framework/DataTypes.h"
+
+#include <Rtypes.h>
+
+#include <regex>
+#include <set>
+#include <vector>
 
 namespace o2
 {
diff --git a/.auto-resolution/PWGCF/TwoParticleCorrelations/Core/TrackSelectionFilterAndAnalysis.cxx b/.auto-resolution/PWGCF/TwoParticleCorrelations/Core/TrackSelectionFilterAndAnalysis.cxx
index 4b5708fdc90..859c6d04802 100644
--- a/.auto-resolution/PWGCF/TwoParticleCorrelations/Core/TrackSelectionFilterAndAnalysis.cxx
+++ b/.auto-resolution/PWGCF/TwoParticleCorrelations/Core/TrackSelectionFilterAndAnalysis.cxx
@@ -9,11 +9,12 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <boost/regex.hpp>
+#include "TrackSelectionFilterAndAnalysis.h"
+
 #include <TObjArray.h>
 
+#include <boost/regex.hpp>
 #include <fairlogger/Logger.h>
-#include "TrackSelectionFilterAndAnalysis.h"
 
 using namespace o2;
 using namespace o2::analysis::PWGCF;
diff --git a/.auto-resolution/PWGCF/TwoParticleCorrelations/Core/TrackSelectionFilterAndAnalysis.h b/.auto-resolution/PWGCF/TwoParticleCorrelations/Core/TrackSelectionFilterAndAnalysis.h
index 8c186a97109..cfb6e4524cd 100644
--- a/.auto-resolution/PWGCF/TwoParticleCorrelations/Core/TrackSelectionFilterAndAnalysis.h
+++ b/.auto-resolution/PWGCF/TwoParticleCorrelations/Core/TrackSelectionFilterAndAnalysis.h
@@ -11,15 +11,17 @@
 #ifndef TRACKSELECTIONFILTERANDANALYSIS_H
 #define TRACKSELECTIONFILTERANDANALYSIS_H
 
-#include <Rtypes.h>
-#include <TString.h>
-#include <TObject.h>
-#include <TNamed.h>
+#include "SelectionFilterAndAnalysis.h"
+#include "SkimmingConfigurableCuts.h"
+
 #include <TList.h>
+#include <TNamed.h>
+#include <TObject.h>
+#include <TString.h>
 
 #include <fairlogger/Logger.h>
-#include "SkimmingConfigurableCuts.h"
-#include "SelectionFilterAndAnalysis.h"
+
+#include <Rtypes.h>
 
 namespace o2
 {
diff --git a/.auto-resolution/PWGCF/TwoParticleCorrelations/DataModel/TwoParticleCorrelationsFiltered.h b/.auto-resolution/PWGCF/TwoParticleCorrelations/DataModel/TwoParticleCorrelationsFiltered.h
index ac35f064808..f0e48acab70 100644
--- a/.auto-resolution/PWGCF/TwoParticleCorrelations/DataModel/TwoParticleCorrelationsFiltered.h
+++ b/.auto-resolution/PWGCF/TwoParticleCorrelations/DataModel/TwoParticleCorrelationsFiltered.h
@@ -11,9 +11,10 @@
 #ifndef O2_ANALYSIS_TWOPARTFILTERED_H
 #define O2_ANALYSIS_TWOPARTFILTERED_H
 
+#include "TwoParticleCorrelationsSkimmed.h"
+
 #include "Framework/ASoA.h"
 #include "Framework/AnalysisDataModel.h"
-#include "TwoParticleCorrelationsSkimmed.h"
 
 namespace o2
 {
diff --git a/.auto-resolution/PWGCF/TwoParticleCorrelations/DataModel/TwoParticleCorrelationsSkimmed.h b/.auto-resolution/PWGCF/TwoParticleCorrelations/DataModel/TwoParticleCorrelationsSkimmed.h
index b032d89647f..c91c3d491d1 100644
--- a/.auto-resolution/PWGCF/TwoParticleCorrelations/DataModel/TwoParticleCorrelationsSkimmed.h
+++ b/.auto-resolution/PWGCF/TwoParticleCorrelations/DataModel/TwoParticleCorrelationsSkimmed.h
@@ -12,19 +12,22 @@
 #ifndef PWGCF_TWOPARTICLECORRELATIONS_DATAMODEL_TWOPARTICLECORRELATIONSSKIMMED_H_
 #define PWGCF_TWOPARTICLECORRELATIONS_DATAMODEL_TWOPARTICLECORRELATIONSSKIMMED_H_
 
-#include <vector>
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoA.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Centrality.h"
-#include "PWGCF/TwoParticleCorrelations/Core/SkimmingConfigurableCuts.h"
 #include "PWGCF/TwoParticleCorrelations/Core/EventSelectionFilterAndAnalysis.h"
-#include "PWGCF/TwoParticleCorrelations/Core/TrackSelectionFilterAndAnalysis.h"
 #include "PWGCF/TwoParticleCorrelations/Core/PIDSelectionFilterAndAnalysis.h"
+#include "PWGCF/TwoParticleCorrelations/Core/SkimmingConfigurableCuts.h"
+#include "PWGCF/TwoParticleCorrelations/Core/TrackSelectionFilterAndAnalysis.h"
+
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
 
+#include <vector>
+
 namespace o2
 {
 namespace aod
@@ -60,15 +63,15 @@ DECLARE_SOA_TABLE(CFMCCollMasks, "AOD", "CFMCCOLLMASK", //! Generated collision/
 using CFMCCollMask = CFMCCollMasks::iterator;
 namespace cfskim
 {
-DECLARE_SOA_INDEX_COLUMN(CFCollision, cfcollision);     //! Reconstructed collision/event
-DECLARE_SOA_INDEX_COLUMN(CFMCCollision, cfmccollision); //! Generated collision/event
-DECLARE_SOA_COLUMN(CFTrackFlags, trackflags, uint64_t); //! The skimming flags for track selection, B0 track/particle positive charge, B1 track/particle negative charge
+DECLARE_SOA_INDEX_COLUMN(CFCollision, cfcollision);         //! Reconstructed collision/event
+DECLARE_SOA_INDEX_COLUMN(CFMCCollision, cfmccollision);     //! Generated collision/event
+DECLARE_SOA_COLUMN(CFTrackFlags, trackflags, uint64_t);     //! The skimming flags for track selection, B0 track/particle positive charge, B1 track/particle negative charge
 DECLARE_SOA_COLUMN(CFMCTrackFlags, mctrackflags, uint64_t); //! The skimming flags for particle selection, B0 track/particle positive charge, B1 track/particle negative charge
 DECLARE_SOA_COLUMN(CFPidFlags, pidflags, uint64_t);         //! The PID skimming flags for track selection
-DECLARE_SOA_COLUMN(Pt, pt, float);                      //! The track transverse momentum
-DECLARE_SOA_COLUMN(Eta, eta, float);                    //! The track pseudorapidity
-DECLARE_SOA_COLUMN(Phi, phi, float);                    //! The track azimuthal angle
-DECLARE_SOA_DYNAMIC_COLUMN(Sign, sign,                  //! Charge: positive: 1, negative: -1
+DECLARE_SOA_COLUMN(Pt, pt, float);                          //! The track transverse momentum
+DECLARE_SOA_COLUMN(Eta, eta, float);                        //! The track pseudorapidity
+DECLARE_SOA_COLUMN(Phi, phi, float);                        //! The track azimuthal angle
+DECLARE_SOA_DYNAMIC_COLUMN(Sign, sign,                      //! Charge: positive: 1, negative: -1
                            [](uint64_t mask) -> int8_t { return ((mask & 0x1L) == 0x1L) ? 1 : ((mask & 0x2L) == 0x2L) ? -1
                                                                                                                       : 0; });
 
diff --git a/.auto-resolution/PWGCF/TwoParticleCorrelations/TableProducer/Productions/skimmingconf_20221115.cxx b/.auto-resolution/PWGCF/TwoParticleCorrelations/TableProducer/Productions/skimmingconf_20221115.cxx
index cd174dc8d86..0299ca49dcf 100644
--- a/.auto-resolution/PWGCF/TwoParticleCorrelations/TableProducer/Productions/skimmingconf_20221115.cxx
+++ b/.auto-resolution/PWGCF/TwoParticleCorrelations/TableProducer/Productions/skimmingconf_20221115.cxx
@@ -9,10 +9,11 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <vector>
-#include <string>
-#include "Framework/AnalysisTask.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+
+#include <string>
+#include <vector>
 
 struct : o2::framework::ConfigurableGroup {
   o2::framework::Configurable<std::vector<std::string>> bfield{"evtflt_bfield", {"positive-yes", "negative-yes"}, "B filed polarity cut: both 'yes' default, anything else alternative"};
diff --git a/.auto-resolution/PWGCF/TwoParticleCorrelations/TableProducer/identifiedBfFilter.cxx b/.auto-resolution/PWGCF/TwoParticleCorrelations/TableProducer/identifiedBfFilter.cxx
index 535dd77cce2..d55ee0c8e78 100644
--- a/.auto-resolution/PWGCF/TwoParticleCorrelations/TableProducer/identifiedBfFilter.cxx
+++ b/.auto-resolution/PWGCF/TwoParticleCorrelations/TableProducer/identifiedBfFilter.cxx
@@ -15,35 +15,38 @@
 
 #include "PWGCF/TwoParticleCorrelations/TableProducer/identifiedBfFilter.h"
 
-#include <cmath>
-#include <algorithm>
-#include <string>
-#include <vector>
+#include "PWGCF/Core/AnalysisConfigurableCuts.h"
+#include "PWGCF/TwoParticleCorrelations/DataModel/IdentifiedBfFiltered.h"
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/CollisionAssociationTables.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGCF/Core/AnalysisConfigurableCuts.h"
-#include "PWGCF/TwoParticleCorrelations/DataModel/IdentifiedBfFiltered.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/CollisionAssociationTables.h"
-#include "Framework/runDataProcessing.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include <TROOT.h>
-#include <TParameter.h>
-#include <TPDGCode.h>
-#include <TList.h>
+#include "Framework/runDataProcessing.h"
+
 #include <TDirectory.h>
 #include <TFolder.h>
 #include <TH1.h>
 #include <TH2.h>
 #include <TH3.h>
+#include <TList.h>
+#include <TPDGCode.h>
+#include <TParameter.h>
 #include <TProfile3D.h>
+#include <TROOT.h>
+
+#include <algorithm>
+#include <cmath>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
@@ -1843,8 +1846,8 @@ inline MatchRecoGenSpecies IdentifiedBfFilterTracks::identifyTrack(TrackObject c
     for (int sp = 0; (sp < kIdBfNoOfSpecies) && !doublematch; ++sp) { // iterate over all species while there's no double match and we're in the list
       if (sp != spMinNSigma) {                                        // for species not current minimum nsigma species
         // LOGF(info, "looking at Reject Range");
-        if (std::fabs(nsigmas[sp]) < rejectRange[spMinNSigma][sp]) {  // If secondary species is in rejection range
-          doublematch = true;                                         // Set double match true
+        if (std::fabs(nsigmas[sp]) < rejectRange[spMinNSigma][sp]) { // If secondary species is in rejection range
+          doublematch = true;                                        // Set double match true
           spDouble = MatchRecoGenSpecies(sp);
         }
       }
@@ -1921,11 +1924,11 @@ inline int8_t IdentifiedBfFilterTracks::acceptTrack(TrackObject const& track)
       if (!(sp < 0)) {
         fillTrackHistosAfterSelection(track, sp); //<Fill accepted track histo with PID
         if (track.sign() > 0) {                   // if positive
-          trkMultPos[sp]++; //<< Update Particle Multiplicity
+          trkMultPos[sp]++;                       //<< Update Particle Multiplicity
           return speciesChargeValue1[sp];
         }
         if (track.sign() < 0) { // if negative
-          trkMultNeg[sp]++; //<< Update Particle Multiplicity
+          trkMultNeg[sp]++;     //<< Update Particle Multiplicity
           return speciesChargeValue1[sp] + 1;
         }
       }
diff --git a/.auto-resolution/PWGCF/TwoParticleCorrelations/TableProducer/identifiedBfFilter.h b/.auto-resolution/PWGCF/TwoParticleCorrelations/TableProducer/identifiedBfFilter.h
index 7335b36c421..ea7f52553b6 100644
--- a/.auto-resolution/PWGCF/TwoParticleCorrelations/TableProducer/identifiedBfFilter.h
+++ b/.auto-resolution/PWGCF/TwoParticleCorrelations/TableProducer/identifiedBfFilter.h
@@ -16,23 +16,24 @@
 #ifndef PWGCF_TWOPARTICLECORRELATIONS_TABLEPRODUCER_IDENTIFIEDBFFILTER_H_
 #define PWGCF_TWOPARTICLECORRELATIONS_TABLEPRODUCER_IDENTIFIEDBFFILTER_H_
 
-#include <CCDB/BasicCCDBManager.h>
-
-#include <vector>
-#include <string>
+#include "PWGCF/Core/AnalysisConfigurableCuts.h"
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/O2DatabasePDGPlugin.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/Core/TrackSelectionDefaults.h"
-#include "PWGCF/Core/AnalysisConfigurableCuts.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 #include "MathUtils/Utils.h"
+#include <CCDB/BasicCCDBManager.h>
+
+#include <string>
+#include <vector>
 
 namespace o2
 
diff --git a/.auto-resolution/PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsFiltering.cxx b/.auto-resolution/PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsFiltering.cxx
index 7bdaddd053d..5d0108119f6 100644
--- a/.auto-resolution/PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsFiltering.cxx
+++ b/.auto-resolution/PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsFiltering.cxx
@@ -9,23 +9,25 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <cmath>
-
-#include "Framework/AnalysisTask.h"
 #include "PWGCF/TwoParticleCorrelations/Core/FilterAndAnalysisFramework.h"
-#include "PWGCF/TwoParticleCorrelations/DataModel/TwoParticleCorrelationsSkimmed.h"
 #include "PWGCF/TwoParticleCorrelations/DataModel/TwoParticleCorrelationsFiltered.h"
+#include "PWGCF/TwoParticleCorrelations/DataModel/TwoParticleCorrelationsSkimmed.h"
+
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include <TROOT.h>
+
 #include <TDatabasePDG.h>
-#include <TParameter.h>
-#include <TList.h>
 #include <TDirectory.h>
 #include <TFolder.h>
 #include <TH1.h>
 #include <TH2.h>
 #include <TH3.h>
+#include <TList.h>
+#include <TParameter.h>
 #include <TProfile3D.h>
+#include <TROOT.h>
+
+#include <cmath>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsFullSkimming.cxx b/.auto-resolution/PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsFullSkimming.cxx
index 2dec74acf61..f4e8e9ac797 100644
--- a/.auto-resolution/PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsFullSkimming.cxx
+++ b/.auto-resolution/PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsFullSkimming.cxx
@@ -9,18 +9,20 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <CCDB/BasicCCDBManager.h>
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "PWGCF/TwoParticleCorrelations/Core/FilterAndAnalysisFramework.h"
+#include "PWGCF/TwoParticleCorrelations/DataModel/TwoParticleCorrelationsSkimmed.h"
+
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGCF/TwoParticleCorrelations/DataModel/TwoParticleCorrelationsSkimmed.h"
-#include "PWGCF/TwoParticleCorrelations/Core/FilterAndAnalysisFramework.h"
-#include "Framework/runDataProcessing.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include <CCDB/BasicCCDBManager.h>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsNotStoredSkimming.cxx b/.auto-resolution/PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsNotStoredSkimming.cxx
index 3964b745b91..497371fea43 100644
--- a/.auto-resolution/PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsNotStoredSkimming.cxx
+++ b/.auto-resolution/PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsNotStoredSkimming.cxx
@@ -9,18 +9,20 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <CCDB/BasicCCDBManager.h>
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "PWGCF/TwoParticleCorrelations/Core/FilterAndAnalysisFramework.h"
+#include "PWGCF/TwoParticleCorrelations/DataModel/TwoParticleCorrelationsSkimmed.h"
+
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGCF/TwoParticleCorrelations/DataModel/TwoParticleCorrelationsSkimmed.h"
-#include "PWGCF/TwoParticleCorrelations/Core/FilterAndAnalysisFramework.h"
-#include "Framework/runDataProcessing.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include <CCDB/BasicCCDBManager.h>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsRegisterSkimming.cxx b/.auto-resolution/PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsRegisterSkimming.cxx
index 20bbd90efbc..8fb759fec54 100644
--- a/.auto-resolution/PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsRegisterSkimming.cxx
+++ b/.auto-resolution/PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsRegisterSkimming.cxx
@@ -9,12 +9,13 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <CCDB/BasicCCDBManager.h>
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
 #include "PWGCF/TwoParticleCorrelations/Core/FilterAndAnalysisFramework.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
+#include <CCDB/BasicCCDBManager.h>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGCF/TwoParticleCorrelations/Tasks/corrSparse.cxx b/.auto-resolution/PWGCF/TwoParticleCorrelations/Tasks/corrSparse.cxx
index 489c99bdbff..117457911da 100644
--- a/.auto-resolution/PWGCF/TwoParticleCorrelations/Tasks/corrSparse.cxx
+++ b/.auto-resolution/PWGCF/TwoParticleCorrelations/Tasks/corrSparse.cxx
@@ -13,30 +13,32 @@
 /// \brief Provides a sparse with usefull two particle correlation info
 /// \author Thor Jensen (thor.kjaersgaard.jensen@cern.ch)
 
-#include <CCDB/BasicCCDBManager.h>
-#include "TRandom3.h"
-#include <vector>
+#include "PWGCF/Core/CorrelationContainer.h"
+#include "PWGCF/Core/PairCuts.h"
+#include "PWGCF/DataModel/CorrelationsDerived.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/StepTHn.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "CommonConstants/MathConstants.h"
 #include "Common/Core/RecoDecay.h"
-
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/CollisionAssociationTables.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Centrality.h"
-#include "PWGCF/DataModel/CorrelationsDerived.h"
-#include "Common/DataModel/CollisionAssociationTables.h"
-#include "PWGCF/Core/CorrelationContainer.h"
-#include "PWGCF/Core/PairCuts.h"
-#include "DataFormatsParameters/GRPObject.h"
+
+#include "CommonConstants/MathConstants.h"
 #include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
+#include <CCDB/BasicCCDBManager.h>
+
+#include "TRandom3.h"
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGCF/TwoParticleCorrelations/Tasks/diHadronCor.cxx b/.auto-resolution/PWGCF/TwoParticleCorrelations/Tasks/diHadronCor.cxx
index e3eb978e08f..498a1772882 100644
--- a/.auto-resolution/PWGCF/TwoParticleCorrelations/Tasks/diHadronCor.cxx
+++ b/.auto-resolution/PWGCF/TwoParticleCorrelations/Tasks/diHadronCor.cxx
@@ -14,39 +14,41 @@
 /// \author Zhiyong Lu (zhiyong.lu@cern.ch)
 /// \since  May/03/2025
 
-#include <CCDB/BasicCCDBManager.h>
-#include "TRandom3.h"
-#include "TF1.h"
-#include <vector>
-#include <string>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/StepTHn.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "CommonConstants/MathConstants.h"
-#include "Common/Core/RecoDecay.h"
-
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Centrality.h"
-#include "PWGCF/DataModel/CorrelationsDerived.h"
-#include "Common/DataModel/CollisionAssociationTables.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "PWGCF/Core/CorrelationContainer.h"
 #include "PWGCF/Core/PairCuts.h"
-#include "PWGCF/GenericFramework/Core/GFWPowerArray.h"
+#include "PWGCF/DataModel/CorrelationsDerived.h"
 #include "PWGCF/GenericFramework/Core/GFW.h"
 #include "PWGCF/GenericFramework/Core/GFWCumulant.h"
+#include "PWGCF/GenericFramework/Core/GFWPowerArray.h"
 #include "PWGCF/GenericFramework/Core/GFWWeights.h"
-#include "DataFormatsParameters/GRPObject.h"
+
+#include "Common/Core/RecoDecay.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/CollisionAssociationTables.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonConstants/MathConstants.h"
 #include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
+#include <CCDB/BasicCCDBManager.h>
+
+#include "TF1.h"
+#include "TRandom3.h"
 #include <TPDGCode.h>
 
+#include <string>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.auto-resolution/PWGCF/TwoParticleCorrelations/Tasks/dptDptEfficiencyAndQc.cxx b/.auto-resolution/PWGCF/TwoParticleCorrelations/Tasks/dptDptEfficiencyAndQc.cxx
index 0fdbca208bf..1bb717b98f8 100644
--- a/.auto-resolution/PWGCF/TwoParticleCorrelations/Tasks/dptDptEfficiencyAndQc.cxx
+++ b/.auto-resolution/PWGCF/TwoParticleCorrelations/Tasks/dptDptEfficiencyAndQc.cxx
@@ -13,35 +13,38 @@
 /// \brief Provides efficiency extraction and QC for track cuts and PID
 /// \author victor.gonzalez.sebastian@gmail.com
 
-#include <TH2F.h>
-#include <TProfile2D.h>
-#include <THnSparse.h>
-#include <TPDGCode.h>
-#include <TMCProcess.h>
-#include <CCDB/BasicCCDBManager.h>
-#include <vector>
-#include <algorithm>
-#include <cstdio>
-#include <memory>
-#include <string>
-#include "ReconstructionDataFormats/PID.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/Core/TableHelper.h"
+#include "PWGCF/Core/AnalysisConfigurableCuts.h"
+#include "PWGCF/DataModel/DptDptFiltered.h"
+#include "PWGCF/TableProducer/dptDptFilter.h"
+
 #include "Common/Core/RecoDecay.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/Core/TableHelper.h"
+#include "Common/Core/TrackSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoAHelpers.h"
-#include "Framework/Expressions.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
+#include "Framework/Expressions.h"
 #include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/PID.h"
+#include <CCDB/BasicCCDBManager.h>
+
 #include "Math/MatrixFunctions.h"
 #include "Math/SMatrix.h"
+#include <TH2F.h>
+#include <THnSparse.h>
+#include <TMCProcess.h>
+#include <TPDGCode.h>
+#include <TProfile2D.h>
 
-#include "PWGCF/Core/AnalysisConfigurableCuts.h"
-#include "PWGCF/DataModel/DptDptFiltered.h"
-#include "PWGCF/TableProducer/dptDptFilter.h"
+#include <algorithm>
+#include <cstdio>
+#include <memory>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGCF/TwoParticleCorrelations/Tasks/dptDptPerRunExtraQc.cxx b/.auto-resolution/PWGCF/TwoParticleCorrelations/Tasks/dptDptPerRunExtraQc.cxx
index 8617a65de2f..c9304ec1ef9 100644
--- a/.auto-resolution/PWGCF/TwoParticleCorrelations/Tasks/dptDptPerRunExtraQc.cxx
+++ b/.auto-resolution/PWGCF/TwoParticleCorrelations/Tasks/dptDptPerRunExtraQc.cxx
@@ -13,18 +13,18 @@
 /// \brief basic per run check of the per analyzed species p vs TPC IW momentum
 /// \author victor.gonzalez.sebastian@gmail.com
 
-#include <array>
-#include <cmath>
-#include <unordered_map>
+#include "PWGCF/DataModel/DptDptFiltered.h"
+#include "PWGCF/TableProducer/dptDptFilter.h"
 
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
 
-#include "PWGCF/DataModel/DptDptFiltered.h"
-#include "PWGCF/TableProducer/dptDptFilter.h"
+#include <array>
+#include <cmath>
+#include <unordered_map>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGCF/TwoParticleCorrelations/Tasks/dptDptPerRunQc.cxx b/.auto-resolution/PWGCF/TwoParticleCorrelations/Tasks/dptDptPerRunQc.cxx
index 598d3305539..286641391ea 100644
--- a/.auto-resolution/PWGCF/TwoParticleCorrelations/Tasks/dptDptPerRunQc.cxx
+++ b/.auto-resolution/PWGCF/TwoParticleCorrelations/Tasks/dptDptPerRunQc.cxx
@@ -13,29 +13,28 @@
 /// \brief basic per run check of the ITS dead chips and of the hadronic interaction rate
 /// \author victor.gonzalez.sebastian@gmail.com
 
-#include <array>
-#include <cmath>
-#include <unordered_map>
-#include <memory>
-#include <vector>
-#include <string>
+#include "PWGCF/DataModel/DptDptFiltered.h"
+#include "PWGCF/TableProducer/dptDptFilter.h"
 
-#include "CCDB/BasicCCDBManager.h"
 #include "Common/CCDB/ctpRateFetcher.h"
 
-#include "DataFormatsParameters/AggregatedRunInfo.h"
+#include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsITSMFT/NoiseMap.h" // missing include in TimeDeadMap.h
 #include "DataFormatsITSMFT/TimeDeadMap.h"
-#include "ITSMFTReconstruction/ChipMappingITS.h"
-
+#include "DataFormatsParameters/AggregatedRunInfo.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
+#include "ITSMFTReconstruction/ChipMappingITS.h"
 
-#include "PWGCF/DataModel/DptDptFiltered.h"
-#include "PWGCF/TableProducer/dptDptFilter.h"
+#include <array>
+#include <cmath>
+#include <memory>
+#include <string>
+#include <unordered_map>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGCF/TwoParticleCorrelations/Tasks/identifiedbf.cxx b/.auto-resolution/PWGCF/TwoParticleCorrelations/Tasks/identifiedbf.cxx
index b357272c17c..100291176ec 100644
--- a/.auto-resolution/PWGCF/TwoParticleCorrelations/Tasks/identifiedbf.cxx
+++ b/.auto-resolution/PWGCF/TwoParticleCorrelations/Tasks/identifiedbf.cxx
@@ -12,7 +12,25 @@
 /// \file identifiedbf.cxx
 /// \brief Fills histograms with particles and tracks to calculate the Balance Function
 /// \author bghanley1995@gmail.com
+#include "PWGCF/Core/AnalysisConfigurableCuts.h"
+#include "PWGCF/Core/PairCuts.h"
+#include "PWGCF/TwoParticleCorrelations/DataModel/IdentifiedBfFiltered.h"
+#include "PWGCF/TwoParticleCorrelations/TableProducer/identifiedBfFilter.h"
+
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 #include <CCDB/BasicCCDBManager.h>
+
 #include <TDirectory.h>
 #include <TFolder.h>
 #include <TH1.h>
@@ -23,27 +41,12 @@
 #include <TProfile3D.h>
 #include <TROOT.h>
 #include <TVector2.h>
+
 #include <cmath>
+#include <cstdio>
 #include <ctime>
-#include <vector>
 #include <string>
-#include <cstdio>
-
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/Core/RecoDecay.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "PWGCF/Core/AnalysisConfigurableCuts.h"
-#include "PWGCF/Core/PairCuts.h"
-#include "PWGCF/TwoParticleCorrelations/DataModel/IdentifiedBfFiltered.h"
-#include "PWGCF/TwoParticleCorrelations/TableProducer/identifiedBfFilter.h"
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
@@ -93,24 +96,24 @@ struct IdentifiedbfTask {
     // The IdentifiedBfCorrelationsAnalysisTask output objects
     //============================================================================================
     /* histograms */
-    TH1F* fhVertexZA;                                                             //!<! the z vertex distribution for the current multiplicity/centrality class
-    std::vector<TH1F*> fhN1VsPt{nch, nullptr};                                    //!<! weighted single particle distribution vs \f$p_T\f$, for the different species
-    std::vector<TH2F*> fhN1VsEtaPhi{nch, nullptr};                                //!<! weighted single particle distribution vs \f$\eta,\;\phi\f$, for the different species
-    std::vector<TH2F*> fhSum1PtVsEtaPhi{nch, nullptr};                            //!<! accumulated sum of weighted \f$p_T\f$ vs \f$\eta,\;\phi\f$, for the different species
-    std::vector<TH3F*> fhN1VsZEtaPhiPt{nch + 1, nullptr};                         //!<! single particle distribution vs \f$\mbox{vtx}_z,\; \eta,\;\phi,\;p_T\f$, for the different species
-    std::vector<TH3F*> fhN1VsZEtaPhiPtPrimary{nch, nullptr};                      //!<! single particle distribution of primary particles vs \f$\mbox{vtx}_z,\; \eta,\;\phi,\;p_T\f$, for the different species
-    std::vector<TH3F*> fhN1VsZEtaPhiPtSecondary{nch, nullptr};                    //!<! single particle distribution of primary particles vs \f$\mbox{vtx}_z,\; \eta,\;\phi,\;p_T\f$, for the different species
-    std::vector<TH3F*> fhN1VsZEtaPhiPtPure{nch + 1, nullptr};                     //!<! single particle distribution of pure particles vs \f$\mbox{vtx}_z,\; \eta,\;\phi,\;p_T\f$, for the different species
-    std::vector<TH3F*> fhSum1PtVsZEtaPhiPt{nch, nullptr};                         //!<! accumulated sum of weighted \f$p_T\f$ vs \f$\mbox{vtx}_z,\; \eta,\;\phi,\;p_T\f$, for the different species
-    std::vector<TH3*> fhNuaNueVsZEtaPhiPt{nch, nullptr};                          //!<! NUA+NUE correction vs \f$\mbox{vtx}_z,\; \eta,\;\phi,\;p_T\f$, for the differents species
-    std::vector<TH2*> fhPtAvgVsEtaPhi{nch, nullptr};                              //!<! average \f$p_T\f$ vs \f$\eta,\;\phi\f$, for the different species
-    std::vector<std::vector<TH2F*>> fhN2VsPtPt{nch, {nch, nullptr}};              //!<! weighted two particle distribution vs \f${p_T}_1, {p_T}_2\f$ for the different species combinations
-    std::vector<std::vector<TH2F*>> fhN2VsDEtaDPhi{nch, {nch, nullptr}};          //!<! two-particle distribution vs \f$\Delta\eta,\;\Delta\phi\f$ for the different species combinations
-    std::vector<std::vector<TH2F*>> fhN2ContVsDEtaDPhi{nch, {nch, nullptr}};      //!<! two-particle distribution continuous vs \f$\Delta\eta,\;\Delta\phi\f$ for the different species combinations
-    std::vector<std::vector<TH2F*>> fhSum2PtPtVsDEtaDPhi{nch, {nch, nullptr}};    //!<! two-particle  \f$\sum {p_T}_1 {p_T}_2\f$ distribution vs \f$\Delta\eta,\;\Delta\phi\f$ for the different species combinations
-    std::vector<std::vector<TH2F*>> fhSum2DptDptVsDEtaDPhi{nch, {nch, nullptr}};  //!<! two-particle  \f$\sum ({p_T}_1- <{p_T}_1>) ({p_T}_2 - <{p_T}_2>) \f$ distribution vs \f$\Delta\eta,\;\Delta\phi\f$ for the different species combinations
-    std::vector<std::vector<TH2F*>> fhSupN1N1VsDEtaDPhi{nch, {nch, nullptr}};     //!<! suppressed n1n1 two-particle distribution vs \f$\Delta\eta,\;\Delta\phi\f$ for the different species combinations
-    std::vector<std::vector<TH2F*>> fhSupPt1Pt1VsDEtaDPhi{nch, {nch, nullptr}};   //!<! suppressed \f${p_T}_1 {p_T}_2\f$ two-particle distribution vs \f$\Delta\eta,\;\Delta\phi\f$ for the different species combinations
+    TH1F* fhVertexZA;                                                            //!<! the z vertex distribution for the current multiplicity/centrality class
+    std::vector<TH1F*> fhN1VsPt{nch, nullptr};                                   //!<! weighted single particle distribution vs \f$p_T\f$, for the different species
+    std::vector<TH2F*> fhN1VsEtaPhi{nch, nullptr};                               //!<! weighted single particle distribution vs \f$\eta,\;\phi\f$, for the different species
+    std::vector<TH2F*> fhSum1PtVsEtaPhi{nch, nullptr};                           //!<! accumulated sum of weighted \f$p_T\f$ vs \f$\eta,\;\phi\f$, for the different species
+    std::vector<TH3F*> fhN1VsZEtaPhiPt{nch + 1, nullptr};                        //!<! single particle distribution vs \f$\mbox{vtx}_z,\; \eta,\;\phi,\;p_T\f$, for the different species
+    std::vector<TH3F*> fhN1VsZEtaPhiPtPrimary{nch, nullptr};                     //!<! single particle distribution of primary particles vs \f$\mbox{vtx}_z,\; \eta,\;\phi,\;p_T\f$, for the different species
+    std::vector<TH3F*> fhN1VsZEtaPhiPtSecondary{nch, nullptr};                   //!<! single particle distribution of primary particles vs \f$\mbox{vtx}_z,\; \eta,\;\phi,\;p_T\f$, for the different species
+    std::vector<TH3F*> fhN1VsZEtaPhiPtPure{nch + 1, nullptr};                    //!<! single particle distribution of pure particles vs \f$\mbox{vtx}_z,\; \eta,\;\phi,\;p_T\f$, for the different species
+    std::vector<TH3F*> fhSum1PtVsZEtaPhiPt{nch, nullptr};                        //!<! accumulated sum of weighted \f$p_T\f$ vs \f$\mbox{vtx}_z,\; \eta,\;\phi,\;p_T\f$, for the different species
+    std::vector<TH3*> fhNuaNueVsZEtaPhiPt{nch, nullptr};                         //!<! NUA+NUE correction vs \f$\mbox{vtx}_z,\; \eta,\;\phi,\;p_T\f$, for the differents species
+    std::vector<TH2*> fhPtAvgVsEtaPhi{nch, nullptr};                             //!<! average \f$p_T\f$ vs \f$\eta,\;\phi\f$, for the different species
+    std::vector<std::vector<TH2F*>> fhN2VsPtPt{nch, {nch, nullptr}};             //!<! weighted two particle distribution vs \f${p_T}_1, {p_T}_2\f$ for the different species combinations
+    std::vector<std::vector<TH2F*>> fhN2VsDEtaDPhi{nch, {nch, nullptr}};         //!<! two-particle distribution vs \f$\Delta\eta,\;\Delta\phi\f$ for the different species combinations
+    std::vector<std::vector<TH2F*>> fhN2ContVsDEtaDPhi{nch, {nch, nullptr}};     //!<! two-particle distribution continuous vs \f$\Delta\eta,\;\Delta\phi\f$ for the different species combinations
+    std::vector<std::vector<TH2F*>> fhSum2PtPtVsDEtaDPhi{nch, {nch, nullptr}};   //!<! two-particle  \f$\sum {p_T}_1 {p_T}_2\f$ distribution vs \f$\Delta\eta,\;\Delta\phi\f$ for the different species combinations
+    std::vector<std::vector<TH2F*>> fhSum2DptDptVsDEtaDPhi{nch, {nch, nullptr}}; //!<! two-particle  \f$\sum ({p_T}_1- <{p_T}_1>) ({p_T}_2 - <{p_T}_2>) \f$ distribution vs \f$\Delta\eta,\;\Delta\phi\f$ for the different species combinations
+    std::vector<std::vector<TH2F*>> fhSupN1N1VsDEtaDPhi{nch, {nch, nullptr}};    //!<! suppressed n1n1 two-particle distribution vs \f$\Delta\eta,\;\Delta\phi\f$ for the different species combinations
+    std::vector<std::vector<TH2F*>> fhSupPt1Pt1VsDEtaDPhi{nch, {nch, nullptr}};  //!<! suppressed \f${p_T}_1 {p_T}_2\f$ two-particle distribution vs \f$\Delta\eta,\;\Delta\phi\f$ for the different species combinations
     /* versus centrality/multiplicity  profiles */
     std::vector<TProfile*> fhN1VsC{nch, nullptr};                               //!<! weighted single particle distribution vs event centrality/multiplicity, track 1 and 2
     std::vector<TProfile*> fhSum1PtVsC{nch, nullptr};                           //!<! accumulated sum of weighted \f$p_T\f$ vs event centrality/multiplicity, track 1 and 2
diff --git a/.auto-resolution/PWGCF/TwoParticleCorrelations/Tasks/identifiedbfqa.cxx b/.auto-resolution/PWGCF/TwoParticleCorrelations/Tasks/identifiedbfqa.cxx
index a52ff377832..f519dbf2eac 100644
--- a/.auto-resolution/PWGCF/TwoParticleCorrelations/Tasks/identifiedbfqa.cxx
+++ b/.auto-resolution/PWGCF/TwoParticleCorrelations/Tasks/identifiedbfqa.cxx
@@ -9,14 +9,15 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <cmath>
+#include "PWGCF/TwoParticleCorrelations/DataModel/IdentifiedBfFiltered.h"
+#include "PWGCF/TwoParticleCorrelations/TableProducer/identifiedBfFilter.h"
 
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGCF/TwoParticleCorrelations/DataModel/IdentifiedBfFiltered.h"
-#include "PWGCF/TwoParticleCorrelations/TableProducer/identifiedBfFilter.h"
+
+#include <cmath>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGCF/TwoParticleCorrelations/Tasks/longrangeCorrelation.cxx b/.auto-resolution/PWGCF/TwoParticleCorrelations/Tasks/longrangeCorrelation.cxx
index 5fb1bc8e1c8..f4942e1515a 100644
--- a/.auto-resolution/PWGCF/TwoParticleCorrelations/Tasks/longrangeCorrelation.cxx
+++ b/.auto-resolution/PWGCF/TwoParticleCorrelations/Tasks/longrangeCorrelation.cxx
@@ -15,42 +15,44 @@
 /// \author Abhi Modak (abhi.modak@cern.ch) and Debojit sarkar (debojit.sarkar@cern.ch)
 /// \since April 22, 2025
 
-#include <TH1F.h>
-#include <chrono>
-#include <string>
-#include <vector>
-#include <TComplex.h>
-#include <TMath.h>
-#include <cstdio>
+#include "PWGCF/Core/CorrelationContainer.h"
+#include "PWGCF/Core/PairCuts.h"
+#include "PWGCF/DataModel/CorrelationsDerived.h"
 
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/StepTHn.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/DataModel/CollisionAssociationTables.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/Core/trackUtilities.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/TrackSelection.h"
-#include "Framework/ASoAHelpers.h"
 #include "Common/DataModel/FT0Corrected.h"
-#include "Common/Core/RecoDecay.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
 #include "CommonConstants/MathConstants.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "DetectorsCommonDataFormats/AlignParam.h"
 #include "FT0Base/Geometry.h"
 #include "FV0Base/Geometry.h"
-#include "PWGCF/DataModel/CorrelationsDerived.h"
-#include "Common/DataModel/CollisionAssociationTables.h"
-#include "PWGCF/Core/CorrelationContainer.h"
-#include "PWGCF/Core/PairCuts.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
-#include "CCDB/CcdbApi.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "DetectorsCommonDataFormats/AlignParam.h"
+#include <TComplex.h>
+#include <TH1F.h>
+#include <TMath.h>
+
+#include <chrono>
+#include <cstdio>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGCF/TwoParticleCorrelations/Tasks/neutronProtonCorrZdc.cxx b/.auto-resolution/PWGCF/TwoParticleCorrelations/Tasks/neutronProtonCorrZdc.cxx
index 1870c66da80..39e6c3fda7c 100644
--- a/.auto-resolution/PWGCF/TwoParticleCorrelations/Tasks/neutronProtonCorrZdc.cxx
+++ b/.auto-resolution/PWGCF/TwoParticleCorrelations/Tasks/neutronProtonCorrZdc.cxx
@@ -13,15 +13,17 @@
 /// \brief Correlations between protons and neutrons in the ZDC
 /// \author Olaf Massen <olaf.massen@cern.ch>
 
-#include <string>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
+
+#include <string>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGCF/TwoParticleCorrelations/Tasks/r2p2-4-id.cxx b/.auto-resolution/PWGCF/TwoParticleCorrelations/Tasks/r2p2-4-id.cxx
index e6c13fe1318..f12e1bdf044 100644
--- a/.auto-resolution/PWGCF/TwoParticleCorrelations/Tasks/r2p2-4-id.cxx
+++ b/.auto-resolution/PWGCF/TwoParticleCorrelations/Tasks/r2p2-4-id.cxx
@@ -9,14 +9,15 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <memory>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include <memory>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGCF/TwoParticleCorrelations/Tasks/twoParticleCorrelations.cxx b/.auto-resolution/PWGCF/TwoParticleCorrelations/Tasks/twoParticleCorrelations.cxx
index a7a05beb310..135db8bb324 100644
--- a/.auto-resolution/PWGCF/TwoParticleCorrelations/Tasks/twoParticleCorrelations.cxx
+++ b/.auto-resolution/PWGCF/TwoParticleCorrelations/Tasks/twoParticleCorrelations.cxx
@@ -9,25 +9,27 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
+#include "PWGCF/Core/AnalysisConfigurableCuts.h"
+#include "PWGCF/Core/PairCuts.h"
+#include "PWGCF/TwoParticleCorrelations/Core/FilterAndAnalysisFramework.h"
+#include "PWGCF/TwoParticleCorrelations/DataModel/TwoParticleCorrelationsSkimmed.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 #include <DataFormatsParameters/GRPObject.h>
-#include <cmath>
-#include <TROOT.h>
+
 #include <TDatabasePDG.h>
-#include <TParameter.h>
-#include <TList.h>
 #include <TDirectory.h>
 #include <TFolder.h>
 #include <TH1.h>
 #include <TH2.h>
 #include <TH3.h>
+#include <TList.h>
+#include <TParameter.h>
 #include <TProfile3D.h>
+#include <TROOT.h>
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "PWGCF/Core/AnalysisConfigurableCuts.h"
-#include "PWGCF/TwoParticleCorrelations/Core/FilterAndAnalysisFramework.h"
-#include "PWGCF/TwoParticleCorrelations/DataModel/TwoParticleCorrelationsSkimmed.h"
-#include "PWGCF/Core/PairCuts.h"
+#include <cmath>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGDQ/Core/AnalysisCompositeCut.h b/.auto-resolution/PWGDQ/Core/AnalysisCompositeCut.h
index f3d603909c4..692ba633638 100644
--- a/.auto-resolution/PWGDQ/Core/AnalysisCompositeCut.h
+++ b/.auto-resolution/PWGDQ/Core/AnalysisCompositeCut.h
@@ -18,6 +18,7 @@
 #define AnalysisCompositeCut_H
 
 #include "PWGDQ/Core/AnalysisCut.h"
+
 #include <vector>
 
 //_________________________________________________________________________
diff --git a/.auto-resolution/PWGDQ/Core/AnalysisCut.h b/.auto-resolution/PWGDQ/Core/AnalysisCut.h
index 6c7185b13ec..9457635798c 100644
--- a/.auto-resolution/PWGDQ/Core/AnalysisCut.h
+++ b/.auto-resolution/PWGDQ/Core/AnalysisCut.h
@@ -18,6 +18,7 @@
 #define AnalysisCut_H
 
 #include <TF1.h>
+
 #include <vector>
 
 //_________________________________________________________________________
diff --git a/.auto-resolution/PWGDQ/Core/CutsLibrary.cxx b/.auto-resolution/PWGDQ/Core/CutsLibrary.cxx
index 5cf99d6f22f..8d61904b7b8 100644
--- a/.auto-resolution/PWGDQ/Core/CutsLibrary.cxx
+++ b/.auto-resolution/PWGDQ/Core/CutsLibrary.cxx
@@ -12,14 +12,18 @@
 // Contact: iarsene@cern.ch, i.c.arsene@fys.uio.no
 //
 #include "PWGDQ/Core/CutsLibrary.h"
-#include <RtypesCore.h>
-#include <TF1.h>
-#include <vector>
-#include <string>
-#include <iostream>
+
 #include "AnalysisCompositeCut.h"
 #include "VarManager.h"
 
+#include <TF1.h>
+
+#include <RtypesCore.h>
+
+#include <iostream>
+#include <string>
+#include <vector>
+
 using std::cout;
 using std::endl;
 
diff --git a/.auto-resolution/PWGDQ/Core/CutsLibrary.h b/.auto-resolution/PWGDQ/Core/CutsLibrary.h
index c6ad4caded2..15ed07b1f11 100644
--- a/.auto-resolution/PWGDQ/Core/CutsLibrary.h
+++ b/.auto-resolution/PWGDQ/Core/CutsLibrary.h
@@ -15,12 +15,13 @@
 #ifndef PWGDQ_CORE_CUTSLIBRARY_H_
 #define PWGDQ_CORE_CUTSLIBRARY_H_
 
-#include <string>
-#include <vector>
-#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/AnalysisCompositeCut.h"
+#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/VarManager.h"
 
+#include <string>
+#include <vector>
+
 // ///////////////////////////////////////////////
 //   These are the Cuts used in the CEFP Task   //
 //   to select tracks in the event selection    //
diff --git a/.auto-resolution/PWGDQ/Core/HistogramManager.cxx b/.auto-resolution/PWGDQ/Core/HistogramManager.cxx
index fb5ce5f8d65..9133dede291 100644
--- a/.auto-resolution/PWGDQ/Core/HistogramManager.cxx
+++ b/.auto-resolution/PWGDQ/Core/HistogramManager.cxx
@@ -11,28 +11,29 @@
 
 #include "PWGDQ/Core/HistogramManager.h"
 
-#include <iostream>
-#include <memory>
+#include "Framework/Logger.h"
+
+#include <algorithm>
 #include <fstream>
+#include <iostream>
 #include <list>
+#include <memory>
 #include <vector>
-#include <algorithm>
-#include "Framework/Logger.h"
 using namespace std;
 
-#include <TObject.h>
-#include <TObjArray.h>
-#include <THashList.h>
+#include <TClass.h>
 #include <TH1F.h>
 #include <TH2F.h>
 #include <TH3F.h>
-#include <TProfile.h>
-#include <TProfile2D.h>
-#include <TProfile3D.h>
+#include <THashList.h>
 #include <THn.h>
 #include <THnSparse.h>
 #include <TIterator.h>
-#include <TClass.h>
+#include <TObjArray.h>
+#include <TObject.h>
+#include <TProfile.h>
+#include <TProfile2D.h>
+#include <TProfile3D.h>
 
 ClassImp(HistogramManager);
 
diff --git a/.auto-resolution/PWGDQ/Core/HistogramManager.h b/.auto-resolution/PWGDQ/Core/HistogramManager.h
index 4b1393b2eb7..1fc0cf858b8 100644
--- a/.auto-resolution/PWGDQ/Core/HistogramManager.h
+++ b/.auto-resolution/PWGDQ/Core/HistogramManager.h
@@ -17,17 +17,17 @@
 #ifndef PWGDQ_CORE_HISTOGRAMMANAGER_H_
 #define PWGDQ_CORE_HISTOGRAMMANAGER_H_
 
-#include <TString.h>
-#include <TNamed.h>
-#include <TList.h>
-#include <THashList.h>
-#include <TAxis.h>
 #include <TArrayD.h>
+#include <TAxis.h>
+#include <THashList.h>
+#include <TList.h>
+#include <TNamed.h>
+#include <TString.h>
 
-#include <string>
+#include <list>
 #include <map>
+#include <string>
 #include <vector>
-#include <list>
 
 class HistogramManager : public TNamed
 {
@@ -103,10 +103,10 @@ class HistogramManager : public TNamed
   std::map<std::string, std::list<std::vector<int>>> fVariablesMap; //!  map holding identifiers for all variables needed by histograms
 
   // various
-  bool fUseDefaultVariableNames;    //! toggle the usage of default variable names and units
-  uint64_t fBinsAllocated;          //! number of allocated bins
-  TString* fVariableNames;          //! variable names
-  TString* fVariableUnits;          //! variable units
+  bool fUseDefaultVariableNames; //! toggle the usage of default variable names and units
+  uint64_t fBinsAllocated;       //! number of allocated bins
+  TString* fVariableNames;       //! variable names
+  TString* fVariableUnits;       //! variable units
 
   void MakeAxisLabels(TAxis* ax, const char* labels);
 
diff --git a/.auto-resolution/PWGDQ/Core/HistogramsLibrary.cxx b/.auto-resolution/PWGDQ/Core/HistogramsLibrary.cxx
index 11c87e700de..5aca1c60acf 100644
--- a/.auto-resolution/PWGDQ/Core/HistogramsLibrary.cxx
+++ b/.auto-resolution/PWGDQ/Core/HistogramsLibrary.cxx
@@ -11,12 +11,15 @@
 //
 // Contact: iarsene@cern.ch, i.c.arsene@fys.uio.no
 //
-#include <vector>
-#include <algorithm>
 #include "PWGDQ/Core/HistogramsLibrary.h"
+
 #include "VarManager.h"
+
 #include "CommonConstants/MathConstants.h"
 
+#include <algorithm>
+#include <vector>
+
 void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* histClass, const char* groupName, const char* subGroupName)
 {
   //
diff --git a/.auto-resolution/PWGDQ/Core/HistogramsLibrary.h b/.auto-resolution/PWGDQ/Core/HistogramsLibrary.h
index 869fb3a85f3..6b7f6a09fc2 100644
--- a/.auto-resolution/PWGDQ/Core/HistogramsLibrary.h
+++ b/.auto-resolution/PWGDQ/Core/HistogramsLibrary.h
@@ -15,10 +15,13 @@
 #ifndef PWGDQ_CORE_HISTOGRAMSLIBRARY_H_
 #define PWGDQ_CORE_HISTOGRAMSLIBRARY_H_
 
-#include <TString.h>
 #include "PWGDQ/Core/HistogramManager.h"
 #include "PWGDQ/Core/VarManager.h"
+
 #include "CommonConstants/MathConstants.h"
+
+#include <TString.h>
+
 #include "rapidjson/document.h"
 
 namespace o2::aod
@@ -29,7 +32,7 @@ void DefineHistograms(HistogramManager* hm, const char* histClass, const char* g
 template <typename T>
 bool ValidateJSONHistogram(T hist);
 void AddHistogramsFromJSON(HistogramManager* hm, const char* json);
-}
+} // namespace dqhistograms
 } // namespace o2::aod
 
 #endif // PWGDQ_CORE_HISTOGRAMSLIBRARY_H_
diff --git a/.auto-resolution/PWGDQ/Core/MCProng.cxx b/.auto-resolution/PWGDQ/Core/MCProng.cxx
index 48f2c52ae36..925542fbe12 100644
--- a/.auto-resolution/PWGDQ/Core/MCProng.cxx
+++ b/.auto-resolution/PWGDQ/Core/MCProng.cxx
@@ -11,10 +11,10 @@
 
 #include "PWGDQ/Core/MCProng.h"
 
-#include <map>
-#include <vector>
 #include <cmath>
 #include <iostream>
+#include <map>
+#include <vector>
 
 ClassImp(MCProng);
 
diff --git a/.auto-resolution/PWGDQ/Core/MCProng.h b/.auto-resolution/PWGDQ/Core/MCProng.h
index cd42965d271..8e679db8bb8 100644
--- a/.auto-resolution/PWGDQ/Core/MCProng.h
+++ b/.auto-resolution/PWGDQ/Core/MCProng.h
@@ -60,9 +60,9 @@ A few non-existent PYTHIA codes are used to select more than one PYTHIA code.
 #include "TNamed.h"
 #include "TString.h"
 
-#include <vector>
 #include <iostream>
 #include <map>
+#include <vector>
 
 class MCProng
 {
diff --git a/.auto-resolution/PWGDQ/Core/MCSignal.cxx b/.auto-resolution/PWGDQ/Core/MCSignal.cxx
index 7a234b65088..ba62e86a6bd 100644
--- a/.auto-resolution/PWGDQ/Core/MCSignal.cxx
+++ b/.auto-resolution/PWGDQ/Core/MCSignal.cxx
@@ -9,11 +9,11 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <vector>
-#include <iostream>
-
 #include "PWGDQ/Core/MCSignal.h"
 
+#include <iostream>
+#include <vector>
+
 using std::cout;
 using std::endl;
 
diff --git a/.auto-resolution/PWGDQ/Core/MCSignal.h b/.auto-resolution/PWGDQ/Core/MCSignal.h
index 42fe0a0a050..534d6985da0 100644
--- a/.auto-resolution/PWGDQ/Core/MCSignal.h
+++ b/.auto-resolution/PWGDQ/Core/MCSignal.h
@@ -57,10 +57,11 @@ process(aod::McParticles const& mcTracks) {
 #define PWGDQ_CORE_MCSIGNAL_H_
 
 #include "MCProng.h"
+
 #include "TNamed.h"
 
-#include <vector>
 #include <iostream>
+#include <vector>
 
 class MCSignal : public TNamed
 {
diff --git a/.auto-resolution/PWGDQ/Core/MCSignalLibrary.cxx b/.auto-resolution/PWGDQ/Core/MCSignalLibrary.cxx
index 5e4f2ada1bb..4b953e2363a 100644
--- a/.auto-resolution/PWGDQ/Core/MCSignalLibrary.cxx
+++ b/.auto-resolution/PWGDQ/Core/MCSignalLibrary.cxx
@@ -15,11 +15,13 @@
 #include <vector>
 // #include <iostream>
 
-#include <TPDGCode.h>
-#include "CommonConstants/PhysicsConstants.h"
 #include "PWGDQ/Core/MCSignalLibrary.h"
+
+#include "CommonConstants/PhysicsConstants.h"
 #include "Framework/Logger.h"
 
+#include <TPDGCode.h>
+
 using namespace o2::constants::physics;
 // using std::cout;
 // using std::endl;
diff --git a/.auto-resolution/PWGDQ/Core/MCSignalLibrary.h b/.auto-resolution/PWGDQ/Core/MCSignalLibrary.h
index df01f60c978..f4c1c88e1df 100644
--- a/.auto-resolution/PWGDQ/Core/MCSignalLibrary.h
+++ b/.auto-resolution/PWGDQ/Core/MCSignalLibrary.h
@@ -15,11 +15,13 @@
 #ifndef PWGDQ_CORE_MCSIGNALLIBRARY_H_
 #define PWGDQ_CORE_MCSIGNALLIBRARY_H_
 
-#include <string>
-#include "rapidjson/document.h"
 #include "PWGDQ/Core/MCProng.h"
 #include "PWGDQ/Core/MCSignal.h"
 
+#include "rapidjson/document.h"
+
+#include <string>
+
 namespace o2::aod
 {
 namespace dqmcsignals
@@ -36,7 +38,7 @@ MCProng* ParseJSONMCProng(T prongJSON, const char* prongName);
 
 template <typename T>
 bool ValidateJSONMCProng(T prongJSON, const char* prongName);
-}
+} // namespace dqmcsignals
 } // namespace o2::aod
 
 #endif // PWGDQ_CORE_MCSIGNALLIBRARY_H_
diff --git a/.auto-resolution/PWGDQ/Core/MixingHandler.cxx b/.auto-resolution/PWGDQ/Core/MixingHandler.cxx
index 532b91ea9ac..d85c3181048 100644
--- a/.auto-resolution/PWGDQ/Core/MixingHandler.cxx
+++ b/.auto-resolution/PWGDQ/Core/MixingHandler.cxx
@@ -10,15 +10,16 @@
 // or submit itself to any jurisdiction.
 
 #include "PWGDQ/Core/MixingHandler.h"
+
 #include "PWGDQ/Core/VarManager.h"
 
-#include <iostream>
 #include <fstream>
+#include <iostream>
 using namespace std;
 
 #include <TMath.h>
-#include <TTimeStamp.h>
 #include <TRandom.h>
+#include <TTimeStamp.h>
 
 ClassImp(MixingHandler);
 
diff --git a/.auto-resolution/PWGDQ/Core/MixingHandler.h b/.auto-resolution/PWGDQ/Core/MixingHandler.h
index 0e38a89291e..f07f73fcef2 100644
--- a/.auto-resolution/PWGDQ/Core/MixingHandler.h
+++ b/.auto-resolution/PWGDQ/Core/MixingHandler.h
@@ -17,16 +17,16 @@
 #ifndef MixingHandler_H
 #define MixingHandler_H
 
-#include <TNamed.h>
+#include "PWGDQ/Core/HistogramManager.h"
+#include "PWGDQ/Core/VarManager.h"
+
 #include <TArrayF.h>
 #include <TArrayI.h>
 #include <TClonesArray.h>
 #include <TList.h>
+#include <TNamed.h>
 #include <TString.h>
 
-#include "PWGDQ/Core/HistogramManager.h"
-#include "PWGDQ/Core/VarManager.h"
-
 class MixingHandler : public TNamed
 {
 
diff --git a/.auto-resolution/PWGDQ/Core/MixingLibrary.h b/.auto-resolution/PWGDQ/Core/MixingLibrary.h
index db7f92583df..4c6a15eed73 100644
--- a/.auto-resolution/PWGDQ/Core/MixingLibrary.h
+++ b/.auto-resolution/PWGDQ/Core/MixingLibrary.h
@@ -11,10 +11,11 @@
 //
 // Contact: iarsene@cern.ch, i.c.arsene@fys.uio.no
 //
-#include <TString.h>
 #include "PWGDQ/Core/MixingHandler.h"
 #include "PWGDQ/Core/VarManager.h"
 
+#include <TString.h>
+
 namespace o2::aod
 {
 namespace dqmixing
diff --git a/.auto-resolution/PWGDQ/Core/VarManager.cxx b/.auto-resolution/PWGDQ/Core/VarManager.cxx
index 912dc06740a..999d5ef3cfe 100644
--- a/.auto-resolution/PWGDQ/Core/VarManager.cxx
+++ b/.auto-resolution/PWGDQ/Core/VarManager.cxx
@@ -8,12 +8,14 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
+#include "PWGDQ/Core/VarManager.h"
+
+#include "Tools/KFparticle/KFUtilities.h"
+
 #include <cmath>
 #include <iostream>
-#include <vector>
 #include <map>
-#include "PWGDQ/Core/VarManager.h"
-#include "Tools/KFparticle/KFUtilities.h"
+#include <vector>
 
 using std::cout;
 using std::endl;
@@ -28,7 +30,7 @@ bool VarManager::fgUsedVars[VarManager::kNVars] = {false};
 bool VarManager::fgUsedKF = false;
 float VarManager::fgMagField = 0.5;
 float VarManager::fgValues[VarManager::kNVars] = {0.0f};
-float VarManager::fgTPCInterSectorBoundary = 1.0;       // cm
+float VarManager::fgTPCInterSectorBoundary = 1.0; // cm
 int VarManager::fgITSROFbias = 0;
 int VarManager::fgITSROFlength = 100;
 int VarManager::fgITSROFBorderMarginLow = 0;
diff --git a/.auto-resolution/PWGDQ/Core/VarManager.h b/.auto-resolution/PWGDQ/Core/VarManager.h
index dfcba891bfc..7e885d342b8 100644
--- a/.auto-resolution/PWGDQ/Core/VarManager.h
+++ b/.auto-resolution/PWGDQ/Core/VarManager.h
@@ -18,7 +18,9 @@
 #define PWGDQ_CORE_VARMANAGER_H_
 
 #include <Framework/AnalysisDataModel.h>
+
 #include <Math/Vector4Dfwd.h>
+
 #include <cstdint>
 #ifndef HomogeneousField
 #define HomogeneousField
@@ -1189,15 +1191,15 @@ class VarManager : public TObject
   static void SetVariableDependencies(); // toggle those variables on which other used variables might depend
 
   static float fgMagField;
-  static float fgCenterOfMassEnergy;      // collision energy
-  static float fgMassofCollidingParticle; // mass of the colliding particle
-  static float fgTPCInterSectorBoundary;  // TPC inter-sector border size at the TPC outer radius, in cm
-  static int fgITSROFbias;                // ITS ROF bias (from ALPIDE parameters)
-  static int fgITSROFlength;              // ITS ROF length (from ALPIDE parameters)
-  static int fgITSROFBorderMarginLow;     // ITS ROF border low margin
-  static int fgITSROFBorderMarginHigh;    // ITS ROF border high margin
-  static uint64_t fgSOR;                  // Timestamp for start of run
-  static uint64_t fgEOR;                  // Timestamp for end of run
+  static float fgCenterOfMassEnergy;        // collision energy
+  static float fgMassofCollidingParticle;   // mass of the colliding particle
+  static float fgTPCInterSectorBoundary;    // TPC inter-sector border size at the TPC outer radius, in cm
+  static int fgITSROFbias;                  // ITS ROF bias (from ALPIDE parameters)
+  static int fgITSROFlength;                // ITS ROF length (from ALPIDE parameters)
+  static int fgITSROFBorderMarginLow;       // ITS ROF border low margin
+  static int fgITSROFBorderMarginHigh;      // ITS ROF border high margin
+  static uint64_t fgSOR;                    // Timestamp for start of run
+  static uint64_t fgEOR;                    // Timestamp for end of run
   static ROOT::Math::PxPyPzEVector fgBeamA; // beam from A-side 4-momentum vector
   static ROOT::Math::PxPyPzEVector fgBeamC; // beam from C-side 4-momentum vector
 
diff --git a/.auto-resolution/PWGDQ/DataModel/ReducedInfoTables.h b/.auto-resolution/PWGDQ/DataModel/ReducedInfoTables.h
index ae5fd853bf9..20e9298e908 100644
--- a/.auto-resolution/PWGDQ/DataModel/ReducedInfoTables.h
+++ b/.auto-resolution/PWGDQ/DataModel/ReducedInfoTables.h
@@ -752,7 +752,7 @@ DECLARE_SOA_COLUMN(CosThetaRM, costhetaRM, float);             //! Cosine in the
 DECLARE_SOA_COLUMN(CosThetaStarTPC, costhetaStarTPC, float);   //! global polarization, event plane reconstructed from TPC tracks
 DECLARE_SOA_COLUMN(CosThetaStarFT0A, costhetaStarFT0A, float); //! global polarization, event plane reconstructed from FT0A tracks
 DECLARE_SOA_COLUMN(CosThetaStarFT0C, costhetaStarFT0C, float); //! global polarization, event plane reconstructed from FT0C tracks
-DECLARE_SOA_DYNAMIC_COLUMN(Px, px, //!
+DECLARE_SOA_DYNAMIC_COLUMN(Px, px,                             //!
                            [](float pt, float phi) -> float { return pt * std::cos(phi); });
 DECLARE_SOA_DYNAMIC_COLUMN(Py, py, //!
                            [](float pt, float phi) -> float { return pt * std::sin(phi); });
diff --git a/.auto-resolution/PWGDQ/Macros/configFit.json b/.auto-resolution/PWGDQ/Macros/configFit.json
index 4fd44eee0ff..83d3d33efc8 100644
--- a/.auto-resolution/PWGDQ/Macros/configFit.json
+++ b/.auto-resolution/PWGDQ/Macros/configFit.json
@@ -1,186 +1,186 @@
 {
-  "input": {
-    "input_file_name": "tutorial.root",
-    "input_name": "histMass",
-    "pdf_dictionary": {
-      "pdf": [
-        "CB2",
-        "CB2",
-        "VWG",
-        "SUM"
-      ],
-      "pdfName": [
-        "Jpsi",
-        "Psi2s",
-        "Bkg",
-        "SUM"
-      ],
-      "pdfNameForLegend": [
-        "J/#psi",
-        "#psi(2S)",
-        "Background",
-        "Fit"
-      ],
-      "pdfColor": [
-        861,
-        417,
-        1
-      ],
-      "pdfStyle": [
-        1,
-        1,
-        2
-      ],
-      "parVal": [
-        [
-          3.096,
-          1.2e-01,
-          1.089,
-          3.393,
-          2.097,
-          8.694
-        ],
-        [
-          3.096,
-          1.2e-01,
-          1.089,
-          3.393,
-          2.097,
-          8.694
-        ],
-        [
-          1,
-          1,
-          1
-        ],
-        [
-          1000,
-          100,
-          100000
-        ]
-      ],
-      "parLimMin": [
-        [
-          2.9,
-          7.0e-02,
-          1.089,
-          3.393,
-          2.097,
-          8.694
-        ],
-        [
-          2.9,
-          7.0e-02,
-          1.089,
-          3.393,
-          2.097,
-          8.694
-        ],
-        [
-          -10,
-          0,
-          -100
-        ],
-        [
-          0,
-          0,
-          0
-        ]
-      ],
-      "parLimMax": [
-        [
-          3.5,
-          1.9e-01,
-          1.089,
-          3.393,
-          2.097,
-          8.694
-        ],
-        [
-          3.9,
-          1.9e-01,
-          1.089,
-          3.393,
-          2.097,
-          8.694
-        ],
-        [
-          10,
-          100,
-          100
-        ],
-        [
-          5000000,
-          5000000,
-          50000000
-        ]
-      ],
-      "parName": [
-        [
-          "mean_Jpsi",
-          "width_Jpsi",
-          "a_Jpsi",
-          "b_Jpsi",
-          "c_Jpsi",
-          "d_Jpsi"
-        ],
-        [
-          "sum::mean_Psi2s(mean_Jpsi,0.584)",
-          "prod::width_Psi2s(width_Jpsi,1.05)",
-          "a_Psi2s",
-          "b_Psi2s",
-          "c_Psi2s",
-          "d_Psi2s"
-        ],
-        [
-          "aa",
-          "bb",
-          "cc"
-        ],
-        [
-          "sig_Jpsi",
-          "sig_Psi2s",
-          "bkg"
-        ]
-      ],
-      "fitRangeMin": [
-        2,
-        2.1,
-        2.2
-      ],
-      "fitRangeMax": [
-        5,
-        4.9,
-        4.8
-      ],
-      "doPropagandaPlot": true,
-      "parForPropagandaPlot": [
-        "mean_Jpsi",
-        "width_Jpsi",
-        "sig_Jpsi",
-        "sig_Psi2s"
-      ],
-      "parNameForPropagandaPlot": [
-        "#mu_{J/#psi}",
-        "#sigma_{J/#psi}",
-        "#it{N}_{J/#psi}",
-        "#it{N}_{#psi(2S)}"
-      ],
-      "textForPropagandaPlot": [
-        [
-          0.20,
-          0.87,
-          "Simulation, toy MC"
-        ],
-        [
-          0.20,
-          0.80,
-          "2.5 < #it{y} < 4, J/#psi #rightarrow #mu^{+}#mu^{-}"
-        ]
-      ]
+    "input": {
+        "input_file_name": "tutorial.root",
+        "input_name": "histMass",
+        "pdf_dictionary": {
+            "pdf": [
+                "CB2",
+                "CB2",
+                "VWG",
+                "SUM"
+            ],
+            "pdfName": [
+                "Jpsi",
+                "Psi2s",
+                "Bkg",
+                "SUM"
+            ],
+            "pdfNameForLegend": [
+                "J/#psi",
+                "#psi(2S)",
+                "Background",
+                "Fit"
+            ],
+            "pdfColor": [
+                861,
+                417,
+                1
+            ],
+            "pdfStyle": [
+                1,
+                1,
+                2
+            ],
+            "parVal": [
+                [
+                    3.096,
+                    1.2e-01,
+                    1.089,
+                    3.393,
+                    2.097,
+                    8.694
+                ],
+                [
+                    3.096,
+                    1.2e-01,
+                    1.089,
+                    3.393,
+                    2.097,
+                    8.694
+                ],
+                [
+                    1,
+                    1,
+                    1
+                ],
+                [
+                    1000,
+                    100,
+                    100000
+                ]
+            ],
+            "parLimMin": [
+                [
+                    2.9,
+                    7.0e-02,
+                    1.089,
+                    3.393,
+                    2.097,
+                    8.694
+                ],
+                [
+                    2.9,
+                    7.0e-02,
+                    1.089,
+                    3.393,
+                    2.097,
+                    8.694
+                ],
+                [
+                    -10,
+                    0,
+                    -100
+                ],
+                [
+                    0,
+                    0,
+                    0
+                ]
+            ],
+            "parLimMax": [
+                [
+                    3.5,
+                    1.9e-01,
+                    1.089,
+                    3.393,
+                    2.097,
+                    8.694
+                ],
+                [
+                    3.9,
+                    1.9e-01,
+                    1.089,
+                    3.393,
+                    2.097,
+                    8.694
+                ],
+                [
+                    10,
+                    100,
+                    100
+                ],
+                [
+                    5000000,
+                    5000000,
+                    50000000
+                ]
+            ],
+            "parName": [
+                [
+                    "mean_Jpsi",
+                    "width_Jpsi",
+                    "a_Jpsi",
+                    "b_Jpsi",
+                    "c_Jpsi",
+                    "d_Jpsi"
+                ],
+                [
+                    "sum::mean_Psi2s(mean_Jpsi,0.584)",
+                    "prod::width_Psi2s(width_Jpsi,1.05)",
+                    "a_Psi2s",
+                    "b_Psi2s",
+                    "c_Psi2s",
+                    "d_Psi2s"
+                ],
+                [
+                    "aa",
+                    "bb",
+                    "cc"
+                ],
+                [
+                    "sig_Jpsi",
+                    "sig_Psi2s",
+                    "bkg"
+                ]
+            ],
+            "fitRangeMin": [
+                2,
+                2.1,
+                2.2
+            ],
+            "fitRangeMax": [
+                5,
+                4.9,
+                4.8
+            ],
+            "doPropagandaPlot": true,
+            "parForPropagandaPlot": [
+                "mean_Jpsi",
+                "width_Jpsi",
+                "sig_Jpsi",
+                "sig_Psi2s"
+            ],
+            "parNameForPropagandaPlot": [
+                "#mu_{J/#psi}",
+                "#sigma_{J/#psi}",
+                "#it{N}_{J/#psi}",
+                "#it{N}_{#psi(2S)}"
+            ],
+            "textForPropagandaPlot": [
+                [
+                    0.20,
+                    0.87,
+                    "Simulation, toy MC"
+                ],
+                [
+                    0.20,
+                    0.80,
+                    "2.5 < #it{y} < 4, J/#psi #rightarrow #mu^{+}#mu^{-}"
+                ]
+            ]
+        }
+    },
+    "output": {
+        "output_file_name": "output/"
     }
-  },
-  "output": {
-    "output_file_name": "output/"
-  }
-}
\ No newline at end of file
+}
diff --git a/.auto-resolution/PWGDQ/Macros/dqFlowAccWeights.C b/.auto-resolution/PWGDQ/Macros/dqFlowAccWeights.C
index 00cb5107d45..13695c9e799 100644
--- a/.auto-resolution/PWGDQ/Macros/dqFlowAccWeights.C
+++ b/.auto-resolution/PWGDQ/Macros/dqFlowAccWeights.C
@@ -14,18 +14,20 @@
 ///
 /// \author Chi ZHANG, CEA-Saclay, chi.zhang@cern.ch
 
-#include <gsl/span>
+#include "PWGCF/GenericFramework/Core/GFWWeights.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "Framework/Logger.h"
+
+#include <TFile.h>
+#include <TSystem.h>
+
 #include <cmath>
+#include <gsl/span>
+#include <iostream>
 #include <string>
 #include <unordered_map>
 #include <vector>
-#include <iostream>
-
-#include <TSystem.h>
-#include <TFile.h>
-#include "Framework/Logger.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "PWGCF/GenericFramework/Core/GFWWeights.h"
 
 using namespace o2;
 using namespace std;
diff --git a/.auto-resolution/PWGDQ/Macros/evalMchTrackingEfficiency.cxx b/.auto-resolution/PWGDQ/Macros/evalMchTrackingEfficiency.cxx
index 34610915850..e2c1ae796e3 100644
--- a/.auto-resolution/PWGDQ/Macros/evalMchTrackingEfficiency.cxx
+++ b/.auto-resolution/PWGDQ/Macros/evalMchTrackingEfficiency.cxx
@@ -14,17 +14,17 @@
 ///
 /// \author Zaida Conesa del Valle <zaida.conesa.del.valle@cern.ch>
 /// \author Andrea Tavira García <tavira-garcia@ijclab.in2p3.fr>
-#include <vector>
-
-#include "TFile.h"
+#include "TAxis.h"
+#include "TCanvas.h"
 #include "TDirectoryFile.h"
-#include "THn.h"
+#include "TFile.h"
 #include "TH1F.h"
 #include "TH2F.h"
-#include "TAxis.h"
-#include "TCanvas.h"
-#include "TStyle.h"
+#include "THn.h"
 #include "TLegend.h"
+#include "TStyle.h"
+
+#include <vector>
 
 double computeEfficiencyPerChamber(THnF* hnf, int iAxis, int iCh, double binLimits[2]);
 double computeEfficiencyPerChamber(THnF* hnf, const int iAxis[3], int iCh, double binLimits[3][2]);
diff --git a/.auto-resolution/PWGDQ/Macros/fit_library/CB2Pdf.cxx b/.auto-resolution/PWGDQ/Macros/fit_library/CB2Pdf.cxx
index 7f2501825e3..43fc0d0a613 100644
--- a/.auto-resolution/PWGDQ/Macros/fit_library/CB2Pdf.cxx
+++ b/.auto-resolution/PWGDQ/Macros/fit_library/CB2Pdf.cxx
@@ -11,14 +11,16 @@
 
 /// \author Luca Micheletti <luca.micheletti@cern.ch>, CERN
 
+#include "CB2Pdf.h"
+
 #include "Riostream.h"
 
-#include "CB2Pdf.h"
-#include "RooAbsReal.h"
 #include "RooAbsCategory.h"
-#include <math.h>
+#include "RooAbsReal.h"
 #include "TMath.h"
 
+#include <math.h>
+
 ClassImp(CB2Pdf);
 
 CB2Pdf::CB2Pdf(const char* name, const char* title,
diff --git a/.auto-resolution/PWGDQ/Macros/fit_library/CB2Pdf.h b/.auto-resolution/PWGDQ/Macros/fit_library/CB2Pdf.h
index a9e3a87409e..2415631b03b 100644
--- a/.auto-resolution/PWGDQ/Macros/fit_library/CB2Pdf.h
+++ b/.auto-resolution/PWGDQ/Macros/fit_library/CB2Pdf.h
@@ -14,11 +14,11 @@
 #ifndef CB2PDF
 #define CB2PDF
 
+#include "RooAbsCategory.h"
 #include "RooAbsPdf.h"
-#include "RooRealProxy.h"
-#include "RooCategoryProxy.h"
 #include "RooAbsReal.h"
-#include "RooAbsCategory.h"
+#include "RooCategoryProxy.h"
+#include "RooRealProxy.h"
 
 class CB2Pdf : public RooAbsPdf
 {
diff --git a/.auto-resolution/PWGDQ/Macros/fit_library/ExpPdf.cxx b/.auto-resolution/PWGDQ/Macros/fit_library/ExpPdf.cxx
index 1841ccd7cbb..9f07c07e07a 100755
--- a/.auto-resolution/PWGDQ/Macros/fit_library/ExpPdf.cxx
+++ b/.auto-resolution/PWGDQ/Macros/fit_library/ExpPdf.cxx
@@ -11,14 +11,16 @@
 
 /// \author Luca Micheletti <luca.micheletti@cern.ch>, CERN
 
+#include "ExpPdf.h"
+
 #include "Riostream.h"
 
-#include "ExpPdf.h"
-#include "RooAbsReal.h"
 #include "RooAbsCategory.h"
-#include <math.h>
+#include "RooAbsReal.h"
 #include "TMath.h"
 
+#include <math.h>
+
 ClassImp(ExpPdf);
 
 ExpPdf::ExpPdf(const char* name, const char* title,
diff --git a/.auto-resolution/PWGDQ/Macros/fit_library/ExpPdf.h b/.auto-resolution/PWGDQ/Macros/fit_library/ExpPdf.h
index 394c73c52e6..4756e5a7ad8 100755
--- a/.auto-resolution/PWGDQ/Macros/fit_library/ExpPdf.h
+++ b/.auto-resolution/PWGDQ/Macros/fit_library/ExpPdf.h
@@ -14,11 +14,11 @@
 #ifndef EXPPDF
 #define EXPPDF
 
+#include "RooAbsCategory.h"
 #include "RooAbsPdf.h"
-#include "RooRealProxy.h"
-#include "RooCategoryProxy.h"
 #include "RooAbsReal.h"
-#include "RooAbsCategory.h"
+#include "RooCategoryProxy.h"
+#include "RooRealProxy.h"
 
 class ExpPdf : public RooAbsPdf
 {
diff --git a/.auto-resolution/PWGDQ/Macros/fit_library/GausPdf.cxx b/.auto-resolution/PWGDQ/Macros/fit_library/GausPdf.cxx
index 84d303e3a2b..bdf7f88aa2f 100755
--- a/.auto-resolution/PWGDQ/Macros/fit_library/GausPdf.cxx
+++ b/.auto-resolution/PWGDQ/Macros/fit_library/GausPdf.cxx
@@ -11,14 +11,16 @@
 
 /// \author Luca Micheletti <luca.micheletti@cern.ch>, CERN
 
+#include "GausPdf.h"
+
 #include "Riostream.h"
 
-#include "GausPdf.h"
-#include "RooAbsReal.h"
 #include "RooAbsCategory.h"
-#include <math.h>
+#include "RooAbsReal.h"
 #include "TMath.h"
 
+#include <math.h>
+
 ClassImp(GausPdf);
 
 GausPdf::GausPdf(const char* name, const char* title,
diff --git a/.auto-resolution/PWGDQ/Macros/fit_library/GausPdf.h b/.auto-resolution/PWGDQ/Macros/fit_library/GausPdf.h
index 4edb19ff47c..0cdda519651 100755
--- a/.auto-resolution/PWGDQ/Macros/fit_library/GausPdf.h
+++ b/.auto-resolution/PWGDQ/Macros/fit_library/GausPdf.h
@@ -14,11 +14,11 @@
 #ifndef GAUSPDF
 #define GAUSPDF
 
+#include "RooAbsCategory.h"
 #include "RooAbsPdf.h"
-#include "RooRealProxy.h"
-#include "RooCategoryProxy.h"
 #include "RooAbsReal.h"
-#include "RooAbsCategory.h"
+#include "RooCategoryProxy.h"
+#include "RooRealProxy.h"
 
 class GausPdf : public RooAbsPdf
 {
diff --git a/.auto-resolution/PWGDQ/Macros/fit_library/Pol4ExpPdf.cxx b/.auto-resolution/PWGDQ/Macros/fit_library/Pol4ExpPdf.cxx
index 912406a3b0b..6ef59d327ee 100755
--- a/.auto-resolution/PWGDQ/Macros/fit_library/Pol4ExpPdf.cxx
+++ b/.auto-resolution/PWGDQ/Macros/fit_library/Pol4ExpPdf.cxx
@@ -11,14 +11,16 @@
 
 /// \author Luca Micheletti <luca.micheletti@cern.ch>, CERN
 
+#include "Pol4ExpPdf.h"
+
 #include "Riostream.h"
 
-#include "Pol4ExpPdf.h"
-#include "RooAbsReal.h"
 #include "RooAbsCategory.h"
-#include <math.h>
+#include "RooAbsReal.h"
 #include "TMath.h"
 
+#include <math.h>
+
 ClassImp(Pol4ExpPdf);
 
 Pol4ExpPdf::Pol4ExpPdf(const char* name, const char* title,
diff --git a/.auto-resolution/PWGDQ/Macros/fit_library/Pol4ExpPdf.h b/.auto-resolution/PWGDQ/Macros/fit_library/Pol4ExpPdf.h
index 13cd8696c6c..42a898a0493 100755
--- a/.auto-resolution/PWGDQ/Macros/fit_library/Pol4ExpPdf.h
+++ b/.auto-resolution/PWGDQ/Macros/fit_library/Pol4ExpPdf.h
@@ -14,11 +14,11 @@
 #ifndef POL4EXPPDF
 #define POL4EXPPDF
 
+#include "RooAbsCategory.h"
 #include "RooAbsPdf.h"
-#include "RooRealProxy.h"
-#include "RooCategoryProxy.h"
 #include "RooAbsReal.h"
-#include "RooAbsCategory.h"
+#include "RooCategoryProxy.h"
+#include "RooRealProxy.h"
 
 TString nameParameters[] = {"p0", "p1", "p2", "p3", "p4", "p5", "N_bkg", "N_sig", "mean", "width"};
 
diff --git a/.auto-resolution/PWGDQ/Macros/fit_library/VWGPdf.cxx b/.auto-resolution/PWGDQ/Macros/fit_library/VWGPdf.cxx
index 8cebc90b2f4..8cbcdd9be83 100644
--- a/.auto-resolution/PWGDQ/Macros/fit_library/VWGPdf.cxx
+++ b/.auto-resolution/PWGDQ/Macros/fit_library/VWGPdf.cxx
@@ -11,14 +11,16 @@
 
 /// \author Luca Micheletti <luca.micheletti@cern.ch>, CERN
 
+#include "VWGPdf.h"
+
 #include "Riostream.h"
 
-#include "VWGPdf.h"
-#include "RooAbsReal.h"
 #include "RooAbsCategory.h"
-#include <math.h>
+#include "RooAbsReal.h"
 #include "TMath.h"
 
+#include <math.h>
+
 ClassImp(VWGPdf);
 
 VWGPdf::VWGPdf(const char* name, const char* title,
diff --git a/.auto-resolution/PWGDQ/Macros/fit_library/VWGPdf.h b/.auto-resolution/PWGDQ/Macros/fit_library/VWGPdf.h
index 9077d43be71..5014c924773 100644
--- a/.auto-resolution/PWGDQ/Macros/fit_library/VWGPdf.h
+++ b/.auto-resolution/PWGDQ/Macros/fit_library/VWGPdf.h
@@ -14,11 +14,11 @@
 #ifndef VWGPDF
 #define VWGPDF
 
+#include "RooAbsCategory.h"
 #include "RooAbsPdf.h"
-#include "RooRealProxy.h"
-#include "RooCategoryProxy.h"
 #include "RooAbsReal.h"
-#include "RooAbsCategory.h"
+#include "RooCategoryProxy.h"
+#include "RooRealProxy.h"
 
 class VWGPdf : public RooAbsPdf
 {
diff --git a/.auto-resolution/PWGDQ/TableProducer/generatedQuarkoniaMC.cxx b/.auto-resolution/PWGDQ/TableProducer/generatedQuarkoniaMC.cxx
index 737faaaa6b2..a820a167a32 100644
--- a/.auto-resolution/PWGDQ/TableProducer/generatedQuarkoniaMC.cxx
+++ b/.auto-resolution/PWGDQ/TableProducer/generatedQuarkoniaMC.cxx
@@ -16,40 +16,42 @@
 // It is meant to help with providing auxiliary information
 // when dealing with derived data.
 
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <map>
-#include <iterator>
-#include <utility>
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+#include "PWGLF/DataModel/EPCalibrationTables.h"
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
 #include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/McCollisionExtra.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/Qvectors.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+#include "Common/TableProducer/PID/pidTOFBase.h"
+
 #include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/PhysicsConstants.h"
-#include "Common/TableProducer/PID/pidTOFBase.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Qvectors.h"
+#include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StaticFor.h"
-#include "Common/DataModel/McCollisionExtra.h"
-#include "PWGLF/DataModel/EPCalibrationTables.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <iterator>
+#include <map>
+#include <utility>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGDQ/TableProducer/tableMaker.cxx b/.auto-resolution/PWGDQ/TableProducer/tableMaker.cxx
index 87d1183d385..f0b74e47974 100644
--- a/.auto-resolution/PWGDQ/TableProducer/tableMaker.cxx
+++ b/.auto-resolution/PWGDQ/TableProducer/tableMaker.cxx
@@ -24,45 +24,48 @@
 #include <string>
 #include <vector>
 // other includes
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/DataTypes.h"
-#include "Framework/runDataProcessing.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
+#include "PWGDQ/Core/AnalysisCompositeCut.h"
+#include "PWGDQ/Core/AnalysisCut.h"
+#include "PWGDQ/Core/CutsLibrary.h"
+#include "PWGDQ/Core/HistogramManager.h"
+#include "PWGDQ/Core/HistogramsLibrary.h"
+#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+
 #include "Common/CCDB/TriggerAliases.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/CollisionAssociationTables.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/FwdTrackReAlignTables.h"
+#include "Common/DataModel/MftmchMatchingML.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/MftmchMatchingML.h"
-#include "Common/DataModel/FwdTrackReAlignTables.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "PWGDQ/Core/VarManager.h"
-#include "PWGDQ/Core/HistogramManager.h"
-#include "PWGDQ/Core/AnalysisCut.h"
-#include "PWGDQ/Core/AnalysisCompositeCut.h"
-#include "PWGDQ/Core/HistogramsLibrary.h"
-#include "PWGDQ/Core/CutsLibrary.h"
-#include "DataFormatsGlobalTracking/RecoContainerCreateTracksVariadic.h"
-#include "DetectorsVertexing/VertexTrackMatcher.h"
-#include "ReconstructionDataFormats/PrimaryVertex.h"
-#include "ReconstructionDataFormats/VtxTrackIndex.h"
-#include "ReconstructionDataFormats/VtxTrackRef.h"
-#include "DataFormatsITSMFT/ROFRecord.h"
+#include "EventFiltering/Zorro.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "CommonDataFormat/InteractionRecord.h"
-#include "DetectorsVertexing/PVertexerParams.h"
-#include "MathUtils/Primitive2D.h"
 #include "DataFormatsGlobalTracking/RecoContainer.h"
-#include "Common/DataModel/CollisionAssociationTables.h"
+#include "DataFormatsGlobalTracking/RecoContainerCreateTracksVariadic.h"
+#include "DataFormatsITSMFT/ROFRecord.h"
 #include "DataFormatsParameters/GRPMagField.h"
 #include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "DetectorsVertexing/PVertexerParams.h"
+#include "DetectorsVertexing/VertexTrackMatcher.h"
 #include "Field/MagneticField.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/DataTypes.h"
+#include "Framework/runDataProcessing.h"
+#include "MathUtils/Primitive2D.h"
+#include "ReconstructionDataFormats/PrimaryVertex.h"
+#include "ReconstructionDataFormats/VtxTrackIndex.h"
+#include "ReconstructionDataFormats/VtxTrackRef.h"
+
 #include "TGeoGlobalMagField.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "EventFiltering/Zorro.h"
 
 using std::cout;
 using std::endl;
diff --git a/.auto-resolution/PWGDQ/TableProducer/tableMakerJpsiHf.cxx b/.auto-resolution/PWGDQ/TableProducer/tableMakerJpsiHf.cxx
index 7ae949c40d1..4700ce4be4f 100644
--- a/.auto-resolution/PWGDQ/TableProducer/tableMakerJpsiHf.cxx
+++ b/.auto-resolution/PWGDQ/TableProducer/tableMakerJpsiHf.cxx
@@ -14,23 +14,23 @@
 /// \author Luca Micheletti <luca.micheletti@to.infn.it>, INFN
 /// \author Fabrizio Grosa <fabrizio.grosa@cern.ch>, CERN
 
-#include <string>
-
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
-
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/AnalysisCompositeCut.h"
+#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/CutsLibrary.h"
 #include "PWGDQ/Core/HistogramManager.h"
 #include "PWGDQ/Core/HistogramsLibrary.h"
 #include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+#include "PWGHF/Core/HfHelper.h"
 #include "PWGHF/DataModel/CandidateReconstructionTables.h"
 #include "PWGHF/DataModel/CandidateSelectionTables.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+
+#include <string>
 
 using namespace o2;
 using namespace o2::analysis;
diff --git a/.auto-resolution/PWGDQ/TableProducer/tableMakerMC.cxx b/.auto-resolution/PWGDQ/TableProducer/tableMakerMC.cxx
index 1d43d196f9d..2edcef5717f 100644
--- a/.auto-resolution/PWGDQ/TableProducer/tableMakerMC.cxx
+++ b/.auto-resolution/PWGDQ/TableProducer/tableMakerMC.cxx
@@ -16,41 +16,45 @@
 //   The skimmed MC stack includes the MC truth particles corresponding to the list of user specified MC signals (see MCsignal.h)
 //    and the MC truth particles corresponding to the reconstructed tracks selected by the specified track cuts on reconstructed data.
 
-#include <iostream>
-#include <string>
-#include <map>
-#include <memory>
-#include <vector>
-#include "TList.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/ASoA.h"
-#include "Framework/DataTypes.h"
-#include "Framework/runDataProcessing.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/CCDB/TriggerAliases.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "PWGDQ/Core/VarManager.h"
-#include "PWGDQ/Core/HistogramManager.h"
-#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/AnalysisCompositeCut.h"
-#include "PWGDQ/Core/HistogramsLibrary.h"
+#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/CutsLibrary.h"
+#include "PWGDQ/Core/HistogramManager.h"
+#include "PWGDQ/Core/HistogramsLibrary.h"
 #include "PWGDQ/Core/MCSignal.h"
 #include "PWGDQ/Core/MCSignalLibrary.h"
+#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+
+#include "Common/CCDB/TriggerAliases.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/CollisionAssociationTables.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/CollisionAssociationTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsParameters/GRPMagField.h"
 #include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
 #include "Field/MagneticField.h"
+#include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/DataTypes.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TGeoGlobalMagField.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "CCDB/BasicCCDBManager.h"
+#include "TList.h"
+
+#include <iostream>
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
 
 using std::cout;
 using std::endl;
@@ -653,7 +657,7 @@ struct TableMakerMC {
                            track.c1PtY(), track.c1PtZ(), track.c1PtSnp(), track.c1PtTgl(), track.c1Pt21Pt2());
           }
         } // end loop over reconstructed tracks
-      }   // end if constexpr (static_cast<bool>(TTrackFillMap))
+      } // end if constexpr (static_cast<bool>(TTrackFillMap))
 
       // Maps for the MFT-muon matching index
       std::map<int, int> newMFTTableSize; // key : oldMFTIndex, value: size of the table-1 at step key
@@ -864,9 +868,9 @@ struct TableMakerMC {
               newMatchIndex[muon.index()] = newEntryNb[matchIdx];                                  // update the match for this muon to the updated entry of the match
               newMatchIndex[muon.index()] += muonBasic.lastIndex() + 1 - newEntryNb[muon.index()]; // adding the offset of muons, muonBasic.lastIndex() start at -1
 
-              if (static_cast<int>(muon.trackType()) == 0) {                                       // for now only do this to global tracks
-                newMatchIndex[matchIdx] = newEntryNb[muon.index()];                                // add the  updated index of this muon as a match to mch track
-                newMatchIndex[matchIdx] += muonBasic.lastIndex() + 1 - newEntryNb[muon.index()];   // adding the offset, muonBasic.lastIndex() start at -1
+              if (static_cast<int>(muon.trackType()) == 0) {                                     // for now only do this to global tracks
+                newMatchIndex[matchIdx] = newEntryNb[muon.index()];                              // add the  updated index of this muon as a match to mch track
+                newMatchIndex[matchIdx] += muonBasic.lastIndex() + 1 - newEntryNb[muon.index()]; // adding the offset, muonBasic.lastIndex() start at -1
               }
             } else {
               newMatchIndex[muon.index()] = -1;
@@ -915,7 +919,7 @@ struct TableMakerMC {
           muonLabels(fNewLabels.find(mctrack.index())->second, muon.mcMask(), mcflags);
         }
       } // end if constexpr (static_cast<bool>(TMuonFillMap))
-    }   // end loop over collisions
+    } // end loop over collisions
 
     // Loop over the label map, create the mother/daughter relationships if these exist and write the skimmed MC stack
     for (const auto& [newLabel, oldLabel] : fNewLabelsReversed) {
@@ -1276,7 +1280,7 @@ struct TableMakerMC {
                            track.c1PtY(), track.c1PtZ(), track.c1PtSnp(), track.c1PtTgl(), track.c1Pt21Pt2());
           }
         } // end loop over reconstructed tracks
-      }   // end if constexpr (static_cast<bool>(TTrackFillMap))
+      } // end if constexpr (static_cast<bool>(TTrackFillMap))
 
       if constexpr (static_cast<bool>(TMuonFillMap)) {
         // build the muon tables
@@ -1454,7 +1458,7 @@ struct TableMakerMC {
           muonLabels(fNewLabels.find(mctrack.index())->second, muon.mcMask(), mcflags);
         }
       } // end if constexpr (static_cast<bool>(TMuonFillMap))
-    }   // end loop over collisions
+    } // end loop over collisions
 
     // Loop over the label map, create the mother/daughter relationships if these exist and write the skimmed MC stack
     for (const auto& [newLabel, oldLabel] : fNewLabelsReversed) {
diff --git a/.auto-resolution/PWGDQ/TableProducer/tableMakerMC_withAssoc.cxx b/.auto-resolution/PWGDQ/TableProducer/tableMakerMC_withAssoc.cxx
index 7dc49516e8a..8fe5f479131 100644
--- a/.auto-resolution/PWGDQ/TableProducer/tableMakerMC_withAssoc.cxx
+++ b/.auto-resolution/PWGDQ/TableProducer/tableMakerMC_withAssoc.cxx
@@ -16,45 +16,49 @@
 //   The skimmed MC stack includes the MC truth particles corresponding to the list of user specified MC signals (see MCsignal.h)
 //    and the MC truth particles corresponding to the reconstructed tracks selected by the specified track cuts on reconstructed data.
 
-#include <cstdint>
-#include <iostream>
-#include <map>
-#include <string>
-#include <memory>
-#include <vector>
-#include <utility>
-#include <unordered_map>
-#include "TList.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/ASoA.h"
-#include "Framework/DataTypes.h"
-#include "Framework/runDataProcessing.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/CCDB/TriggerAliases.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "PWGDQ/Core/VarManager.h"
-#include "PWGDQ/Core/HistogramManager.h"
-#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/AnalysisCompositeCut.h"
-#include "PWGDQ/Core/HistogramsLibrary.h"
+#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/CutsLibrary.h"
+#include "PWGDQ/Core/HistogramManager.h"
+#include "PWGDQ/Core/HistogramsLibrary.h"
 #include "PWGDQ/Core/MCSignal.h"
 #include "PWGDQ/Core/MCSignalLibrary.h"
+#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+
+#include "Common/CCDB/TriggerAliases.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/CollisionAssociationTables.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/FwdTrackReAlignTables.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/FwdTrackReAlignTables.h"
-#include "Common/DataModel/CollisionAssociationTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsParameters/GRPMagField.h"
 #include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
 #include "Field/MagneticField.h"
+#include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/DataTypes.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TGeoGlobalMagField.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "CCDB/BasicCCDBManager.h"
+#include "TList.h"
+
+#include <cstdint>
+#include <iostream>
+#include <map>
+#include <memory>
+#include <string>
+#include <unordered_map>
+#include <utility>
+#include <vector>
 
 using std::cout;
 using std::endl;
diff --git a/.auto-resolution/PWGDQ/TableProducer/tableMakerMuonMchTrkEfficiency.cxx b/.auto-resolution/PWGDQ/TableProducer/tableMakerMuonMchTrkEfficiency.cxx
index 11634be2e0d..7474dd1740f 100644
--- a/.auto-resolution/PWGDQ/TableProducer/tableMakerMuonMchTrkEfficiency.cxx
+++ b/.auto-resolution/PWGDQ/TableProducer/tableMakerMuonMchTrkEfficiency.cxx
@@ -19,34 +19,35 @@
 /// \author Zaida Conesa del Valle <zaida.conesa.del.valle@cern.ch>
 ///
 
-#include <vector>
-#include <memory>
-#include <string>
-#include <algorithm>
+#include "TDatabasePDG.h"
 #include <TH1F.h>
 #include <TH3F.h>
 #include <THashList.h>
 #include <TList.h>
-#include <TString.h>
 #include <TLorentzVector.h>
-#include "TDatabasePDG.h"
+#include <TString.h>
+
+#include <algorithm>
+#include <memory>
+#include <string>
+#include <vector>
 //
 #include "Common/DataModel/TrackSelectionTables.h"
 //
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/ASoA.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/Logger.h"
 #include "Framework/runDataProcessing.h"
 //
-#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/AnalysisCompositeCut.h"
+#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/CutsLibrary.h"
 #include "PWGDQ/Core/VarManager.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
 #include "PWGDQ/DataModel/MchTrkEffTables.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.auto-resolution/PWGDQ/TableProducer/tableMaker_withAssoc.cxx b/.auto-resolution/PWGDQ/TableProducer/tableMaker_withAssoc.cxx
index 3b3d4c4e0af..7b35a84bd87 100644
--- a/.auto-resolution/PWGDQ/TableProducer/tableMaker_withAssoc.cxx
+++ b/.auto-resolution/PWGDQ/TableProducer/tableMaker_withAssoc.cxx
@@ -23,46 +23,49 @@
 #include <string>
 #include <vector>
 // other includes
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/DataTypes.h"
-#include "Framework/runDataProcessing.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
+#include "PWGDQ/Core/AnalysisCompositeCut.h"
+#include "PWGDQ/Core/AnalysisCut.h"
+#include "PWGDQ/Core/CutsLibrary.h"
+#include "PWGDQ/Core/HistogramManager.h"
+#include "PWGDQ/Core/HistogramsLibrary.h"
+#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+
 #include "Common/CCDB/TriggerAliases.h"
+#include "Common/Core/TableHelper.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/CollisionAssociationTables.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/FwdTrackReAlignTables.h"
+#include "Common/DataModel/MftmchMatchingML.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/MftmchMatchingML.h"
-#include "Common/DataModel/FwdTrackReAlignTables.h"
-#include "Common/Core/TableHelper.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "PWGDQ/Core/VarManager.h"
-#include "PWGDQ/Core/HistogramManager.h"
-#include "PWGDQ/Core/AnalysisCut.h"
-#include "PWGDQ/Core/AnalysisCompositeCut.h"
-#include "PWGDQ/Core/HistogramsLibrary.h"
-#include "PWGDQ/Core/CutsLibrary.h"
-#include "DataFormatsGlobalTracking/RecoContainerCreateTracksVariadic.h"
-#include "DetectorsVertexing/VertexTrackMatcher.h"
-#include "ReconstructionDataFormats/PrimaryVertex.h"
-#include "ReconstructionDataFormats/VtxTrackIndex.h"
-#include "ReconstructionDataFormats/VtxTrackRef.h"
-#include "DataFormatsITSMFT/ROFRecord.h"
+#include "EventFiltering/Zorro.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "CommonDataFormat/InteractionRecord.h"
-#include "DetectorsVertexing/PVertexerParams.h"
-#include "MathUtils/Primitive2D.h"
 #include "DataFormatsGlobalTracking/RecoContainer.h"
-#include "Common/DataModel/CollisionAssociationTables.h"
+#include "DataFormatsGlobalTracking/RecoContainerCreateTracksVariadic.h"
+#include "DataFormatsITSMFT/ROFRecord.h"
 #include "DataFormatsParameters/GRPMagField.h"
 #include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "DetectorsVertexing/PVertexerParams.h"
+#include "DetectorsVertexing/VertexTrackMatcher.h"
 #include "Field/MagneticField.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/DataTypes.h"
+#include "Framework/runDataProcessing.h"
+#include "MathUtils/Primitive2D.h"
+#include "ReconstructionDataFormats/PrimaryVertex.h"
+#include "ReconstructionDataFormats/VtxTrackIndex.h"
+#include "ReconstructionDataFormats/VtxTrackRef.h"
+
 #include "TGeoGlobalMagField.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "EventFiltering/Zorro.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGDQ/Tasks/DalitzSelection.cxx b/.auto-resolution/PWGDQ/Tasks/DalitzSelection.cxx
index 6b285d4e04a..a19ab82ae65 100755
--- a/.auto-resolution/PWGDQ/Tasks/DalitzSelection.cxx
+++ b/.auto-resolution/PWGDQ/Tasks/DalitzSelection.cxx
@@ -13,26 +13,28 @@
 //        It can produce track and pair histograms for selected tracks
 //      It creates a bitmap with selections to be stored during skimming
 //
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/DataTypes.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
+#include "PWGDQ/Core/AnalysisCompositeCut.h"
+#include "PWGDQ/Core/AnalysisCut.h"
+#include "PWGDQ/Core/CutsLibrary.h"
+#include "PWGDQ/Core/HistogramManager.h"
+#include "PWGDQ/Core/HistogramsLibrary.h"
+#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+
 #include "Common/CCDB/TriggerAliases.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "PWGDQ/Core/VarManager.h"
-#include "PWGDQ/Core/HistogramManager.h"
-#include "PWGDQ/Core/AnalysisCut.h"
-#include "PWGDQ/Core/AnalysisCompositeCut.h"
-#include "PWGDQ/Core/HistogramsLibrary.h"
-#include "PWGDQ/Core/CutsLibrary.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsParameters/GRPMagField.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/DataTypes.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGDQ/Tasks/MIDefficiency.cxx b/.auto-resolution/PWGDQ/Tasks/MIDefficiency.cxx
index 3dcbcc4d595..219489d9ab9 100644
--- a/.auto-resolution/PWGDQ/Tasks/MIDefficiency.cxx
+++ b/.auto-resolution/PWGDQ/Tasks/MIDefficiency.cxx
@@ -18,11 +18,12 @@
 ///
 /// \author Luca Quaglia <luca.quaglia@cern.ch
 
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/CallbackService.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
-#include "Framework/CallbackService.h"
-#include "Framework/ASoAHelpers.h"
+
 #include <iostream>
 
 // O2 physics classes
@@ -30,13 +31,12 @@
 
 // O2
 #include "DataFormatsMID/Track.h" //MID track from O2
-#include "Framework/Variant.h"
-#include "Framework/ConfigParamSpec.h"
 #include "Framework/CompletionPolicyHelpers.h"
-
-#include "MIDEfficiency/Efficiency.h"
+#include "Framework/ConfigParamSpec.h"
+#include "Framework/Variant.h"
 #include "MIDBase/DetectorParameters.h"
 #include "MIDBase/Mapping.h"
+#include "MIDEfficiency/Efficiency.h"
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.auto-resolution/PWGDQ/Tasks/ModelConverterMultPv.cxx b/.auto-resolution/PWGDQ/Tasks/ModelConverterMultPv.cxx
index 088590435b8..42b19de5191 100644
--- a/.auto-resolution/PWGDQ/Tasks/ModelConverterMultPv.cxx
+++ b/.auto-resolution/PWGDQ/Tasks/ModelConverterMultPv.cxx
@@ -15,15 +15,17 @@
 // the conflict with the old data model.
 
 // other includes
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 #include <THashList.h>
 #include <TList.h>
 #include <TString.h>
-#include "DataFormatsParameters/GRPObject.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGDQ/Tasks/dqCorrelation.cxx b/.auto-resolution/PWGDQ/Tasks/dqCorrelation.cxx
index 950e82364cb..f3aed01c057 100644
--- a/.auto-resolution/PWGDQ/Tasks/dqCorrelation.cxx
+++ b/.auto-resolution/PWGDQ/Tasks/dqCorrelation.cxx
@@ -11,44 +11,45 @@
 /// @author  Victor Valencia
 // Contact: iarsene@cern.ch, i.c.arsene@fys.uio.no
 //
-#include <iostream>
-#include <vector>
-#include <algorithm>
-#include <TH1F.h>
-#include <TH3F.h>
-#include <THashList.h>
-#include <TList.h>
-#include <TString.h>
-#include <TRandom3.h>
-#include <cmath>
-
-#include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
 #include "PWGCF/GenericFramework/Core/FlowContainer.h"
-#include "PWGCF/GenericFramework/Core/GFWCumulant.h"
 #include "PWGCF/GenericFramework/Core/GFW.h"
+#include "PWGCF/GenericFramework/Core/GFWCumulant.h"
+#include "PWGCF/GenericFramework/Core/GFWPowerArray.h"
 #include "PWGCF/GenericFramework/Core/GFWWeights.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "PWGDQ/Core/VarManager.h"
-#include "PWGDQ/Core/HistogramManager.h"
-#include "PWGDQ/Core/MixingHandler.h"
-#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/AnalysisCompositeCut.h"
-#include "PWGDQ/Core/HistogramsLibrary.h"
+#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/CutsLibrary.h"
+#include "PWGDQ/Core/HistogramManager.h"
+#include "PWGDQ/Core/HistogramsLibrary.h"
+#include "PWGDQ/Core/MixingHandler.h"
 #include "PWGDQ/Core/MixingLibrary.h"
+#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include "Field/MagneticField.h"
-#include "TGeoGlobalMagField.h"
-#include "DetectorsBase/Propagator.h"
+#include "DataFormatsParameters/GRPObject.h"
 #include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Field/MagneticField.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
-#include "PWGCF/GenericFramework/Core/GFWPowerArray.h"
+#include "TGeoGlobalMagField.h"
 #include "TProfile.h"
+#include <TH1F.h>
+#include <TH3F.h>
+#include <THashList.h>
+#include <TList.h>
+#include <TRandom3.h>
+#include <TString.h>
+
+#include <algorithm>
+#include <cmath>
+#include <iostream>
+#include <vector>
 
 using std::cout;
 using std::endl;
diff --git a/.auto-resolution/PWGDQ/Tasks/dqEfficiency.cxx b/.auto-resolution/PWGDQ/Tasks/dqEfficiency.cxx
index 29f7b79392b..6083aa610c8 100644
--- a/.auto-resolution/PWGDQ/Tasks/dqEfficiency.cxx
+++ b/.auto-resolution/PWGDQ/Tasks/dqEfficiency.cxx
@@ -13,30 +13,33 @@
 //
 // Analysis task for processing O2::DQ MC skimmed AODs
 //
-#include <iostream>
-#include <vector>
-#include <TMath.h>
-#include <TH1F.h>
-#include <THashList.h>
-#include <TString.h>
-#include <cstdio>
-#include <string>
-#include <memory>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "PWGDQ/Core/VarManager.h"
-#include "PWGDQ/Core/HistogramManager.h"
-#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/AnalysisCompositeCut.h"
-#include "PWGDQ/Core/HistogramsLibrary.h"
+#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/CutsLibrary.h"
+#include "PWGDQ/Core/HistogramManager.h"
+#include "PWGDQ/Core/HistogramsLibrary.h"
 #include "PWGDQ/Core/MCSignal.h"
 #include "PWGDQ/Core/MCSignalLibrary.h"
+#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsParameters/GRPMagField.h"
 #include "DetectorsBase/GeometryManager.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include <TH1F.h>
+#include <THashList.h>
+#include <TMath.h>
+#include <TString.h>
+
+#include <cstdio>
+#include <iostream>
+#include <memory>
+#include <string>
+#include <vector>
 
 using std::cout;
 using std::endl;
diff --git a/.auto-resolution/PWGDQ/Tasks/dqEfficiency_withAssoc.cxx b/.auto-resolution/PWGDQ/Tasks/dqEfficiency_withAssoc.cxx
index e2a58ff5bf2..3d7e1613f44 100644
--- a/.auto-resolution/PWGDQ/Tasks/dqEfficiency_withAssoc.cxx
+++ b/.auto-resolution/PWGDQ/Tasks/dqEfficiency_withAssoc.cxx
@@ -12,43 +12,47 @@
 // Contact: iarsene@cern.ch, i.c.arsene@fys.uio.no
 //   Configurable workflow for running several DQ or other PWG analyses
 
-#include <iostream>
-#include <vector>
-#include <algorithm>
-#include <map>
-#include <string>
-#include <memory>
-#include <utility>
-#include <TH1F.h>
-#include <TH3F.h>
-#include <THashList.h>
-#include <TList.h>
-#include <TString.h>
-#include <TObjString.h>
-#include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/AnalysisHelpers.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "PWGDQ/Core/VarManager.h"
-#include "PWGDQ/Core/HistogramManager.h"
-#include "PWGDQ/Core/MixingHandler.h"
-#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/AnalysisCompositeCut.h"
-#include "PWGDQ/Core/HistogramsLibrary.h"
+#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/CutsLibrary.h"
-#include "PWGDQ/Core/MixingLibrary.h"
+#include "PWGDQ/Core/HistogramManager.h"
+#include "PWGDQ/Core/HistogramsLibrary.h"
 #include "PWGDQ/Core/MCSignal.h"
 #include "PWGDQ/Core/MCSignalLibrary.h"
+#include "PWGDQ/Core/MixingHandler.h"
+#include "PWGDQ/Core/MixingLibrary.h"
+#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+
+#include "Common/Core/TableHelper.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
 #include "Field/MagneticField.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TGeoGlobalMagField.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "Common/Core/TableHelper.h"
+#include <TH1F.h>
+#include <TH3F.h>
+#include <THashList.h>
+#include <TList.h>
+#include <TObjString.h>
+#include <TString.h>
+
+#include <algorithm>
+#include <iostream>
+#include <map>
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
 
 using std::cout;
 using std::endl;
@@ -534,7 +538,7 @@ struct AnalysisTrackSelection {
         DefineHistograms(fHistMan, "TrackBarrel_AmbiguityInBunch;TrackBarrel_AmbiguityOutOfBunch;", "ambiguity");
       }
       dqhistograms::AddHistogramsFromJSON(fHistMan, fConfigAddJSONHistograms.value.c_str()); // ad-hoc histograms via JSON
-      VarManager::SetUseVars(fHistMan->GetUsedVars()); // provide the list of required variables so that VarManager knows what to fill
+      VarManager::SetUseVars(fHistMan->GetUsedVars());                                       // provide the list of required variables so that VarManager knows what to fill
       fOutputList.setObject(fHistMan->GetMainHistogramList());
     }
 
@@ -856,9 +860,9 @@ struct AnalysisMuonSelection {
         histClasses += "Muon_AmbiguityInBunch;Muon_AmbiguityOutOfBunch;";
       }
 
-      DefineHistograms(fHistMan, histClasses.Data(), fConfigAddMuonHistogram.value.data()); // define all histograms
+      DefineHistograms(fHistMan, histClasses.Data(), fConfigAddMuonHistogram.value.data());  // define all histograms
       dqhistograms::AddHistogramsFromJSON(fHistMan, fConfigAddJSONHistograms.value.c_str()); // ad-hoc histograms via JSON
-      VarManager::SetUseVars(fHistMan->GetUsedVars());                                      // provide the list of required variables so that VarManager knows what to fill
+      VarManager::SetUseVars(fHistMan->GetUsedVars());                                       // provide the list of required variables so that VarManager knows what to fill
       fOutputList.setObject(fHistMan->GetMainHistogramList());
     }
 
@@ -1638,9 +1642,9 @@ struct AnalysisSameEventPairing {
 
     VarManager::SetCollisionSystem((TString)fConfigOptions.collisionSystem, fConfigOptions.centerMassEnergy); // set collision system and center of mass energy
 
-    DefineHistograms(fHistMan, histNames.Data(), fConfigAddSEPHistogram.value.data()); // define all histograms
+    DefineHistograms(fHistMan, histNames.Data(), fConfigAddSEPHistogram.value.data());     // define all histograms
     dqhistograms::AddHistogramsFromJSON(fHistMan, fConfigAddJSONHistograms.value.c_str()); // ad-hoc histograms via JSON
-    VarManager::SetUseVars(fHistMan->GetUsedVars());                                   // provide the list of required variables so that VarManager knows what to fill
+    VarManager::SetUseVars(fHistMan->GetUsedVars());                                       // provide the list of required variables so that VarManager knows what to fill
     fOutputList.setObject(fHistMan->GetMainHistogramList());
   }
 
@@ -2642,7 +2646,7 @@ struct AnalysisAsymmetricPairing {
     VarManager::SetupMatLUTFwdDCAFitter(fLUT);
 
     dqhistograms::AddHistogramsFromJSON(fHistMan, fConfigAddJSONHistograms.value.c_str()); // ad-hoc histograms via JSON
-    VarManager::SetUseVars(fHistMan->GetUsedVars());                                      // provide the list of required variables so that VarManager knows what to fill
+    VarManager::SetUseVars(fHistMan->GetUsedVars());                                       // provide the list of required variables so that VarManager knows what to fill
     fOutputList.setObject(fHistMan->GetMainHistogramList());
   }
 
@@ -2802,7 +2806,7 @@ struct AnalysisAsymmetricPairing {
         for (int icut = 0; icut < fNLegCuts; icut++) {
           if (twoTrackFilter & (static_cast<uint32_t>(1) << icut)) {
             isAmbi = (twoTrackFilter & (static_cast<uint32_t>(1) << 30)) || (twoTrackFilter & (static_cast<uint32_t>(1) << 31));
-            if (sign1 * sign2 < 0) {                                                    // +- pairs
+            if (sign1 * sign2 < 0) {                                                                                // +- pairs
               fHistMan->FillHistClass(Form("PairsBarrelSEPM_%s", fLegCutNames[icut].Data()), VarManager::fgValues); // reconstructed, unmatched
               if (isAmbi && fConfigQA) {
                 fHistMan->FillHistClass(Form("PairsBarrelSEPM_ambiguous_%s", fLegCutNames[icut].Data()), VarManager::fgValues);
diff --git a/.auto-resolution/PWGDQ/Tasks/dqFlow.cxx b/.auto-resolution/PWGDQ/Tasks/dqFlow.cxx
index 52e3ca8c29c..c3c0820030d 100644
--- a/.auto-resolution/PWGDQ/Tasks/dqFlow.cxx
+++ b/.auto-resolution/PWGDQ/Tasks/dqFlow.cxx
@@ -16,38 +16,42 @@
 ///       o2-analysis-timestamp --aod-file AO2D.root -b | o2-analysis-event-selection -b | o2-analysis-multiplicity-table -b | o2-analysis-centrality-table -b | o2-analysis-fdd-converter -b | o2-analysis-trackselection -b | o2-analysis-trackextension -b | o2-analysis-pid-tpc-full -b | o2-analysis-pid-tof-full -b | o2-analysis-pid-tof-base -b | o2-analysis-pid-tof-beta -b | o2-analysis-dq-flow -b
 ///       tested (June 2, 2022) on AO2D.root files from train production 242
 
-#include <iostream>
-#include <vector>
-#include <string>
-#include <memory>
-#include <TH1F.h>
-#include <THashList.h>
-#include <TString.h>
-#include <TRandom3.h>
-#include "CCDB/BasicCCDBManager.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "PWGDQ/Core/VarManager.h"
-#include "PWGDQ/Core/HistogramManager.h"
-#include "PWGDQ/Core/MixingHandler.h"
-#include "PWGDQ/Core/AnalysisCut.h"
-#include "PWGDQ/Core/AnalysisCompositeCut.h"
-#include "PWGDQ/Core/HistogramsLibrary.h"
-#include "PWGDQ/Core/CutsLibrary.h"
-#include "PWGDQ/Core/MixingLibrary.h"
+#include "PWGCF/GenericFramework/Core/FlowContainer.h"
 #include "PWGCF/GenericFramework/Core/GFW.h"
+#include "PWGCF/GenericFramework/Core/GFWConfig.h"
 #include "PWGCF/GenericFramework/Core/GFWCumulant.h"
-#include "PWGCF/GenericFramework/Core/FlowContainer.h"
 #include "PWGCF/GenericFramework/Core/GFWWeights.h"
-#include "PWGCF/GenericFramework/Core/GFWConfig.h"
-#include "Common/DataModel/EventSelection.h"
+#include "PWGDQ/Core/AnalysisCompositeCut.h"
+#include "PWGDQ/Core/AnalysisCut.h"
+#include "PWGDQ/Core/CutsLibrary.h"
+#include "PWGDQ/Core/HistogramManager.h"
+#include "PWGDQ/Core/HistogramsLibrary.h"
+#include "PWGDQ/Core/MixingHandler.h"
+#include "PWGDQ/Core/MixingLibrary.h"
+#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Qvectors.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include <TH1F.h>
+#include <THashList.h>
+#include <TRandom3.h>
+#include <TString.h>
+
+#include <iostream>
+#include <memory>
+#include <string>
+#include <vector>
 
 using std::complex;
 using std::cout;
diff --git a/.auto-resolution/PWGDQ/Tasks/filterPP.cxx b/.auto-resolution/PWGDQ/Tasks/filterPP.cxx
index c9239f8366d..0f5fd7b1b74 100644
--- a/.auto-resolution/PWGDQ/Tasks/filterPP.cxx
+++ b/.auto-resolution/PWGDQ/Tasks/filterPP.cxx
@@ -11,35 +11,39 @@
 //
 // Contact: iarsene@cern.ch, i.c.arsene@fys.uio.no
 //
-#include <iostream>
-#include <vector>
-#include <map>
-#include <string>
-#include <memory>
-#include <cstring>
-#include <TH1.h>
-#include <THashList.h>
-#include <TString.h>
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/DataTypes.h"
-#include "Framework/runDataProcessing.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
+#include "PWGDQ/Core/AnalysisCompositeCut.h"
+#include "PWGDQ/Core/AnalysisCut.h"
+#include "PWGDQ/Core/CutsLibrary.h"
+#include "PWGDQ/Core/HistogramManager.h"
+#include "PWGDQ/Core/HistogramsLibrary.h"
+#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+
 #include "Common/CCDB/TriggerAliases.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 #include "EventFiltering/filterTables.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "PWGDQ/Core/VarManager.h"
-#include "PWGDQ/Core/HistogramManager.h"
-#include "PWGDQ/Core/AnalysisCut.h"
-#include "PWGDQ/Core/AnalysisCompositeCut.h"
-#include "PWGDQ/Core/HistogramsLibrary.h"
-#include "PWGDQ/Core/CutsLibrary.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/DataTypes.h"
+#include "Framework/runDataProcessing.h"
+
+#include <TH1.h>
+#include <THashList.h>
+#include <TString.h>
+
+#include <cstring>
+#include <iostream>
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
 
 using std::cout;
 using std::endl;
diff --git a/.auto-resolution/PWGDQ/Tasks/filterPPwithAssociation.cxx b/.auto-resolution/PWGDQ/Tasks/filterPPwithAssociation.cxx
index 532482e641b..be139e0344b 100644
--- a/.auto-resolution/PWGDQ/Tasks/filterPPwithAssociation.cxx
+++ b/.auto-resolution/PWGDQ/Tasks/filterPPwithAssociation.cxx
@@ -11,44 +11,48 @@
 //
 // Contact: iarsene@cern.ch, i.c.arsene@fys.uio.no
 //
-#include <iostream>
-#include <vector>
-#include <map>
-#include <string>
-#include <memory>
-#include <cstring>
-#include <TH1.h>
-#include <THashList.h>
-#include <TString.h>
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/DataTypes.h"
-#include "Framework/runDataProcessing.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
+#include "PWGDQ/Core/AnalysisCompositeCut.h"
+#include "PWGDQ/Core/AnalysisCut.h"
+#include "PWGDQ/Core/CutsLibrary.h"
+#include "PWGDQ/Core/HistogramManager.h"
+#include "PWGDQ/Core/HistogramsLibrary.h"
+#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+
 #include "Common/CCDB/TriggerAliases.h"
+#include "Common/Core/CollisionAssociation.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/CollisionAssociationTables.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 #include "EventFiltering/filterTables.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "PWGDQ/Core/VarManager.h"
-#include "PWGDQ/Core/HistogramManager.h"
-#include "PWGDQ/Core/AnalysisCut.h"
-#include "PWGDQ/Core/AnalysisCompositeCut.h"
-#include "PWGDQ/Core/HistogramsLibrary.h"
-#include "PWGDQ/Core/CutsLibrary.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/LHCConstants.h"
-#include "Common/Core/CollisionAssociation.h"
-#include "Common/DataModel/CollisionAssociationTables.h"
 #include "DataFormatsParameters/GRPMagField.h"
 #include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
 #include "Field/MagneticField.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/DataTypes.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TGeoGlobalMagField.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
+#include <TH1.h>
+#include <THashList.h>
+#include <TString.h>
+
+#include <cstring>
+#include <iostream>
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
 
 using std::cout;
 using std::endl;
@@ -83,9 +87,9 @@ DECLARE_SOA_COLUMN(IsDQBarrelSelected, isDQBarrelSelected, uint32_t);
 DECLARE_SOA_COLUMN(IsDQMuonSelected, isDQMuonSelected, uint32_t);
 DECLARE_SOA_COLUMN(IsDQEMuBarrelSelected, isDQEMuBarrelSelected, uint32_t); // for electron-muon pair
 DECLARE_SOA_COLUMN(IsDQEMuMuonSelected, isDQEMuMuonSelected, uint32_t);     // for electron-muon pair
-DECLARE_SOA_INDEX_COLUMN(Collision, collision); //! Collision index
-DECLARE_SOA_INDEX_COLUMN(Track, track);         //! Track index
-DECLARE_SOA_INDEX_COLUMN(FwdTrack, fwdtrack);   //! FwdTrack index
+DECLARE_SOA_INDEX_COLUMN(Collision, collision);                             //! Collision index
+DECLARE_SOA_INDEX_COLUMN(Track, track);                                     //! Track index
+DECLARE_SOA_INDEX_COLUMN(FwdTrack, fwdtrack);                               //! FwdTrack index
 } // namespace dqppfilter
 
 DECLARE_SOA_TABLE(DQEventCuts, "AOD", "DQEVENTCUTS", dqppfilter::IsDQEventSelected);
@@ -160,7 +164,7 @@ struct DQEventSelectionTask {
       fHistMan->SetDefaultVarNames(VarManager::fgVariableNames, VarManager::fgVariableUnits);
 
       DefineHistograms(fHistMan, "Event_BeforeCuts;Event_AfterCuts;", fConfigHistClasses.value); // define all histograms
-      VarManager::SetUseVars(fHistMan->GetUsedVars());                 // provide the list of required variables so that VarManager knows what to fill
+      VarManager::SetUseVars(fHistMan->GetUsedVars());                                           // provide the list of required variables so that VarManager knows what to fill
       fOutputList.setObject(fHistMan->GetMainHistogramList());
     }
   }
@@ -266,7 +270,7 @@ struct DQBarrelTrackSelection {
       }
 
       DefineHistograms(fHistMan, cutNames.Data(), fConfigHistClasses.value); // define all histograms
-      VarManager::SetUseVars(fHistMan->GetUsedVars()); // provide the list of required variables so that VarManager knows what to fill
+      VarManager::SetUseVars(fHistMan->GetUsedVars());                       // provide the list of required variables so that VarManager knows what to fill
       fOutputList.setObject(fHistMan->GetMainHistogramList());
 
       // CCDB configuration
@@ -441,7 +445,7 @@ struct DQMuonsSelection {
       }
 
       DefineHistograms(fHistMan, cutNames.Data(), fConfigHistClasses.value); // define all histograms
-      VarManager::SetUseVars(fHistMan->GetUsedVars()); // provide the list of required variables so that VarManager knows what to fill
+      VarManager::SetUseVars(fHistMan->GetUsedVars());                       // provide the list of required variables so that VarManager knows what to fill
       fOutputList.setObject(fHistMan->GetMainHistogramList());
     }
   }
@@ -539,21 +543,21 @@ struct DQFilterPPTask {
 
   int fCurrentRun; // needed to detect if the run changed and trigger update of calibrations etc.
 
-  int fNBarrelCuts;                                    // number of barrel selections
-  int fNMuonCuts;                                      // number of muon selections
-  int fNElectronMuonCuts;                              // number of electron-muon selections
-  std::vector<bool> fBarrelRunPairing;                 // bit map on whether the selections require pairing (barrel)
-  std::vector<bool> fMuonRunPairing;                   // bit map on whether the selections require pairing (muon)
-  std::vector<bool> fElectronMuonRunPairing;           // bit map on whether the selections require pairing (e-mu)
-  std::vector<int> fBarrelNreqObjs;                    // minimal number of tracks/pairs required (barrel)
-  std::vector<int> fMuonNreqObjs;                      // minimal number of tracks/pairs required (muon)
-  std::vector<int> fElectronMuonNreqObjs;              // minimal number of electron-muon pairs required
-  std::map<int, AnalysisCompositeCut> fBarrelPairCuts; // map of barrel pair cuts
-  std::map<int, AnalysisCompositeCut> fMuonPairCuts;   // map of muon pair cuts
+  int fNBarrelCuts;                                          // number of barrel selections
+  int fNMuonCuts;                                            // number of muon selections
+  int fNElectronMuonCuts;                                    // number of electron-muon selections
+  std::vector<bool> fBarrelRunPairing;                       // bit map on whether the selections require pairing (barrel)
+  std::vector<bool> fMuonRunPairing;                         // bit map on whether the selections require pairing (muon)
+  std::vector<bool> fElectronMuonRunPairing;                 // bit map on whether the selections require pairing (e-mu)
+  std::vector<int> fBarrelNreqObjs;                          // minimal number of tracks/pairs required (barrel)
+  std::vector<int> fMuonNreqObjs;                            // minimal number of tracks/pairs required (muon)
+  std::vector<int> fElectronMuonNreqObjs;                    // minimal number of electron-muon pairs required
+  std::map<int, AnalysisCompositeCut> fBarrelPairCuts;       // map of barrel pair cuts
+  std::map<int, AnalysisCompositeCut> fMuonPairCuts;         // map of muon pair cuts
   std::map<int, AnalysisCompositeCut> fElectronMuonPairCuts; // map of electron-muon pair cuts
-  std::map<int, TString> fBarrelPairHistNames;         // map with names of the barrel pairing histogram directories
-  std::map<int, TString> fMuonPairHistNames;           // map with names of the muon pairing histogram directories
-  std::map<int, TString> fElectronMuonPairHistNames;   // map with names of the electron-muon pairing histogram directories
+  std::map<int, TString> fBarrelPairHistNames;               // map with names of the barrel pairing histogram directories
+  std::map<int, TString> fMuonPairHistNames;                 // map with names of the muon pairing histogram directories
+  std::map<int, TString> fElectronMuonPairHistNames;         // map with names of the electron-muon pairing histogram directories
 
   std::map<uint64_t, uint64_t> fFiltersMap;           // map of filters for events that passed at least one filter
   std::map<uint64_t, std::vector<bool>> fCEFPfilters; // map of CEFP filters for events that passed at least one filter
@@ -771,7 +775,7 @@ struct DQFilterPPTask {
           if (objCountersBarrel[i] > 1) { // pairing has to be enabled and at least two tracks are needed
             pairingMask |= (static_cast<uint32_t>(1) << i);
           }
-          objCountersBarrel[i] = 0; // reset counters for selections where pairing is needed (count pairs instead)
+          objCountersBarrel[i] = 0;    // reset counters for selections where pairing is needed (count pairs instead)
           taggedCollisions[i].clear(); // empty the list of tagged collisions if pairing is needed (so we count just events with pairs or containing selected pair legs)
         }
       }
@@ -848,7 +852,7 @@ struct DQFilterPPTask {
           if (objCountersMuon[i] > 1) {
             pairingMask |= (static_cast<uint32_t>(1) << i);
           }
-          objCountersMuon[i] = 0; // reset counters for selections where pairing is needed (count pairs instead)
+          objCountersMuon[i] = 0;                     // reset counters for selections where pairing is needed (count pairs instead)
           taggedCollisions[i + fNBarrelCuts].clear(); // empty the list of tagged collisions if pairing is needed (so we count just events with pairs or containing selected pair legs)
         }
       }
diff --git a/.auto-resolution/PWGDQ/Tasks/filterPbPb.cxx b/.auto-resolution/PWGDQ/Tasks/filterPbPb.cxx
index 1544ea14f21..155f7a0610b 100644
--- a/.auto-resolution/PWGDQ/Tasks/filterPbPb.cxx
+++ b/.auto-resolution/PWGDQ/Tasks/filterPbPb.cxx
@@ -9,16 +9,19 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 //
-#include <Framework/AnalysisDataModel.h>
-#include <fairlogger/Logger.h>
-#include <cstdint>
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
 #include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+#include "PWGUD/Core/SGSelector.h"
+
 #include "CommonConstants/LHCConstants.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Vertex.h"
-#include "PWGUD/Core/SGSelector.h"
+#include <Framework/AnalysisDataModel.h>
+
+#include <fairlogger/Logger.h>
+
+#include <cstdint>
 
 using namespace std;
 
diff --git a/.auto-resolution/PWGDQ/Tasks/mchAlignRecord.cxx b/.auto-resolution/PWGDQ/Tasks/mchAlignRecord.cxx
index 2f612493b6e..bd34e08496b 100644
--- a/.auto-resolution/PWGDQ/Tasks/mchAlignRecord.cxx
+++ b/.auto-resolution/PWGDQ/Tasks/mchAlignRecord.cxx
@@ -14,63 +14,61 @@
 ///
 /// \author Chi ZHANG, CEA-Saclay, chi.zhang@cern.ch
 
-#include <gsl/span>
-#include <cmath>
-#include <string>
-#include <unordered_map>
-#include <vector>
-#include <iostream>
-#include <memory>
+#include "PWGDQ/Core/VarManager.h"
+
+#include "Common/DataModel/EventSelection.h"
 
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonConstants/LHCConstants.h"
+#include "CommonUtils/NameConf.h"
+#include "DataFormatsMCH/Cluster.h"
+#include "DataFormatsMCH/TrackMCH.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GRPGeomHelper.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "DetectorsCommonDataFormats/AlignParam.h"
+#include "DetectorsCommonDataFormats/DetID.h"
+#include "DetectorsCommonDataFormats/DetectorNameConf.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/CallbackService.h"
+#include "Framework/Logger.h"
 #include "Framework/runDataProcessing.h"
+#include "MCHAlign/Aligner.h"
+#include "MCHBase/TrackerParam.h"
+#include "MCHGeometryTransformer/Transformations.h"
+#include "MCHTracking/Track.h"
+#include "MCHTracking/TrackExtrap.h"
+#include "MCHTracking/TrackFitter.h"
+#include "MCHTracking/TrackParam.h"
+#include "ReconstructionDataFormats/TrackMCHMID.h"
 
 #include <TCanvas.h>
+#include <TChain.h>
 #include <TDatabasePDG.h>
 #include <TF1.h>
 #include <TFile.h>
+#include <TGraph.h>
+#include <TGraphErrors.h>
 #include <TH1F.h>
 #include <TH2F.h>
 #include <TLegend.h>
+#include <TLine.h>
 #include <TMatrixD.h>
 #include <TParameter.h>
 #include <TSystem.h>
 #include <TTree.h>
 #include <TTreeReader.h>
 #include <TTreeReaderValue.h>
-#include <TChain.h>
-#include <TGraph.h>
-#include <TGraphErrors.h>
-#include <TLine.h>
-#include <TSystem.h>
-
-#include "CommonConstants/LHCConstants.h"
-#include "CommonUtils/NameConf.h"
-#include "Common/DataModel/EventSelection.h"
-#include "PWGDQ/Core/VarManager.h"
 
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DetectorsBase/GRPGeomHelper.h"
-#include "DetectorsBase/Propagator.h"
-#include "Framework/Logger.h"
-#include "Framework/CallbackService.h"
-#include "CCDB/BasicCCDBManager.h"
-
-#include "MCHGeometryTransformer/Transformations.h"
-#include "DataFormatsMCH/Cluster.h"
-#include "DataFormatsMCH/TrackMCH.h"
-#include "MCHTracking/Track.h"
-#include "MCHTracking/TrackExtrap.h"
-#include "MCHTracking/TrackParam.h"
-#include "MCHTracking/TrackFitter.h"
-#include "MCHBase/TrackerParam.h"
-#include "ReconstructionDataFormats/TrackMCHMID.h"
-#include "MCHAlign/Aligner.h"
-#include "DetectorsCommonDataFormats/AlignParam.h"
-#include "DetectorsCommonDataFormats/DetID.h"
-#include "DetectorsCommonDataFormats/DetectorNameConf.h"
+#include <cmath>
+#include <gsl/span>
+#include <iostream>
+#include <memory>
+#include <string>
+#include <unordered_map>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGDQ/Tasks/muonDCA.cxx b/.auto-resolution/PWGDQ/Tasks/muonDCA.cxx
index b2031418d5c..9581efe62b5 100644
--- a/.auto-resolution/PWGDQ/Tasks/muonDCA.cxx
+++ b/.auto-resolution/PWGDQ/Tasks/muonDCA.cxx
@@ -13,14 +13,15 @@
 /// \brief Task to compute and evaluate DCA quantities
 /// \author Nicolas Bizé <nicolas.bize@cern.ch>, SUBATECH
 //
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "GlobalTracking/MatchGlobalFwd.h"
+#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "PWGDQ/Core/VarManager.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "GlobalTracking/MatchGlobalFwd.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGDQ/Tasks/quarkoniaToHyperons.cxx b/.auto-resolution/PWGDQ/Tasks/quarkoniaToHyperons.cxx
index 6133ee4e090..accdde13a9d 100644
--- a/.auto-resolution/PWGDQ/Tasks/quarkoniaToHyperons.cxx
+++ b/.auto-resolution/PWGDQ/Tasks/quarkoniaToHyperons.cxx
@@ -29,44 +29,45 @@
 //    david.dobrigkeit.chinellato@cern.ch
 //
 
-#include <Math/Vector4D.h>
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <map>
-#include <string>
-#include <vector>
-
-#include <TFile.h>
-#include <TH2F.h>
-#include <TProfile.h>
-#include <TLorentzVector.h>
-#include <TPDGCode.h>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "PWGLF/DataModel/LFStrangenessMLTables.h"
 #include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGUD/Core/SGSelector.h"
+
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/Core/SGSelector.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+#include "EventFiltering/Zorro.h"
+#include "EventFiltering/ZorroSummary.h"
 #include "Tools/ML/MlResponse.h"
 #include "Tools/ML/model.h"
 
-#include "EventFiltering/Zorro.h"
-#include "EventFiltering/ZorroSummary.h"
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <Math/Vector4D.h>
+#include <TFile.h>
+#include <TH2F.h>
+#include <TLorentzVector.h>
+#include <TPDGCode.h>
+#include <TProfile.h>
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <map>
+#include <string>
+#include <vector>
 
 // constants
 const float ctauXiPDG = 4.91;     // Xi PDG lifetime
diff --git a/.auto-resolution/PWGDQ/Tasks/tableReader.cxx b/.auto-resolution/PWGDQ/Tasks/tableReader.cxx
index 22a8d82e2d8..a51d54c48f8 100644
--- a/.auto-resolution/PWGDQ/Tasks/tableReader.cxx
+++ b/.auto-resolution/PWGDQ/Tasks/tableReader.cxx
@@ -11,39 +11,43 @@
 //
 // Contact: iarsene@cern.ch, i.c.arsene@fys.uio.no
 //
-#include <iostream>
-#include <vector>
-#include <algorithm>
-#include <map>
-#include <string>
-#include <memory>
-#include <TH1F.h>
-#include <TH3F.h>
-#include <THashList.h>
-#include <TList.h>
-#include <TString.h>
-#include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "PWGDQ/Core/VarManager.h"
-#include "PWGDQ/Core/HistogramManager.h"
-#include "PWGDQ/Core/MixingHandler.h"
-#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/AnalysisCompositeCut.h"
-#include "PWGDQ/Core/HistogramsLibrary.h"
+#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/CutsLibrary.h"
+#include "PWGDQ/Core/HistogramManager.h"
+#include "PWGDQ/Core/HistogramsLibrary.h"
+#include "PWGDQ/Core/MixingHandler.h"
 #include "PWGDQ/Core/MixingLibrary.h"
+#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+
+#include "Common/CCDB/EventSelectionParams.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include "Field/MagneticField.h"
-#include "TGeoGlobalMagField.h"
-#include "DetectorsBase/Propagator.h"
+#include "DataFormatsParameters/GRPObject.h"
 #include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Field/MagneticField.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 #include "ITSMFTBase/DPLAlpideParam.h"
-#include "Common/CCDB/EventSelectionParams.h"
+
+#include "TGeoGlobalMagField.h"
+#include <TH1F.h>
+#include <TH3F.h>
+#include <THashList.h>
+#include <TList.h>
+#include <TString.h>
+
+#include <algorithm>
+#include <iostream>
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
 
 using std::cout;
 using std::endl;
diff --git a/.auto-resolution/PWGDQ/Tasks/tableReader_withAssoc.cxx b/.auto-resolution/PWGDQ/Tasks/tableReader_withAssoc.cxx
index d6b29b461d2..b08729dabdb 100644
--- a/.auto-resolution/PWGDQ/Tasks/tableReader_withAssoc.cxx
+++ b/.auto-resolution/PWGDQ/Tasks/tableReader_withAssoc.cxx
@@ -12,51 +12,54 @@
 // Contact: iarsene@cern.ch, i.c.arsene@fys.uio.no
 //   Configurable workflow for running several DQ or other PWG analyses
 
+#include "PWGDQ/Core/AnalysisCompositeCut.h"
+#include "PWGDQ/Core/AnalysisCut.h"
+#include "PWGDQ/Core/CutsLibrary.h"
+#include "PWGDQ/Core/HistogramManager.h"
+#include "PWGDQ/Core/HistogramsLibrary.h"
+#include "PWGDQ/Core/MixingHandler.h"
+#include "PWGDQ/Core/MixingLibrary.h"
+#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+
+#include "Common/CCDB/EventSelectionParams.h"
+#include "Common/Core/TableHelper.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Field/MagneticField.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/Configurable.h"
+#include "Framework/OutputObjHeader.h"
+#include "Framework/runDataProcessing.h"
+#include "ITSMFTBase/DPLAlpideParam.h"
+
+#include "TGeoGlobalMagField.h"
+#include <TH1F.h>
+#include <TH3F.h>
+#include <THashList.h>
+#include <TList.h>
+#include <TObjString.h>
+#include <TString.h>
+
+#include <algorithm>
 #include <cstdint>
 #include <cstdio>
 #include <cstring>
 #include <iostream>
+#include <map>
+#include <memory>
 #include <numeric>
-#include <vector>
-#include <algorithm>
-#include <utility>
 #include <set>
-#include <map>
 #include <string>
-#include <memory>
 #include <utility>
-#include <TH1F.h>
-#include <TH3F.h>
-#include <THashList.h>
-#include <TList.h>
-#include <TString.h>
-#include <TObjString.h>
-#include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "Framework/AnalysisHelpers.h"
-#include "Framework/Configurable.h"
-#include "Framework/OutputObjHeader.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "PWGDQ/Core/VarManager.h"
-#include "PWGDQ/Core/HistogramManager.h"
-#include "PWGDQ/Core/MixingHandler.h"
-#include "PWGDQ/Core/AnalysisCut.h"
-#include "PWGDQ/Core/AnalysisCompositeCut.h"
-#include "PWGDQ/Core/HistogramsLibrary.h"
-#include "PWGDQ/Core/CutsLibrary.h"
-#include "PWGDQ/Core/MixingLibrary.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "Field/MagneticField.h"
-#include "TGeoGlobalMagField.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "Common/Core/TableHelper.h"
-#include "ITSMFTBase/DPLAlpideParam.h"
-#include "Common/CCDB/EventSelectionParams.h"
+#include <vector>
 
 using std::cout;
 using std::endl;
diff --git a/.auto-resolution/PWGDQ/Tasks/taskFwdTrackPid.cxx b/.auto-resolution/PWGDQ/Tasks/taskFwdTrackPid.cxx
index cbe6e233630..52c2c3b908a 100644
--- a/.auto-resolution/PWGDQ/Tasks/taskFwdTrackPid.cxx
+++ b/.auto-resolution/PWGDQ/Tasks/taskFwdTrackPid.cxx
@@ -13,38 +13,42 @@
 /// \brief Task for the analysis of forward PID with MFT
 /// \author Luca Micheletti <luca.micheletti@to.infn.it>, INFN
 
-#include <iostream>
-#include <vector>
-#include <algorithm>
-#include <TH1F.h>
-#include <TH3F.h>
-#include <THashList.h>
-#include <TList.h>
-#include <TString.h>
-#include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/Core/AnalysisCompositeCut.h"
+#include "PWGDQ/Core/AnalysisCut.h"
+#include "PWGDQ/Core/CutsLibrary.h"
 #include "PWGDQ/Core/HistogramManager.h"
-#include "PWGDQ/Core/MixingHandler.h"
+#include "PWGDQ/Core/HistogramsLibrary.h"
 #include "PWGDQ/Core/MCSignal.h"
 #include "PWGDQ/Core/MCSignalLibrary.h"
-#include "PWGDQ/Core/AnalysisCut.h"
-#include "PWGDQ/Core/AnalysisCompositeCut.h"
-#include "PWGDQ/Core/HistogramsLibrary.h"
-#include "PWGDQ/Core/CutsLibrary.h"
+#include "PWGDQ/Core/MixingHandler.h"
 #include "PWGDQ/Core/MixingLibrary.h"
+#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+
+#include "Common/CCDB/EventSelectionParams.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include "Field/MagneticField.h"
-#include "TGeoGlobalMagField.h"
-#include "DetectorsBase/Propagator.h"
+#include "DataFormatsParameters/GRPObject.h"
 #include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Field/MagneticField.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 #include "ITSMFTBase/DPLAlpideParam.h"
-#include "Common/CCDB/EventSelectionParams.h"
+
+#include "TGeoGlobalMagField.h"
+#include <TH1F.h>
+#include <TH3F.h>
+#include <THashList.h>
+#include <TList.h>
+#include <TString.h>
+
+#include <algorithm>
+#include <iostream>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGDQ/Tasks/taskJpsiHf.cxx b/.auto-resolution/PWGDQ/Tasks/taskJpsiHf.cxx
index 79d9348940a..d9cd1133472 100644
--- a/.auto-resolution/PWGDQ/Tasks/taskJpsiHf.cxx
+++ b/.auto-resolution/PWGDQ/Tasks/taskJpsiHf.cxx
@@ -14,20 +14,20 @@
 /// \author Luca Micheletti <luca.micheletti@to.infn.it>, INFN
 /// \author Fabrizio Grosa <fabrizio.grosa@cern.ch>, CERN
 
-#include <string>
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
+#include "PWGHF/Utils/utilsAnalysis.h"
+
+#include "Common/Core/RecoDecay.h"
 
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
 
-#include "Common/Core/RecoDecay.h"
-
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
-#include "PWGHF/Utils/utilsAnalysis.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
+#include <string>
 
 using namespace o2;
 using namespace o2::analysis;
diff --git a/.auto-resolution/PWGDQ/Tasks/taskMuonMchTrkEfficiency.cxx b/.auto-resolution/PWGDQ/Tasks/taskMuonMchTrkEfficiency.cxx
index 4914658ae81..7ff72350bd7 100644
--- a/.auto-resolution/PWGDQ/Tasks/taskMuonMchTrkEfficiency.cxx
+++ b/.auto-resolution/PWGDQ/Tasks/taskMuonMchTrkEfficiency.cxx
@@ -19,12 +19,12 @@
 /// \author Zaida Conesa del Valle <zaida.conesa.del.valle@cern.ch>
 ///
 
+#include "PWGDQ/DataModel/MchTrkEffTables.h"
+
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
 
-#include "PWGDQ/DataModel/MchTrkEffTables.h"
-
 using namespace o2;
 using namespace o2::aod;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGDQ/Tasks/v0selector.cxx b/.auto-resolution/PWGDQ/Tasks/v0selector.cxx
index 0c970d80c91..378c2332b15 100644
--- a/.auto-resolution/PWGDQ/Tasks/v0selector.cxx
+++ b/.auto-resolution/PWGDQ/Tasks/v0selector.cxx
@@ -17,35 +17,39 @@
 //    Comments, questions, complaints, suggestions?
 //    Please write to: daiki.sekihata@cern.ch
 //
-#include <array>
-#include <map>
-#include <string>
-#include <memory>
-#include <vector>
-#include "Math/Vector4D.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/trackUtilities.h"
+#include "PWGDQ/Core/HistogramManager.h"
+#include "PWGDQ/Core/HistogramsLibrary.h"
+#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/RecoDecay.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "DCAFitter/DCAFitterN.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "PWGDQ/Core/VarManager.h"
-#include "PWGDQ/Core/HistogramManager.h"
-#include "PWGDQ/Core/HistogramsLibrary.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include "Math/Vector4D.h"
+
+#include <array>
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
@@ -574,7 +578,7 @@ struct trackPIDQA {
       }
 
     } // end of track loop
-  }   // end of process
+  } // end of process
 
   void DefineHistograms(TString histClasses)
   {
diff --git a/.auto-resolution/PWGEM/Dilepton/TableProducer/eventSelection.cxx b/.auto-resolution/PWGEM/Dilepton/TableProducer/eventSelection.cxx
index 65eb1a93d53..d5420a13225 100644
--- a/.auto-resolution/PWGEM/Dilepton/TableProducer/eventSelection.cxx
+++ b/.auto-resolution/PWGEM/Dilepton/TableProducer/eventSelection.cxx
@@ -14,14 +14,17 @@
 // This code produces event selection table for PWG-EM.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include <string>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/CCDB/RCTSelectionFlags.h"
 #include "PWGEM/Dilepton/DataModel/dileptonTables.h"
 
+#include "Common/CCDB/RCTSelectionFlags.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include <string>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.auto-resolution/PWGEM/Dilepton/Tasks/Converters/electronConverter2.cxx b/.auto-resolution/PWGEM/Dilepton/Tasks/Converters/electronConverter2.cxx
index 785272dcf3a..cde46f9cf7d 100644
--- a/.auto-resolution/PWGEM/Dilepton/Tasks/Converters/electronConverter2.cxx
+++ b/.auto-resolution/PWGEM/Dilepton/Tasks/Converters/electronConverter2.cxx
@@ -14,11 +14,12 @@
 // This code runs loop over ULS ee pars for virtual photon QC.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
 #include "PWGEM/Dilepton/DataModel/dileptonTables.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::aod;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGEM/Dilepton/Tasks/Converters/eventConverter2.cxx b/.auto-resolution/PWGEM/Dilepton/Tasks/Converters/eventConverter2.cxx
index 568cb741d08..944f92e699f 100644
--- a/.auto-resolution/PWGEM/Dilepton/Tasks/Converters/eventConverter2.cxx
+++ b/.auto-resolution/PWGEM/Dilepton/Tasks/Converters/eventConverter2.cxx
@@ -14,11 +14,12 @@
 // This code runs loop over ULS ee pars for virtual photon QC.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
 #include "PWGEM/Dilepton/DataModel/dileptonTables.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::aod;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGEM/Dilepton/Tasks/MCtemplates.cxx b/.auto-resolution/PWGEM/Dilepton/Tasks/MCtemplates.cxx
index 3288bd2745e..c7bf193aa61 100644
--- a/.auto-resolution/PWGEM/Dilepton/Tasks/MCtemplates.cxx
+++ b/.auto-resolution/PWGEM/Dilepton/Tasks/MCtemplates.cxx
@@ -13,27 +13,31 @@
 //
 // Analysis task to generate Monte Carlo templates of different heavy-flavour dielectron sources
 //
-#include <iostream>
-#include <vector>
-#include <TMath.h>
-#include <TH1F.h>
-#include <THashList.h>
-#include <TString.h>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "PWGDQ/Core/VarManager.h"
-#include "PWGDQ/Core/HistogramManager.h"
-#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/AnalysisCompositeCut.h"
-#include "PWGDQ/Core/HistogramsLibrary.h"
+#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/CutsLibrary.h"
+#include "PWGDQ/Core/HistogramManager.h"
+#include "PWGDQ/Core/HistogramsLibrary.h"
 #include "PWGDQ/Core/MCSignal.h"
 #include "PWGDQ/Core/MCSignalLibrary.h"
+#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+
 #include "Common/DataModel/TrackSelectionTables.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include <TH1F.h>
+#include <THashList.h>
+#include <TMath.h>
+#include <TString.h>
+
+#include <iostream>
+#include <vector>
+
 using std::cout;
 using std::endl;
 using std::string;
@@ -480,8 +484,8 @@ struct AnalysisSameEventPairing {
           }
           fBarrelHistNamesMCmatched.emplace_back(mcSigClasses);
         } // end loop over cuts
-      }   // end if(cutNames.IsNull())
-    }     // end if processBarrel
+      } // end if(cutNames.IsNull())
+    } // end if processBarrel
 
     // Add histogram classes for each specified MCsignal at the generator level
     // TODO: create a std::vector of hist classes to be used at Fill time, to avoid using Form in the process function
@@ -577,7 +581,7 @@ struct AnalysisSameEventPairing {
         }
       }
     } // end loop over barrel track pairs
-  }   // end runPairing
+  } // end runPairing
 
   template <typename TTracksMC>
   void runMCGenPair(TTracksMC const& groupedMCTracks)
@@ -609,7 +613,7 @@ struct AnalysisSameEventPairing {
         }
       }
     } // end of true pairing loop
-  }   // end runMCGen
+  } // end runMCGen
 
   // skimmed
   PresliceUnsorted<ReducedMCTracks> perReducedMcEvent = aod::reducedtrackMC::reducedMCeventId;
diff --git a/.auto-resolution/PWGEM/Dilepton/Tasks/PhotonHBTEEEE.cxx b/.auto-resolution/PWGEM/Dilepton/Tasks/PhotonHBTEEEE.cxx
index b26a40af6fc..59002430983 100644
--- a/.auto-resolution/PWGEM/Dilepton/Tasks/PhotonHBTEEEE.cxx
+++ b/.auto-resolution/PWGEM/Dilepton/Tasks/PhotonHBTEEEE.cxx
@@ -14,25 +14,25 @@
 // This code loops over v0 photons and makes pairs for photon HBT analysis.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include <cstring>
-#include <iterator>
+#include "PWGEM/Dilepton/Core/PhotonHBT.h"
 
-#include "TString.h"
-#include "Math/Vector4D.h"
-#include "Math/Vector3D.h"
-#include "Math/LorentzRotation.h"
-#include "Math/GenVector/Boost.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
+#include "Math/GenVector/Boost.h"
+#include "Math/LorentzRotation.h"
+#include "Math/Vector3D.h"
+#include "Math/Vector4D.h"
+#include "TString.h"
 
-#include "PWGEM/Dilepton/Core/PhotonHBT.h"
+#include <cstring>
+#include <iterator>
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.auto-resolution/PWGEM/Dilepton/Tasks/PhotonHBTPCMEE.cxx b/.auto-resolution/PWGEM/Dilepton/Tasks/PhotonHBTPCMEE.cxx
index 3e792f9d27a..bd8392fd75a 100644
--- a/.auto-resolution/PWGEM/Dilepton/Tasks/PhotonHBTPCMEE.cxx
+++ b/.auto-resolution/PWGEM/Dilepton/Tasks/PhotonHBTPCMEE.cxx
@@ -14,25 +14,25 @@
 // This code loops over v0 photons and makes pairs for photon HBT analysis.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include <cstring>
-#include <iterator>
+#include "PWGEM/Dilepton/Core/PhotonHBT.h"
 
-#include "TString.h"
-#include "Math/Vector4D.h"
-#include "Math/Vector3D.h"
-#include "Math/LorentzRotation.h"
-#include "Math/GenVector/Boost.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
+#include "Math/GenVector/Boost.h"
+#include "Math/LorentzRotation.h"
+#include "Math/Vector3D.h"
+#include "Math/Vector4D.h"
+#include "TString.h"
 
-#include "PWGEM/Dilepton/Core/PhotonHBT.h"
+#include <cstring>
+#include <iterator>
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.auto-resolution/PWGEM/Dilepton/Tasks/PhotonHBTPCMPCM.cxx b/.auto-resolution/PWGEM/Dilepton/Tasks/PhotonHBTPCMPCM.cxx
index ddcbe423eae..7c3abcd362d 100644
--- a/.auto-resolution/PWGEM/Dilepton/Tasks/PhotonHBTPCMPCM.cxx
+++ b/.auto-resolution/PWGEM/Dilepton/Tasks/PhotonHBTPCMPCM.cxx
@@ -14,25 +14,25 @@
 // This code loops over v0 photons and makes pairs for photon HBT analysis.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include <cstring>
-#include <iterator>
+#include "PWGEM/Dilepton/Core/PhotonHBT.h"
 
-#include "TString.h"
-#include "Math/Vector4D.h"
-#include "Math/Vector3D.h"
-#include "Math/LorentzRotation.h"
-#include "Math/GenVector/Boost.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
+#include "Math/GenVector/Boost.h"
+#include "Math/LorentzRotation.h"
+#include "Math/Vector3D.h"
+#include "Math/Vector4D.h"
+#include "TString.h"
 
-#include "PWGEM/Dilepton/Core/PhotonHBT.h"
+#include <cstring>
+#include <iterator>
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.auto-resolution/PWGEM/Dilepton/Tasks/associateMCcollision.cxx b/.auto-resolution/PWGEM/Dilepton/Tasks/associateMCcollision.cxx
index eb0e7d3bf5c..7f3c860e526 100644
--- a/.auto-resolution/PWGEM/Dilepton/Tasks/associateMCcollision.cxx
+++ b/.auto-resolution/PWGEM/Dilepton/Tasks/associateMCcollision.cxx
@@ -14,11 +14,12 @@
 // This code produces a table with an index between mc collision and rec. collision.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
 #include "PWGEM/Dilepton/DataModel/dileptonTables.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::aod;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGEM/Dilepton/Tasks/bcCounter.cxx b/.auto-resolution/PWGEM/Dilepton/Tasks/bcCounter.cxx
index 1b16c88e89b..da462851aef 100644
--- a/.auto-resolution/PWGEM/Dilepton/Tasks/bcCounter.cxx
+++ b/.auto-resolution/PWGEM/Dilepton/Tasks/bcCounter.cxx
@@ -14,29 +14,32 @@
 // This code is for bc counter.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include <string>
-#include <vector>
-#include <algorithm>
-#include <type_traits>
-#include <optional>
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "TString.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
 #include "Common/Core/RecoDecay.h"
-#include "MathUtils/Utils.h"
-#include "Framework/AnalysisDataModel.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Qvectors.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/PIDResponseITS.h"
+#include "Common/DataModel/Qvectors.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "MathUtils/Utils.h"
+
+#include "TString.h"
+
+#include <algorithm>
+#include <optional>
+#include <string>
+#include <type_traits>
+#include <vector>
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.auto-resolution/PWGEM/Dilepton/Tasks/dielectron.cxx b/.auto-resolution/PWGEM/Dilepton/Tasks/dielectron.cxx
index c8fa31b0e3b..494d50b49b1 100644
--- a/.auto-resolution/PWGEM/Dilepton/Tasks/dielectron.cxx
+++ b/.auto-resolution/PWGEM/Dilepton/Tasks/dielectron.cxx
@@ -14,12 +14,12 @@
 // This code is for dielectron analyses.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-
 #include "PWGEM/Dilepton/Core/Dilepton.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
   return WorkflowSpec{
diff --git a/.auto-resolution/PWGEM/Dilepton/Tasks/dielectronMC.cxx b/.auto-resolution/PWGEM/Dilepton/Tasks/dielectronMC.cxx
index 3c525c29c6e..ff8e2f1bdca 100644
--- a/.auto-resolution/PWGEM/Dilepton/Tasks/dielectronMC.cxx
+++ b/.auto-resolution/PWGEM/Dilepton/Tasks/dielectronMC.cxx
@@ -14,12 +14,12 @@
 // This code runs loop over dalitz ee table for dalitz QC.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-
 #include "PWGEM/Dilepton/Core/DileptonMC.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
   return WorkflowSpec{
diff --git a/.auto-resolution/PWGEM/Dilepton/Tasks/dimuon.cxx b/.auto-resolution/PWGEM/Dilepton/Tasks/dimuon.cxx
index 51b92ab81b7..8cfa155b422 100644
--- a/.auto-resolution/PWGEM/Dilepton/Tasks/dimuon.cxx
+++ b/.auto-resolution/PWGEM/Dilepton/Tasks/dimuon.cxx
@@ -14,12 +14,12 @@
 // This code is for dimuon analyses.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-
 #include "PWGEM/Dilepton/Core/Dilepton.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
   return WorkflowSpec{
diff --git a/.auto-resolution/PWGEM/Dilepton/Tasks/dimuonMC.cxx b/.auto-resolution/PWGEM/Dilepton/Tasks/dimuonMC.cxx
index f505c073dc3..9c203ff4461 100644
--- a/.auto-resolution/PWGEM/Dilepton/Tasks/dimuonMC.cxx
+++ b/.auto-resolution/PWGEM/Dilepton/Tasks/dimuonMC.cxx
@@ -14,12 +14,12 @@
 // This code runs loop over dalitz ee table for dalitz QC.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-
 #include "PWGEM/Dilepton/Core/DileptonMC.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
   return WorkflowSpec{
diff --git a/.auto-resolution/PWGEM/Dilepton/Tasks/emEfficiencyEE.cxx b/.auto-resolution/PWGEM/Dilepton/Tasks/emEfficiencyEE.cxx
index 7cc41a190d2..a29cfc62359 100644
--- a/.auto-resolution/PWGEM/Dilepton/Tasks/emEfficiencyEE.cxx
+++ b/.auto-resolution/PWGEM/Dilepton/Tasks/emEfficiencyEE.cxx
@@ -12,41 +12,45 @@
 //
 // Analysis task for calculating single electron and dielectron efficiency
 //
-#include <iostream>
-#include <vector>
-#include <TMath.h>
-#include <TH1F.h>
-#include <THashList.h>
-#include <TLorentzVector.h>
-#include <TString.h>
-#include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/ASoA.h"
-#include "Framework/DataTypes.h"
-#include "Framework/HistogramRegistry.h"
-#include "PWGDQ/Core/VarManager.h"
-#include "PWGDQ/Core/HistogramManager.h"
-#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/AnalysisCompositeCut.h"
-#include "PWGDQ/Core/HistogramsLibrary.h"
+#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/CutsLibrary.h"
+#include "PWGDQ/Core/HistogramManager.h"
+#include "PWGDQ/Core/HistogramsLibrary.h"
 #include "PWGDQ/Core/MCSignal.h"
 #include "PWGDQ/Core/MCSignalLibrary.h"
+#include "PWGDQ/Core/VarManager.h"
 #include "PWGDQ/DataModel/ReducedInfoTables.h"
+#include "PWGEM/Dilepton/DataModel/dileptonTables.h"
+
+#include "Common/CCDB/TriggerAliases.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/CCDB/TriggerAliases.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
 #include "Field/MagneticField.h"
+#include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/DataTypes.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TGeoGlobalMagField.h"
-#include "PWGEM/Dilepton/DataModel/dileptonTables.h"
+#include <TH1F.h>
+#include <THashList.h>
+#include <TLorentzVector.h>
+#include <TMath.h>
+#include <TString.h>
+
+#include <iostream>
+#include <vector>
 
 using std::cout;
 using std::endl;
@@ -1027,8 +1031,8 @@ struct AnalysisTrackSelection {
               fHistManQA->FillHistClass(fHistNamesMCMatchedQA[j][i].Data(), VarManager::fgValues);
           }
         } // end loop over cuts
-      }   // end loop over MC signals
-    }     // end loop over reconstructed track belonging to the events
+      } // end loop over MC signals
+    } // end loop over reconstructed track belonging to the events
   }
 
   template <uint32_t TEventFillMap, uint32_t TTrackFillMap, typename TEvents, typename TEventsMC, typename TTracks, typename TTracksMC, typename TAmbigTracks>
@@ -1275,8 +1279,8 @@ struct AnalysisTrackSelection {
               fHistManQA->FillHistClass(fHistNamesMCMatchedQA[j][i].Data(), VarManager::fgValues);
           }
         } // end loop over cuts
-      }   // end loop over MC signals
-    }     // end loop over reconstructed track belonging to the events
+      } // end loop over MC signals
+    } // end loop over reconstructed track belonging to the events
   }
 
   void processSkimmed(soa::Filtered<MyEventsSelected> const& events, MyBarrelTracks const& tracks, ReducedMCEvents const& eventsMC, ReducedMCTracks const& tracksMC)
@@ -1601,7 +1605,7 @@ struct AnalysisSameEventPairing {
         runRecPair<TTrackFillMap>(groupedTracks, tracksMC);
       }
     } // end loop over reconstructed event
-  }   // end loop pairing function
+  } // end loop pairing function
 
   template <uint32_t TEventMCFillMap, uint32_t TTrackFillMap, typename TEventMC, typename TTracksMC>
   void runMCPairing(TEventMC const& /*eventMC*/, TTracksMC const& tracksMC)
@@ -1716,7 +1720,7 @@ struct AnalysisSameEventPairing {
         }
       }
     } // end of true pairing loop
-  }   // end runMCGen
+  } // end runMCGen
 
   template <uint32_t TTrackFillMap, typename TTracks, typename TTracksMC>
   void runRecPair(TTracks const& tracks, TTracksMC const& /*tracksMC*/)
diff --git a/.auto-resolution/PWGEM/Dilepton/Tasks/lmeeHFCocktail.cxx b/.auto-resolution/PWGEM/Dilepton/Tasks/lmeeHFCocktail.cxx
index d3bb410813f..776e51cffa5 100644
--- a/.auto-resolution/PWGEM/Dilepton/Tasks/lmeeHFCocktail.cxx
+++ b/.auto-resolution/PWGEM/Dilepton/Tasks/lmeeHFCocktail.cxx
@@ -15,16 +15,18 @@
 /// \author Daniel Samitz, <daniel.samitz@cern.ch>, SMI Vienna
 ///         Elisa Meninno, <elisa.meninno@cern.ch>, SMI Vienna
 
-#include <vector>
+#include "PWGEM/Dilepton/DataModel/dileptonTables.h"
+#include "PWGEM/Dilepton/Utils/MCUtilities.h"
 
-#include "Math/Vector4D.h"
-#include "MathUtils/Utils.h"
-#include "Framework/Task.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "PWGEM/Dilepton/Utils/MCUtilities.h"
-#include "PWGEM/Dilepton/DataModel/dileptonTables.h"
+#include "Framework/Task.h"
+#include "Framework/runDataProcessing.h"
+#include "MathUtils/Utils.h"
+
+#include "Math/Vector4D.h"
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGEM/Dilepton/Tasks/lmeeLFCocktail.cxx b/.auto-resolution/PWGEM/Dilepton/Tasks/lmeeLFCocktail.cxx
index 1cac2727e98..a4120a48b03 100644
--- a/.auto-resolution/PWGEM/Dilepton/Tasks/lmeeLFCocktail.cxx
+++ b/.auto-resolution/PWGEM/Dilepton/Tasks/lmeeLFCocktail.cxx
@@ -14,16 +14,18 @@
 /// \analysis task for lmee light flavour cocktail
 /// \author Daniel Samitz, <daniel.samitz@cern.ch>, SMI Vienna
 
-#include <map>
-#include <vector>
-#include <string>
+#include "PWGEM/Dilepton/DataModel/dileptonTables.h"
+#include "PWGEM/Dilepton/Utils/PairUtilities.h"
 
-#include "Math/Vector4D.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "PWGEM/Dilepton/DataModel/dileptonTables.h"
-#include "PWGEM/Dilepton/Utils/PairUtilities.h"
+#include "Framework/runDataProcessing.h"
+
+#include "Math/Vector4D.h"
+
+#include <map>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGEM/Dilepton/Tasks/prefilterDielectron.cxx b/.auto-resolution/PWGEM/Dilepton/Tasks/prefilterDielectron.cxx
index 75a92e03c9a..a407547ddbd 100644
--- a/.auto-resolution/PWGEM/Dilepton/Tasks/prefilterDielectron.cxx
+++ b/.auto-resolution/PWGEM/Dilepton/Tasks/prefilterDielectron.cxx
@@ -14,32 +14,33 @@
 // This code produces information on prefilter for dielectron.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include <string>
-#include <vector>
-#include <unordered_map>
-#include <map>
-#include <tuple>
+#include "PWGEM/Dilepton/Core/DielectronCut.h"
+#include "PWGEM/Dilepton/Core/EMEventCut.h"
+#include "PWGEM/Dilepton/DataModel/dileptonTables.h"
+#include "PWGEM/Dilepton/Utils/EMTrack.h"
+#include "PWGEM/Dilepton/Utils/EventHistograms.h"
+#include "PWGEM/Dilepton/Utils/PairUtilities.h"
 
-#include "TString.h"
-#include "Math/Vector4D.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
 #include "Common/Core/RecoDecay.h"
 #include "Common/Core/trackUtilities.h"
 
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
 #include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
-#include "PWGEM/Dilepton/DataModel/dileptonTables.h"
-#include "PWGEM/Dilepton/Core/DielectronCut.h"
-#include "PWGEM/Dilepton/Core/EMEventCut.h"
-#include "PWGEM/Dilepton/Utils/EMTrack.h"
-#include "PWGEM/Dilepton/Utils/EventHistograms.h"
-#include "PWGEM/Dilepton/Utils/PairUtilities.h"
+#include "Math/Vector4D.h"
+#include "TString.h"
+
+#include <map>
+#include <string>
+#include <tuple>
+#include <unordered_map>
+#include <vector>
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.auto-resolution/PWGEM/Dilepton/Tasks/singleElectronQC.cxx b/.auto-resolution/PWGEM/Dilepton/Tasks/singleElectronQC.cxx
index 4a687e82217..21d45ac9a8c 100644
--- a/.auto-resolution/PWGEM/Dilepton/Tasks/singleElectronQC.cxx
+++ b/.auto-resolution/PWGEM/Dilepton/Tasks/singleElectronQC.cxx
@@ -14,12 +14,12 @@
 // Analysis task for single electron QC
 //    Please write to: daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-
 #include "PWGEM/Dilepton/Core/SingleTrackQC.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
   return WorkflowSpec{
diff --git a/.auto-resolution/PWGEM/Dilepton/Tasks/singleElectronQCMC.cxx b/.auto-resolution/PWGEM/Dilepton/Tasks/singleElectronQCMC.cxx
index da2617158ec..3c9d030d50c 100644
--- a/.auto-resolution/PWGEM/Dilepton/Tasks/singleElectronQCMC.cxx
+++ b/.auto-resolution/PWGEM/Dilepton/Tasks/singleElectronQCMC.cxx
@@ -14,12 +14,12 @@
 // Analysis task for single electron QC in MC
 //    Please write to: daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-
 #include "PWGEM/Dilepton/Core/SingleTrackQCMC.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
   return WorkflowSpec{
diff --git a/.auto-resolution/PWGEM/Dilepton/Tasks/singleMuonQC.cxx b/.auto-resolution/PWGEM/Dilepton/Tasks/singleMuonQC.cxx
index b9ccb722ea3..a42d68f3d18 100644
--- a/.auto-resolution/PWGEM/Dilepton/Tasks/singleMuonQC.cxx
+++ b/.auto-resolution/PWGEM/Dilepton/Tasks/singleMuonQC.cxx
@@ -14,12 +14,12 @@
 // Analysis task for single muon QC
 //    Please write to: daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-
 #include "PWGEM/Dilepton/Core/SingleTrackQC.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
   return WorkflowSpec{
diff --git a/.auto-resolution/PWGEM/Dilepton/Tasks/singleMuonQCMC.cxx b/.auto-resolution/PWGEM/Dilepton/Tasks/singleMuonQCMC.cxx
index 7b7176238c1..51d70c187c2 100644
--- a/.auto-resolution/PWGEM/Dilepton/Tasks/singleMuonQCMC.cxx
+++ b/.auto-resolution/PWGEM/Dilepton/Tasks/singleMuonQCMC.cxx
@@ -14,12 +14,12 @@
 // Analysis task for single muon QC in MC
 //    Please write to: daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-
 #include "PWGEM/Dilepton/Core/SingleTrackQCMC.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
   return WorkflowSpec{
diff --git a/.auto-resolution/PWGEM/Dilepton/Tasks/smearing.cxx b/.auto-resolution/PWGEM/Dilepton/Tasks/smearing.cxx
index 7d2404645ca..59dbf6cc885 100644
--- a/.auto-resolution/PWGEM/Dilepton/Tasks/smearing.cxx
+++ b/.auto-resolution/PWGEM/Dilepton/Tasks/smearing.cxx
@@ -13,21 +13,21 @@
 // Analysis task to produce smeared pt, eta, phi for electrons/muons in dilepton analysis
 //    Please write to: daiki.sekihata@cern.ch
 
-#include <array>
-#include <string>
-#include <chrono>
-
 #include "CCDB/BasicCCDBManager.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/DataTypes.h"
 #include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+
+#include <array>
+#include <chrono>
+#include <string>
 // #include "PWGDQ/DataModel/ReducedInfoTables.h" // remove this later, because 2 data tables (covariant matrix) in this header confilict against EM tables.
-#include "PWGEM/Dilepton/Utils/MomentumSmearer.h"
 #include "PWGEM/Dilepton/DataModel/dileptonTables.h"
+#include "PWGEM/Dilepton/Utils/MomentumSmearer.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGEM/Dilepton/Tasks/studyMCTruth.cxx b/.auto-resolution/PWGEM/Dilepton/Tasks/studyMCTruth.cxx
index 4204a95a9c4..17561e1c023 100644
--- a/.auto-resolution/PWGEM/Dilepton/Tasks/studyMCTruth.cxx
+++ b/.auto-resolution/PWGEM/Dilepton/Tasks/studyMCTruth.cxx
@@ -14,19 +14,22 @@
 // This code is to study MC truth. e.g. evet selection bias
 //    Please write to: daiki.sekihata@cern.ch
 
-#include <string>
-#include "Math/Vector4D.h"
+#include "PWGEM/Dilepton/DataModel/dileptonTables.h"
+#include "PWGEM/Dilepton/Utils/MCUtilities.h"
 
+#include "Common/Core/TableHelper.h"
+#include "Common/DataModel/EventSelection.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/StaticFor.h"
 #include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/TableHelper.h"
-#include "Common/DataModel/EventSelection.h"
-#include "PWGEM/Dilepton/DataModel/dileptonTables.h"
-#include "PWGEM/Dilepton/Utils/MCUtilities.h"
+
+#include "Math/Vector4D.h"
+
+#include <string>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGEM/Dilepton/Tasks/tableReaderBarrel.cxx b/.auto-resolution/PWGEM/Dilepton/Tasks/tableReaderBarrel.cxx
index 819a85efe65..a2d5a465621 100644
--- a/.auto-resolution/PWGEM/Dilepton/Tasks/tableReaderBarrel.cxx
+++ b/.auto-resolution/PWGEM/Dilepton/Tasks/tableReaderBarrel.cxx
@@ -12,39 +12,43 @@
 // Contact: iarsene@cern.ch, i.c.arsene@fys.uio.no
 //
 
-#include <map>
-#include <string>
-#include <memory>
-#include <iostream>
-#include <vector>
-#include <algorithm>
-#include <TH1F.h>
-#include <TH3F.h>
-#include <THashList.h>
-#include <TList.h>
-#include <TString.h>
-#include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "PWGDQ/Core/VarManager.h"
-#include "PWGDQ/Core/HistogramManager.h"
-#include "PWGDQ/Core/MixingHandler.h"
-#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/AnalysisCompositeCut.h"
-#include "PWGDQ/Core/HistogramsLibrary.h"
+#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/CutsLibrary.h"
+#include "PWGDQ/Core/HistogramManager.h"
+#include "PWGDQ/Core/HistogramsLibrary.h"
+#include "PWGDQ/Core/MixingHandler.h"
 #include "PWGDQ/Core/MixingLibrary.h"
+#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+
+#include "Common/CCDB/EventSelectionParams.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include "Field/MagneticField.h"
-#include "TGeoGlobalMagField.h"
-#include "DetectorsBase/Propagator.h"
+#include "DataFormatsParameters/GRPObject.h"
 #include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Field/MagneticField.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 #include "ITSMFTBase/DPLAlpideParam.h"
-#include "Common/CCDB/EventSelectionParams.h"
+
+#include "TGeoGlobalMagField.h"
+#include <TH1F.h>
+#include <TH3F.h>
+#include <THashList.h>
+#include <TList.h>
+#include <TString.h>
+
+#include <algorithm>
+#include <iostream>
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
 
 using std::cout;
 using std::endl;
@@ -1072,7 +1076,7 @@ struct AnalysisSameEventPairing {
       }
     }
 
-    if (fConfigNbTrackCut > 0 && fConfigNbTrackCut < 31) {   // if track cuts
+    if (fConfigNbTrackCut > 0 && fConfigNbTrackCut < 31) {           // if track cuts
       for (std::size_t icut = 0; icut < fConfigNbTrackCut; ++icut) { // loop over track cuts
         fTwoTrackFilterMask |= (static_cast<uint32_t>(1) << icut);
         // no pair cuts
diff --git a/.auto-resolution/PWGEM/Dilepton/Tasks/taggingHFE.cxx b/.auto-resolution/PWGEM/Dilepton/Tasks/taggingHFE.cxx
index f843b20819a..cc1988e8f47 100644
--- a/.auto-resolution/PWGEM/Dilepton/Tasks/taggingHFE.cxx
+++ b/.auto-resolution/PWGEM/Dilepton/Tasks/taggingHFE.cxx
@@ -13,36 +13,38 @@
 /// \brief a task to study tagging e from charm hadron decays in MC
 /// \author daiki.sekihata@cern.ch
 
-#include <vector>
-#include <string>
-#include <array>
-#include <utility>
-#include <iostream>
-
-#include "Math/Vector4D.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "DataFormatsCalibration/MeanVertexObject.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "Common/Core/trackUtilities.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/TableHelper.h"
-#include "Common/Core/RecoDecay.h"
-#include "DCAFitter/DCAFitterN.h"
+#include "PWGEM/Dilepton/Utils/MCUtilities.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/TableHelper.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/CollisionAssociationTables.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGEM/Dilepton/Utils/MCUtilities.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsCalibration/MeanVertexObject.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "Math/Vector4D.h"
+
+#include <array>
+#include <iostream>
+#include <string>
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::soa;
diff --git a/.auto-resolution/PWGEM/Dilepton/Utils/EMTrack.h b/.auto-resolution/PWGEM/Dilepton/Utils/EMTrack.h
index 0f894d5b4dc..5042db6d622 100644
--- a/.auto-resolution/PWGEM/Dilepton/Utils/EMTrack.h
+++ b/.auto-resolution/PWGEM/Dilepton/Utils/EMTrack.h
@@ -15,9 +15,10 @@
 #ifndef PWGEM_DILEPTON_UTILS_EMTRACK_H_
 #define PWGEM_DILEPTON_UTILS_EMTRACK_H_
 
-#include <vector>
 #include "Math/Vector4D.h"
 
+#include <vector>
+
 namespace o2::aod::pwgem::dilepton::utils
 {
 class EMTrack
diff --git a/.auto-resolution/PWGEM/Dilepton/Utils/MomentumSmearer.h b/.auto-resolution/PWGEM/Dilepton/Utils/MomentumSmearer.h
index 7e36dcfed0f..45f491956de 100644
--- a/.auto-resolution/PWGEM/Dilepton/Utils/MomentumSmearer.h
+++ b/.auto-resolution/PWGEM/Dilepton/Utils/MomentumSmearer.h
@@ -15,19 +15,19 @@
 #ifndef PWGEM_DILEPTON_UTILS_MOMENTUMSMEARER_H_
 #define PWGEM_DILEPTON_UTILS_MOMENTUMSMEARER_H_
 
-#include <vector>
+#include "CCDB/BasicCCDBManager.h"
+#include "Framework/Logger.h"
 
+#include <TFile.h>
+#include <TGrid.h>
 #include <TH1.h>
 #include <TH2.h>
 #include <TH3.h>
 #include <THnSparse.h>
-#include <TString.h>
-#include <TGrid.h>
-#include <TFile.h>
 #include <TKey.h>
+#include <TString.h>
 
-#include "CCDB/BasicCCDBManager.h"
-#include "Framework/Logger.h"
+#include <vector>
 
 using namespace o2::framework;
 using namespace o2;
diff --git a/.auto-resolution/PWGEM/PhotonMeson/Core/CutsLibrary.cxx b/.auto-resolution/PWGEM/PhotonMeson/Core/CutsLibrary.cxx
index c2f313e6e62..44dfae30898 100644
--- a/.auto-resolution/PWGEM/PhotonMeson/Core/CutsLibrary.cxx
+++ b/.auto-resolution/PWGEM/PhotonMeson/Core/CutsLibrary.cxx
@@ -11,10 +11,11 @@
 //
 // Contact: daiki.sekihata@cern.ch
 //
+#include "PWGEM/PhotonMeson/Core/CutsLibrary.h"
+
+#include <regex>
 #include <string>
 #include <vector>
-#include <regex>
-#include "PWGEM/PhotonMeson/Core/CutsLibrary.h"
 
 //_______________________________________________
 int customAtoi(const std::string& str)
diff --git a/.auto-resolution/PWGEM/PhotonMeson/Core/CutsLibrary.h b/.auto-resolution/PWGEM/PhotonMeson/Core/CutsLibrary.h
index bf4fcfe7037..376ad652b63 100644
--- a/.auto-resolution/PWGEM/PhotonMeson/Core/CutsLibrary.h
+++ b/.auto-resolution/PWGEM/PhotonMeson/Core/CutsLibrary.h
@@ -15,13 +15,14 @@
 #ifndef PWGEM_PHOTONMESON_CORE_CUTSLIBRARY_H_
 #define PWGEM_PHOTONMESON_CORE_CUTSLIBRARY_H_
 
-#include <string>
-#include "PWGEM/PhotonMeson/Core/EMPhotonEventCut.h"
-#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
 #include "PWGEM/PhotonMeson/Core/DalitzEECut.h"
-#include "PWGEM/PhotonMeson/Core/PHOSPhotonCut.h"
 #include "PWGEM/PhotonMeson/Core/EMCPhotonCut.h"
+#include "PWGEM/PhotonMeson/Core/EMPhotonEventCut.h"
+#include "PWGEM/PhotonMeson/Core/PHOSPhotonCut.h"
 #include "PWGEM/PhotonMeson/Core/PairCut.h"
+#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
+
+#include <string>
 
 namespace o2::aod
 {
diff --git a/.auto-resolution/PWGEM/PhotonMeson/Core/EMCPhotonCut.cxx b/.auto-resolution/PWGEM/PhotonMeson/Core/EMCPhotonCut.cxx
index 582b9754057..0761921b765 100644
--- a/.auto-resolution/PWGEM/PhotonMeson/Core/EMCPhotonCut.cxx
+++ b/.auto-resolution/PWGEM/PhotonMeson/Core/EMCPhotonCut.cxx
@@ -13,11 +13,14 @@
 // Class for EMCal cluster selection
 //
 
-#include <string>
-#include "Framework/Logger.h"
 #include "PWGEM/PhotonMeson/Core/EMCPhotonCut.h"
+
 #include "PWGJE/DataModel/EMCALClusters.h"
 
+#include "Framework/Logger.h"
+
+#include <string>
+
 ClassImp(EMCPhotonCut);
 
 const char* EMCPhotonCut::mCutNames[static_cast<int>(EMCPhotonCut::EMCPhotonCuts::kNCuts)] = {"Definition", "Energy", "NCell", "M02", "Timing", "TrackMatching", "Exotic"};
diff --git a/.auto-resolution/PWGEM/PhotonMeson/Core/EMCPhotonCut.h b/.auto-resolution/PWGEM/PhotonMeson/Core/EMCPhotonCut.h
index 8bfd8ca630f..372eff52061 100644
--- a/.auto-resolution/PWGEM/PhotonMeson/Core/EMCPhotonCut.h
+++ b/.auto-resolution/PWGEM/PhotonMeson/Core/EMCPhotonCut.h
@@ -16,16 +16,19 @@
 #ifndef PWGEM_PHOTONMESON_CORE_EMCPHOTONCUT_H_
 #define PWGEM_PHOTONMESON_CORE_EMCPHOTONCUT_H_
 
-#include <set>
-#include <vector>
-#include <utility>
-#include <string>
-#include <optional>
-#include "Framework/Logger.h"
-#include "Framework/DataTypes.h"
 #include "Rtypes.h"
+
+#include "Framework/DataTypes.h"
+#include "Framework/Logger.h"
+
 #include "TNamed.h"
 
+#include <optional>
+#include <set>
+#include <string>
+#include <utility>
+#include <vector>
+
 class EMCPhotonCut : public TNamed
 {
  public:
diff --git a/.auto-resolution/PWGEM/PhotonMeson/Core/EMPhotonEventCut.cxx b/.auto-resolution/PWGEM/PhotonMeson/Core/EMPhotonEventCut.cxx
index 285bf50eba4..6526daa47c9 100644
--- a/.auto-resolution/PWGEM/PhotonMeson/Core/EMPhotonEventCut.cxx
+++ b/.auto-resolution/PWGEM/PhotonMeson/Core/EMPhotonEventCut.cxx
@@ -13,9 +13,10 @@
 // Class for em photon event selection
 //
 
-#include "Framework/Logger.h"
 #include "PWGEM/PhotonMeson/Core/EMPhotonEventCut.h"
 
+#include "Framework/Logger.h"
+
 ClassImp(EMPhotonEventCut);
 
 void EMPhotonEventCut::SetRequireEMCReadoutInMB(bool flag)
diff --git a/.auto-resolution/PWGEM/PhotonMeson/Core/HistogramsLibrary.cxx b/.auto-resolution/PWGEM/PhotonMeson/Core/HistogramsLibrary.cxx
index 50174ab9e08..59700cbb215 100644
--- a/.auto-resolution/PWGEM/PhotonMeson/Core/HistogramsLibrary.cxx
+++ b/.auto-resolution/PWGEM/PhotonMeson/Core/HistogramsLibrary.cxx
@@ -11,26 +11,28 @@
 //
 // Contact: daiki.sekihata@cern.ch
 //
+#include <fstream>
 #include <iostream>
 #include <memory>
-#include <fstream>
 using namespace std;
 
-#include <TObject.h>
-#include <TObjArray.h>
-#include <THashList.h>
+#include "PWGEM/PhotonMeson/Core/HistogramsLibrary.h"
+
+#include "Framework/Logger.h"
+
+#include <TClass.h>
 #include <TH1F.h>
 #include <TH2F.h>
 #include <TH3F.h>
-#include <TProfile.h>
-#include <TProfile2D.h>
-#include <TProfile3D.h>
+#include <THashList.h>
 #include <THn.h>
 #include <THnSparse.h>
 #include <TIterator.h>
-#include <TClass.h>
-#include "Framework/Logger.h"
-#include "PWGEM/PhotonMeson/Core/HistogramsLibrary.h"
+#include <TObjArray.h>
+#include <TObject.h>
+#include <TProfile.h>
+#include <TProfile2D.h>
+#include <TProfile3D.h>
 
 void o2::aod::pwgem::photon::histogram::DefineHistograms(THashList* list, const char* histClass, const char* subGroup)
 {
@@ -184,7 +186,7 @@ void o2::aod::pwgem::photon::histogram::DefineHistograms(THashList* list, const
       list->Add(new TH2F("hEtaRec_DeltaEta", "photon #eta resolution;#eta^{rec} of conversion point;#eta^{rec} - #eta^{gen}", 400, -2, +2, 400, -1.0f, 1.0f));
       list->Add(new TH2F("hEtaRec_DeltaPhi", "photon #varphi resolution;#eta^{rec} of conversion point;#varphi^{rec} - #varphi^{gen} (rad.)", 400, -2, +2, 400, -1.0f, 1.0f));
     } // end of mc
-  }   // end of V0
+  } // end of V0
 
   if (TString(histClass).Contains("Dalitz")) {
     THnSparseF* hs_dilepton_uls_same = nullptr;
@@ -576,7 +578,7 @@ void o2::aod::pwgem::photon::histogram::DefineHistograms(THashList* list, const
       hs_conv_point_mix->Sumw2();
       list->Add(hs_conv_point_mix);
     } // end of pair
-  }   // end of material budget study
+  } // end of material budget study
 
   if (TString(histClass) == "Generated") {
     list->Add(new TH1F("hCollisionCounter", "hCollisionCounter", 5, 0.5f, 5.5f));
diff --git a/.auto-resolution/PWGEM/PhotonMeson/Core/HistogramsLibrary.h b/.auto-resolution/PWGEM/PhotonMeson/Core/HistogramsLibrary.h
index 324718a663e..5307f5608a5 100644
--- a/.auto-resolution/PWGEM/PhotonMeson/Core/HistogramsLibrary.h
+++ b/.auto-resolution/PWGEM/PhotonMeson/Core/HistogramsLibrary.h
@@ -15,26 +15,27 @@
 #ifndef PWGEM_PHOTONMESON_CORE_HISTOGRAMSLIBRARY_H_
 #define PWGEM_PHOTONMESON_CORE_HISTOGRAMSLIBRARY_H_
 
-#include <iostream>
-#include <array>
-#include <TString.h>
-#include <THashList.h>
-#include <TObject.h>
-#include <TObjArray.h>
-#include <THashList.h>
-#include <TMath.h>
+#include "Common/CCDB/EventSelectionParams.h"
+#include "Common/Core/RecoDecay.h"
+
+#include <TClass.h>
 #include <TH1F.h>
 #include <TH2F.h>
 #include <TH3F.h>
-#include <TProfile.h>
-#include <TProfile2D.h>
-#include <TProfile3D.h>
+#include <THashList.h>
 #include <THn.h>
 #include <THnSparse.h>
 #include <TIterator.h>
-#include <TClass.h>
-#include "Common/CCDB/EventSelectionParams.h"
-#include "Common/Core/RecoDecay.h"
+#include <TMath.h>
+#include <TObjArray.h>
+#include <TObject.h>
+#include <TProfile.h>
+#include <TProfile2D.h>
+#include <TProfile3D.h>
+#include <TString.h>
+
+#include <array>
+#include <iostream>
 
 enum EMHistType {
   kEvent = 0,
diff --git a/.auto-resolution/PWGEM/PhotonMeson/Core/PHOSPhotonCut.cxx b/.auto-resolution/PWGEM/PhotonMeson/Core/PHOSPhotonCut.cxx
index 96db9e331b3..083d68078cc 100644
--- a/.auto-resolution/PWGEM/PhotonMeson/Core/PHOSPhotonCut.cxx
+++ b/.auto-resolution/PWGEM/PhotonMeson/Core/PHOSPhotonCut.cxx
@@ -13,9 +13,10 @@
 // Class for track selection
 //
 
-#include "Framework/Logger.h"
 #include "PWGEM/PhotonMeson/Core/PHOSPhotonCut.h"
 
+#include "Framework/Logger.h"
+
 ClassImp(PHOSPhotonCut);
 
 const char* PHOSPhotonCut::mCutNames[static_cast<int>(PHOSPhotonCut::PHOSPhotonCuts::kNCuts)] = {"Energy", "Dispersion", "CPV"};
diff --git a/.auto-resolution/PWGEM/PhotonMeson/Core/PHOSPhotonCut.h b/.auto-resolution/PWGEM/PhotonMeson/Core/PHOSPhotonCut.h
index c60944dd52b..d7f6ee64805 100644
--- a/.auto-resolution/PWGEM/PhotonMeson/Core/PHOSPhotonCut.h
+++ b/.auto-resolution/PWGEM/PhotonMeson/Core/PHOSPhotonCut.h
@@ -16,15 +16,18 @@
 #ifndef PWGEM_PHOTONMESON_CORE_PHOSPHOTONCUT_H_
 #define PWGEM_PHOTONMESON_CORE_PHOSPHOTONCUT_H_
 
-#include <set>
-#include <vector>
-#include <utility>
-#include <string>
-#include "Framework/Logger.h"
-#include "Framework/DataTypes.h"
 #include "Rtypes.h"
+
+#include "Framework/DataTypes.h"
+#include "Framework/Logger.h"
+
 #include "TNamed.h"
 
+#include <set>
+#include <string>
+#include <utility>
+#include <vector>
+
 class PHOSPhotonCut : public TNamed
 {
  public:
diff --git a/.auto-resolution/PWGEM/PhotonMeson/Core/PairCut.cxx b/.auto-resolution/PWGEM/PhotonMeson/Core/PairCut.cxx
index be8bee172c7..10161ba3dd4 100644
--- a/.auto-resolution/PWGEM/PhotonMeson/Core/PairCut.cxx
+++ b/.auto-resolution/PWGEM/PhotonMeson/Core/PairCut.cxx
@@ -13,9 +13,10 @@
 // Class for track selection
 //
 
-#include "Framework/Logger.h"
 #include "PWGEM/PhotonMeson/Core/PairCut.h"
 
+#include "Framework/Logger.h"
+
 ClassImp(PairCut);
 
 const char* PairCut::mCutNames[static_cast<int>(PairCut::PairCuts::kNCuts)] = {"Asym"};
diff --git a/.auto-resolution/PWGEM/PhotonMeson/Core/PairCut.h b/.auto-resolution/PWGEM/PhotonMeson/Core/PairCut.h
index 19ba27c79bf..b9cf1fe5cf0 100644
--- a/.auto-resolution/PWGEM/PhotonMeson/Core/PairCut.h
+++ b/.auto-resolution/PWGEM/PhotonMeson/Core/PairCut.h
@@ -16,15 +16,18 @@
 #ifndef PWGEM_PHOTONMESON_CORE_PAIRCUT_H_
 #define PWGEM_PHOTONMESON_CORE_PAIRCUT_H_
 
-#include <set>
-#include <vector>
-#include <utility>
-#include <string>
-#include "Framework/Logger.h"
-#include "Framework/DataTypes.h"
 #include "Rtypes.h"
-#include "TNamed.h"
+
+#include "Framework/DataTypes.h"
+#include "Framework/Logger.h"
+
 #include "TMath.h"
+#include "TNamed.h"
+
+#include <set>
+#include <string>
+#include <utility>
+#include <vector>
 
 class PairCut : public TNamed
 {
diff --git a/.auto-resolution/PWGEM/PhotonMeson/Core/TaggingPi0.h b/.auto-resolution/PWGEM/PhotonMeson/Core/TaggingPi0.h
index d74af2ceb0c..7e80b3d466d 100644
--- a/.auto-resolution/PWGEM/PhotonMeson/Core/TaggingPi0.h
+++ b/.auto-resolution/PWGEM/PhotonMeson/Core/TaggingPi0.h
@@ -19,40 +19,41 @@
 #ifndef PWGEM_PHOTONMESON_CORE_TAGGINGPI0_H_
 #define PWGEM_PHOTONMESON_CORE_TAGGINGPI0_H_
 
+#include "PWGEM/Dilepton/Utils/EMTrack.h"
+#include "PWGEM/Dilepton/Utils/EMTrackUtilities.h"
+#include "PWGEM/Dilepton/Utils/EventMixingHandler.h"
+#include "PWGEM/PhotonMeson/Core/DalitzEECut.h"
+#include "PWGEM/PhotonMeson/Core/EMCPhotonCut.h"
+#include "PWGEM/PhotonMeson/Core/EMPhotonEventCut.h"
+#include "PWGEM/PhotonMeson/Core/PHOSPhotonCut.h"
+#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+#include "PWGEM/PhotonMeson/Utils/EventHistograms.h"
+#include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
+
+#include "Common/Core/RecoDecay.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "Math/Vector4D.h"
+#include "TString.h"
+
+#include <algorithm>
+#include <array>
 #include <cstring>
 #include <iterator>
-#include <string>
 #include <map>
-#include <vector>
+#include <string>
 #include <tuple>
 #include <utility>
-#include <array>
-#include <algorithm>
-
-#include "TString.h"
-#include "Math/Vector4D.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
-
-#include "Common/Core/RecoDecay.h"
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/DalitzEECut.h"
-#include "PWGEM/PhotonMeson/Core/PHOSPhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/EMCPhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/EMPhotonEventCut.h"
-#include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
-#include "PWGEM/Dilepton/Utils/EMTrack.h"
-#include "PWGEM/Dilepton/Utils/EventMixingHandler.h"
-#include "PWGEM/PhotonMeson/Utils/EventHistograms.h"
-#include "PWGEM/Dilepton/Utils/EMTrackUtilities.h"
+#include <vector>
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.auto-resolution/PWGEM/PhotonMeson/Core/TaggingPi0MC.h b/.auto-resolution/PWGEM/PhotonMeson/Core/TaggingPi0MC.h
index 56c6274a141..04fe0cadd9c 100644
--- a/.auto-resolution/PWGEM/PhotonMeson/Core/TaggingPi0MC.h
+++ b/.auto-resolution/PWGEM/PhotonMeson/Core/TaggingPi0MC.h
@@ -17,35 +17,36 @@
 #ifndef PWGEM_PHOTONMESON_CORE_TAGGINGPI0MC_H_
 #define PWGEM_PHOTONMESON_CORE_TAGGINGPI0MC_H_
 
-#include <string>
-#include <map>
-#include <vector>
+#include "PWGEM/Dilepton/Utils/MCUtilities.h"
+#include "PWGEM/PhotonMeson/Core/DalitzEECut.h"
+#include "PWGEM/PhotonMeson/Core/EMCPhotonCut.h"
+#include "PWGEM/PhotonMeson/Core/EMPhotonEventCut.h"
+#include "PWGEM/PhotonMeson/Core/PHOSPhotonCut.h"
+#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+#include "PWGEM/PhotonMeson/Utils/EventHistograms.h"
+#include "PWGEM/PhotonMeson/Utils/MCUtilities.h"
+#include "PWGEM/PhotonMeson/Utils/NMHistograms.h"
+#include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
 
-#include "TF1.h"
-#include "TString.h"
-#include "Math/Vector4D.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
+#include "Common/Core/RecoDecay.h"
 
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
 #include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
-#include "Common/Core/RecoDecay.h"
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
-#include "PWGEM/PhotonMeson/Utils/MCUtilities.h"
-#include "PWGEM/PhotonMeson/Utils/EventHistograms.h"
-#include "PWGEM/PhotonMeson/Utils/NMHistograms.h"
-#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/DalitzEECut.h"
-#include "PWGEM/PhotonMeson/Core/PHOSPhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/EMCPhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/EMPhotonEventCut.h"
-#include "PWGEM/Dilepton/Utils/MCUtilities.h"
+#include "Math/Vector4D.h"
+#include "TF1.h"
+#include "TString.h"
+
+#include <map>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.auto-resolution/PWGEM/PhotonMeson/Core/V0PhotonCut.cxx b/.auto-resolution/PWGEM/PhotonMeson/Core/V0PhotonCut.cxx
index 07d805fa291..493565011ff 100644
--- a/.auto-resolution/PWGEM/PhotonMeson/Core/V0PhotonCut.cxx
+++ b/.auto-resolution/PWGEM/PhotonMeson/Core/V0PhotonCut.cxx
@@ -13,11 +13,12 @@
 // Class for v0 photon selection
 //
 
-#include <set>
-#include <utility>
+#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
 
 #include "Framework/Logger.h"
-#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
+
+#include <set>
+#include <utility>
 
 ClassImp(V0PhotonCut);
 
diff --git a/.auto-resolution/PWGEM/PhotonMeson/Core/V0PhotonCut.h b/.auto-resolution/PWGEM/PhotonMeson/Core/V0PhotonCut.h
index d6064ab8786..c908acb5acd 100644
--- a/.auto-resolution/PWGEM/PhotonMeson/Core/V0PhotonCut.h
+++ b/.auto-resolution/PWGEM/PhotonMeson/Core/V0PhotonCut.h
@@ -16,16 +16,18 @@
 #ifndef PWGEM_PHOTONMESON_CORE_V0PHOTONCUT_H_
 #define PWGEM_PHOTONMESON_CORE_V0PHOTONCUT_H_
 
-#include <algorithm>
-#include <set>
-#include <vector>
-#include <utility>
-#include <string>
 #include "Rtypes.h"
-#include "TNamed.h"
-#include "TMath.h"
 
 #include "PWGEM/PhotonMeson/Utils/TrackSelection.h"
+
+#include "TMath.h"
+#include "TNamed.h"
+
+#include <algorithm>
+#include <set>
+#include <string>
+#include <utility>
+#include <vector>
 using namespace o2::pwgem::photonmeson;
 
 class V0PhotonCut : public TNamed
diff --git a/.auto-resolution/PWGEM/PhotonMeson/DataModel/bcWiseTables.h b/.auto-resolution/PWGEM/PhotonMeson/DataModel/bcWiseTables.h
index a306d5645ce..1ca1c78b683 100644
--- a/.auto-resolution/PWGEM/PhotonMeson/DataModel/bcWiseTables.h
+++ b/.auto-resolution/PWGEM/PhotonMeson/DataModel/bcWiseTables.h
@@ -73,9 +73,9 @@ DECLARE_SOA_COLUMN(StoredFT0MAmplitude, storedFT0MAmplitude, uint16_t); //! ft0a
 DECLARE_SOA_COLUMN(StoredMu, storedMu, uint16_t);                       //! probability of TVX collision per BC (x1000)
 DECLARE_SOA_COLUMN(StoredTimeSinceSOF, storedTimeSinceSOF, uint16_t);   //! time since decreation of ADJUST in seconds (x2)
 
-DECLARE_SOA_DYNAMIC_COLUMN(Centrality, centrality, [](uint8_t storedcentrality) -> float { return std::nextafter(storedcentrality / emdownscaling::downscalingFactors[emdownscaling::kFT0MCent], std::numeric_limits<float>::infinity()); });           //! Centrality (0-100)
-DECLARE_SOA_DYNAMIC_COLUMN(FT0MAmplitude, ft0Amplitude, [](uint16_t storedFT0MAmplitude) -> float { return std::nextafter(storedFT0MAmplitude / emdownscaling::downscalingFactors[emdownscaling::kFT0Amp], std::numeric_limits<float>::infinity()); }); //! FT0M amplitude
-DECLARE_SOA_DYNAMIC_COLUMN(Mu, mu, [](uint16_t storedMu) -> float { return std::nextafter(storedMu / emdownscaling::downscalingFactors[emdownscaling::kMu], std::numeric_limits<float>::infinity()); });                                                //! probability of TVX collision per BC
+DECLARE_SOA_DYNAMIC_COLUMN(Centrality, centrality, [](uint8_t storedcentrality) -> float { return std::nextafter(storedcentrality / emdownscaling::downscalingFactors[emdownscaling::kFT0MCent], std::numeric_limits<float>::infinity()); });              //! Centrality (0-100)
+DECLARE_SOA_DYNAMIC_COLUMN(FT0MAmplitude, ft0Amplitude, [](uint16_t storedFT0MAmplitude) -> float { return std::nextafter(storedFT0MAmplitude / emdownscaling::downscalingFactors[emdownscaling::kFT0Amp], std::numeric_limits<float>::infinity()); });    //! FT0M amplitude
+DECLARE_SOA_DYNAMIC_COLUMN(Mu, mu, [](uint16_t storedMu) -> float { return std::nextafter(storedMu / emdownscaling::downscalingFactors[emdownscaling::kMu], std::numeric_limits<float>::infinity()); });                                                   //! probability of TVX collision per BC
 DECLARE_SOA_DYNAMIC_COLUMN(TimeSinceSOF, timeSinceSOF, [](uint16_t storedTimeSinceSOF) -> float { return std::nextafter(storedTimeSinceSOF / emdownscaling::downscalingFactors[emdownscaling::kTimeSinceSOF], std::numeric_limits<float>::infinity()); }); //! probability of TVX collision per BC
 } // namespace bcwisebc
 DECLARE_SOA_TABLE(BCWiseBCs, "AOD", "BCWISEBC", //! table of bc wise centrality estimation and event selection input
diff --git a/.auto-resolution/PWGEM/PhotonMeson/DataModel/gammaTables.h b/.auto-resolution/PWGEM/PhotonMeson/DataModel/gammaTables.h
index 0abbc3bfe76..d73ddcc3f16 100644
--- a/.auto-resolution/PWGEM/PhotonMeson/DataModel/gammaTables.h
+++ b/.auto-resolution/PWGEM/PhotonMeson/DataModel/gammaTables.h
@@ -9,15 +9,15 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <vector>
-#include <TMath.h>
+#include "PWGEM/Dilepton/DataModel/dileptonTables.h"
+#include "PWGJE/DataModel/EMCALClusters.h"
 
 #include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/CaloClusters.h"
 
-#include "PWGEM/Dilepton/DataModel/dileptonTables.h"
+#include <TMath.h>
 
-#include "PWGJE/DataModel/EMCALClusters.h"
+#include <vector>
 
 #ifndef PWGEM_PHOTONMESON_DATAMODEL_GAMMATABLES_H_
 #define PWGEM_PHOTONMESON_DATAMODEL_GAMMATABLES_H_
diff --git a/.auto-resolution/PWGEM/PhotonMeson/TableProducer/associateMCinfoPhoton.cxx b/.auto-resolution/PWGEM/PhotonMeson/TableProducer/associateMCinfoPhoton.cxx
index 2fafc5118e3..90b97762131 100644
--- a/.auto-resolution/PWGEM/PhotonMeson/TableProducer/associateMCinfoPhoton.cxx
+++ b/.auto-resolution/PWGEM/PhotonMeson/TableProducer/associateMCinfoPhoton.cxx
@@ -16,16 +16,17 @@
 /// \author Daiki Sekihata (daiki.sekihata@cern.ch)
 ///
 
-#include <map>
-#include <vector>
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+#include "PWGEM/PhotonMeson/Utils/MCUtilities.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/PhotonMeson/Utils/MCUtilities.h"
+
+#include <map>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGEM/PhotonMeson/TableProducer/createEMEventPhoton.cxx b/.auto-resolution/PWGEM/PhotonMeson/TableProducer/createEMEventPhoton.cxx
index fc155fe5502..3e08ed6e33f 100644
--- a/.auto-resolution/PWGEM/PhotonMeson/TableProducer/createEMEventPhoton.cxx
+++ b/.auto-resolution/PWGEM/PhotonMeson/TableProducer/createEMEventPhoton.cxx
@@ -14,23 +14,22 @@
 ///
 /// \author Daiki Sekihata, daiki.sekihata@cern.ch
 
-#include <string>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+#include "PWGJE/DataModel/Jet.h"
 
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
 #include "Common/CCDB/TriggerAliases.h"
 
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+#include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
-#include "PWGJE/DataModel/Jet.h"
+#include <string>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGEM/PhotonMeson/TableProducer/createPCM.cxx b/.auto-resolution/PWGEM/PhotonMeson/TableProducer/createPCM.cxx
index 4ca74633e1b..4862ccba420 100644
--- a/.auto-resolution/PWGEM/PhotonMeson/TableProducer/createPCM.cxx
+++ b/.auto-resolution/PWGEM/PhotonMeson/TableProducer/createPCM.cxx
@@ -14,26 +14,29 @@
 // This code produces photon data tables.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include <array>
-#include <vector>
-#include <algorithm>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/Core/trackUtilities.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+#include "PWGEM/PhotonMeson/Utils/PCMUtilities.h"
+#include "PWGEM/PhotonMeson/Utils/TrackSelection.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "Common/Core/RecoDecay.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/CollisionAssociationTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "DCAFitter/DCAFitterN.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGEM/PhotonMeson/Utils/PCMUtilities.h"
-#include "PWGEM/PhotonMeson/Utils/TrackSelection.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include <algorithm>
+#include <array>
+#include <vector>
 
 using namespace o2;
 using namespace o2::soa;
@@ -443,9 +446,9 @@ struct createPCM {
               //     collision_in_sw.globalIndex(), ele.collisionId(), pos.collisionId(), ele.globalIndex(), pos.globalIndex());
               fillV0Table(collision_in_sw, ele, pos, false);
             } // end of searching window loop
-          }   // end of pairing loop
-        }     // end of pos track loop in sw
-      }       // end of pos track loop in sw
+          } // end of pairing loop
+        } // end of pos track loop in sw
+      } // end of pos track loop in sw
 
       // LOGF(info, "possible number of V0 = %d", cospa_map.size());
       std::map<std::pair<uint32_t, uint32_t>, bool> used_pair_map;
@@ -550,7 +553,7 @@ struct createPCM {
         }
       }
     } // end of collision loop
-  }   // end of process
+  } // end of process
   PROCESS_SWITCH(createPCM, processTrkCollAsso, "create V0s with track-to-collision associator", false);
 };
 
diff --git a/.auto-resolution/PWGEM/PhotonMeson/TableProducer/gammaSelection.cxx b/.auto-resolution/PWGEM/PhotonMeson/TableProducer/gammaSelection.cxx
index 7a3708d480b..ea98a8f255c 100644
--- a/.auto-resolution/PWGEM/PhotonMeson/TableProducer/gammaSelection.cxx
+++ b/.auto-resolution/PWGEM/PhotonMeson/TableProducer/gammaSelection.cxx
@@ -14,22 +14,22 @@
 /// \author marvin.hemmer@cern.ch
 
 // TODO: add PCM table
-#include <typeinfo>
-
 #include "PWGEM/PhotonMeson/Utils/gammaSelectionCuts.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
-// includes for the R recalculation
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "CCDB/BasicCCDBManager.h"
+#include <typeinfo>
 
+// includes for the R recalculation
 #include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
 #include "PWGEM/PhotonMeson/Utils/emcalHistoDefinitions.h"
 
+#include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.auto-resolution/PWGEM/PhotonMeson/TableProducer/photonconversionbuilder.cxx b/.auto-resolution/PWGEM/PhotonMeson/TableProducer/photonconversionbuilder.cxx
index 8f8e795edfb..67e11f24e16 100644
--- a/.auto-resolution/PWGEM/PhotonMeson/TableProducer/photonconversionbuilder.cxx
+++ b/.auto-resolution/PWGEM/PhotonMeson/TableProducer/photonconversionbuilder.cxx
@@ -15,43 +15,43 @@
 //
 // \author Daiki Sekihata <daiki.sekihata@cern.ch>, Tokyo
 
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <map>
-#include <iterator>
-#include <utility>
-#include <string>
-#include <set>
-#include <algorithm>
-#include <vector>
-#include <unordered_map>
-
-#include "Math/Vector4D.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+#include "PWGEM/PhotonMeson/Utils/PCMUtilities.h"
+#include "PWGEM/PhotonMeson/Utils/TrackSelection.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
+#include "Common/Core/TPCVDriftManager.h"
+#include "Common/Core/TableHelper.h"
 #include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+#include "Tools/KFparticle/KFUtilities.h"
+
 #include "CCDB/BasicCCDBManager.h"
-#include "Common/Core/TableHelper.h"
-#include "Common/Core/TPCVDriftManager.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
-#include "Tools/KFparticle/KFUtilities.h"
+#include "Math/Vector4D.h"
 
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/PhotonMeson/Utils/PCMUtilities.h"
-#include "PWGEM/PhotonMeson/Utils/TrackSelection.h"
+#include <algorithm>
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <iterator>
+#include <map>
+#include <set>
+#include <string>
+#include <unordered_map>
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::soa;
diff --git a/.auto-resolution/PWGEM/PhotonMeson/TableProducer/produceMesonCalo.cxx b/.auto-resolution/PWGEM/PhotonMeson/TableProducer/produceMesonCalo.cxx
index 7fd19416d3d..face43fb3e4 100644
--- a/.auto-resolution/PWGEM/PhotonMeson/TableProducer/produceMesonCalo.cxx
+++ b/.auto-resolution/PWGEM/PhotonMeson/TableProducer/produceMesonCalo.cxx
@@ -21,9 +21,9 @@
 #include "Framework/runDataProcessing.h"
 
 // includes for the R recalculation
+#include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsParameters/GRPObject.h"
 #include "DetectorsBase/GeometryManager.h"
-#include "CCDB/BasicCCDBManager.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGEM/PhotonMeson/TableProducer/skimmerDalitzEE.cxx b/.auto-resolution/PWGEM/PhotonMeson/TableProducer/skimmerDalitzEE.cxx
index 5eb1bfeb069..b7e5049ebed 100644
--- a/.auto-resolution/PWGEM/PhotonMeson/TableProducer/skimmerDalitzEE.cxx
+++ b/.auto-resolution/PWGEM/PhotonMeson/TableProducer/skimmerDalitzEE.cxx
@@ -12,19 +12,19 @@
 /// \brief write relevant information for dalitz ee analysis to an AO2D.root file. This file is then the only necessary input to perform pcm analysis.
 /// \author daiki.sekihata@cern.ch
 
-#include "Math/Vector4D.h"
+#include "PWGEM/Dilepton/Utils/PairUtilities.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
 
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
 #include "CCDB/BasicCCDBManager.h"
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "CommonConstants/PhysicsConstants.h"
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/Dilepton/Utils/PairUtilities.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "Math/Vector4D.h"
 
 using namespace o2;
 using namespace o2::soa;
@@ -290,7 +290,7 @@ struct skimmerDalitzEE {
 
         fRegistry.fill(HIST("hNpairs"), static_cast<int>(pairtype));
         npair++;
-      }      // end of pairing loop
+      } // end of pairing loop
     } else { // LS
       for (auto& [t1, t2] : combinations(CombinationsStrictlyUpperIndexPolicy(tracks1, tracks2))) {
         if (!checkTrack(t1) || !checkTrack(t2)) {
diff --git a/.auto-resolution/PWGEM/PhotonMeson/TableProducer/skimmerGammaConversion.cxx b/.auto-resolution/PWGEM/PhotonMeson/TableProducer/skimmerGammaConversion.cxx
index 6a39aea8881..80572200a12 100644
--- a/.auto-resolution/PWGEM/PhotonMeson/TableProducer/skimmerGammaConversion.cxx
+++ b/.auto-resolution/PWGEM/PhotonMeson/TableProducer/skimmerGammaConversion.cxx
@@ -23,38 +23,37 @@
 
 // runme like: o2-analysis-trackselection -b --aod-file ${sourceFile} --aod-writer-json ${writerFile} | o2-analysis-timestamp -b | o2-analysis-trackextension -b | o2-analysis-lf-lambdakzerobuilder -b | o2-analysis-pid-tpc -b | o2-analysis-em-skimmermc -b
 
-#include <memory>
 #include <map>
+#include <memory>
 #include <string>
 #include <vector>
 
 // todo: remove reduantant information in GammaConversionsInfoTrue
 #include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/PhotonMeson/Utils/gammaConvDefinitions.h"
 #include "PWGEM/PhotonMeson/Utils/PCMUtilities.h"
+#include "PWGEM/PhotonMeson/Utils/gammaConvDefinitions.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 // includes for the R recalculation
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
+#include "Common/Core/trackUtilities.h"
+#include "Tools/KFparticle/KFUtilities.h"
 
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonConstants/PhysicsConstants.h"
 #include "DCAFitter/HelixHelper.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
 #include "ReconstructionDataFormats/TrackFwd.h"
-#include "Common/Core/trackUtilities.h"
-#include "CommonConstants/PhysicsConstants.h"
 
+#include "Math/Vector4D.h"
 #include <TMath.h>
 #include <TVector2.h>
-#include "Math/Vector4D.h"
-
-#include "Tools/KFparticle/KFUtilities.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGEM/PhotonMeson/TableProducer/skimmerGammaConversionTruthOnlyMc.cxx b/.auto-resolution/PWGEM/PhotonMeson/TableProducer/skimmerGammaConversionTruthOnlyMc.cxx
index 509a949b0dd..08a90fcf351 100644
--- a/.auto-resolution/PWGEM/PhotonMeson/TableProducer/skimmerGammaConversionTruthOnlyMc.cxx
+++ b/.auto-resolution/PWGEM/PhotonMeson/TableProducer/skimmerGammaConversionTruthOnlyMc.cxx
@@ -20,11 +20,11 @@
 #include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
 #include "PWGEM/PhotonMeson/Utils/gammaConvDefinitions.h"
 
-#include "TVector3.h"
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TVector3.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGEM/PhotonMeson/TableProducer/skimmerPHOS.cxx b/.auto-resolution/PWGEM/PhotonMeson/TableProducer/skimmerPHOS.cxx
index ef825ca5578..f205d74ec78 100644
--- a/.auto-resolution/PWGEM/PhotonMeson/TableProducer/skimmerPHOS.cxx
+++ b/.auto-resolution/PWGEM/PhotonMeson/TableProducer/skimmerPHOS.cxx
@@ -13,12 +13,14 @@
 /// dependencies: o2-analysis-calo-cluster
 /// \author daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+
 #include "Common/DataModel/CaloClusters.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 #include "PHOSBase/Geometry.h"
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGEM/PhotonMeson/Tasks/CheckMCV0.cxx b/.auto-resolution/PWGEM/PhotonMeson/Tasks/CheckMCV0.cxx
index 912e2ffc07a..cfd83f6abe7 100644
--- a/.auto-resolution/PWGEM/PhotonMeson/Tasks/CheckMCV0.cxx
+++ b/.auto-resolution/PWGEM/PhotonMeson/Tasks/CheckMCV0.cxx
@@ -13,23 +13,25 @@
 /// \dependencies: o2-analysis-lf-lambdakzeromcfinder
 /// \author daiki.sekihata@cern.ch felix.schlepper@cern.ch
 
-#include "TDatabasePDG.h"
-#include "TMath.h"
+#include "PWGEM/PhotonMeson/DataModel/mcV0Tables.h"
+#include "PWGEM/PhotonMeson/Utils/TrackSelection.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonConstants/LHCConstants.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DetectorsBase/Propagator.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "DetectorsBase/Propagator.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "PWGEM/PhotonMeson/Utils/TrackSelection.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGEM/PhotonMeson/DataModel/mcV0Tables.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "CommonConstants/LHCConstants.h"
+
+#include "TDatabasePDG.h"
+#include "TMath.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGEM/PhotonMeson/Tasks/HeavyNeutralMeson.cxx b/.auto-resolution/PWGEM/PhotonMeson/Tasks/HeavyNeutralMeson.cxx
index b416f173480..7e8f8250370 100644
--- a/.auto-resolution/PWGEM/PhotonMeson/Tasks/HeavyNeutralMeson.cxx
+++ b/.auto-resolution/PWGEM/PhotonMeson/Tasks/HeavyNeutralMeson.cxx
@@ -16,32 +16,34 @@
 /// \author Nicolas Strangmann (nicolas.strangmann@cern.ch) - Goethe University Frankfurt
 ///
 
-#include <vector>
-#include <iterator>
-#include <string>
-
-#include "Math/GenVector/Boost.h"
-#include "Math/Vector4D.h"
-#include "TMath.h"
-#include "TRandom3.h"
-
 #include "PWGEM/PhotonMeson/Utils/HNMUtilities.h"
 #include "PWGJE/DataModel/EMCALMatchedCollisions.h"
 
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/PIDResponseITS.h"
-#include "fairlogger/Logger.h"
-#include "Framework/Configurable.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonConstants/MathConstants.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/Configurable.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
-#include "CommonConstants/MathConstants.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
+
+#include "Math/GenVector/Boost.h"
+#include "Math/Vector4D.h"
+#include "TMath.h"
+#include "TRandom3.h"
+
+#include "fairlogger/Logger.h"
+
+#include <iterator>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGEM/PhotonMeson/Tasks/MaterialBudget.cxx b/.auto-resolution/PWGEM/PhotonMeson/Tasks/MaterialBudget.cxx
index b5c1a5d8fde..d2f48e3e1ea 100644
--- a/.auto-resolution/PWGEM/PhotonMeson/Tasks/MaterialBudget.cxx
+++ b/.auto-resolution/PWGEM/PhotonMeson/Tasks/MaterialBudget.cxx
@@ -14,27 +14,30 @@
 // This code loops over v0 photons for studying material budget.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include <cstring>
-#include <iterator>
+#include "PWGEM/PhotonMeson/Core/CutsLibrary.h"
+#include "PWGEM/PhotonMeson/Core/HistogramsLibrary.h"
+#include "PWGEM/PhotonMeson/Core/PairCut.h"
+#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+#include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
 
-#include "TString.h"
-#include "Math/Vector4D.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/RecoDecay.h"
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
-#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/PairCut.h"
-#include "PWGEM/PhotonMeson/Core/CutsLibrary.h"
-#include "PWGEM/PhotonMeson/Core/HistogramsLibrary.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include "Math/Vector4D.h"
+#include "TString.h"
+
+#include <cstring>
+#include <iterator>
 
 using namespace o2;
 using namespace o2::aod;
@@ -112,8 +115,8 @@ struct MaterialBudget {
           THashList* list_pair_subsys_paircut = reinterpret_cast<THashList*>(list_pair_subsys_photoncut->FindObject(pair_cut_name.data()));
           o2::aod::pwgem::photon::histogram::DefineHistograms(list_pair_subsys_paircut, "material_budget_study", "Pair");
         } // end of cut3 loop pair cut
-      }   // end of cut2 loop
-    }     // end of cut1 loop
+      } // end of cut2 loop
+    } // end of cut1 loop
   }
 
   static constexpr std::string_view pairnames[9] = {"PCMPCM", "PHOSPHOS", "EMCEMC", "PCMPHOS", "PCMEMC", "PCMDalitzEE", "PCMDalitzMuMu", "PHOSEMC", "DalitzEEDalitzEE"};
@@ -245,7 +248,7 @@ struct MaterialBudget {
           reinterpret_cast<THnSparseF*>(list_v0->FindObject(cut.GetName())->FindObject("hs_conv_point"))->Fill(value);
 
         } // end of photon loop
-      }   // end of cut loop
+      } // end of cut loop
 
     } // end of collision loop
   }
@@ -298,11 +301,11 @@ struct MaterialBudget {
                 value[5] = eta_cp2;
                 reinterpret_cast<THnSparseF*>(list_pair_ss->FindObject(Form("%s_%s", tagcut.GetName(), probecut.GetName()))->FindObject(paircut.GetName())->FindObject("hs_conv_point_same"))->Fill(value);
               } // end of pair cut loop
-            }   // end of g2 loop
-          }     // end of g1 loop
-        }       // end of probecut loop
-      }         // end of tagcut loop
-    }           // end of collision loop
+            } // end of g2 loop
+          } // end of g1 loop
+        } // end of probecut loop
+      } // end of tagcut loop
+    } // end of collision loop
   }
 
   Configurable<int> ndepth{"ndepth", 10, "depth for event mixing"};
@@ -368,11 +371,11 @@ struct MaterialBudget {
                 reinterpret_cast<THnSparseF*>(list_pair_ss->FindObject(Form("%s_%s", tagcut.GetName(), probecut.GetName()))->FindObject(paircut.GetName())->FindObject("hs_conv_point_mix"))->Fill(value);
 
               } // end of pair cut loop
-            }   // end of g2 loop
-          }     // end of g1 loop
-        }       // end of probecut loop
-      }         // end of tagcut loop
-    }           // end of different collision combinations
+            } // end of g2 loop
+          } // end of g1 loop
+        } // end of probecut loop
+      } // end of tagcut loop
+    } // end of different collision combinations
   }
 
   Partition<MyCollisions> grouped_collisions = cfgCentMin < o2::aod::cent::centFT0M && o2::aod::cent::centFT0M < cfgCentMax; // this goes to same event.
diff --git a/.auto-resolution/PWGEM/PhotonMeson/Tasks/MaterialBudgetMC.cxx b/.auto-resolution/PWGEM/PhotonMeson/Tasks/MaterialBudgetMC.cxx
index 3fe51c1ff7c..57d34165ce8 100644
--- a/.auto-resolution/PWGEM/PhotonMeson/Tasks/MaterialBudgetMC.cxx
+++ b/.auto-resolution/PWGEM/PhotonMeson/Tasks/MaterialBudgetMC.cxx
@@ -14,29 +14,32 @@
 // This code loops over v0 photons for studying material budget.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include <cstring>
-#include <iterator>
+#include "PWGEM/Dilepton/Utils/MCUtilities.h"
+#include "PWGEM/PhotonMeson/Core/CutsLibrary.h"
+#include "PWGEM/PhotonMeson/Core/HistogramsLibrary.h"
+#include "PWGEM/PhotonMeson/Core/PairCut.h"
+#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+#include "PWGEM/PhotonMeson/Utils/MCUtilities.h"
+#include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
 
-#include "TString.h"
-#include "Math/Vector4D.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/RecoDecay.h"
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
-#include "PWGEM/PhotonMeson/Utils/MCUtilities.h"
-#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/PairCut.h"
-#include "PWGEM/PhotonMeson/Core/CutsLibrary.h"
-#include "PWGEM/PhotonMeson/Core/HistogramsLibrary.h"
-#include "PWGEM/Dilepton/Utils/MCUtilities.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include "Math/Vector4D.h"
+#include "TString.h"
+
+#include <cstring>
+#include <iterator>
 
 using namespace o2;
 using namespace o2::aod;
@@ -127,8 +130,8 @@ struct MaterialBudgetMC {
           THashList* list_pair_subsys_paircut = reinterpret_cast<THashList*>(list_pair_subsys_photoncut->FindObject(pair_cut_name.data()));
           o2::aod::pwgem::photon::histogram::DefineHistograms(list_pair_subsys_paircut, "material_budget_study", "Pair");
         } // end of cut3 loop pair cut
-      }   // end of probecut loop
-    }     // end of tagcut loop
+      } // end of probecut loop
+    } // end of tagcut loop
   }
 
   static constexpr std::string_view pairnames[9] = {"PCMPCM", "PHOSPHOS", "EMCEMC", "PCMPHOS", "PCMEMC", "PCMDalitzEE", "PCMDalitzMuMu", "PHOSEMC", "DalitzEEDalitzEE"};
@@ -280,7 +283,7 @@ struct MaterialBudgetMC {
           reinterpret_cast<THnSparseF*>(list_v0->FindObject(cut.GetName())->FindObject("hs_conv_point"))->Fill(value);
 
         } // end of photon loop
-      }   // end of cut loop
+      } // end of cut loop
 
     } // end of collision loop
   }
@@ -372,11 +375,11 @@ struct MaterialBudgetMC {
                 value[5] = eta_cp2;
                 reinterpret_cast<THnSparseF*>(list_pair_ss->FindObject(Form("%s_%s", tagcut.GetName(), probecut.GetName()))->FindObject(paircut.GetName())->FindObject("hs_conv_point_same"))->Fill(value);
               } // end of pair cut loop
-            }   // end of g2 loop
-          }     // end of g1 loop
-        }       // end of probecut loop
-      }         // end of tagcut loop
-    }           // end of collision loop
+            } // end of g2 loop
+          } // end of g1 loop
+        } // end of probecut loop
+      } // end of tagcut loop
+    } // end of collision loop
   }
 
   Partition<MyCollisions> grouped_collisions = cfgCentMin < o2::aod::cent::centFT0M && o2::aod::cent::centFT0M < cfgCentMax; // this goes to same event.
diff --git a/.auto-resolution/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaEMCEMC.cxx b/.auto-resolution/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaEMCEMC.cxx
index 3b7893f7373..3ea65c53fbd 100644
--- a/.auto-resolution/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaEMCEMC.cxx
+++ b/.auto-resolution/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaEMCEMC.cxx
@@ -14,14 +14,14 @@
 // This code loops over photons and makes pairs for neutral mesons analyses.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-
+#include "PWGEM/PhotonMeson/Core/Pi0EtaToGammaGamma.h"
 #include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
 #include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
-#include "PWGEM/PhotonMeson/Core/Pi0EtaToGammaGamma.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.auto-resolution/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaMCEMCEMC.cxx b/.auto-resolution/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaMCEMCEMC.cxx
index 7cd7ba3c492..cc91949c4a7 100644
--- a/.auto-resolution/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaMCEMCEMC.cxx
+++ b/.auto-resolution/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaMCEMCEMC.cxx
@@ -14,14 +14,14 @@
 // This code loops over photons and makes pairs for neutral mesons analyses.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-
+#include "PWGEM/PhotonMeson/Core/Pi0EtaToGammaGammaMC.h"
 #include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
 #include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
-#include "PWGEM/PhotonMeson/Core/Pi0EtaToGammaGammaMC.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.auto-resolution/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaMCPCMDalitzEE.cxx b/.auto-resolution/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaMCPCMDalitzEE.cxx
index 2d929f1a82a..d4d4e45cecc 100644
--- a/.auto-resolution/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaMCPCMDalitzEE.cxx
+++ b/.auto-resolution/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaMCPCMDalitzEE.cxx
@@ -14,14 +14,14 @@
 // This code loops over photons and makes pairs for neutral mesons analyses.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-
+#include "PWGEM/PhotonMeson/Core/Pi0EtaToGammaGammaMC.h"
 #include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
 #include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
-#include "PWGEM/PhotonMeson/Core/Pi0EtaToGammaGammaMC.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.auto-resolution/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaMCPCMPCM.cxx b/.auto-resolution/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaMCPCMPCM.cxx
index 9b79891739c..12fc3ea5067 100644
--- a/.auto-resolution/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaMCPCMPCM.cxx
+++ b/.auto-resolution/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaMCPCMPCM.cxx
@@ -14,14 +14,14 @@
 // This code loops over photons and makes pairs for neutral mesons analyses.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-
+#include "PWGEM/PhotonMeson/Core/Pi0EtaToGammaGammaMC.h"
 #include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
 #include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
-#include "PWGEM/PhotonMeson/Core/Pi0EtaToGammaGammaMC.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.auto-resolution/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaPCMDalitzEE.cxx b/.auto-resolution/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaPCMDalitzEE.cxx
index 15ccbe72bd4..bbe380442c5 100644
--- a/.auto-resolution/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaPCMDalitzEE.cxx
+++ b/.auto-resolution/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaPCMDalitzEE.cxx
@@ -14,15 +14,16 @@
 // This code loops over photons and makes pairs for neutral mesons analyses.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-
-#include "Common/Core/RecoDecay.h"
+#include "PWGEM/PhotonMeson/Core/Pi0EtaToGammaGamma.h"
 #include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
 #include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
-#include "PWGEM/PhotonMeson/Core/Pi0EtaToGammaGamma.h"
+
+#include "Common/Core/RecoDecay.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.auto-resolution/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaPCMPCM.cxx b/.auto-resolution/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaPCMPCM.cxx
index 24557c828a7..739beddd277 100644
--- a/.auto-resolution/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaPCMPCM.cxx
+++ b/.auto-resolution/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaPCMPCM.cxx
@@ -14,14 +14,14 @@
 // This code loops over photons and makes pairs for neutral mesons analyses.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-
+#include "PWGEM/PhotonMeson/Core/Pi0EtaToGammaGamma.h"
 #include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
 #include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
-#include "PWGEM/PhotonMeson/Core/Pi0EtaToGammaGamma.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.auto-resolution/PWGEM/PhotonMeson/Tasks/SinglePhoton.cxx b/.auto-resolution/PWGEM/PhotonMeson/Tasks/SinglePhoton.cxx
index 9c82fa7b09a..b0e127e5f7a 100644
--- a/.auto-resolution/PWGEM/PhotonMeson/Tasks/SinglePhoton.cxx
+++ b/.auto-resolution/PWGEM/PhotonMeson/Tasks/SinglePhoton.cxx
@@ -14,29 +14,32 @@
 // This code loops over photon candidate and fill histograms
 //    Please write to: daiki.sekihata@cern.ch
 
-#include <cstring>
-#include <iterator>
+#include "PWGEM/PhotonMeson/Core/CutsLibrary.h"
+#include "PWGEM/PhotonMeson/Core/EMCPhotonCut.h"
+#include "PWGEM/PhotonMeson/Core/HistogramsLibrary.h"
+#include "PWGEM/PhotonMeson/Core/PHOSPhotonCut.h"
+#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
 
-#include "TString.h"
-#include "Math/Vector4D.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/trackUtilities.h"
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/RecoDecay.h"
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/PHOSPhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/EMCPhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/CutsLibrary.h"
-#include "PWGEM/PhotonMeson/Core/HistogramsLibrary.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include "Math/Vector4D.h"
+#include "TString.h"
+
+#include <cstring>
+#include <iterator>
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.auto-resolution/PWGEM/PhotonMeson/Tasks/SinglePhotonMC.cxx b/.auto-resolution/PWGEM/PhotonMeson/Tasks/SinglePhotonMC.cxx
index ccb33db7f3a..5e6eded4e78 100644
--- a/.auto-resolution/PWGEM/PhotonMeson/Tasks/SinglePhotonMC.cxx
+++ b/.auto-resolution/PWGEM/PhotonMeson/Tasks/SinglePhotonMC.cxx
@@ -14,32 +14,35 @@
 // This code loops over photon candidate and fill histograms
 //    Please write to: daiki.sekihata@cern.ch
 
-#include <cstring>
-#include <iterator>
+#include "PWGEM/Dilepton/Utils/MCUtilities.h"
+#include "PWGEM/PhotonMeson/Core/CutsLibrary.h"
+#include "PWGEM/PhotonMeson/Core/EMCPhotonCut.h"
+#include "PWGEM/PhotonMeson/Core/HistogramsLibrary.h"
+#include "PWGEM/PhotonMeson/Core/PHOSPhotonCut.h"
+#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+#include "PWGEM/PhotonMeson/Utils/MCUtilities.h"
 
-#include "TString.h"
-#include "TMath.h"
-#include "Math/Vector4D.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/trackUtilities.h"
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/RecoDecay.h"
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/PhotonMeson/Utils/MCUtilities.h"
-#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/PHOSPhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/EMCPhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/CutsLibrary.h"
-#include "PWGEM/PhotonMeson/Core/HistogramsLibrary.h"
-#include "PWGEM/Dilepton/Utils/MCUtilities.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include "Math/Vector4D.h"
+#include "TMath.h"
+#include "TString.h"
+
+#include <cstring>
+#include <iterator>
 
 using namespace o2;
 using namespace o2::aod;
@@ -351,8 +354,8 @@ struct SinglePhotonMC {
           }
 
         } // end of photon loop
-      }   // end of cut loop
-    }     // end of collision loop
+      } // end of cut loop
+    } // end of collision loop
   }
 
   Partition<MyCollisions> grouped_collisions = (cfgCentMin < o2::aod::cent::centFT0M && o2::aod::cent::centFT0M < cfgCentMax) || (cfgCentMin < o2::aod::cent::centFT0A && o2::aod::cent::centFT0A < cfgCentMax) || (cfgCentMin < o2::aod::cent::centFT0C && o2::aod::cent::centFT0C < cfgCentMax); // this goes to same event.
diff --git a/.auto-resolution/PWGEM/PhotonMeson/Tasks/TagAndProbe.cxx b/.auto-resolution/PWGEM/PhotonMeson/Tasks/TagAndProbe.cxx
index 2f91a62dc43..b305a76228e 100644
--- a/.auto-resolution/PWGEM/PhotonMeson/Tasks/TagAndProbe.cxx
+++ b/.auto-resolution/PWGEM/PhotonMeson/Tasks/TagAndProbe.cxx
@@ -14,28 +14,31 @@
 // This code is for data-driven efficiency for photon analyses. tag and probe method
 //    Please write to: daiki.sekihata@cern.ch
 
-#include <cstring>
-#include <iterator>
+#include "PWGEM/PhotonMeson/Core/CutsLibrary.h"
+#include "PWGEM/PhotonMeson/Core/EMCPhotonCut.h"
+#include "PWGEM/PhotonMeson/Core/HistogramsLibrary.h"
+#include "PWGEM/PhotonMeson/Core/PHOSPhotonCut.h"
+#include "PWGEM/PhotonMeson/Core/PairCut.h"
+#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+#include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
 
-#include "TString.h"
-#include "Math/Vector4D.h"
-#include "Math/Vector3D.h"
+#include "Common/Core/RecoDecay.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "Math/AxisAngle.h"
 #include "Math/LorentzRotation.h"
 #include "Math/Rotation3D.h"
-#include "Math/AxisAngle.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/Core/RecoDecay.h"
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
-#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/PHOSPhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/EMCPhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/PairCut.h"
-#include "PWGEM/PhotonMeson/Core/CutsLibrary.h"
-#include "PWGEM/PhotonMeson/Core/HistogramsLibrary.h"
+#include "Math/Vector3D.h"
+#include "Math/Vector4D.h"
+#include "TString.h"
+
+#include <cstring>
+#include <iterator>
 
 using namespace o2;
 using namespace o2::aod;
@@ -126,7 +129,7 @@ struct TagAndProbe {
         THashList* list_pair_subsys_paircut = reinterpret_cast<THashList*>(list_pair_subsys_photoncut->FindObject(pair_cut_name.data()));
         o2::aod::pwgem::photon::histogram::DefineHistograms(list_pair_subsys_paircut, "tag_and_probe", pairname.data());
       } // end of cut3 loop pair cut
-    }   // end of cut2 loop
+    } // end of cut2 loop
   }
 
   static constexpr std::string_view pairnames[6] = {"PCMPCM", "PHOSPHOS", "EMCEMC", "PCMPHOS", "PCMEMC", "PHOSEMC"};
@@ -318,10 +321,10 @@ struct TagAndProbe {
                 RotationBackground<aod::SkimEMCClusters>(v12, v1, v2, photons2_coll, g1.globalIndex(), g2.globalIndex(), probecut, paircut, emcmatchedtracks);
               }
             } // end of probe cut loop
-          }   // end of pair cut loop
-        }     // end of g2 loop
-      }       // end of g1 loop
-    }         // end of collision loop
+          } // end of pair cut loop
+        } // end of g2 loop
+      } // end of g1 loop
+    } // end of collision loop
   }
 
   Configurable<int> ndepth{"ndepth", 10, "depth for event mixing"};
@@ -406,10 +409,10 @@ struct TagAndProbe {
               reinterpret_cast<TH2F*>(list_pair_ss->FindObject(Form("%s_%s", tagcut.GetName(), probecut.GetName()))->FindObject(paircut.GetName())->FindObject("hMggPt_PassingProbe_Mixed"))->Fill(v12.M(), v2.Pt());
 
             } // end of probe cut loop
-          }   // end of pair cut loop
-        }     // end of g2 loop
-      }       // end of g1 loop
-    }         // end of different collision combinations
+          } // end of pair cut loop
+        } // end of g2 loop
+      } // end of g1 loop
+    } // end of different collision combinations
   }
 
   /// \brief Calculate background (using rotation background method only for EMCal!)
diff --git a/.auto-resolution/PWGEM/PhotonMeson/Tasks/TaggingPi0MCPCMDalitzEE.cxx b/.auto-resolution/PWGEM/PhotonMeson/Tasks/TaggingPi0MCPCMDalitzEE.cxx
index ccdc4184568..22dfbe45376 100644
--- a/.auto-resolution/PWGEM/PhotonMeson/Tasks/TaggingPi0MCPCMDalitzEE.cxx
+++ b/.auto-resolution/PWGEM/PhotonMeson/Tasks/TaggingPi0MCPCMDalitzEE.cxx
@@ -14,10 +14,11 @@
 // This code loops over photons and makes pairs for neutral mesons analyses.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "PWGEM/PhotonMeson/Core/TaggingPi0MC.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::aod;
 
diff --git a/.auto-resolution/PWGEM/PhotonMeson/Tasks/TaggingPi0PCMDalitzEE.cxx b/.auto-resolution/PWGEM/PhotonMeson/Tasks/TaggingPi0PCMDalitzEE.cxx
index 2292faef120..ce583e23b5f 100644
--- a/.auto-resolution/PWGEM/PhotonMeson/Tasks/TaggingPi0PCMDalitzEE.cxx
+++ b/.auto-resolution/PWGEM/PhotonMeson/Tasks/TaggingPi0PCMDalitzEE.cxx
@@ -14,10 +14,11 @@
 // This code loops over photons and makes pairs for neutral mesons analyses.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "PWGEM/PhotonMeson/Core/TaggingPi0.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::aod;
 
diff --git a/.auto-resolution/PWGEM/PhotonMeson/Tasks/emcalPi0QC.cxx b/.auto-resolution/PWGEM/PhotonMeson/Tasks/emcalPi0QC.cxx
index 509e74402b5..743e4a67f25 100644
--- a/.auto-resolution/PWGEM/PhotonMeson/Tasks/emcalPi0QC.cxx
+++ b/.auto-resolution/PWGEM/PhotonMeson/Tasks/emcalPi0QC.cxx
@@ -9,36 +9,35 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <climits>
-#include <cstdlib>
-#include <map>
-#include <memory>
-#include <sstream>
-#include <string>
-#include <vector>
-#include <cmath>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoA.h"
-#include "Framework/HistogramRegistry.h"
+#include "PWGJE/DataModel/EMCALClusters.h"
+#include "PWGJE/DataModel/EMCALMatchedCollisions.h"
 
-#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 
-#include "EMCALBase/Geometry.h"
-#include "PWGJE/DataModel/EMCALClusters.h"
-#include "PWGJE/DataModel/EMCALMatchedCollisions.h"
+#include "CommonDataFormat/InteractionRecord.h"
+#include "DataFormatsEMCAL/AnalysisCluster.h"
 #include "DataFormatsEMCAL/Cell.h"
 #include "DataFormatsEMCAL/Constants.h"
-#include "DataFormatsEMCAL/AnalysisCluster.h"
-
-#include "CommonDataFormat/InteractionRecord.h"
+#include "EMCALBase/Geometry.h"
+#include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 
 #include "TLorentzVector.h"
 #include "TVector3.h"
 
+#include <climits>
+#include <cmath>
+#include <cstdlib>
+#include <map>
+#include <memory>
+#include <sstream>
+#include <string>
+#include <vector>
+
 // \struct Pi0QCTask
 /// \brief Simple monitoring task for EMCal clusters
 /// \author Joshua Koenig <joshua.konig@cern.ch>, Goethe University Frankfurt
diff --git a/.auto-resolution/PWGEM/PhotonMeson/Tasks/emcalQC.cxx b/.auto-resolution/PWGEM/PhotonMeson/Tasks/emcalQC.cxx
index 4173c26eccf..91b558cb609 100644
--- a/.auto-resolution/PWGEM/PhotonMeson/Tasks/emcalQC.cxx
+++ b/.auto-resolution/PWGEM/PhotonMeson/Tasks/emcalQC.cxx
@@ -18,28 +18,32 @@
 /// \author Nicolas Strangmann (nicolas.strangmann@cern.ch) Goethe University Frankfurt
 ///
 
-#include <string>
-#include <vector>
-#include <array>
-#include "TString.h"
-#include "THashList.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/trackUtilities.h"
+#include "PWGEM/PhotonMeson/Core/CutsLibrary.h"
+#include "PWGEM/PhotonMeson/Core/EMCPhotonCut.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+#include "PWGEM/PhotonMeson/Utils/ClusterHistograms.h"
+#include "PWGEM/PhotonMeson/Utils/EventHistograms.h"
+
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/RecoDecay.h"
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/PhotonMeson/Core/EMCPhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/CutsLibrary.h"
-#include "PWGEM/PhotonMeson/Utils/EventHistograms.h"
-#include "PWGEM/PhotonMeson/Utils/ClusterHistograms.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include "THashList.h"
+#include "TString.h"
+
+#include <array>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.auto-resolution/PWGEM/PhotonMeson/Tasks/gammaConversions.cxx b/.auto-resolution/PWGEM/PhotonMeson/Tasks/gammaConversions.cxx
index 37e4bf4dde1..933dd12944f 100644
--- a/.auto-resolution/PWGEM/PhotonMeson/Tasks/gammaConversions.cxx
+++ b/.auto-resolution/PWGEM/PhotonMeson/Tasks/gammaConversions.cxx
@@ -15,21 +15,22 @@
 
 #include "PWGEM/PhotonMeson/Tasks/gammaConversions.h"
 
-#include <map>
-#include <vector>
-#include <string>
-#include <memory>
-
 #include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
 #include "PWGEM/PhotonMeson/Utils/gammaConvDefinitions.h"
 
-#include "Framework/AnalysisTask.h"
+#include "Common/Core/RecoDecay.h"
+
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "Common/Core/RecoDecay.h"
 
-#include <TVector3.h>
 #include <TMath.h> // for ATan2, Cos, Sin, Sqrt
+#include <TVector3.h>
+
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGEM/PhotonMeson/Tasks/gammaConversions.h b/.auto-resolution/PWGEM/PhotonMeson/Tasks/gammaConversions.h
index 9e1c9ebe7db..a09121baf36 100644
--- a/.auto-resolution/PWGEM/PhotonMeson/Tasks/gammaConversions.h
+++ b/.auto-resolution/PWGEM/PhotonMeson/Tasks/gammaConversions.h
@@ -162,4 +162,5 @@ struct tHistoRegistry {
   tHistoFolderCTV mCollision{mPath + "Collision/"};
   tHistoFolderCTV mTrack{mPath + "Track/"};
   tHistoFolderCTV mV0{mPath + "V0/"};
-};
\ No newline at end of file
+};
+  
\ No newline at end of file
diff --git a/.auto-resolution/PWGEM/PhotonMeson/Tasks/gammaConversionsTruthOnlyMc.cxx b/.auto-resolution/PWGEM/PhotonMeson/Tasks/gammaConversionsTruthOnlyMc.cxx
index 259a53cd037..89c094c530b 100644
--- a/.auto-resolution/PWGEM/PhotonMeson/Tasks/gammaConversionsTruthOnlyMc.cxx
+++ b/.auto-resolution/PWGEM/PhotonMeson/Tasks/gammaConversionsTruthOnlyMc.cxx
@@ -17,12 +17,12 @@
 #include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
 #include "PWGEM/PhotonMeson/Utils/gammaConvDefinitions.h"
 
-#include "TVector3.h"
-
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
 
+#include "TVector3.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
@@ -163,4 +163,5 @@ struct gammaConversionsTruthOnlyMc {
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
   return WorkflowSpec{adaptAnalysisTask<gammaConversionsTruthOnlyMc>(cfgc)};
-}
\ No newline at end of file
+}
+ 
\ No newline at end of file
diff --git a/.auto-resolution/PWGEM/PhotonMeson/Tasks/mcGeneratorStudies.cxx b/.auto-resolution/PWGEM/PhotonMeson/Tasks/mcGeneratorStudies.cxx
index 889858359ed..d7c5aafb298 100644
--- a/.auto-resolution/PWGEM/PhotonMeson/Tasks/mcGeneratorStudies.cxx
+++ b/.auto-resolution/PWGEM/PhotonMeson/Tasks/mcGeneratorStudies.cxx
@@ -16,11 +16,11 @@
 /// \author Nicolas Strangmann (nicolas.strangmann@cern.ch) - Goethe University Frankfurt
 ///
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 
 #include "TDatabasePDG.h"
 
diff --git a/.auto-resolution/PWGEM/PhotonMeson/Tasks/pcmQC.cxx b/.auto-resolution/PWGEM/PhotonMeson/Tasks/pcmQC.cxx
index 077a1be9f7d..9c621c62745 100644
--- a/.auto-resolution/PWGEM/PhotonMeson/Tasks/pcmQC.cxx
+++ b/.auto-resolution/PWGEM/PhotonMeson/Tasks/pcmQC.cxx
@@ -14,18 +14,18 @@
 // This code runs loop over v0 photons for PCM QC.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include <string>
-#include <vector>
+#include "PWGEM/PhotonMeson/Core/EMPhotonEventCut.h"
+#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+#include "PWGEM/PhotonMeson/Utils/PCMUtilities.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
-#include "PWGEM/PhotonMeson/Utils/PCMUtilities.h"
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/EMPhotonEventCut.h"
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.auto-resolution/PWGEM/PhotonMeson/Tasks/pcmQCMC.cxx b/.auto-resolution/PWGEM/PhotonMeson/Tasks/pcmQCMC.cxx
index 0587fe75138..694941112ba 100644
--- a/.auto-resolution/PWGEM/PhotonMeson/Tasks/pcmQCMC.cxx
+++ b/.auto-resolution/PWGEM/PhotonMeson/Tasks/pcmQCMC.cxx
@@ -14,20 +14,20 @@
 // This code runs loop over v0 photons for PCM QC.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include <string>
-#include <vector>
+#include "PWGEM/Dilepton/Utils/MCUtilities.h"
+#include "PWGEM/PhotonMeson/Core/EMPhotonEventCut.h"
+#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+#include "PWGEM/PhotonMeson/Utils/MCUtilities.h"
+#include "PWGEM/PhotonMeson/Utils/PCMUtilities.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/PhotonMeson/Utils/PCMUtilities.h"
-#include "PWGEM/PhotonMeson/Utils/MCUtilities.h"
-#include "PWGEM/Dilepton/Utils/MCUtilities.h"
-#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/EMPhotonEventCut.h"
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.auto-resolution/PWGEM/PhotonMeson/Tasks/phosQC.cxx b/.auto-resolution/PWGEM/PhotonMeson/Tasks/phosQC.cxx
index e7009b94f05..074a517122f 100644
--- a/.auto-resolution/PWGEM/PhotonMeson/Tasks/phosQC.cxx
+++ b/.auto-resolution/PWGEM/PhotonMeson/Tasks/phosQC.cxx
@@ -14,25 +14,29 @@
 // This code runs loop over PHOS clusters for PHOS QC.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include <array>
-#include "TString.h"
-#include "THashList.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/trackUtilities.h"
+#include "PWGEM/PhotonMeson/Core/CutsLibrary.h"
+#include "PWGEM/PhotonMeson/Core/HistogramsLibrary.h"
+#include "PWGEM/PhotonMeson/Core/PHOSPhotonCut.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/RecoDecay.h"
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/PhotonMeson/Core/PHOSPhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/CutsLibrary.h"
-#include "PWGEM/PhotonMeson/Core/HistogramsLibrary.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include "THashList.h"
+#include "TString.h"
+
+#include <array>
 
 using namespace o2;
 using namespace o2::aod;
@@ -148,8 +152,8 @@ struct phosQC {
         } // end of v0 loop
         reinterpret_cast<TH1F*>(fMainList->FindObject("Cluster")->FindObject(cut.GetName())->FindObject("hNgamma"))->Fill(ng);
       } // end of cut loop
-    }   // end of collision loop
-  }     // end of process
+    } // end of collision loop
+  } // end of process
 
   void processDummy(MyCollisions const&) {}
 
diff --git a/.auto-resolution/PWGEM/PhotonMeson/Tasks/prefilterPhoton.cxx b/.auto-resolution/PWGEM/PhotonMeson/Tasks/prefilterPhoton.cxx
index 4b0ce098f6c..41975a0a9c6 100644
--- a/.auto-resolution/PWGEM/PhotonMeson/Tasks/prefilterPhoton.cxx
+++ b/.auto-resolution/PWGEM/PhotonMeson/Tasks/prefilterPhoton.cxx
@@ -14,32 +14,33 @@
 // This code produces information on prefilter for photon.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include <string>
-#include <vector>
-#include <unordered_map>
 #include <map>
+#include <string>
 #include <tuple>
+#include <unordered_map>
+#include <vector>
 
 // #include "TString.h"
-#include "Math/Vector4D.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "Math/Vector4D.h"
 // #include "Common/Core/RecoDecay.h"
+#include "PWGEM/Dilepton/Utils/PairUtilities.h"
+#include "PWGEM/PhotonMeson/Core/DalitzEECut.h"
+#include "PWGEM/PhotonMeson/Core/EMPhotonEventCut.h"
+#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+#include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
+
 #include "Common/Core/trackUtilities.h"
 
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
 #include "CCDB/BasicCCDBManager.h"
-
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
-#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/EMPhotonEventCut.h"
-#include "PWGEM/PhotonMeson/Core/DalitzEECut.h"
-#include "PWGEM/Dilepton/Utils/PairUtilities.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.auto-resolution/PWGEM/PhotonMeson/Tasks/taskPi0FlowEMC.cxx b/.auto-resolution/PWGEM/PhotonMeson/Tasks/taskPi0FlowEMC.cxx
index 2e64bd6ebe2..b2eb97a3ac4 100644
--- a/.auto-resolution/PWGEM/PhotonMeson/Tasks/taskPi0FlowEMC.cxx
+++ b/.auto-resolution/PWGEM/PhotonMeson/Tasks/taskPi0FlowEMC.cxx
@@ -14,47 +14,46 @@
 ///
 /// \author M. Hemmer, marvin.hemmer@cern.ch
 
-#include <numbers>
-#include <iterator>
-#include <array>
-#include <string>
-#include <map>
-#include <algorithm>
-#include <vector>
-#include <tuple>
-#include <utility>
-#include <cmath>
-
-#include "Math/Vector4D.h"
-#include "Math/Vector3D.h"
-#include "Math/LorentzRotation.h"
-#include "Math/Rotation3D.h"
-#include "Math/AxisAngle.h"
-
-#include "CCDB/BasicCCDBManager.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
+#include "PWGEM/Dilepton/Utils/EMTrackUtilities.h"
+#include "PWGEM/PhotonMeson/Core/EMCPhotonCut.h"
+#include "PWGEM/PhotonMeson/Core/EMPhotonEventCut.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+#include "PWGEM/PhotonMeson/Utils/EventHistograms.h"
+#include "PWGEM/PhotonMeson/Utils/NMHistograms.h"
+#include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
+#include "PWGEM/PhotonMeson/Utils/emcalHistoDefinitions.h"
 
 #include "Common/Core/EventPlaneHelper.h"
 #include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/Qvectors.h"
-#include "CommonConstants/MathConstants.h"
 
-#include "DetectorsBase/GeometryManager.h"
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonConstants/MathConstants.h"
 #include "DataFormatsEMCAL/Constants.h"
+#include "DetectorsBase/GeometryManager.h"
 #include "EMCALBase/Geometry.h"
 #include "EMCALCalib/BadChannelMap.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 
-#include "PWGEM/Dilepton/Utils/EMTrackUtilities.h"
-#include "PWGEM/PhotonMeson/Core/EMCPhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/EMPhotonEventCut.h"
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/PhotonMeson/Utils/emcalHistoDefinitions.h"
-#include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
-#include "PWGEM/PhotonMeson/Utils/EventHistograms.h"
-#include "PWGEM/PhotonMeson/Utils/NMHistograms.h"
+#include "Math/AxisAngle.h"
+#include "Math/LorentzRotation.h"
+#include "Math/Rotation3D.h"
+#include "Math/Vector3D.h"
+#include "Math/Vector4D.h"
+
+#include <algorithm>
+#include <array>
+#include <cmath>
+#include <iterator>
+#include <map>
+#include <numbers>
+#include <string>
+#include <tuple>
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.auto-resolution/PWGEM/PhotonMeson/Utils/HNMUtilities.h b/.auto-resolution/PWGEM/PhotonMeson/Utils/HNMUtilities.h
index bb985686285..24472e677d4 100644
--- a/.auto-resolution/PWGEM/PhotonMeson/Utils/HNMUtilities.h
+++ b/.auto-resolution/PWGEM/PhotonMeson/Utils/HNMUtilities.h
@@ -19,23 +19,26 @@
 #ifndef PWGEM_PHOTONMESON_UTILS_HNMUTILITIES_H_
 #define PWGEM_PHOTONMESON_UTILS_HNMUTILITIES_H_
 
-#include <CommonConstants/MathConstants.h>
-#include <CommonConstants/PhysicsConstants.h>
-#include <vector>
-#include "TVector3.h"
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Common/DataModel/EventSelection.h"
-#include "EMCALBase/Geometry.h"
-#include "PWGJE/DataModel/EMCALClusters.h"
 #include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
 #include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
+#include "PWGJE/DataModel/EMCALClusters.h"
+
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 #include "EventFiltering/filterTables.h"
 
+#include "EMCALBase/Geometry.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include <CommonConstants/MathConstants.h>
+#include <CommonConstants/PhysicsConstants.h>
+
+#include "TVector3.h"
+
+#include <vector>
+
 namespace o2::aod::pwgem::photonmeson::hnmutilities
 {
 // -------> Struct to store photons from EMC clusters or V0s
diff --git a/.auto-resolution/PWGEM/PhotonMeson/Utils/PCMUtilities.h b/.auto-resolution/PWGEM/PhotonMeson/Utils/PCMUtilities.h
index e82d580cfcd..03c3b366e58 100644
--- a/.auto-resolution/PWGEM/PhotonMeson/Utils/PCMUtilities.h
+++ b/.auto-resolution/PWGEM/PhotonMeson/Utils/PCMUtilities.h
@@ -15,11 +15,13 @@
 #ifndef PWGEM_PHOTONMESON_UTILS_PCMUTILITIES_H_
 #define PWGEM_PHOTONMESON_UTILS_PCMUTILITIES_H_
 
-#include <TVector2.h>
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/trackUtilities.h"
+
 #include "DCAFitter/HelixHelper.h"
 #include "DetectorsBase/Propagator.h"
-#include "Common/Core/trackUtilities.h"
-#include "Common/Core/RecoDecay.h"
+
+#include <TVector2.h>
 
 //_______________________________________________________________________
 inline bool checkAP(const float alpha, const float qt, const float alpha_max = 0.95, const float qt_max = 0.05)
diff --git a/.auto-resolution/PWGEM/PhotonMeson/Utils/PairUtilities.h b/.auto-resolution/PWGEM/PhotonMeson/Utils/PairUtilities.h
index 86ac4f0eb16..3fa44f1c735 100644
--- a/.auto-resolution/PWGEM/PhotonMeson/Utils/PairUtilities.h
+++ b/.auto-resolution/PWGEM/PhotonMeson/Utils/PairUtilities.h
@@ -16,6 +16,7 @@
 #define PWGEM_PHOTONMESON_UTILS_PAIRUTILITIES_H_
 
 #include <TVector2.h>
+
 #include <cmath>
 
 namespace o2::aod::pwgem::photonmeson::utils::pairutil
diff --git a/.auto-resolution/PWGEM/PhotonMeson/Utils/emcalHistoDefinitions.h b/.auto-resolution/PWGEM/PhotonMeson/Utils/emcalHistoDefinitions.h
index 6ce678e9c35..2540064309a 100644
--- a/.auto-resolution/PWGEM/PhotonMeson/Utils/emcalHistoDefinitions.h
+++ b/.auto-resolution/PWGEM/PhotonMeson/Utils/emcalHistoDefinitions.h
@@ -12,10 +12,10 @@
 /// \brief commonly used histogram (axis) definitions for emcal in PWGEM
 /// \author marvin.hemmer@cern.ch
 
-#include <vector>
-
 #include "Framework/AnalysisTask.h"
 
+#include <vector>
+
 #ifndef PWGEM_PHOTONMESON_UTILS_EMCALHISTODEFINITIONS_H_
 #define PWGEM_PHOTONMESON_UTILS_EMCALHISTODEFINITIONS_H_
 
diff --git a/.auto-resolution/PWGEM/PhotonMeson/Utils/gammaSelectionCuts.h b/.auto-resolution/PWGEM/PhotonMeson/Utils/gammaSelectionCuts.h
index 341a6c95e38..8fe140ef92d 100644
--- a/.auto-resolution/PWGEM/PhotonMeson/Utils/gammaSelectionCuts.h
+++ b/.auto-resolution/PWGEM/PhotonMeson/Utils/gammaSelectionCuts.h
@@ -12,10 +12,11 @@
 /// \brief cut selection and cut functions for photon candidates
 /// \author marvin.hemmer@cern.ch
 
-#include <vector>
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
 
 #include "Framework/AnalysisTask.h"
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+
+#include <vector>
 
 #ifndef PWGEM_PHOTONMESON_UTILS_GAMMASELECTIONCUTS_H_
 #define PWGEM_PHOTONMESON_UTILS_GAMMASELECTIONCUTS_H_
diff --git a/.auto-resolution/PWGEM/Tasks/phosAlign.cxx b/.auto-resolution/PWGEM/Tasks/phosAlign.cxx
index d63d77b84e5..e628250a670 100644
--- a/.auto-resolution/PWGEM/Tasks/phosAlign.cxx
+++ b/.auto-resolution/PWGEM/Tasks/phosAlign.cxx
@@ -9,35 +9,35 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <climits>
-#include <cstdlib>
-#include <map>
-#include <memory>
-#include <vector>
-#include "Common/Core/trackUtilities.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/CaloClusters.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "ReconstructionDataFormats/TrackParametrization.h"
 
-#include "Framework/ConfigParamSpec.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonDataFormat/InteractionRecord.h"
+#include "DataFormatsParameters/GRPLHCIFData.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DetectorsBase/Propagator.h"
 #include "Framework/ASoA.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/ConfigParamSpec.h"
 #include "Framework/HistogramRegistry.h"
-
+#include "Framework/runDataProcessing.h"
 #include "PHOSBase/Geometry.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CommonDataFormat/InteractionRecord.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPLHCIFData.h"
-#include "DetectorsBase/Propagator.h"
+#include "ReconstructionDataFormats/TrackParametrization.h"
+
+#include <climits>
+#include <cstdlib>
+#include <map>
+#include <memory>
+#include <vector>
 
 /// \struct PHOS pi0 analysis
 /// \brief Monitoring task for PHOS related quantities
diff --git a/.auto-resolution/PWGEM/Tasks/phosCalibration.cxx b/.auto-resolution/PWGEM/Tasks/phosCalibration.cxx
index 1116f47f0f2..59b6c295be2 100644
--- a/.auto-resolution/PWGEM/Tasks/phosCalibration.cxx
+++ b/.auto-resolution/PWGEM/Tasks/phosCalibration.cxx
@@ -9,35 +9,35 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <climits>
-#include <cstdlib>
-#include <map>
-#include <memory>
-#include <vector>
-#include "TFile.h"
-#include "TGrid.h"
-#include "TLorentzVector.h"
-
-#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/CaloClusters.h"
+#include "Common/DataModel/EventSelection.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonDataFormat/InteractionRecord.h"
+#include "CommonUtils/NameConf.h"
+#include "DataFormatsPHOS/BadChannelsMap.h"
+#include "DataFormatsPHOS/CalibParams.h"
 #include "DataFormatsPHOS/Cell.h"
 #include "DataFormatsPHOS/Cluster.h"
 #include "DataFormatsPHOS/TriggerRecord.h"
-#include "DataFormatsPHOS/BadChannelsMap.h"
-#include "DataFormatsPHOS/CalibParams.h"
+#include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/ConfigParamSpec.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 #include "PHOSBase/Geometry.h"
 #include "PHOSReconstruction/Clusterer.h"
 
-#include "Framework/ConfigParamSpec.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoA.h"
-#include "Framework/HistogramRegistry.h"
-#include "CommonUtils/NameConf.h"
-#include "CCDB/BasicCCDBManager.h"
+#include "TFile.h"
+#include "TGrid.h"
+#include "TLorentzVector.h"
 
-#include "CommonDataFormat/InteractionRecord.h"
+#include <climits>
+#include <cstdlib>
+#include <map>
+#include <memory>
+#include <vector>
 
 using namespace o2;
 using namespace o2::aod::evsel;
diff --git a/.auto-resolution/PWGEM/Tasks/phosCellQA.cxx b/.auto-resolution/PWGEM/Tasks/phosCellQA.cxx
index 710244c1a6d..26a627830ca 100644
--- a/.auto-resolution/PWGEM/Tasks/phosCellQA.cxx
+++ b/.auto-resolution/PWGEM/Tasks/phosCellQA.cxx
@@ -9,26 +9,26 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <climits>
-#include <cstdlib>
-#include <map>
-#include <memory>
-#include <vector>
-#include <string>
+#include "Common/DataModel/EventSelection.h"
 
 #include "CCDB/BasicCCDBManager.h"
-#include "Common/DataModel/EventSelection.h"
-#include "DataFormatsPHOS/Cell.h"
+#include "CommonDataFormat/InteractionRecord.h"
 #include "DataFormatsPHOS/CalibParams.h"
-#include "Framework/ConfigParamSpec.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "DataFormatsPHOS/Cell.h"
 #include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/ConfigParamSpec.h"
 #include "Framework/HistogramRegistry.h"
-
+#include "Framework/runDataProcessing.h"
 #include "PHOSBase/Geometry.h"
-#include "CommonDataFormat/InteractionRecord.h"
+
+#include <climits>
+#include <cstdlib>
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
 
 /// \struct PHOS QA
 /// \brief Monitoring task for PHOS related quantities
diff --git a/.auto-resolution/PWGEM/Tasks/phosCluQA.cxx b/.auto-resolution/PWGEM/Tasks/phosCluQA.cxx
index e563dc3aebe..6ccf4f2ed3c 100644
--- a/.auto-resolution/PWGEM/Tasks/phosCluQA.cxx
+++ b/.auto-resolution/PWGEM/Tasks/phosCluQA.cxx
@@ -9,26 +9,26 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <climits>
-#include <cstdlib>
-#include <map>
-#include <memory>
-#include <vector>
 #include "Common/DataModel/CaloClusters.h"
 #include "Common/DataModel/EventSelection.h"
 
-#include "Framework/ConfigParamSpec.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoA.h"
-#include "Framework/HistogramRegistry.h"
-#include "CommonUtils/NameConf.h"
 #include "CCDB/BasicCCDBManager.h"
+#include "CommonDataFormat/InteractionRecord.h"
+#include "CommonUtils/NameConf.h"
 #include "DataFormatsParameters/GRPLHCIFData.h"
-
+#include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/ConfigParamSpec.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 #include "PHOSBase/Geometry.h"
-#include "CommonDataFormat/InteractionRecord.h"
+
+#include <climits>
+#include <cstdlib>
+#include <map>
+#include <memory>
+#include <vector>
 
 /// \struct PHOS QA
 /// \brief Monitoring task for PHOS related quantities
diff --git a/.auto-resolution/PWGEM/Tasks/phosElId.cxx b/.auto-resolution/PWGEM/Tasks/phosElId.cxx
index 23e09da288f..2734e57e1dd 100644
--- a/.auto-resolution/PWGEM/Tasks/phosElId.cxx
+++ b/.auto-resolution/PWGEM/Tasks/phosElId.cxx
@@ -16,37 +16,40 @@
 /// \author Yeghishe Hambardzumyan, MIPT
 /// \since Apr, 2024
 
-#include <climits>
-#include <cstdlib>
-#include <map>
-#include <memory>
-#include <vector>
-#include "Common/Core/trackUtilities.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/CaloClusters.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/FT0Corrected.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "ReconstructionDataFormats/TrackParametrization.h"
-#include "Framework/ConfigParamSpec.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonDataFormat/InteractionRecord.h"
+#include "DataFormatsParameters/GRPLHCIFData.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DetectorsBase/Propagator.h"
 #include "Framework/ASoA.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/ConfigParamSpec.h"
 #include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 #include "PHOSBase/Geometry.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CommonDataFormat/InteractionRecord.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPLHCIFData.h"
-#include "DetectorsBase/Propagator.h"
+#include "ReconstructionDataFormats/TrackParametrization.h"
+
 #include "TF1.h"
 
+#include <climits>
+#include <cstdlib>
+#include <map>
+#include <memory>
+#include <vector>
+
 using namespace o2;
 using namespace o2::soa;
 using namespace o2::aod::evsel;
diff --git a/.auto-resolution/PWGEM/Tasks/phosNbar.cxx b/.auto-resolution/PWGEM/Tasks/phosNbar.cxx
index 7cd2e4387a7..31e35368a6b 100644
--- a/.auto-resolution/PWGEM/Tasks/phosNbar.cxx
+++ b/.auto-resolution/PWGEM/Tasks/phosNbar.cxx
@@ -8,30 +8,30 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include <queue>
-#include "TRandom.h"
-
 #include "Common/Core/trackUtilities.h"
-#include "Framework/ConfigParamSpec.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoA.h"
-#include "Framework/HistogramRegistry.h"
-#include "CommonUtils/NameConf.h"
+#include "Common/DataModel/CaloClusters.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "CommonDataFormat/InteractionRecord.h"
+#include "CommonUtils/NameConf.h"
 #include "DataFormatsParameters/GRPLHCIFData.h"
 #include "DataFormatsParameters/GRPMagField.h"
 #include "DetectorsBase/Propagator.h"
-
+#include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/ConfigParamSpec.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include "PHOSBase/Geometry.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/CaloClusters.h"
 
-#include "PHOSBase/Geometry.h"
-#include "CommonDataFormat/InteractionRecord.h"
+#include "TRandom.h"
+
+#include <queue>
 
 /// \struct phosNbar
 /// \brief account Nbar who's clusters appeared within PHOS
diff --git a/.auto-resolution/PWGEM/Tasks/phosNonlin.cxx b/.auto-resolution/PWGEM/Tasks/phosNonlin.cxx
index f25043c5f0c..4cbb9e11219 100644
--- a/.auto-resolution/PWGEM/Tasks/phosNonlin.cxx
+++ b/.auto-resolution/PWGEM/Tasks/phosNonlin.cxx
@@ -14,15 +14,6 @@
 /// \author Dmitri Peresunko <Dmitri.Peresunko@cern.ch>
 ///
 
-#include <array>
-#include <climits>
-#include <cstdlib>
-#include <map>
-#include <memory>
-#include <string>
-#include <vector>
-
-#include <TLorentzVector.h>
 #include "Common/DataModel/CaloClusters.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
@@ -30,18 +21,27 @@
 #include "EventFiltering/Zorro.h"
 #include "EventFiltering/ZorroSummary.h"
 
-#include "Framework/ConfigParamSpec.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonDataFormat/InteractionRecord.h"
+#include "DataFormatsParameters/GRPLHCIFData.h"
 #include "Framework/ASoA.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/ConfigParamSpec.h"
 #include "Framework/HistogramRegistry.h"
-
+#include "Framework/runDataProcessing.h"
 #include "PHOSBase/Geometry.h"
-#include "CommonDataFormat/InteractionRecord.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPLHCIFData.h"
+
+#include <TLorentzVector.h>
+
+#include <array>
+#include <climits>
+#include <cstdlib>
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::aod::evsel;
diff --git a/.auto-resolution/PWGEM/Tasks/phosPi0.cxx b/.auto-resolution/PWGEM/Tasks/phosPi0.cxx
index a47aaa0d485..cccae5045aa 100644
--- a/.auto-resolution/PWGEM/Tasks/phosPi0.cxx
+++ b/.auto-resolution/PWGEM/Tasks/phosPi0.cxx
@@ -14,34 +14,32 @@
 /// \author Dmitri Peresunko <Dmitri.Peresunko@cern.ch>
 ///
 
-#include <algorithm>
-#include <climits>
-#include <cstdlib>
-#include <map>
-#include <memory>
-#include <string>
-#include <vector>
-
 #include "Common/DataModel/CaloClusters.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-
-#include "Framework/ConfigParamSpec.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoA.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/HistogramRegistry.h"
-
 #include "EventFiltering/Zorro.h"
 #include "EventFiltering/ZorroSummary.h"
 
-#include "PHOSBase/Geometry.h"
-#include "CommonDataFormat/InteractionRecord.h"
 #include "CCDB/BasicCCDBManager.h"
+#include "CommonDataFormat/InteractionRecord.h"
 #include "DataFormatsParameters/GRPLHCIFData.h"
+#include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/ConfigParamSpec.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include "PHOSBase/Geometry.h"
+
+#include <algorithm>
+#include <climits>
+#include <cstdlib>
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::aod::evsel;
diff --git a/.auto-resolution/PWGEM/Tasks/phosTrigQA.cxx b/.auto-resolution/PWGEM/Tasks/phosTrigQA.cxx
index b0b0949cfb5..c7dab6e4e7a 100644
--- a/.auto-resolution/PWGEM/Tasks/phosTrigQA.cxx
+++ b/.auto-resolution/PWGEM/Tasks/phosTrigQA.cxx
@@ -9,28 +9,28 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <climits>
-#include <cstdlib>
-#include <map>
-#include <memory>
-#include <vector>
 #include "Common/DataModel/CaloClusters.h"
 #include "Common/DataModel/EventSelection.h"
+#include "EventFiltering/filterTables.h"
 
-#include "Framework/ConfigParamSpec.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonDataFormat/InteractionRecord.h"
+#include "CommonUtils/NameConf.h"
+#include "DataFormatsParameters/GRPLHCIFData.h"
 #include "Framework/ASoA.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/ConfigParamSpec.h"
 #include "Framework/HistogramRegistry.h"
-#include "CommonUtils/NameConf.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPLHCIFData.h"
-
+#include "Framework/runDataProcessing.h"
 #include "PHOSBase/Geometry.h"
-#include "CommonDataFormat/InteractionRecord.h"
-#include "EventFiltering/filterTables.h"
+
+#include <climits>
+#include <cstdlib>
+#include <map>
+#include <memory>
+#include <vector>
 
 /// \struct PHOS trigger QA
 /// \brief Monitoring task for PHOS related quantities
diff --git a/.auto-resolution/PWGHF/ALICE3/TableProducer/candidateCreatorChic.cxx b/.auto-resolution/PWGHF/ALICE3/TableProducer/candidateCreatorChic.cxx
index e01b4fe0a6a..e34932fcdea 100644
--- a/.auto-resolution/PWGHF/ALICE3/TableProducer/candidateCreatorChic.cxx
+++ b/.auto-resolution/PWGHF/ALICE3/TableProducer/candidateCreatorChic.cxx
@@ -15,8 +15,12 @@
 ///
 /// \author Alessandro De Falco <alessandro.de.falco@ca.infn.it>, Cagliari University
 
-#include <utility>
-#include <vector>
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
+
+#include "ALICE3/DataModel/ECAL.h"
+#include "Common/Core/trackUtilities.h"
 
 #include "CommonConstants/PhysicsConstants.h"
 #include "DCAFitter/DCAFitterN.h"
@@ -24,12 +28,8 @@
 #include "ReconstructionDataFormats/DCA.h"
 #include "ReconstructionDataFormats/V0.h"
 
-#include "ALICE3/DataModel/ECAL.h"
-#include "Common/Core/trackUtilities.h"
-
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis;
@@ -201,9 +201,9 @@ struct HfCandidateCreatorChic {
           hMassChicToJpsiToMuMuGamma->Fill(massJpsiGamma);
         }
       } // ecal loop
-    }   // Jpsi loop
-  }     // process
-};      // struct
+    } // Jpsi loop
+  } // process
+}; // struct
 
 /// Extends the base table with expression columns.
 struct HfCandidateCreatorChicExpressions {
@@ -299,8 +299,8 @@ struct HfCandidateCreatorChicMc {
 
       rowMcMatchGen(flag, origin, channel);
     } // candidate loop
-  }   // process
-};    // struct
+  } // process
+}; // struct
 
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
diff --git a/.auto-resolution/PWGHF/ALICE3/TableProducer/candidateCreatorX.cxx b/.auto-resolution/PWGHF/ALICE3/TableProducer/candidateCreatorX.cxx
index 2e3477dab99..02e5939ec32 100644
--- a/.auto-resolution/PWGHF/ALICE3/TableProducer/candidateCreatorX.cxx
+++ b/.auto-resolution/PWGHF/ALICE3/TableProducer/candidateCreatorX.cxx
@@ -16,8 +16,11 @@
 /// \author Rik Spijkers <r.spijkers@students.uu.nl>, Utrecht University
 /// \author Luca Micheletti <luca.micheletti@to.infn.it>, INFN
 
-#include <utility>
-#include <vector>
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
+
+#include "Common/Core/trackUtilities.h"
 
 #include "CommonConstants/PhysicsConstants.h"
 #include "DCAFitter/DCAFitterN.h"
@@ -25,11 +28,8 @@
 #include "ReconstructionDataFormats/DCA.h"
 #include "ReconstructionDataFormats/V0.h"
 
-#include "Common/Core/trackUtilities.h"
-
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis;
@@ -255,10 +255,10 @@ struct HfCandidateCreatorX {
             hMassXToJpsiToMuMuPiPi->Fill(massJpsiPiPi);
           }
         } // pi- loop
-      }   // pi+ loop
-    }     // Jpsi loop
-  }       // process
-};        // struct
+      } // pi+ loop
+    } // Jpsi loop
+  } // process
+}; // struct
 
 /// Extends the base table with expression columns.
 struct HfCandidateCreatorXExpressions {
@@ -363,8 +363,8 @@ struct HfCandidateCreatorXMc {
 
       rowMcMatchGen(flag, origin, channel);
     } // candidate loop
-  }   // process
-};    // struct
+  } // process
+}; // struct
 
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
diff --git a/.auto-resolution/PWGHF/ALICE3/TableProducer/candidateSelectorChicToJpsiGamma.cxx b/.auto-resolution/PWGHF/ALICE3/TableProducer/candidateSelectorChicToJpsiGamma.cxx
index 5160a2ba99c..bcd3c25cbe7 100644
--- a/.auto-resolution/PWGHF/ALICE3/TableProducer/candidateSelectorChicToJpsiGamma.cxx
+++ b/.auto-resolution/PWGHF/ALICE3/TableProducer/candidateSelectorChicToJpsiGamma.cxx
@@ -15,16 +15,16 @@
 ///
 /// \author Alessandro De Falco <alessandro.de.falco@ca.infn.it>, Università/INFN Cagliari
 
-#include <vector>
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/Core/SelectorCuts.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
 
 #include "CommonConstants/PhysicsConstants.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
 
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/Core/SelectorCuts.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
+#include <vector>
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.auto-resolution/PWGHF/ALICE3/TableProducer/candidateSelectorD0Alice3Barrel.cxx b/.auto-resolution/PWGHF/ALICE3/TableProducer/candidateSelectorD0Alice3Barrel.cxx
index 705deeeaff2..64a74907928 100644
--- a/.auto-resolution/PWGHF/ALICE3/TableProducer/candidateSelectorD0Alice3Barrel.cxx
+++ b/.auto-resolution/PWGHF/ALICE3/TableProducer/candidateSelectorD0Alice3Barrel.cxx
@@ -15,18 +15,18 @@
 /// \author Nima Zardoshti <nima.zardoshti@cern.ch>, CERN
 /// \author Vít Kučera <vit.kucera@cern.ch>, CERN
 
-#include <vector>
-#include <algorithm>
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
+
+#include "ALICE3/DataModel/RICH.h"
 
 #include "CommonConstants/PhysicsConstants.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
 
-#include "ALICE3/DataModel/RICH.h"
-
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
+#include <algorithm>
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis;
diff --git a/.auto-resolution/PWGHF/ALICE3/TableProducer/candidateSelectorD0Alice3Forward.cxx b/.auto-resolution/PWGHF/ALICE3/TableProducer/candidateSelectorD0Alice3Forward.cxx
index a213c3edd04..adc59d03ed9 100644
--- a/.auto-resolution/PWGHF/ALICE3/TableProducer/candidateSelectorD0Alice3Forward.cxx
+++ b/.auto-resolution/PWGHF/ALICE3/TableProducer/candidateSelectorD0Alice3Forward.cxx
@@ -15,18 +15,18 @@
 /// \author Nima Zardoshti <nima.zardoshti@cern.ch>, CERN
 /// \author Vít Kučera <vit.kucera@cern.ch>, CERN
 
-#include <vector>
-#include <algorithm>
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
+
+#include "ALICE3/DataModel/RICH.h"
 
 #include "CommonConstants/PhysicsConstants.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
 
-#include "ALICE3/DataModel/RICH.h"
-
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
+#include <algorithm>
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis;
diff --git a/.auto-resolution/PWGHF/ALICE3/TableProducer/candidateSelectorD0ParametrizedPid.cxx b/.auto-resolution/PWGHF/ALICE3/TableProducer/candidateSelectorD0ParametrizedPid.cxx
index 6a46231b0c2..1ae60aa64b9 100644
--- a/.auto-resolution/PWGHF/ALICE3/TableProducer/candidateSelectorD0ParametrizedPid.cxx
+++ b/.auto-resolution/PWGHF/ALICE3/TableProducer/candidateSelectorD0ParametrizedPid.cxx
@@ -15,18 +15,18 @@
 /// \author Nima Zardoshti <nima.zardoshti@cern.ch>, CERN
 /// \author Vít Kučera <vit.kucera@cern.ch>, CERN
 
-#include <vector>
-#include <algorithm>
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
+
+#include "ALICE3/DataModel/RICH.h"
 
 #include "CommonConstants/PhysicsConstants.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
 
-#include "ALICE3/DataModel/RICH.h"
-
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
+#include <algorithm>
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis;
diff --git a/.auto-resolution/PWGHF/ALICE3/TableProducer/candidateSelectorJpsi.cxx b/.auto-resolution/PWGHF/ALICE3/TableProducer/candidateSelectorJpsi.cxx
index 391aba49da0..a04b064b1b1 100644
--- a/.auto-resolution/PWGHF/ALICE3/TableProducer/candidateSelectorJpsi.cxx
+++ b/.auto-resolution/PWGHF/ALICE3/TableProducer/candidateSelectorJpsi.cxx
@@ -16,18 +16,18 @@
 /// \author Nima Zardoshti <nima.zardoshti@cern.ch>, CERN
 /// \author Vít Kučera <vit.kucera@cern.ch>, CERN
 
-#include <vector>
-
-#include "CommonConstants/PhysicsConstants.h"
-#include "Framework/AnalysisTask.h"
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
 
 #include "ALICE3/DataModel/MID.h"
 #include "ALICE3/DataModel/RICH.h"
 #include "Common/Core/TrackSelectorPID.h"
 
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/AnalysisTask.h"
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis;
diff --git a/.auto-resolution/PWGHF/ALICE3/TableProducer/candidateSelectorLcAlice3.cxx b/.auto-resolution/PWGHF/ALICE3/TableProducer/candidateSelectorLcAlice3.cxx
index c9abeedad39..0703dbcaf89 100644
--- a/.auto-resolution/PWGHF/ALICE3/TableProducer/candidateSelectorLcAlice3.cxx
+++ b/.auto-resolution/PWGHF/ALICE3/TableProducer/candidateSelectorLcAlice3.cxx
@@ -16,17 +16,17 @@
 /// \author Nima Zardoshti <nima.zardoshti@cern.ch>, CERN
 /// \author Vít Kučera <vit.kucera@cern.ch>, CERN
 
-#include <vector>
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
+
+#include "ALICE3/DataModel/RICH.h"
 
 #include "CommonConstants/PhysicsConstants.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
 
-#include "ALICE3/DataModel/RICH.h"
-
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis;
diff --git a/.auto-resolution/PWGHF/ALICE3/TableProducer/candidateSelectorLcParametrizedPid.cxx b/.auto-resolution/PWGHF/ALICE3/TableProducer/candidateSelectorLcParametrizedPid.cxx
index 0a3210a63f6..4b5ab4feaea 100644
--- a/.auto-resolution/PWGHF/ALICE3/TableProducer/candidateSelectorLcParametrizedPid.cxx
+++ b/.auto-resolution/PWGHF/ALICE3/TableProducer/candidateSelectorLcParametrizedPid.cxx
@@ -16,17 +16,17 @@
 /// \author Nima Zardoshti <nima.zardoshti@cern.ch>, CERN
 /// \author Vít Kučera <vit.kucera@cern.ch>, CERN
 
-#include <vector>
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
+
+#include "ALICE3/DataModel/RICH.h"
 
 #include "CommonConstants/PhysicsConstants.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
 
-#include "ALICE3/DataModel/RICH.h"
-
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis;
diff --git a/.auto-resolution/PWGHF/ALICE3/TableProducer/candidateSelectorXToJpsiPiPi.cxx b/.auto-resolution/PWGHF/ALICE3/TableProducer/candidateSelectorXToJpsiPiPi.cxx
index bff87d84e70..bc1f5da2f7a 100644
--- a/.auto-resolution/PWGHF/ALICE3/TableProducer/candidateSelectorXToJpsiPiPi.cxx
+++ b/.auto-resolution/PWGHF/ALICE3/TableProducer/candidateSelectorXToJpsiPiPi.cxx
@@ -16,16 +16,16 @@
 /// \author Rik Spijkers <r.spijkers@students.uu.nl>, Utrecht University
 /// \author Luca Micheletti <luca.micheletti@to.infn.it>, INFN
 
-#include <vector>
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/Core/SelectorCuts.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
 
 #include "CommonConstants/PhysicsConstants.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
 
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/Core/SelectorCuts.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
+#include <vector>
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.auto-resolution/PWGHF/ALICE3/TableProducer/treeCreatorChicToJpsiGamma.cxx b/.auto-resolution/PWGHF/ALICE3/TableProducer/treeCreatorChicToJpsiGamma.cxx
index 1b164a0fc0e..29019da1884 100644
--- a/.auto-resolution/PWGHF/ALICE3/TableProducer/treeCreatorChicToJpsiGamma.cxx
+++ b/.auto-resolution/PWGHF/ALICE3/TableProducer/treeCreatorChicToJpsiGamma.cxx
@@ -18,14 +18,14 @@
 /// \author Alessandro De Falco <alessandro.de.falco@ca.infn.it>, Università/INFN Cagliari
 /// \author Luca Micheletti <luca.micheletti@to.infn.it>, INFN
 
-#include "CommonConstants/PhysicsConstants.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-
 #include "PWGHF/Core/HfHelper.h"
 #include "PWGHF/DataModel/CandidateReconstructionTables.h"
 #include "PWGHF/DataModel/CandidateSelectionTables.h"
 
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::aod;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGHF/ALICE3/TableProducer/treeCreatorXToJpsiPiPi.cxx b/.auto-resolution/PWGHF/ALICE3/TableProducer/treeCreatorXToJpsiPiPi.cxx
index 7a981b35798..d6cb0c8a83d 100644
--- a/.auto-resolution/PWGHF/ALICE3/TableProducer/treeCreatorXToJpsiPiPi.cxx
+++ b/.auto-resolution/PWGHF/ALICE3/TableProducer/treeCreatorXToJpsiPiPi.cxx
@@ -17,13 +17,13 @@
 ///
 /// \author Luca Micheletti <luca.micheletti@to.infn.it>, INFN
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-
 #include "PWGHF/Core/HfHelper.h"
 #include "PWGHF/DataModel/CandidateReconstructionTables.h"
 #include "PWGHF/DataModel/CandidateSelectionTables.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::aod;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGHF/ALICE3/Tasks/taskChic.cxx b/.auto-resolution/PWGHF/ALICE3/Tasks/taskChic.cxx
index f8cb85454a1..5a7adab7404 100644
--- a/.auto-resolution/PWGHF/ALICE3/Tasks/taskChic.cxx
+++ b/.auto-resolution/PWGHF/ALICE3/Tasks/taskChic.cxx
@@ -15,16 +15,16 @@
 /// \author Gian Michele Innocenti <gian.michele.innocenti@cern.ch>, CERN
 /// \author Alessandro De Falco <alessandro.de.falco@ca.infn.it>, Cagliari University
 
-#include <vector>
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/Core/SelectorCuts.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
 
 #include "CommonConstants/PhysicsConstants.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/Core/SelectorCuts.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
+#include <vector>
 
 using namespace o2;
 using namespace o2::aod;
@@ -101,8 +101,8 @@ struct HfTaskChic {
       registry.fill(HIST("hDecLenXYErr"), candidate.errorDecayLengthXY(), candidate.pt());
       //      registry.fill(HIST("hEGamma"), candidate.prong1().e());
     } // candidate loop
-  }   // process
-};    // struct
+  } // process
+}; // struct
 
 struct HfTaskChicMc {
   Configurable<int> selectionFlagChic{"selectionFlagChic", 1, "Selection Flag for Chic"};
@@ -225,8 +225,8 @@ struct HfTaskChicMc {
         registry.fill(HIST("hPtProng1Gen"), ptProngs[1], particle.pt());
       }
     } // gen
-  }   // process
-};    // struct
+  } // process
+}; // struct
 
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
diff --git a/.auto-resolution/PWGHF/ALICE3/Tasks/taskD0Alice3Barrel.cxx b/.auto-resolution/PWGHF/ALICE3/Tasks/taskD0Alice3Barrel.cxx
index da86e77a06b..481c85248b0 100644
--- a/.auto-resolution/PWGHF/ALICE3/Tasks/taskD0Alice3Barrel.cxx
+++ b/.auto-resolution/PWGHF/ALICE3/Tasks/taskD0Alice3Barrel.cxx
@@ -15,15 +15,15 @@
 /// \author Gian Michele Innocenti <gian.michele.innocenti@cern.ch>, CERN
 /// \author Vít Kučera <vit.kucera@cern.ch>, CERN
 
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
+
 #include "CommonConstants/PhysicsConstants.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
 
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.auto-resolution/PWGHF/ALICE3/Tasks/taskD0Alice3Forward.cxx b/.auto-resolution/PWGHF/ALICE3/Tasks/taskD0Alice3Forward.cxx
index dea53a20d70..0b4afc24583 100644
--- a/.auto-resolution/PWGHF/ALICE3/Tasks/taskD0Alice3Forward.cxx
+++ b/.auto-resolution/PWGHF/ALICE3/Tasks/taskD0Alice3Forward.cxx
@@ -15,15 +15,15 @@
 /// \author Gian Michele Innocenti <gian.michele.innocenti@cern.ch>, CERN
 /// \author Vít Kučera <vit.kucera@cern.ch>, CERN
 
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
+
 #include "CommonConstants/PhysicsConstants.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
 
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.auto-resolution/PWGHF/ALICE3/Tasks/taskD0ParametrizedPid.cxx b/.auto-resolution/PWGHF/ALICE3/Tasks/taskD0ParametrizedPid.cxx
index 3fe2487b2f3..a0df06fd12c 100644
--- a/.auto-resolution/PWGHF/ALICE3/Tasks/taskD0ParametrizedPid.cxx
+++ b/.auto-resolution/PWGHF/ALICE3/Tasks/taskD0ParametrizedPid.cxx
@@ -15,15 +15,15 @@
 /// \author Gian Michele Innocenti <gian.michele.innocenti@cern.ch>, CERN
 /// \author Vít Kučera <vit.kucera@cern.ch>, CERN
 
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
+
 #include "CommonConstants/PhysicsConstants.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
 
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.auto-resolution/PWGHF/ALICE3/Tasks/taskJpsi.cxx b/.auto-resolution/PWGHF/ALICE3/Tasks/taskJpsi.cxx
index a9210ccca86..d231b55c3d4 100644
--- a/.auto-resolution/PWGHF/ALICE3/Tasks/taskJpsi.cxx
+++ b/.auto-resolution/PWGHF/ALICE3/Tasks/taskJpsi.cxx
@@ -16,15 +16,15 @@
 /// \author Vít Kučera <vit.kucera@cern.ch>, CERN
 /// \author Biao Zhang <biao.zhang@cern.ch>, CCNU
 
-#include <vector>
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
 
 #include "CommonConstants/PhysicsConstants.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis;
diff --git a/.auto-resolution/PWGHF/ALICE3/Tasks/taskLcAlice3.cxx b/.auto-resolution/PWGHF/ALICE3/Tasks/taskLcAlice3.cxx
index 9bbfdaf91e5..4889ac7d5b3 100644
--- a/.auto-resolution/PWGHF/ALICE3/Tasks/taskLcAlice3.cxx
+++ b/.auto-resolution/PWGHF/ALICE3/Tasks/taskLcAlice3.cxx
@@ -15,15 +15,15 @@
 /// \author Gian Michele Innocenti <gian.michele.innocenti@cern.ch>, CERN
 /// \author Vít Kučera <vit.kucera@cern.ch>, CERN
 
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
+
 #include "CommonConstants/PhysicsConstants.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
 
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.auto-resolution/PWGHF/ALICE3/Tasks/taskLcParametrizedPid.cxx b/.auto-resolution/PWGHF/ALICE3/Tasks/taskLcParametrizedPid.cxx
index 8936c56e2c1..2457f7a6e88 100644
--- a/.auto-resolution/PWGHF/ALICE3/Tasks/taskLcParametrizedPid.cxx
+++ b/.auto-resolution/PWGHF/ALICE3/Tasks/taskLcParametrizedPid.cxx
@@ -15,15 +15,15 @@
 /// \author Gian Michele Innocenti <gian.michele.innocenti@cern.ch>, CERN
 /// \author Vít Kučera <vit.kucera@cern.ch>, CERN
 
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
+
 #include "CommonConstants/PhysicsConstants.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
 
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.auto-resolution/PWGHF/ALICE3/Tasks/taskQaPidRejection.cxx b/.auto-resolution/PWGHF/ALICE3/Tasks/taskQaPidRejection.cxx
index f0e819e3086..82156ed8e3f 100644
--- a/.auto-resolution/PWGHF/ALICE3/Tasks/taskQaPidRejection.cxx
+++ b/.auto-resolution/PWGHF/ALICE3/Tasks/taskQaPidRejection.cxx
@@ -16,16 +16,7 @@
 /// \author Henrique J C Zanoli <henrique.zanoli@cern.ch>, Utrecht University
 /// \author Nicolo' Jacazio <nicolo.jacazio@cern.ch>, CERN
 
-#include <utility>
-#include <vector>
-
-#include <TEfficiency.h>
-#include <TList.h>
-#include <TPDGCode.h>
-
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "ReconstructionDataFormats/DCA.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
 
 #include "ALICE3/DataModel/MID.h"
 #include "ALICE3/DataModel/RICH.h"
@@ -33,7 +24,16 @@
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "ReconstructionDataFormats/DCA.h"
+
+#include <TEfficiency.h>
+#include <TList.h>
+#include <TPDGCode.h>
+
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGHF/ALICE3/Tasks/taskX.cxx b/.auto-resolution/PWGHF/ALICE3/Tasks/taskX.cxx
index f090eb57876..295d7517787 100644
--- a/.auto-resolution/PWGHF/ALICE3/Tasks/taskX.cxx
+++ b/.auto-resolution/PWGHF/ALICE3/Tasks/taskX.cxx
@@ -16,16 +16,16 @@
 /// \author Rik Spijkers <r.spijkers@students.uu.nl>, Utrecht University
 /// \author Luca Micheletti <luca.micheletti@to.infn.it>, INFN
 
-#include <vector>
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/Core/SelectorCuts.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
 
 #include "CommonConstants/PhysicsConstants.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/Core/SelectorCuts.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
+#include <vector>
 
 using namespace o2;
 using namespace o2::aod;
@@ -102,8 +102,8 @@ struct HfTaskX {
       registry.fill(HIST("hDecLenErr"), candidate.errorDecayLength(), candidate.pt());
       registry.fill(HIST("hDecLenXYErr"), candidate.errorDecayLengthXY(), candidate.pt());
     } // candidate loop
-  }   // process
-};    // struct
+  } // process
+}; // struct
 
 struct HfTaskXMc {
   Configurable<int> selectionFlagX{"selectionFlagX", 1, "Selection Flag for X"};
@@ -230,8 +230,8 @@ struct HfTaskXMc {
         registry.fill(HIST("hPtGenProng2"), ptProngs[2], particle.pt());
       }
     } // gen
-  }   // process
-};    // struct
+  } // process
+}; // struct
 
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
diff --git a/.auto-resolution/PWGHF/D2H/DataModel/ReducedDataModel.h b/.auto-resolution/PWGHF/D2H/DataModel/ReducedDataModel.h
index e5a776c02c4..34f844cdc3e 100644
--- a/.auto-resolution/PWGHF/D2H/DataModel/ReducedDataModel.h
+++ b/.auto-resolution/PWGHF/D2H/DataModel/ReducedDataModel.h
@@ -1165,7 +1165,7 @@ DECLARE_SOA_COLUMN(Sign, sign, int8_t);                                      //!
 DECLARE_SOA_COLUMN(ItsNClsSoftPi, itsNClsSoftPi, int);                       //! minimum value of number of ITS clusters for the decay daughter tracks
 DECLARE_SOA_COLUMN(TpcNClsCrossedRowsSoftPi, tpcNClsCrossedRowsSoftPi, int); //! minimum value of number of TPC crossed rows for the decay daughter tracks
 DECLARE_SOA_COLUMN(TpcChi2NClSoftPi, tpcChi2NClSoftPi, float);               //! maximum value of TPC chi2 for the decay daughter tracks
-DECLARE_SOA_DYNAMIC_COLUMN(Px, px, //!
+DECLARE_SOA_DYNAMIC_COLUMN(Px, px,                                           //!
                            [](float pxProng0, float pxProng1, float pxProng2) -> float { return 1.f * pxProng0 + 1.f * pxProng1 + 1.f * pxProng2; });
 DECLARE_SOA_DYNAMIC_COLUMN(Py, py, //!
                            [](float pyProng0, float pyProng1, float pyProng2) -> float { return 1.f * pyProng0 + 1.f * pyProng1 + 1.f * pyProng2; });
@@ -1376,16 +1376,16 @@ DECLARE_SOA_COLUMN(InvMassProng1, invMassProng1, float); //! Invariant Mass of V
 DECLARE_SOA_COLUMN(Sign, sign, int8_t);                  //! Sign of the Resonance candidate
 DECLARE_SOA_COLUMN(IsWrongSign, isWrongSign, int8_t);    //! Flag for wrong sign of the Resonance candidate, 1 = wrong sign, 0 = right sign
 
-DECLARE_SOA_COLUMN(FlagMcMatchRec, flagMcMatchRec, int8_t);               // flag for resonance decay channel classification reconstruction level
-DECLARE_SOA_COLUMN(FlagMcMatchRecD, flagMcMatchRecD, int8_t);             // flag for D meson bachelor decay channel classification reconstruction level
-DECLARE_SOA_COLUMN(FlagMcMatchChanD, flagMcMatchChanD, int8_t);           // flag for D meson resonant channel classification reconstruction level
-DECLARE_SOA_COLUMN(FlagMcMatchGen, flagMcMatchGen, int8_t);               // flag for decay channel classification generator level
-DECLARE_SOA_COLUMN(DebugMcRec, debugMcRec, uint16_t);                     // debug flag for mis-association at reconstruction level
-DECLARE_SOA_COLUMN(Origin, origin, int8_t);                               // Flag for origin of MC particle 1=promt, 2=FD
-DECLARE_SOA_COLUMN(SignD0, signD0, int8_t);                               // Sign of the D0 in the channels with D* -> D0 pi, needed in case of non-matched D*
-DECLARE_SOA_COLUMN(PtGen, ptGen, float);                                  // Pt at generation level in GeV/c
-DECLARE_SOA_COLUMN(InvMassGen, invMassGen, float);                        //! Invariant mass at generation level in GeV/c2
-DECLARE_SOA_DYNAMIC_COLUMN(Pt, pt,                                        //!
+DECLARE_SOA_COLUMN(FlagMcMatchRec, flagMcMatchRec, int8_t);     // flag for resonance decay channel classification reconstruction level
+DECLARE_SOA_COLUMN(FlagMcMatchRecD, flagMcMatchRecD, int8_t);   // flag for D meson bachelor decay channel classification reconstruction level
+DECLARE_SOA_COLUMN(FlagMcMatchChanD, flagMcMatchChanD, int8_t); // flag for D meson resonant channel classification reconstruction level
+DECLARE_SOA_COLUMN(FlagMcMatchGen, flagMcMatchGen, int8_t);     // flag for decay channel classification generator level
+DECLARE_SOA_COLUMN(DebugMcRec, debugMcRec, uint16_t);           // debug flag for mis-association at reconstruction level
+DECLARE_SOA_COLUMN(Origin, origin, int8_t);                     // Flag for origin of MC particle 1=promt, 2=FD
+DECLARE_SOA_COLUMN(SignD0, signD0, int8_t);                     // Sign of the D0 in the channels with D* -> D0 pi, needed in case of non-matched D*
+DECLARE_SOA_COLUMN(PtGen, ptGen, float);                        // Pt at generation level in GeV/c
+DECLARE_SOA_COLUMN(InvMassGen, invMassGen, float);              //! Invariant mass at generation level in GeV/c2
+DECLARE_SOA_DYNAMIC_COLUMN(Pt, pt,                              //!
                            [](float pxProng0, float pxProng1, float pyProng0, float pyProng1) -> float { return RecoDecay::pt((1.f * pxProng0 + 1.f * pxProng1), (1.f * pyProng0 + 1.f * pyProng1)); });
 DECLARE_SOA_DYNAMIC_COLUMN(PtProng0, ptProng0, //!
                            [](float pxProng0, float pyProng0) -> float { return RecoDecay::pt(pxProng0, pyProng0); });
diff --git a/.auto-resolution/PWGHF/HFC/Macros/DhCorrelationExtraction.h b/.auto-resolution/PWGHF/HFC/Macros/DhCorrelationExtraction.h
index 73b07c61e83..ddfe205372c 100644
--- a/.auto-resolution/PWGHF/HFC/Macros/DhCorrelationExtraction.h
+++ b/.auto-resolution/PWGHF/HFC/Macros/DhCorrelationExtraction.h
@@ -17,8 +17,6 @@
 #ifndef PWGHF_HFC_MACROS_DHCORRELATIONEXTRACTION_H_
 #define PWGHF_HFC_MACROS_DHCORRELATIONEXTRACTION_H_
 
-#include <Rtypes.h>
-#include <RtypesCore.h>
 #include <TAttMarker.h>
 #include <TDirectoryFile.h>
 #include <TFile.h>
@@ -28,6 +26,9 @@
 #include <TObject.h>
 #include <TString.h>
 
+#include <Rtypes.h>
+#include <RtypesCore.h>
+
 class DhCorrelationExtraction : public TObject
 {
 
diff --git a/.auto-resolution/PWGHF/HFC/Macros/DhCorrelationFitter.h b/.auto-resolution/PWGHF/HFC/Macros/DhCorrelationFitter.h
index a4bdf3c3bb1..e2354624bf2 100644
--- a/.auto-resolution/PWGHF/HFC/Macros/DhCorrelationFitter.h
+++ b/.auto-resolution/PWGHF/HFC/Macros/DhCorrelationFitter.h
@@ -17,12 +17,13 @@
 #ifndef PWGHF_HFC_MACROS_DHCORRELATIONFITTER_H_
 #define PWGHF_HFC_MACROS_DHCORRELATIONFITTER_H_
 
-#include <cstdio>
-
-#include <RtypesCore.h>
 #include <TF1.h>
 #include <TH1.h>
 
+#include <RtypesCore.h>
+
+#include <cstdio>
+
 class DhCorrelationFitter
 {
 
diff --git a/.auto-resolution/PWGHF/HFC/Macros/ExtractOutputCorrel.C b/.auto-resolution/PWGHF/HFC/Macros/ExtractOutputCorrel.C
index 301434f66e2..872093701ff 100644
--- a/.auto-resolution/PWGHF/HFC/Macros/ExtractOutputCorrel.C
+++ b/.auto-resolution/PWGHF/HFC/Macros/ExtractOutputCorrel.C
@@ -16,12 +16,14 @@
 /// \author Samuele Cattaruzzi <samuele.cattaruzzi@cern.ch>
 /// \author Swapnesh Santosh Khade <swapnesh.santosh.khade@cern.ch>
 
+#include "DhCorrelationExtraction.h"
 #include "Riostream.h"
+
 #include <TROOT.h>
 #include <TStyle.h>
+
 #include <rapidjson/document.h>
 #include <rapidjson/filereadstream.h>
-#include "DhCorrelationExtraction.h"
 
 using namespace rapidjson;
 
diff --git a/.auto-resolution/PWGHF/HFC/Macros/FitCorrel.C b/.auto-resolution/PWGHF/HFC/Macros/FitCorrel.C
index 37b36a5e1b3..3e15eda604a 100644
--- a/.auto-resolution/PWGHF/HFC/Macros/FitCorrel.C
+++ b/.auto-resolution/PWGHF/HFC/Macros/FitCorrel.C
@@ -16,17 +16,19 @@
 /// \author Samuele Cattaruzzi <samuele.cattaruzzi@cern.ch>
 /// \author Swapnesh Santosh Khade <swapnesh.santosh.khade@cern.ch>
 
+#include "DhCorrelationFitter.h"
 #include "Riostream.h"
-#include <TROOT.h>
+
 #include <TF1.h>
 #include <TH1D.h>
 #include <TMath.h>
 #include <TPaveText.h>
-#include <TSystem.h>
+#include <TROOT.h>
 #include <TStyle.h>
+#include <TSystem.h>
+
 #include <rapidjson/document.h>
 #include <rapidjson/filereadstream.h>
-#include "DhCorrelationFitter.h"
 
 using namespace rapidjson;
 
diff --git a/.auto-resolution/PWGJE/Core/MlResponseHfTagging.h b/.auto-resolution/PWGJE/Core/MlResponseHfTagging.h
index 2b07e1c1c25..186575205b9 100644
--- a/.auto-resolution/PWGJE/Core/MlResponseHfTagging.h
+++ b/.auto-resolution/PWGJE/Core/MlResponseHfTagging.h
@@ -18,11 +18,10 @@
 
 #include "Tools/ML/MlResponse.h"
 
-#include <onnxruntime_cxx_api.h>
-
 #include <Framework/Logger.h>
 
 #include <onnxruntime_c_api.h>
+#include <onnxruntime_cxx_api.h>
 
 #include <cstddef>
 #include <cstdint>
@@ -330,6 +329,7 @@ class TensorAllocator
 {
  protected:
   Ort::MemoryInfo memInfo;
+
  public:
   TensorAllocator()
     : memInfo(Ort::MemoryInfo::CreateCpu(OrtAllocatorType::OrtArenaAllocator, OrtMemType::OrtMemTypeDefault))
diff --git a/.auto-resolution/PWGJE/DataModel/PhotonChargedTriggerCorrelation.h b/.auto-resolution/PWGJE/DataModel/PhotonChargedTriggerCorrelation.h
index 53f5e581d82..36806e1f4c0 100644
--- a/.auto-resolution/PWGJE/DataModel/PhotonChargedTriggerCorrelation.h
+++ b/.auto-resolution/PWGJE/DataModel/PhotonChargedTriggerCorrelation.h
@@ -18,11 +18,12 @@
 #ifndef PWGJE_DATAMODEL_PHOTONCHARGEDTRIGGERCORRELATION_H_
 #define PWGJE_DATAMODEL_PHOTONCHARGEDTRIGGERCORRELATION_H_
 
-#include "Framework/AnalysisDataModel.h"
-#include "PWGJE/Core/JetDerivedDataUtilities.h"
-#include "PWGJE/DataModel/Jet.h"
 #include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
 #include "PWGEM/PhotonMeson/Utils/PCMUtilities.h"
+#include "PWGJE/Core/JetDerivedDataUtilities.h"
+#include "PWGJE/DataModel/Jet.h"
+
+#include "Framework/AnalysisDataModel.h"
 
 namespace o2::aod
 {
diff --git a/.auto-resolution/PWGJE/Tasks/photonChargedTriggerCorrelation.cxx b/.auto-resolution/PWGJE/Tasks/photonChargedTriggerCorrelation.cxx
index 8c62845a145..57d72df74ab 100644
--- a/.auto-resolution/PWGJE/Tasks/photonChargedTriggerCorrelation.cxx
+++ b/.auto-resolution/PWGJE/Tasks/photonChargedTriggerCorrelation.cxx
@@ -18,36 +18,37 @@
 /// Also contains checks and monte-carlo (efficiency, purity, mc-true correlation,...)
 /// End goal of studying correlations between direct photons and jets
 
-#include <cmath>
-#include <deque>
-#include <string>
-#include <vector>
-#include <algorithm>
-#include <chrono>
-#include <memory>
-#include <random>
+#include "PWGJE/DataModel/PhotonChargedTriggerCorrelation.h"
 
-#include "TMath.h"
-#include "Math/Vector4D.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+#include "PWGEM/PhotonMeson/Utils/PCMUtilities.h"
+#include "PWGJE/DataModel/Jet.h"
+
+#include "Common/Core/TableHelper.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
 #include "CCDB/BasicCCDBManager.h"
 #include "Framework/ASoAHelpers.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/TableHelper.h"
+#include "Framework/runDataProcessing.h"
 
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/PhotonMeson/Utils/PCMUtilities.h"
+#include "Math/Vector4D.h"
+#include "TMath.h"
 
-#include "PWGJE/DataModel/Jet.h"
-#include "PWGJE/DataModel/PhotonChargedTriggerCorrelation.h"
+#include <algorithm>
+#include <chrono>
+#include <cmath>
+#include <deque>
+#include <memory>
+#include <random>
+#include <string>
+#include <vector>
 
 const double absEtaMax = 0.8;
 #define DPHI_SCALE constants::math::TwoPI - constants::math::PIHalf
diff --git a/.auto-resolution/PWGJE/Tasks/statPromptPhoton.cxx b/.auto-resolution/PWGJE/Tasks/statPromptPhoton.cxx
index 977b94741c5..f23bb34df88 100644
--- a/.auto-resolution/PWGJE/Tasks/statPromptPhoton.cxx
+++ b/.auto-resolution/PWGJE/Tasks/statPromptPhoton.cxx
@@ -1114,9 +1114,9 @@ struct statPromptPhoton {
 
     histos.fill(HIST("DATA_nEvents"), 2.5);
 
-      if (!jetderiveddatautilities::selectTrigger(collision, triggerMaskBits)) {
-        return;
-      }
+    if (!jetderiveddatautilities::selectTrigger(collision, triggerMaskBits)) {
+      return;
+    }
 
     histos.fill(HIST("DATA_nEvents"), 3.5);
 
diff --git a/.auto-resolution/PWGJE/Tasks/trackEfficiency.cxx b/.auto-resolution/PWGJE/Tasks/trackEfficiency.cxx
index bb2683b0918..564e3bf10d0 100644
--- a/.auto-resolution/PWGJE/Tasks/trackEfficiency.cxx
+++ b/.auto-resolution/PWGJE/Tasks/trackEfficiency.cxx
@@ -554,7 +554,7 @@ struct TrackEfficiency {
 
       registry.fill(HIST("h3_particle_pt_high_particle_eta_particle_phi_mcpartofinterest"), jMcParticle.pt(), jMcParticle.eta(), jMcParticle.phi(), mcCollEventWeight);
 
-      if ((std::abs(jMcParticle.eta()) < trackEtaAcceptanceCountQA)) { // removed from actual cuts for now because all the histograms have an eta axis
+      if ((std::abs(jMcParticle.eta()) < trackEtaAcceptanceCountQA)) {       // removed from actual cuts for now because all the histograms have an eta axis
         registry.fill(HIST("hMcPartCutsCounts"), 3.5, mcCollision.weight()); // etaAccept // not actually applied here but it will give an idea of what will be done in the post processing
       }
     }
diff --git a/.auto-resolution/PWGLF/DataModel/EPCalibrationTables.h b/.auto-resolution/PWGLF/DataModel/EPCalibrationTables.h
index 8954ccd1c9e..a00acd94353 100644
--- a/.auto-resolution/PWGLF/DataModel/EPCalibrationTables.h
+++ b/.auto-resolution/PWGLF/DataModel/EPCalibrationTables.h
@@ -16,13 +16,14 @@
 #ifndef PWGLF_DATAMODEL_EPCALIBRATIONTABLES_H_
 #define PWGLF_DATAMODEL_EPCALIBRATIONTABLES_H_
 
-#include <cmath>
-
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/Core/RecoDecay.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/AnalysisDataModel.h"
 
+#include <cmath>
+
 namespace o2::aod
 {
 namespace epcalibrationtable
diff --git a/.auto-resolution/PWGLF/DataModel/FilterF1ProtonTables.h b/.auto-resolution/PWGLF/DataModel/FilterF1ProtonTables.h
index 0475e7cebb5..dff0c1c0d00 100644
--- a/.auto-resolution/PWGLF/DataModel/FilterF1ProtonTables.h
+++ b/.auto-resolution/PWGLF/DataModel/FilterF1ProtonTables.h
@@ -16,13 +16,14 @@
 #ifndef PWGLF_DATAMODEL_FILTERF1PROTONTABLES_H_
 #define PWGLF_DATAMODEL_FILTERF1PROTONTABLES_H_
 
-#include <cmath>
-
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/Core/RecoDecay.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/AnalysisDataModel.h"
 
+#include <cmath>
+
 namespace o2::aod
 {
 namespace filtering
diff --git a/.auto-resolution/PWGLF/DataModel/LFClusterStudiesTable.h b/.auto-resolution/PWGLF/DataModel/LFClusterStudiesTable.h
index 88ca35a85d3..edb9d77edf5 100644
--- a/.auto-resolution/PWGLF/DataModel/LFClusterStudiesTable.h
+++ b/.auto-resolution/PWGLF/DataModel/LFClusterStudiesTable.h
@@ -11,8 +11,8 @@
 //
 // Author: Giorgio Alberto Lucia
 
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
 
 #ifndef PWGLF_DATAMODEL_LFCLUSTERSTUDIESTABLE_H_
 #define PWGLF_DATAMODEL_LFCLUSTERSTUDIESTABLE_H_
diff --git a/.auto-resolution/PWGLF/DataModel/LFDoubleCascTables.h b/.auto-resolution/PWGLF/DataModel/LFDoubleCascTables.h
index 49e3b6604de..ec17c6a9864 100644
--- a/.auto-resolution/PWGLF/DataModel/LFDoubleCascTables.h
+++ b/.auto-resolution/PWGLF/DataModel/LFDoubleCascTables.h
@@ -9,8 +9,8 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
 
 #ifndef PWGLF_DATAMODEL_LFDOUBLECASCTABLES_H_
 #define PWGLF_DATAMODEL_LFDOUBLECASCTABLES_H_
diff --git a/.auto-resolution/PWGLF/DataModel/LFEbyeTables.h b/.auto-resolution/PWGLF/DataModel/LFEbyeTables.h
index 59876ae59c1..16d1982f69c 100644
--- a/.auto-resolution/PWGLF/DataModel/LFEbyeTables.h
+++ b/.auto-resolution/PWGLF/DataModel/LFEbyeTables.h
@@ -9,8 +9,8 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
 
 #ifndef PWGLF_DATAMODEL_LFEBYETABLES_H_
 #define PWGLF_DATAMODEL_LFEBYETABLES_H_
diff --git a/.auto-resolution/PWGLF/DataModel/LFF1Tables.h b/.auto-resolution/PWGLF/DataModel/LFF1Tables.h
index 947e9f0c3a8..a38dc30ea97 100644
--- a/.auto-resolution/PWGLF/DataModel/LFF1Tables.h
+++ b/.auto-resolution/PWGLF/DataModel/LFF1Tables.h
@@ -16,13 +16,14 @@
 #ifndef PWGLF_DATAMODEL_LFF1TABLES_H_
 #define PWGLF_DATAMODEL_LFF1TABLES_H_
 
-#include <cmath>
-
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/Core/RecoDecay.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/AnalysisDataModel.h"
 
+#include <cmath>
+
 namespace o2::aod
 {
 /// F1 Collisions
diff --git a/.auto-resolution/PWGLF/DataModel/LFHyperhelium4Tables.h b/.auto-resolution/PWGLF/DataModel/LFHyperhelium4Tables.h
index 8d7d5f4d379..256229876ce 100644
--- a/.auto-resolution/PWGLF/DataModel/LFHyperhelium4Tables.h
+++ b/.auto-resolution/PWGLF/DataModel/LFHyperhelium4Tables.h
@@ -11,10 +11,12 @@
 #ifndef PWGLF_DATAMODEL_LFHYHEFOURTABLES_H_
 #define PWGLF_DATAMODEL_LFHYHEFOURTABLES_H_
 
-#include <cmath>
-#include "Framework/AnalysisDataModel.h"
 #include "Common/Core/RecoDecay.h"
+
 #include "CommonConstants/PhysicsConstants.h"
+#include "Framework/AnalysisDataModel.h"
+
+#include <cmath>
 
 //===========================================================================
 // For aiding in building: tag those candidates that are interesting
diff --git a/.auto-resolution/PWGLF/DataModel/LFHypernucleiKfTables.h b/.auto-resolution/PWGLF/DataModel/LFHypernucleiKfTables.h
index 0e2424f3bb5..5e8ab65ce91 100644
--- a/.auto-resolution/PWGLF/DataModel/LFHypernucleiKfTables.h
+++ b/.auto-resolution/PWGLF/DataModel/LFHypernucleiKfTables.h
@@ -16,11 +16,13 @@
 #ifndef PWGLF_DATAMODEL_LFHYPERNUCLEIKFTABLES_H_
 #define PWGLF_DATAMODEL_LFHYPERNUCLEIKFTABLES_H_
 
-#include <cmath>
+#include "Common/Core/RecoDecay.h"
+#include "Common/DataModel/Centrality.h"
+
 #include "Framework/ASoA.h"
 #include "Framework/AnalysisDataModel.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/Core/RecoDecay.h"
+
+#include <cmath>
 
 namespace o2::aod
 {
diff --git a/.auto-resolution/PWGLF/DataModel/LFHypernucleiTables.h b/.auto-resolution/PWGLF/DataModel/LFHypernucleiTables.h
index f144daccba6..b04e24a26a2 100644
--- a/.auto-resolution/PWGLF/DataModel/LFHypernucleiTables.h
+++ b/.auto-resolution/PWGLF/DataModel/LFHypernucleiTables.h
@@ -14,8 +14,8 @@
 /// \brief Slim hypernuclei tables
 ///
 
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
 
 #ifndef PWGLF_DATAMODEL_LFHYPERNUCLEITABLES_H_
 #define PWGLF_DATAMODEL_LFHYPERNUCLEITABLES_H_
diff --git a/.auto-resolution/PWGLF/DataModel/LFLithium4Tables.h b/.auto-resolution/PWGLF/DataModel/LFLithium4Tables.h
index 486e44575ee..95d8a26ef05 100644
--- a/.auto-resolution/PWGLF/DataModel/LFLithium4Tables.h
+++ b/.auto-resolution/PWGLF/DataModel/LFLithium4Tables.h
@@ -14,8 +14,8 @@
 /// \brief Slim tables for Lithium4
 ///
 
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
 
 #ifndef PWGLF_DATAMODEL_LFLITHIUM4TABLES_H_
 #define PWGLF_DATAMODEL_LFLITHIUM4TABLES_H_
diff --git a/.auto-resolution/PWGLF/DataModel/LFLnnTables.h b/.auto-resolution/PWGLF/DataModel/LFLnnTables.h
index f9ab7fe3989..613d37931d4 100644
--- a/.auto-resolution/PWGLF/DataModel/LFLnnTables.h
+++ b/.auto-resolution/PWGLF/DataModel/LFLnnTables.h
@@ -14,8 +14,8 @@
 /// \brief Slim lnn tables
 ///
 
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
 
 #ifndef PWGLF_DATAMODEL_LFLNNTABLES_H_
 #define PWGLF_DATAMODEL_LFLNNTABLES_H_
diff --git a/.auto-resolution/PWGLF/DataModel/LFNonPromptCascadeTables.h b/.auto-resolution/PWGLF/DataModel/LFNonPromptCascadeTables.h
index b698164abd4..0651a38eb68 100644
--- a/.auto-resolution/PWGLF/DataModel/LFNonPromptCascadeTables.h
+++ b/.auto-resolution/PWGLF/DataModel/LFNonPromptCascadeTables.h
@@ -14,8 +14,8 @@
 /// \brief Non prompt cascade tables
 ///
 
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
 
 #ifndef PWGLF_DATAMODEL_LFNONPROMPTCASCADETABLES_H_
 #define PWGLF_DATAMODEL_LFNONPROMPTCASCADETABLES_H_
diff --git a/.auto-resolution/PWGLF/DataModel/LFNucleiTables.h b/.auto-resolution/PWGLF/DataModel/LFNucleiTables.h
index 1cd9ba76c93..be19614fc9b 100644
--- a/.auto-resolution/PWGLF/DataModel/LFNucleiTables.h
+++ b/.auto-resolution/PWGLF/DataModel/LFNucleiTables.h
@@ -16,8 +16,9 @@
 ///
 
 #include "Common/CCDB/EventSelectionParams.h"
-#include "Framework/AnalysisDataModel.h"
+
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
 
 #ifndef PWGLF_DATAMODEL_LFNUCLEITABLES_H_
 #define PWGLF_DATAMODEL_LFNUCLEITABLES_H_
diff --git a/.auto-resolution/PWGLF/DataModel/LFParticleIdentification.h b/.auto-resolution/PWGLF/DataModel/LFParticleIdentification.h
index 5a688e4c97c..a3c6cf52581 100644
--- a/.auto-resolution/PWGLF/DataModel/LFParticleIdentification.h
+++ b/.auto-resolution/PWGLF/DataModel/LFParticleIdentification.h
@@ -20,11 +20,12 @@
 #define PWGLF_DATAMODEL_LFPARTICLEIDENTIFICATION_H_
 
 // O2 includes
+#include "Common/DataModel/PIDResponse.h"
+
 #include "Framework/ASoA.h"
 #include "Framework/AnalysisDataModel.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "ReconstructionDataFormats/PID.h"
 #include "Framework/Logger.h"
+#include "ReconstructionDataFormats/PID.h"
 
 namespace o2::aod
 {
diff --git a/.auto-resolution/PWGLF/DataModel/LFResonanceTables.h b/.auto-resolution/PWGLF/DataModel/LFResonanceTables.h
index 67e1fb013c5..fd8cd3b938b 100644
--- a/.auto-resolution/PWGLF/DataModel/LFResonanceTables.h
+++ b/.auto-resolution/PWGLF/DataModel/LFResonanceTables.h
@@ -22,15 +22,17 @@
 #ifndef PWGLF_DATAMODEL_LFRESONANCETABLES_H_
 #define PWGLF_DATAMODEL_LFRESONANCETABLES_H_
 
-#include <cmath>
-#include <algorithm>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/Core/RecoDecay.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/AnalysisDataModel.h"
-#include "Common/DataModel/Multiplicity.h"
+
+#include <algorithm>
+#include <cmath>
 
 namespace o2::aod
 {
diff --git a/.auto-resolution/PWGLF/DataModel/LFSigmaTables.h b/.auto-resolution/PWGLF/DataModel/LFSigmaTables.h
index bd808cef106..8eb7706f563 100644
--- a/.auto-resolution/PWGLF/DataModel/LFSigmaTables.h
+++ b/.auto-resolution/PWGLF/DataModel/LFSigmaTables.h
@@ -9,15 +9,17 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <cmath>
-#include <vector>
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/Qvectors.h"
+
 #include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+
+#include <cmath>
+#include <vector>
 
 #ifndef PWGLF_DATAMODEL_LFSIGMATABLES_H_
 #define PWGLF_DATAMODEL_LFSIGMATABLES_H_
diff --git a/.auto-resolution/PWGLF/DataModel/LFSlimHeLambda.h b/.auto-resolution/PWGLF/DataModel/LFSlimHeLambda.h
index 0789c8ee095..1b21b7fc647 100644
--- a/.auto-resolution/PWGLF/DataModel/LFSlimHeLambda.h
+++ b/.auto-resolution/PWGLF/DataModel/LFSlimHeLambda.h
@@ -19,6 +19,7 @@
 
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
+
 #include <Math/Vector4D.h>
 
 namespace o2::aod
@@ -78,5 +79,4 @@ struct lambdaCandidate {
   int8_t sign; // Charge sign of the Lambda candidate
 };
 
-
 #endif // PWGLF_DATAMODEL_LFSLIMNUCLEITABLES_H_
diff --git a/.auto-resolution/PWGLF/DataModel/LFSlimStrangeTables.h b/.auto-resolution/PWGLF/DataModel/LFSlimStrangeTables.h
index 423a412bb6d..87d5d53957a 100644
--- a/.auto-resolution/PWGLF/DataModel/LFSlimStrangeTables.h
+++ b/.auto-resolution/PWGLF/DataModel/LFSlimStrangeTables.h
@@ -9,8 +9,8 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
 
 #ifndef PWGLF_DATAMODEL_LFSLIMSTRANGETABLES_H_
 #define PWGLF_DATAMODEL_LFSLIMSTRANGETABLES_H_
diff --git a/.auto-resolution/PWGLF/DataModel/LFStrangenessFinderTables.h b/.auto-resolution/PWGLF/DataModel/LFStrangenessFinderTables.h
index 6bff37f12fd..b0a8325c25e 100644
--- a/.auto-resolution/PWGLF/DataModel/LFStrangenessFinderTables.h
+++ b/.auto-resolution/PWGLF/DataModel/LFStrangenessFinderTables.h
@@ -16,9 +16,11 @@
 #ifndef O2_ANALYSIS_STRANGENESSFINDERTABLES_H_
 #define O2_ANALYSIS_STRANGENESSFINDERTABLES_H_
 
-#include "Framework/AnalysisDataModel.h"
 #include "Common/Core/RecoDecay.h"
+
 #include "CommonConstants/PhysicsConstants.h"
+#include "Framework/AnalysisDataModel.h"
+
 #include <cmath>
 
 // V0 auxiliary tables
diff --git a/.auto-resolution/PWGLF/DataModel/LFStrangenessMLTables.h b/.auto-resolution/PWGLF/DataModel/LFStrangenessMLTables.h
index abae8814856..c3a1b8a83b7 100644
--- a/.auto-resolution/PWGLF/DataModel/LFStrangenessMLTables.h
+++ b/.auto-resolution/PWGLF/DataModel/LFStrangenessMLTables.h
@@ -9,11 +9,13 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <cmath>
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
 #include "Common/Core/RecoDecay.h"
+
 #include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+
+#include <cmath>
 
 #ifndef PWGLF_DATAMODEL_LFSTRANGENESSMLTABLES_H_
 #define PWGLF_DATAMODEL_LFSTRANGENESSMLTABLES_H_
diff --git a/.auto-resolution/PWGLF/DataModel/LFStrangenessPIDTables.h b/.auto-resolution/PWGLF/DataModel/LFStrangenessPIDTables.h
index e689dc28141..8dc320d8b55 100644
--- a/.auto-resolution/PWGLF/DataModel/LFStrangenessPIDTables.h
+++ b/.auto-resolution/PWGLF/DataModel/LFStrangenessPIDTables.h
@@ -15,10 +15,12 @@
 #ifndef PWGLF_DATAMODEL_LFSTRANGENESSPIDTABLES_H_
 #define PWGLF_DATAMODEL_LFSTRANGENESSPIDTABLES_H_
 
-#include <cmath>
-#include "Framework/AnalysisDataModel.h"
 #include "Common/Core/RecoDecay.h"
+
 #include "CommonConstants/PhysicsConstants.h"
+#include "Framework/AnalysisDataModel.h"
+
+#include <cmath>
 
 namespace o2::aod
 {
@@ -55,8 +57,8 @@ DECLARE_SOA_COLUMN(PosTOFSignal, posTOFSignal, float);         //! positive trac
 DECLARE_SOA_COLUMN(NegTOFSignal, negTOFSignal, float);         //! negative track signal
 DECLARE_SOA_COLUMN(PosTOFEventTime, posTOFEventTime, float);   //! positive track event time
 DECLARE_SOA_COLUMN(NegTOFEventTime, negTOFEventTime, float);   //! negative track event time
-DECLARE_SOA_COLUMN(PosTOFLength, posTOFLength, float); //! positive track length, recalculated
-DECLARE_SOA_COLUMN(NegTOFLength, negTOFLength, float); //! negative track length, recalculated
+DECLARE_SOA_COLUMN(PosTOFLength, posTOFLength, float);         //! positive track length, recalculated
+DECLARE_SOA_COLUMN(NegTOFLength, negTOFLength, float);         //! negative track length, recalculated
 
 // delta-times
 DECLARE_SOA_COLUMN(PosTOFDeltaTLaPi, posTOFDeltaTLaPi, float); //! positive track TOFDeltaT from pion <- lambda expectation
diff --git a/.auto-resolution/PWGLF/DataModel/LFhe3HadronTables.h b/.auto-resolution/PWGLF/DataModel/LFhe3HadronTables.h
index f0dbc5cc3dd..ba37e73eba2 100644
--- a/.auto-resolution/PWGLF/DataModel/LFhe3HadronTables.h
+++ b/.auto-resolution/PWGLF/DataModel/LFhe3HadronTables.h
@@ -14,8 +14,8 @@
 /// \brief Slim tables for he3Hadron
 ///
 
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
 
 #ifndef PWGLF_DATAMODEL_LFHE3HADRONTABLES_H_
 #define PWGLF_DATAMODEL_LFHE3HADRONTABLES_H_
diff --git a/.auto-resolution/PWGLF/DataModel/LFzdcSPtables.h b/.auto-resolution/PWGLF/DataModel/LFzdcSPtables.h
index d5e09d5f9b7..0cdd6234e97 100644
--- a/.auto-resolution/PWGLF/DataModel/LFzdcSPtables.h
+++ b/.auto-resolution/PWGLF/DataModel/LFzdcSPtables.h
@@ -12,10 +12,11 @@
 #ifndef PWGLF_DATAMODEL_LFZDCSPTABLES_H_
 #define PWGLF_DATAMODEL_LFZDCSPTABLES_H_
 
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
 #include "Common/DataModel/Centrality.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+
 namespace o2::aod
 {
 namespace ZdcSPTableNS
diff --git a/.auto-resolution/PWGLF/DataModel/QC/strangenessTablesQC.h b/.auto-resolution/PWGLF/DataModel/QC/strangenessTablesQC.h
index ccf1724dc4b..e1b2bede6fa 100644
--- a/.auto-resolution/PWGLF/DataModel/QC/strangenessTablesQC.h
+++ b/.auto-resolution/PWGLF/DataModel/QC/strangenessTablesQC.h
@@ -16,8 +16,8 @@
 #ifndef PWGLF_DATAMODEL_QC_STRANGENESSTABLESQC_H_
 #define PWGLF_DATAMODEL_QC_STRANGENESSTABLESQC_H_
 
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
 
 namespace o2::aod
 {
diff --git a/.auto-resolution/PWGLF/DataModel/Reduced3BodyTables.h b/.auto-resolution/PWGLF/DataModel/Reduced3BodyTables.h
index 3b221d17539..0837e1d72f6 100644
--- a/.auto-resolution/PWGLF/DataModel/Reduced3BodyTables.h
+++ b/.auto-resolution/PWGLF/DataModel/Reduced3BodyTables.h
@@ -17,13 +17,16 @@
 #ifndef PWGLF_DATAMODEL_REDUCED3BODYTABLES_H_
 #define PWGLF_DATAMODEL_REDUCED3BODYTABLES_H_
 
-#include <cmath>
-#include "Framework/AnalysisDataModel.h"
+#include "PWGLF/DataModel/Vtx3BodyTables.h"
+
 #include "Common/Core/RecoDecay.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/Centrality.h"
-#include "PWGLF/DataModel/Vtx3BodyTables.h"
+#include "Common/DataModel/Multiplicity.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/AnalysisDataModel.h"
+
+#include <cmath>
 
 namespace o2::aod
 {
diff --git a/.auto-resolution/PWGLF/DataModel/ReducedDoublePhiTables.h b/.auto-resolution/PWGLF/DataModel/ReducedDoublePhiTables.h
index 76cc65312a7..cd858b2da95 100644
--- a/.auto-resolution/PWGLF/DataModel/ReducedDoublePhiTables.h
+++ b/.auto-resolution/PWGLF/DataModel/ReducedDoublePhiTables.h
@@ -15,15 +15,16 @@
 #ifndef PWGLF_DATAMODEL_REDUCEDDOUBLEPHITABLES_H_
 #define PWGLF_DATAMODEL_REDUCEDDOUBLEPHITABLES_H_
 
-#include <cmath>
-
+#include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Framework/AnalysisDataModel.h"
+
 #include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+
+#include <cmath>
 
 namespace o2::aod
 {
diff --git a/.auto-resolution/PWGLF/DataModel/ReducedF1ProtonTables.h b/.auto-resolution/PWGLF/DataModel/ReducedF1ProtonTables.h
index 2f806c4bd1b..bb79ffb87c0 100644
--- a/.auto-resolution/PWGLF/DataModel/ReducedF1ProtonTables.h
+++ b/.auto-resolution/PWGLF/DataModel/ReducedF1ProtonTables.h
@@ -16,15 +16,16 @@
 #ifndef PWGLF_DATAMODEL_REDUCEDF1PROTONTABLES_H_
 #define PWGLF_DATAMODEL_REDUCEDF1PROTONTABLES_H_
 
-#include <cmath>
-
+#include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Framework/AnalysisDataModel.h"
+
 #include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+
+#include <cmath>
 
 namespace o2::aod
 {
diff --git a/.auto-resolution/PWGLF/DataModel/ReducedHeptaQuarkTables.h b/.auto-resolution/PWGLF/DataModel/ReducedHeptaQuarkTables.h
index a8dd487fe9c..f35d088f71c 100644
--- a/.auto-resolution/PWGLF/DataModel/ReducedHeptaQuarkTables.h
+++ b/.auto-resolution/PWGLF/DataModel/ReducedHeptaQuarkTables.h
@@ -15,22 +15,23 @@
 #ifndef PWGLF_DATAMODEL_REDUCEDHEPTAQUARKTABLES_H_
 #define PWGLF_DATAMODEL_REDUCEDHEPTAQUARKTABLES_H_
 
-#include <cmath>
-
+#include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Framework/AnalysisDataModel.h"
+
 #include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+
+#include <cmath>
 
 namespace o2::aod
 {
 namespace redhqevent
 {
-DECLARE_SOA_COLUMN(NumPhi, numPhi, int);       //! Number of negative K
-DECLARE_SOA_COLUMN(NumLambda, numLambda, int); //! Number of lambda
+DECLARE_SOA_COLUMN(NumPhi, numPhi, int);           //! Number of negative K
+DECLARE_SOA_COLUMN(NumLambda, numLambda, int);     //! Number of lambda
 DECLARE_SOA_COLUMN(Centrality, centrality, float); //!
 } // namespace redhqevent
 DECLARE_SOA_TABLE(RedHQEvents, "AOD", "REDHQEVENT",
diff --git a/.auto-resolution/PWGLF/DataModel/ReducedLambdaLambdaTables.h b/.auto-resolution/PWGLF/DataModel/ReducedLambdaLambdaTables.h
index 88ea8fb0530..ec2d0b27098 100644
--- a/.auto-resolution/PWGLF/DataModel/ReducedLambdaLambdaTables.h
+++ b/.auto-resolution/PWGLF/DataModel/ReducedLambdaLambdaTables.h
@@ -15,15 +15,16 @@
 #ifndef PWGLF_DATAMODEL_REDUCEDLAMBDALAMBDATABLES_H_
 #define PWGLF_DATAMODEL_REDUCEDLAMBDALAMBDATABLES_H_
 
-#include <cmath>
-
+#include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Framework/AnalysisDataModel.h"
+
 #include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+
+#include <cmath>
 
 namespace o2::aod
 {
diff --git a/.auto-resolution/PWGLF/DataModel/SPCalibrationTables.h b/.auto-resolution/PWGLF/DataModel/SPCalibrationTables.h
index 2b417ce8758..07bef14d8f8 100644
--- a/.auto-resolution/PWGLF/DataModel/SPCalibrationTables.h
+++ b/.auto-resolution/PWGLF/DataModel/SPCalibrationTables.h
@@ -17,13 +17,14 @@
 #ifndef PWGLF_DATAMODEL_SPCALIBRATIONTABLES_H_
 #define PWGLF_DATAMODEL_SPCALIBRATIONTABLES_H_
 
-#include <cmath>
-
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/Core/RecoDecay.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/AnalysisDataModel.h"
 
+#include <cmath>
+
 namespace o2::aod
 {
 namespace spcalibrationtable
diff --git a/.auto-resolution/PWGLF/DataModel/V0SelectorTables.h b/.auto-resolution/PWGLF/DataModel/V0SelectorTables.h
index 1283c754819..d47b0bf3462 100644
--- a/.auto-resolution/PWGLF/DataModel/V0SelectorTables.h
+++ b/.auto-resolution/PWGLF/DataModel/V0SelectorTables.h
@@ -11,8 +11,9 @@
 #ifndef PWGLF_DATAMODEL_V0SELECTORTABLES_H_
 #define PWGLF_DATAMODEL_V0SELECTORTABLES_H_
 
-#include <cstdint>
 #include <Framework/ASoA.h>
+
+#include <cstdint>
 namespace o2::aod
 {
 
diff --git a/.auto-resolution/PWGLF/DataModel/cascqaanalysis.h b/.auto-resolution/PWGLF/DataModel/cascqaanalysis.h
index efe98908517..e734afd3ba1 100644
--- a/.auto-resolution/PWGLF/DataModel/cascqaanalysis.h
+++ b/.auto-resolution/PWGLF/DataModel/cascqaanalysis.h
@@ -16,17 +16,20 @@
 #ifndef PWGLF_DATAMODEL_CASCQAANALYSIS_H_
 #define PWGLF_DATAMODEL_CASCQAANALYSIS_H_
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "TRandom.h"
-#include "Math/Vector4D.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 #include "Math/Boost.h"
+#include "Math/Vector4D.h"
+#include "TRandom.h"
 
 namespace o2::aod
 {
diff --git a/.auto-resolution/PWGLF/DataModel/kfStrangenessStudy.h b/.auto-resolution/PWGLF/DataModel/kfStrangenessStudy.h
index 120b3cf62f1..5f27acfe89b 100755
--- a/.auto-resolution/PWGLF/DataModel/kfStrangenessStudy.h
+++ b/.auto-resolution/PWGLF/DataModel/kfStrangenessStudy.h
@@ -14,10 +14,11 @@
 #ifndef PWGLF_DATAMODEL_KFSTRANGENESSSTUDY_H_
 #define PWGLF_DATAMODEL_KFSTRANGENESSSTUDY_H_
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Common/Core/trackUtilities.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+
 namespace o2::aod
 {
 namespace kfStrangenessStudy
diff --git a/.auto-resolution/PWGLF/DataModel/lambdaJetpolarization.h b/.auto-resolution/PWGLF/DataModel/lambdaJetpolarization.h
index 41bd7e26b15..cd1f4b96449 100644
--- a/.auto-resolution/PWGLF/DataModel/lambdaJetpolarization.h
+++ b/.auto-resolution/PWGLF/DataModel/lambdaJetpolarization.h
@@ -16,17 +16,20 @@
 #ifndef PWGLF_DATAMODEL_LAMBDAJETPOLARIZATION_H_
 #define PWGLF_DATAMODEL_LAMBDAJETPOLARIZATION_H_
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "TRandom.h"
-#include "Math/Vector4D.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 #include "Math/Boost.h"
+#include "Math/Vector4D.h"
+#include "TRandom.h"
 
 namespace o2::aod
 {
diff --git a/.auto-resolution/PWGLF/DataModel/mcCentrality.h b/.auto-resolution/PWGLF/DataModel/mcCentrality.h
index 86e97eb8c33..fdbe1426e52 100644
--- a/.auto-resolution/PWGLF/DataModel/mcCentrality.h
+++ b/.auto-resolution/PWGLF/DataModel/mcCentrality.h
@@ -21,9 +21,10 @@
 #define PWGLF_DATAMODEL_MCCENTRALITY_H_
 
 // O2 includes
+#include "Common/DataModel/Centrality.h"
+
 #include "Framework/ASoA.h"
 #include "Framework/AnalysisDataModel.h"
-#include "Common/DataModel/Centrality.h"
 #include "Framework/Logger.h"
 
 namespace o2::aod
diff --git a/.auto-resolution/PWGLF/DataModel/pidTOFGeneric.h b/.auto-resolution/PWGLF/DataModel/pidTOFGeneric.h
index a0d287a7643..1942dbecd3d 100644
--- a/.auto-resolution/PWGLF/DataModel/pidTOFGeneric.h
+++ b/.auto-resolution/PWGLF/DataModel/pidTOFGeneric.h
@@ -11,9 +11,10 @@
 
 #ifndef PWGLF_DATAMODEL_PIDTOFGENERIC_H_
 #define PWGLF_DATAMODEL_PIDTOFGENERIC_H_
-#include "CommonDataFormat/InteractionRecord.h"
 #include "Common/Core/PID/PIDTOF.h"
 
+#include "CommonDataFormat/InteractionRecord.h"
+
 namespace o2::aod
 {
 namespace evtime
diff --git a/.auto-resolution/PWGLF/DataModel/spectraTOF.h b/.auto-resolution/PWGLF/DataModel/spectraTOF.h
index 9cf4b789295..4ae259d171f 100644
--- a/.auto-resolution/PWGLF/DataModel/spectraTOF.h
+++ b/.auto-resolution/PWGLF/DataModel/spectraTOF.h
@@ -22,21 +22,23 @@
 #include <memory>
 
 // O2 includes
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/runDataProcessing.h"
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/FT0Corrected.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/StaticFor.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/FT0Corrected.h"
-#include "Common/Core/TrackSelectionDefaults.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
 #include "TPDGCode.h"
 
diff --git a/.auto-resolution/PWGLF/TableProducer/Common/epvector.cxx b/.auto-resolution/PWGLF/TableProducer/Common/epvector.cxx
index a662b20bd0b..61996521fdd 100644
--- a/.auto-resolution/PWGLF/TableProducer/Common/epvector.cxx
+++ b/.auto-resolution/PWGLF/TableProducer/Common/epvector.cxx
@@ -19,42 +19,46 @@
 ///
 
 // C++/ROOT includes.
+#include <TComplex.h>
 #include <TH1F.h>
+#include <TMath.h>
+
 #include <chrono>
+#include <cstdio>
 #include <string>
 #include <vector>
-#include <TComplex.h>
-#include <TMath.h>
-#include <cstdio>
 
 // o2Physics includes.
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/StepTHn.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
+#include "PWGLF/DataModel/EPCalibrationTables.h"
+
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/Core/trackUtilities.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/TrackSelection.h"
-#include "Framework/ASoAHelpers.h"
 #include "Common/DataModel/FT0Corrected.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonConstants/PhysicsConstants.h"
 #include "FT0Base/Geometry.h"
 #include "FV0Base/Geometry.h"
-#include "PWGLF/DataModel/EPCalibrationTables.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
 #include "TF1.h"
 
 // #include "Common/Core/EventPlaneHelper.h"
 // #include "Common/DataModel/Qvectors.h"
 
 // o2 includes.
-#include "CCDB/CcdbApi.h"
 #include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
 #include "DetectorsCommonDataFormats/AlignParam.h"
 
 using namespace o2;
diff --git a/.auto-resolution/PWGLF/TableProducer/Common/lfTPCPID.cxx b/.auto-resolution/PWGLF/TableProducer/Common/lfTPCPID.cxx
index e812633a604..74d0d56c257 100644
--- a/.auto-resolution/PWGLF/TableProducer/Common/lfTPCPID.cxx
+++ b/.auto-resolution/PWGLF/TableProducer/Common/lfTPCPID.cxx
@@ -17,26 +17,29 @@
 ///
 
 // ROOT includes
-#include "TFile.h"
-#include "TSystem.h"
 #include "TF1.h"
+#include "TFile.h"
 #include "TGraph.h"
 #include "TList.h"
+#include "TSystem.h"
 
 // O2 includes
-#include "CCDB/BasicCCDBManager.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "CCDB/CcdbApi.h"
+#include "TableHelper.h"
+
 #include "PWGLF/DataModel/LFParticleIdentification.h"
+
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Framework/AnalysisTask.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
+#include "DataFormatsTPC/BetheBlochAleph.h"
 #include "Framework/AnalysisDataModel.h"
-#include "Framework/runDataProcessing.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StaticFor.h"
-#include "DataFormatsTPC/BetheBlochAleph.h"
-#include "TableHelper.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/TableProducer/Common/mcCentrality.cxx b/.auto-resolution/PWGLF/TableProducer/Common/mcCentrality.cxx
index 690d049af4d..4a55503ada8 100644
--- a/.auto-resolution/PWGLF/TableProducer/Common/mcCentrality.cxx
+++ b/.auto-resolution/PWGLF/TableProducer/Common/mcCentrality.cxx
@@ -18,21 +18,25 @@
 ///
 
 // O2 includes
+#include "PWGLF/DataModel/mcCentrality.h"
+
+#include "TableHelper.h"
+
+#include "PWGLF/Utils/inelGt.h"
+
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "CCDB/CcdbApi.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
-#include "Framework/runDataProcessing.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StaticFor.h"
-#include "TableHelper.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "Common/DataModel/Centrality.h"
-#include "PWGLF/DataModel/mcCentrality.h"
-#include "PWGLF/Utils/inelGt.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/TableProducer/Common/zdcSP.cxx b/.auto-resolution/PWGLF/TableProducer/Common/zdcSP.cxx
index 783526e1400..c10ac4804d0 100644
--- a/.auto-resolution/PWGLF/TableProducer/Common/zdcSP.cxx
+++ b/.auto-resolution/PWGLF/TableProducer/Common/zdcSP.cxx
@@ -12,43 +12,39 @@
 // Minimal example to run this task:
 // o2-analysis-centrality-table -b --configuration json://configuration.json | o2-analysis-timestamp -b --configuration json://configuration.json | o2-analysis-event-selection -b --configuration json://configuration.json | o2-analysis-multiplicity-table -b --configuration json://configuration.json | o2-analysis-lf-zdcsp -b --configuration json://configuration.json --aod-file @input_data.txt --aod-writer-json OutputDirector.json
 
-#include <array>
-#include <cmath>
-
-#include "Math/Vector4D.h"
-
-#include "CCDB/BasicCCDBManager.h"
+#include "PWGLF/DataModel/LFzdcSPtables.h"
 
+#include "Common/CCDB/ctpRateFetcher.h"
+#include "Common/Core/EventPlaneHelper.h"
+#include "Common/Core/PID/PIDTOF.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/Qvectors.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/Core/PID/PIDTOF.h"
 #include "Common/TableProducer/PID/pidTOFBase.h"
-#include "Common/Core/EventPlaneHelper.h"
-#include "Common/DataModel/Qvectors.h"
-#include "Common/CCDB/ctpRateFetcher.h"
 
+#include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsParameters/GRPMagField.h"
 #include "DataFormatsParameters/GRPObject.h"
 #include "DataFormatsTPC/BetheBlochAleph.h"
 #include "DetectorsBase/GeometryManager.h"
 #include "DetectorsBase/Propagator.h"
-
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
-
 #include "ReconstructionDataFormats/Track.h"
 
-#include "PWGLF/DataModel/LFzdcSPtables.h"
-
+#include "Math/Vector4D.h"
 #include "TRandom3.h"
 
+#include <array>
+#include <cmath>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.auto-resolution/PWGLF/TableProducer/Nuspex/LFTreeCreatorClusterStudies.cxx b/.auto-resolution/PWGLF/TableProducer/Nuspex/LFTreeCreatorClusterStudies.cxx
index d8df6f0bbf6..c05fcddfb61 100644
--- a/.auto-resolution/PWGLF/TableProducer/Nuspex/LFTreeCreatorClusterStudies.cxx
+++ b/.auto-resolution/PWGLF/TableProducer/Nuspex/LFTreeCreatorClusterStudies.cxx
@@ -14,45 +14,45 @@
 //
 // Author: Giorgio Alberto Lucia
 
-#include <vector>
-#include <utility>
-#include <random>
-#include <cstdint>
-#include <cstring>
-#include <unordered_map>
-#include <numeric>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "Common/DataModel/EventSelection.h"
+#include "PWGLF/DataModel/LFClusterStudiesTable.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
 
 #include "Common/Core/PID/PIDTOF.h"
-#include "Common/TableProducer/PID/pidTOFBase.h"
 #include "Common/Core/PID/TPCPIDResponse.h"
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/PIDResponseITS.h"
-#include "DCAFitter/DCAFitterN.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/TableProducer/PID/pidTOFBase.h"
 
-#include "PWGLF/DataModel/LFClusterStudiesTable.h"
+#include "CCDB/BasicCCDBManager.h"
+#include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
 #include "TDatabasePDG.h"
 #include "TPDGCode.h"
 
+#include <cstdint>
+#include <cstring>
+#include <numeric>
+#include <random>
+#include <unordered_map>
+#include <utility>
+#include <vector>
+
 using namespace ::o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.auto-resolution/PWGLF/TableProducer/Nuspex/he3HadronFemto.cxx b/.auto-resolution/PWGLF/TableProducer/Nuspex/he3HadronFemto.cxx
index 547d4b08c3b..1afb97fe35c 100644
--- a/.auto-resolution/PWGLF/TableProducer/Nuspex/he3HadronFemto.cxx
+++ b/.auto-resolution/PWGLF/TableProducer/Nuspex/he3HadronFemto.cxx
@@ -15,30 +15,9 @@
 /// \author Your Name (your.email@cern.ch)
 /// \since April 2025
 
-#include <TH1F.h>
-#include <TDirectory.h>
-#include <THn.h>
-#include <TMath.h>
-#include <TObjArray.h>
-#include <TFile.h>
-#include <TH2F.h>
-#include <TPDGCode.h>
-#include <TDatabasePDG.h>
-
-#include <cmath>
-#include <string>
-#include <algorithm>
-#include <vector>
-#include <array>
-#include <cstdlib>
-#include <iterator> // std::prev
-
-#include "Framework/ASoAHelpers.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/StepTHn.h"
+#include "PWGLF/DataModel/EPCalibrationTables.h"
+#include "PWGLF/DataModel/LFhe3HadronTables.h"
+#include "PWGLF/Utils/svPoolCreator.h"
 
 #include "Common/Core/PID/PIDTOF.h"
 #include "Common/Core/PID/TPCPIDResponse.h"
@@ -52,21 +31,40 @@
 #include "Common/DataModel/PIDResponseITS.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/TableProducer/PID/pidTOFBase.h"
-
 #include "EventFiltering/Zorro.h"
 #include "EventFiltering/ZorroSummary.h"
 
 #include "CCDB/BasicCCDBManager.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsTPC/BetheBlochAleph.h"
-#include "DataFormatsParameters/GRPObject.h"
 #include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DataFormatsTPC/BetheBlochAleph.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
 
-#include "PWGLF/DataModel/EPCalibrationTables.h"
-#include "PWGLF/DataModel/LFhe3HadronTables.h"
-#include "PWGLF/Utils/svPoolCreator.h"
+#include <TDatabasePDG.h>
+#include <TDirectory.h>
+#include <TFile.h>
+#include <TH1F.h>
+#include <TH2F.h>
+#include <THn.h>
+#include <TMath.h>
+#include <TObjArray.h>
+#include <TPDGCode.h>
+
+#include <algorithm>
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <iterator> // std::prev
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/TableProducer/Nuspex/he3LambdaAnalysis.cxx b/.auto-resolution/PWGLF/TableProducer/Nuspex/he3LambdaAnalysis.cxx
index 6f936659dd1..1d6c80fc3fa 100644
--- a/.auto-resolution/PWGLF/TableProducer/Nuspex/he3LambdaAnalysis.cxx
+++ b/.auto-resolution/PWGLF/TableProducer/Nuspex/he3LambdaAnalysis.cxx
@@ -18,7 +18,6 @@
 #include "Common/DataModel/PIDResponseTPC.h"
 #include "EventFiltering/Zorro.h"
 #include "EventFiltering/ZorroSummary.h"
-#include "PWGLF/DataModel/LFSlimHeLambda.h"
 
 #include <CCDB/BasicCCDBManager.h>
 #include <DCAFitter/DCAFitterN.h>
diff --git a/.auto-resolution/PWGLF/TableProducer/Nuspex/hyhe4builder.cxx b/.auto-resolution/PWGLF/TableProducer/Nuspex/hyhe4builder.cxx
index 66fe812f7a2..1c56cff15dd 100644
--- a/.auto-resolution/PWGLF/TableProducer/Nuspex/hyhe4builder.cxx
+++ b/.auto-resolution/PWGLF/TableProducer/Nuspex/hyhe4builder.cxx
@@ -19,32 +19,34 @@
 // --- kumar.lokesh@cern.ch
 // --- david.dobrigkeit.chinellato@cern.ch
 
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <map>
-#include <iterator>
-#include <utility>
+#include "PWGLF/DataModel/LFHyperhelium4Tables.h"
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
 #include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+
 #include "CCDB/BasicCCDBManager.h"
-#include "PWGLF/DataModel/LFHyperhelium4Tables.h"
+#include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <iterator>
+#include <map>
+#include <utility>
 
 using namespace std;
 using namespace o2;
diff --git a/.auto-resolution/PWGLF/TableProducer/Nuspex/hypKfRecoTask.cxx b/.auto-resolution/PWGLF/TableProducer/Nuspex/hypKfRecoTask.cxx
index 160310d5bd8..f36a2c7b362 100644
--- a/.auto-resolution/PWGLF/TableProducer/Nuspex/hypKfRecoTask.cxx
+++ b/.auto-resolution/PWGLF/TableProducer/Nuspex/hypKfRecoTask.cxx
@@ -13,45 +13,50 @@
 /// \brief Hypernuclei rconstruction using KFParticle package
 /// \author Janik Ditzel <jditzel@cern.ch> and Michael Hartung <mhartung@cern.ch>
 
-#include <limits>
-#include <vector>
-#include <string>
-#include <map>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
+#include "MetadataHelper.h"
+
+#include "PWGLF/DataModel/LFHypernucleiKfTables.h"
+
+#include "Common/Core/PID/TPCPIDResponse.h"
 #include "Common/Core/RecoDecay.h"
 #include "Common/Core/trackUtilities.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Centrality.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+#include "Common/DataModel/CollisionAssociationTables.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/PIDResponseTPC.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/TableProducer/PID/pidTPCBase.h"
+
 #include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/PID/TPCPIDResponse.h"
-#include "DataFormatsTPC/BetheBlochAleph.h"
 #include "DCAFitter/DCAFitterN.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGLF/DataModel/LFHypernucleiKfTables.h"
-#include "TRandom3.h"
-#include "Common/DataModel/CollisionAssociationTables.h"
-#include "Common/TableProducer/PID/pidTPCBase.h"
-#include "Common/DataModel/PIDResponseTPC.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DataFormatsTPC/BetheBlochAleph.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/PID.h"
-#include "MetadataHelper.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include "TRandom3.h"
+
+#include <limits>
+#include <map>
+#include <string>
+#include <vector>
 
 // KFParticle
 #ifndef HomogeneousField
 #define HomogeneousField // o2-linter: disable=name/macro (Name is defined in KFParticle package)
 #endif
-#include "KFParticle.h"
 #include "KFPTrack.h"
 #include "KFPVertex.h"
+#include "KFParticle.h"
 #include "KFParticleBase.h"
 #include "KFVertex.h"
 
diff --git a/.auto-resolution/PWGLF/TableProducer/Nuspex/hypKfTreeCreator.cxx b/.auto-resolution/PWGLF/TableProducer/Nuspex/hypKfTreeCreator.cxx
index 246a67f57d6..90295290025 100644
--- a/.auto-resolution/PWGLF/TableProducer/Nuspex/hypKfTreeCreator.cxx
+++ b/.auto-resolution/PWGLF/TableProducer/Nuspex/hypKfTreeCreator.cxx
@@ -13,28 +13,31 @@
 /// \brief Creates flat tree for ML analysis
 /// \author Janik Ditzel <jditzel@cern.ch> and Michael Hartung <mhartung@cern.ch>
 
-#include <vector>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
+#include "PWGLF/DataModel/LFHypernucleiKfTables.h"
+
+#include "Common/Core/PID/TPCPIDResponse.h"
 #include "Common/Core/RecoDecay.h"
 #include "Common/Core/trackUtilities.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Centrality.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/PID/TPCPIDResponse.h"
-#include "DataFormatsTPC/BetheBlochAleph.h"
 #include "DCAFitter/DCAFitterN.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGLF/DataModel/LFHypernucleiKfTables.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DataFormatsTPC/BetheBlochAleph.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/TableProducer/Nuspex/lnnRecoTask.cxx b/.auto-resolution/PWGLF/TableProducer/Nuspex/lnnRecoTask.cxx
index e607057e5c6..88db18c376f 100644
--- a/.auto-resolution/PWGLF/TableProducer/Nuspex/lnnRecoTask.cxx
+++ b/.auto-resolution/PWGLF/TableProducer/Nuspex/lnnRecoTask.cxx
@@ -11,43 +11,40 @@
 //
 // Build \Lambda-n-n candidates from V0s and tracks
 // ==============================================================================
-#include <array>
-#include <memory>
-#include <string>
-#include <vector>
-#include <algorithm>
-
-#include <TLorentzVector.h>
+#include "PWGLF/DataModel/EPCalibrationTables.h"
+#include "PWGLF/DataModel/LFLnnTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
+#include "Common/Core/PID/PIDTOF.h"
+#include "Common/Core/PID/TPCPIDResponse.h"
 #include "Common/Core/RecoDecay.h"
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "PWGLF/DataModel/EPCalibrationTables.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
-
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/TableProducer/PID/pidTOFBase.h"
 
-#include "Common/Core/PID/TPCPIDResponse.h"
-#include "DataFormatsTPC/BetheBlochAleph.h"
+#include "CCDB/BasicCCDBManager.h"
 #include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DataFormatsTPC/BetheBlochAleph.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
-#include "Common/DataModel/TrackSelectionTables.h"
-
-#include "Common/Core/PID/PIDTOF.h"
-#include "Common/TableProducer/PID/pidTOFBase.h"
+#include <TLorentzVector.h>
 
-#include "PWGLF/DataModel/LFLnnTables.h"
+#include <algorithm>
+#include <array>
+#include <memory>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/TableProducer/Nuspex/nucleiFlowTree.cxx b/.auto-resolution/PWGLF/TableProducer/Nuspex/nucleiFlowTree.cxx
index 14192166fae..238cf021cfd 100644
--- a/.auto-resolution/PWGLF/TableProducer/Nuspex/nucleiFlowTree.cxx
+++ b/.auto-resolution/PWGLF/TableProducer/Nuspex/nucleiFlowTree.cxx
@@ -19,54 +19,49 @@
 // o2-analysis-pid-tof-base, o2-analysis-multiplicity-table, o2-analysis-event-selection
 // (to add flow: o2-analysis-qvector-table, o2-analysis-centrality-table)
 
-#include <algorithm>
-#include <cmath>
-#include <memory>
-#include <string>
-#include <vector>
-
-#include "Math/Vector4D.h"
+#include "nucleiUtils.h"
 
-#include "CCDB/BasicCCDBManager.h"
+#include "PWGLF/DataModel/EPCalibrationTables.h"
+#include "PWGLF/DataModel/LFSlimNucleiTables.h"
 
+#include "Common/Core/EventPlaneHelper.h"
+#include "Common/Core/PID/PIDTOF.h"
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/PIDResponseITS.h"
+#include "Common/DataModel/Qvectors.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/Core/PID/PIDTOF.h"
 #include "Common/TableProducer/PID/pidTOFBase.h"
-#include "Common/Core/EventPlaneHelper.h"
-#include "Common/DataModel/Qvectors.h"
 #include "Common/Tools/TrackTuner.h"
-#include "Common/Core/RecoDecay.h"
+#include "EventFiltering/Zorro.h"
+#include "EventFiltering/ZorroSummary.h"
 
+#include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsParameters/GRPMagField.h"
 #include "DataFormatsParameters/GRPObject.h"
 #include "DataFormatsTPC/BetheBlochAleph.h"
 #include "DetectorsBase/GeometryManager.h"
 #include "DetectorsBase/Propagator.h"
-
-#include "EventFiltering/Zorro.h"
-#include "EventFiltering/ZorroSummary.h"
-
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
-
 #include "ReconstructionDataFormats/Track.h"
 
-#include "PWGLF/DataModel/EPCalibrationTables.h"
-#include "PWGLF/DataModel/LFSlimNucleiTables.h"
-
+#include "Math/Vector4D.h"
 #include "TRandom3.h"
 
-#include "nucleiUtils.h"
+#include <algorithm>
+#include <cmath>
+#include <memory>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/TableProducer/Nuspex/pidTOFGeneric.cxx b/.auto-resolution/PWGLF/TableProducer/Nuspex/pidTOFGeneric.cxx
index 9997d4d27c8..5e934fec44e 100644
--- a/.auto-resolution/PWGLF/TableProducer/Nuspex/pidTOFGeneric.cxx
+++ b/.auto-resolution/PWGLF/TableProducer/Nuspex/pidTOFGeneric.cxx
@@ -16,28 +16,30 @@
 ///         In order to redo TOF PID for tracks which are linked to wrong collisions
 ///
 
+#include <string>
 #include <utility>
 #include <vector>
-#include <string>
 
 // O2 includes
 #include "CCDB/BasicCCDBManager.h"
-#include "TOFBase/EventTimeMaker.h"
 #include "Framework/AnalysisTask.h"
 #include "ReconstructionDataFormats/Track.h"
+#include "TOFBase/EventTimeMaker.h"
 
 // O2Physics includes
+#include "PWGLF/DataModel/pidTOFGeneric.h"
+
 #include "Common/Core/TableHelper.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/FT0Corrected.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
-#include "PID/ParamBase.h"
 #include "PID/PIDTOF.h"
-#include "PWGLF/DataModel/pidTOFGeneric.h"
+#include "PID/ParamBase.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/TableProducer/Nuspex/spectraDerivedMaker.cxx b/.auto-resolution/PWGLF/TableProducer/Nuspex/spectraDerivedMaker.cxx
index bce0c9153d1..4e7de3c2821 100644
--- a/.auto-resolution/PWGLF/TableProducer/Nuspex/spectraDerivedMaker.cxx
+++ b/.auto-resolution/PWGLF/TableProducer/Nuspex/spectraDerivedMaker.cxx
@@ -18,20 +18,22 @@
 ///
 
 // O2 includes
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/spectraTOF.h"
+
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
 #include "Framework/StaticFor.h"
-#include "Common/Core/TrackSelectionDefaults.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
-#include "PWGLF/DataModel/spectraTOF.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
 #include "TPDGCode.h"
 
diff --git a/.auto-resolution/PWGLF/TableProducer/Nuspex/threebodymcfinder.cxx b/.auto-resolution/PWGLF/TableProducer/Nuspex/threebodymcfinder.cxx
index 875128758b8..a10510153bc 100644
--- a/.auto-resolution/PWGLF/TableProducer/Nuspex/threebodymcfinder.cxx
+++ b/.auto-resolution/PWGLF/TableProducer/Nuspex/threebodymcfinder.cxx
@@ -25,36 +25,38 @@
 //    david.dobrigkeit.chinellato@cern.ch
 //
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "ReconstructionDataFormats/Track.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/McCollisionExtra.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "Common/Core/TrackSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
+#include <Math/Vector4D.h>
+#include <TDatabasePDG.h>
 #include <TFile.h>
-#include <TLorentzVector.h>
 #include <TH1F.h>
 #include <TH2F.h>
-#include <TProfile.h>
-#include <Math/Vector4D.h>
+#include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
-#include <cmath>
+#include <TProfile.h>
+
 #include <array>
+#include <cmath>
 #include <cstdlib>
 
 using namespace o2;
diff --git a/.auto-resolution/PWGLF/TableProducer/Nuspex/trHeAnalysis.cxx b/.auto-resolution/PWGLF/TableProducer/Nuspex/trHeAnalysis.cxx
index 40378ba6df4..2f06f165046 100644
--- a/.auto-resolution/PWGLF/TableProducer/Nuspex/trHeAnalysis.cxx
+++ b/.auto-resolution/PWGLF/TableProducer/Nuspex/trHeAnalysis.cxx
@@ -16,8 +16,10 @@
 ///
 /// \author Matthias Herzer <matthias.herzer@cern.ch>, Goethe University Frankfurt
 ///
-#include <string>
-#include <vector>
+#include "PWGLF/DataModel/LFNucleiTables.h"
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/pidTOFGeneric.h"
+
 #include "Common/CCDB/EventSelectionParams.h"
 #include "Common/Core/PID/TPCPIDResponse.h"
 #include "Common/Core/trackUtilities.h"
@@ -26,18 +28,20 @@
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFNucleiTables.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
 #include "ReconstructionDataFormats/PID.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "PWGLF/DataModel/pidTOFGeneric.h"
+
 #include <TF1.h>
 
+#include <string>
+#include <vector>
+
 namespace o2::aod
 {
 namespace h3_data
diff --git a/.auto-resolution/PWGLF/TableProducer/QC/strangenessQC.cxx b/.auto-resolution/PWGLF/TableProducer/QC/strangenessQC.cxx
index f35ad82899c..9452899f913 100644
--- a/.auto-resolution/PWGLF/TableProducer/QC/strangenessQC.cxx
+++ b/.auto-resolution/PWGLF/TableProducer/QC/strangenessQC.cxx
@@ -14,15 +14,17 @@
 /// In case of questions please write to:
 /// \author Roman Nepeivoda (roman.nepeivoda@cern.ch)
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "PWGLF/DataModel/QC/strangenessTablesQC.h"
 
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.auto-resolution/PWGLF/TableProducer/Resonances/HeptaQuarktable.cxx b/.auto-resolution/PWGLF/TableProducer/Resonances/HeptaQuarktable.cxx
index ccb0c61465f..36765795b05 100644
--- a/.auto-resolution/PWGLF/TableProducer/Resonances/HeptaQuarktable.cxx
+++ b/.auto-resolution/PWGLF/TableProducer/Resonances/HeptaQuarktable.cxx
@@ -14,39 +14,38 @@
 ///
 /// \author Junlee Kim, (junlee.kim@cern.ch)
 
-#include <Framework/Configurable.h>
-#include <Math/GenVector/Boost.h>
-#include <Math/Vector4D.h>
-#include <TMath.h>
-#include <fairlogger/Logger.h>
-
-#include <iostream>
-#include <iterator>
-#include <string>
-#include <vector>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/DataModel/ReducedHeptaQuarkTables.h"
 
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/PIDResponseITS.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 #include "EventFiltering/Zorro.h"
 #include "EventFiltering/ZorroSummary.h"
 
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
+#include "CommonConstants/MathConstants.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
+#include <Framework/Configurable.h>
 
-#include "CommonConstants/MathConstants.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/PIDResponseITS.h"
+#include <Math/GenVector/Boost.h>
+#include <Math/Vector4D.h>
+#include <TMath.h>
 
-#include "CCDB/BasicCCDBManager.h"
-#include "CCDB/CcdbApi.h"
+#include <fairlogger/Logger.h>
 
-#include "PWGLF/DataModel/ReducedHeptaQuarkTables.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include <iostream>
+#include <iterator>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/TableProducer/Resonances/doublephitable.cxx b/.auto-resolution/PWGLF/TableProducer/Resonances/doublephitable.cxx
index d02ab3d3734..4279cff1c02 100644
--- a/.auto-resolution/PWGLF/TableProducer/Resonances/doublephitable.cxx
+++ b/.auto-resolution/PWGLF/TableProducer/Resonances/doublephitable.cxx
@@ -14,39 +14,41 @@
 ///
 /// \author Sourav Kundu, sourav.kundu@cern.ch
 
+#include "PWGLF/DataModel/ReducedDoublePhiTables.h"
+
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/PIDResponseITS.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+#include "EventFiltering/Zorro.h"
+#include "EventFiltering/ZorroSummary.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
+#include "CommonConstants/MathConstants.h"
+#include "DataFormatsTPC/BetheBlochAleph.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 #include <Framework/Configurable.h>
+
 #include <Math/GenVector/Boost.h>
 #include <Math/Vector4D.h>
+#include <TDatabasePDG.h> // FIXME
 #include <TMath.h>
+#include <TPDGCode.h> // FIXME
+
 #include <fairlogger/Logger.h>
-#include <TDatabasePDG.h> // FIXME
-#include <TPDGCode.h>     // FIXME
 
 #include <iostream>
 #include <iterator>
 #include <string>
 #include <vector>
 
-#include "EventFiltering/Zorro.h"
-#include "EventFiltering/ZorroSummary.h"
-
-#include "PWGLF/DataModel/ReducedDoublePhiTables.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
-#include "CommonConstants/MathConstants.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "DataFormatsTPC/BetheBlochAleph.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "CCDB/CcdbApi.h"
-#include "Common/DataModel/PIDResponseITS.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.auto-resolution/PWGLF/TableProducer/Resonances/f1protonInitializer.cxx b/.auto-resolution/PWGLF/TableProducer/Resonances/f1protonInitializer.cxx
index e7240c72f90..a6db6759a68 100644
--- a/.auto-resolution/PWGLF/TableProducer/Resonances/f1protonInitializer.cxx
+++ b/.auto-resolution/PWGLF/TableProducer/Resonances/f1protonInitializer.cxx
@@ -12,39 +12,40 @@
 /// \file f1protonInitializer.cxx
 /// check if the event have f1-p candidate
 /// \author Sourav Kundu <sourav.kundu@cern.ch>
-#include <TH1F.h>
-#include <TDirectory.h>
-#include <THn.h>
-#include <TLorentzVector.h>
-#include <TMath.h>
-#include <TObjArray.h>
-#include <TFile.h>
-#include <TH2F.h>
-#include <TLorentzVector.h>
-#include <TPDGCode.h>
-#include <TDatabasePDG.h>
-
-#include <cmath>
-#include <array>
-#include <cstdlib>
+#include "PWGLF/DataModel/LFF1Tables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/Utils/collisionCuts.h"
 
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Multiplicity.h"
 #include "Common/Core/trackUtilities.h"
-#include "CommonConstants/PhysicsConstants.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonConstants/PhysicsConstants.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFF1Tables.h"
-#include "PWGLF/Utils/collisionCuts.h"
 #include "ReconstructionDataFormats/Track.h"
 
+#include <TDatabasePDG.h>
+#include <TDirectory.h>
+#include <TFile.h>
+#include <TH1F.h>
+#include <TH2F.h>
+#include <THn.h>
+#include <TLorentzVector.h>
+#include <TMath.h>
+#include <TObjArray.h>
+#include <TPDGCode.h>
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.auto-resolution/PWGLF/TableProducer/Resonances/f1protonreducedtable.cxx b/.auto-resolution/PWGLF/TableProducer/Resonances/f1protonreducedtable.cxx
index ce0cdcf3af5..4a3959ab776 100644
--- a/.auto-resolution/PWGLF/TableProducer/Resonances/f1protonreducedtable.cxx
+++ b/.auto-resolution/PWGLF/TableProducer/Resonances/f1protonreducedtable.cxx
@@ -14,40 +14,42 @@
 ///
 /// \author Sourav Kundu, sourav.kundu@cern.ch
 
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/DataModel/ReducedF1ProtonTables.h"
+
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/PIDResponseITS.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+#include "EventFiltering/Zorro.h"
+#include "EventFiltering/ZorroSummary.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
+#include "CommonConstants/MathConstants.h"
+#include "DataFormatsTPC/BetheBlochAleph.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 #include <Framework/Configurable.h>
+
 #include <Math/GenVector/Boost.h>
 #include <Math/Vector4D.h>
+#include <TDatabasePDG.h> // FIXME
 #include <TMath.h>
+#include <TPDGCode.h> // FIXME
+
 #include <fairlogger/Logger.h>
-#include <TDatabasePDG.h> // FIXME
-#include <TPDGCode.h>     // FIXME
 
 #include <iostream>
 #include <iterator>
 #include <string>
 #include <vector>
 
-#include "EventFiltering/Zorro.h"
-#include "EventFiltering/ZorroSummary.h"
-
-#include "PWGLF/DataModel/ReducedF1ProtonTables.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
-#include "CommonConstants/MathConstants.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "DataFormatsTPC/BetheBlochAleph.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "CCDB/CcdbApi.h"
-#include "Common/DataModel/PIDResponseITS.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
@@ -767,10 +769,10 @@ struct f1protonreducedtable {
                 F1KaonIndex.push_back(KaonIndex.at(i2));
                 F1KshortDaughterPositiveIndex.push_back(KshortPosDaughIndex.at(i3));
                 F1KshortDaughterNegativeIndex.push_back(KshortNegDaughIndex.at(i3));
-                PionTOFHitFinal.push_back(PionTOFHit.at(i1)); // Pion TOF Hit
-                KaonTOFHitFinal.push_back(KaonTOFHit.at(i2)); // Kaon TOF Hit
-                PionTPCFinal.push_back(PionTPC.at(i1));       // Pion TPC
-                KaonTPCFinal.push_back(KaonTPC.at(i2));       // Kaon TPC
+                PionTOFHitFinal.push_back(PionTOFHit.at(i1));           // Pion TOF Hit
+                KaonTOFHitFinal.push_back(KaonTOFHit.at(i2));           // Kaon TOF Hit
+                PionTPCFinal.push_back(PionTPC.at(i1));                 // Pion TPC
+                KaonTPCFinal.push_back(KaonTPC.at(i2));                 // Kaon TPC
                 KaonTPCPionHypoFinal.push_back(KaonTPCPionHypo.at(i2)); // Kaon TPC
                 if (pairsign == 1) {
                   qaRegistry.fill(HIST("hInvMassf1"), F1Vector.M(), F1Vector.Pt());
diff --git a/.auto-resolution/PWGLF/TableProducer/Resonances/filterf1proton.cxx b/.auto-resolution/PWGLF/TableProducer/Resonances/filterf1proton.cxx
index 831209b0905..df684770709 100644
--- a/.auto-resolution/PWGLF/TableProducer/Resonances/filterf1proton.cxx
+++ b/.auto-resolution/PWGLF/TableProducer/Resonances/filterf1proton.cxx
@@ -14,32 +14,36 @@
 ///
 /// \author Sourav Kundu, sourav.kundu@cern.ch
 
-#include <Framework/Configurable.h>
-#include <Math/GenVector/Boost.h>
-#include <Math/Vector4D.h>
-#include <TMath.h>
-#include <fairlogger/Logger.h>
-#include <iostream>
-#include <iterator>
-#include <string>
-
 #include "PWGLF/DataModel/FilterF1ProtonTables.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
-#include "CommonConstants/MathConstants.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "DataFormatsTPC/BetheBlochAleph.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
 #include "CCDB/CcdbApi.h"
+#include "CommonConstants/MathConstants.h"
 #include "CommonConstants/PhysicsConstants.h"
+#include "DataFormatsTPC/BetheBlochAleph.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include <Framework/Configurable.h>
+
+#include <Math/GenVector/Boost.h>
+#include <Math/Vector4D.h>
+#include <TMath.h>
+
+#include <fairlogger/Logger.h>
+
+#include <iostream>
+#include <iterator>
+#include <string>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/TableProducer/Resonances/resonanceInitializer.cxx b/.auto-resolution/PWGLF/TableProducer/Resonances/resonanceInitializer.cxx
index c318d1d57d9..23d4b0df3ae 100644
--- a/.auto-resolution/PWGLF/TableProducer/Resonances/resonanceInitializer.cxx
+++ b/.auto-resolution/PWGLF/TableProducer/Resonances/resonanceInitializer.cxx
@@ -14,32 +14,35 @@
 /// \author Bong-Hwi Lim <bong-hwi.lim@cern.ch>
 ///
 
-#include <string>
-#include <vector>
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/Centrality.h"
+#include "PWGLF/DataModel/LFResonanceTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/Utils/collisionCuts.h"
+
+#include "Common/Core/EventPlaneHelper.h"
 #include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/Qvectors.h"
-#include "Common/Core/EventPlaneHelper.h"
-#include "Framework/ASoAHelpers.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonConstants/MathConstants.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
 #include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
-#include "PWGLF/Utils/collisionCuts.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "CommonConstants/MathConstants.h"
+
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/TableProducer/Resonances/resonanceMergeDF.cxx b/.auto-resolution/PWGLF/TableProducer/Resonances/resonanceMergeDF.cxx
index 99ba4ec391d..c94d5940ff2 100644
--- a/.auto-resolution/PWGLF/TableProducer/Resonances/resonanceMergeDF.cxx
+++ b/.auto-resolution/PWGLF/TableProducer/Resonances/resonanceMergeDF.cxx
@@ -26,31 +26,33 @@
 /// \author Bong-Hwi Lim <bong-hwi.lim@cern.ch>
 ///         Nasir Mehdi Malik <nasir.mehdi.malik@cern.ch>
 ///         Min-jae Kim <minjae.kim@cern.ch>
-#include <vector>
+#include "PWGLF/DataModel/LFResonanceTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/Utils/collisionCuts.h"
 
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Multiplicity.h"
+#include "Common/Core/EventPlaneHelper.h"
 #include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/Qvectors.h"
-#include "Common/Core/EventPlaneHelper.h"
-#include "Framework/ASoAHelpers.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
 #include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
-#include "PWGLF/Utils/collisionCuts.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/TableProducer/Resonances/resonanceModuleInitializer.cxx b/.auto-resolution/PWGLF/TableProducer/Resonances/resonanceModuleInitializer.cxx
index 54d2533b05a..d369995d3fd 100644
--- a/.auto-resolution/PWGLF/TableProducer/Resonances/resonanceModuleInitializer.cxx
+++ b/.auto-resolution/PWGLF/TableProducer/Resonances/resonanceModuleInitializer.cxx
@@ -14,34 +14,37 @@
 ///
 /// \author Bong-Hwi Lim <bong-hwi.lim@cern.ch>
 
-#include <string>
-#include <vector>
-#include "CCDB/BasicCCDBManager.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/Centrality.h"
+#include "PWGLF/DataModel/LFResonanceTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/DataModel/mcCentrality.h"
+#include "PWGLF/Utils/collisionCuts.h"
+
+#include "Common/Core/EventPlaneHelper.h"
 #include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/Qvectors.h"
-#include "Common/Core/EventPlaneHelper.h"
-#include "CommonConstants/PhysicsConstants.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/MathConstants.h"
-#include "DataFormatsParameters/GRPObject.h"
+#include "CommonConstants/PhysicsConstants.h"
 #include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
 #include "DetectorsBase/Propagator.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
-#include "PWGLF/DataModel/mcCentrality.h"
-#include "PWGLF/Utils/collisionCuts.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
 
+#include <string>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.auto-resolution/PWGLF/TableProducer/Strangeness/Converters/stracentconverter.cxx b/.auto-resolution/PWGLF/TableProducer/Strangeness/Converters/stracentconverter.cxx
index 74a786101e9..150b3734301 100644
--- a/.auto-resolution/PWGLF/TableProducer/Strangeness/Converters/stracentconverter.cxx
+++ b/.auto-resolution/PWGLF/TableProducer/Strangeness/Converters/stracentconverter.cxx
@@ -8,11 +8,12 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.auto-resolution/PWGLF/TableProducer/Strangeness/Converters/stradautracksconverter.cxx b/.auto-resolution/PWGLF/TableProducer/Strangeness/Converters/stradautracksconverter.cxx
index 5fe25abb572..e5b4533350e 100644
--- a/.auto-resolution/PWGLF/TableProducer/Strangeness/Converters/stradautracksconverter.cxx
+++ b/.auto-resolution/PWGLF/TableProducer/Strangeness/Converters/stradautracksconverter.cxx
@@ -8,11 +8,12 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/TableProducer/Strangeness/Converters/stradautracksextraconverter.cxx b/.auto-resolution/PWGLF/TableProducer/Strangeness/Converters/stradautracksextraconverter.cxx
index ad436f4dfee..e40250a1ab3 100644
--- a/.auto-resolution/PWGLF/TableProducer/Strangeness/Converters/stradautracksextraconverter.cxx
+++ b/.auto-resolution/PWGLF/TableProducer/Strangeness/Converters/stradautracksextraconverter.cxx
@@ -8,11 +8,12 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
@@ -37,4 +38,5 @@ WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
   return WorkflowSpec{
     adaptAnalysisTask<stradautracksextraconverter>(cfgc)};
-}
\ No newline at end of file
+}
+ 
\ No newline at end of file
diff --git a/.auto-resolution/PWGLF/TableProducer/Strangeness/Converters/stradautracksextraconverter2.cxx b/.auto-resolution/PWGLF/TableProducer/Strangeness/Converters/stradautracksextraconverter2.cxx
index 22c9fc7eea4..e9c2f78c407 100644
--- a/.auto-resolution/PWGLF/TableProducer/Strangeness/Converters/stradautracksextraconverter2.cxx
+++ b/.auto-resolution/PWGLF/TableProducer/Strangeness/Converters/stradautracksextraconverter2.cxx
@@ -8,11 +8,12 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/TableProducer/Strangeness/Converters/stradautracksextraconverter3.cxx b/.auto-resolution/PWGLF/TableProducer/Strangeness/Converters/stradautracksextraconverter3.cxx
index a4144c1ee9a..9f4d341ff39 100644
--- a/.auto-resolution/PWGLF/TableProducer/Strangeness/Converters/stradautracksextraconverter3.cxx
+++ b/.auto-resolution/PWGLF/TableProducer/Strangeness/Converters/stradautracksextraconverter3.cxx
@@ -8,11 +8,12 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/TableProducer/Strangeness/Converters/stradautrackstofpidconverter.cxx b/.auto-resolution/PWGLF/TableProducer/Strangeness/Converters/stradautrackstofpidconverter.cxx
index 8731939ca53..063b318657f 100644
--- a/.auto-resolution/PWGLF/TableProducer/Strangeness/Converters/stradautrackstofpidconverter.cxx
+++ b/.auto-resolution/PWGLF/TableProducer/Strangeness/Converters/stradautrackstofpidconverter.cxx
@@ -8,11 +8,12 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
@@ -62,4 +63,5 @@ WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
   return WorkflowSpec{
     adaptAnalysisTask<stradautrackstofpidconverter>(cfgc)};
-}
\ No newline at end of file
+}
+ 
\ No newline at end of file
diff --git a/.auto-resolution/PWGLF/TableProducer/Strangeness/Converters/straevselsconverter.cxx b/.auto-resolution/PWGLF/TableProducer/Strangeness/Converters/straevselsconverter.cxx
index 9806e15abfc..8cadcdacd2a 100644
--- a/.auto-resolution/PWGLF/TableProducer/Strangeness/Converters/straevselsconverter.cxx
+++ b/.auto-resolution/PWGLF/TableProducer/Strangeness/Converters/straevselsconverter.cxx
@@ -8,11 +8,12 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.auto-resolution/PWGLF/TableProducer/Strangeness/Converters/straevselsconverter2rawcents.cxx b/.auto-resolution/PWGLF/TableProducer/Strangeness/Converters/straevselsconverter2rawcents.cxx
index deeafa8eeca..90ce25774c7 100644
--- a/.auto-resolution/PWGLF/TableProducer/Strangeness/Converters/straevselsconverter2rawcents.cxx
+++ b/.auto-resolution/PWGLF/TableProducer/Strangeness/Converters/straevselsconverter2rawcents.cxx
@@ -8,11 +8,12 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.auto-resolution/PWGLF/TableProducer/Strangeness/Converters/straevselsconverter2rawcents2.cxx b/.auto-resolution/PWGLF/TableProducer/Strangeness/Converters/straevselsconverter2rawcents2.cxx
index ffed58e9072..fa3a2ba8e48 100644
--- a/.auto-resolution/PWGLF/TableProducer/Strangeness/Converters/straevselsconverter2rawcents2.cxx
+++ b/.auto-resolution/PWGLF/TableProducer/Strangeness/Converters/straevselsconverter2rawcents2.cxx
@@ -8,11 +8,12 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.auto-resolution/PWGLF/TableProducer/Strangeness/Converters/straevselsconverter2rawcents3.cxx b/.auto-resolution/PWGLF/TableProducer/Strangeness/Converters/straevselsconverter2rawcents3.cxx
index 8d92146d6f7..0a5e98462ce 100644
--- a/.auto-resolution/PWGLF/TableProducer/Strangeness/Converters/straevselsconverter2rawcents3.cxx
+++ b/.auto-resolution/PWGLF/TableProducer/Strangeness/Converters/straevselsconverter2rawcents3.cxx
@@ -8,11 +8,12 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.auto-resolution/PWGLF/TableProducer/Strangeness/Converters/stramccollisionconverter.cxx b/.auto-resolution/PWGLF/TableProducer/Strangeness/Converters/stramccollisionconverter.cxx
index 8c7950dc4fd..c29ad673dbc 100644
--- a/.auto-resolution/PWGLF/TableProducer/Strangeness/Converters/stramccollisionconverter.cxx
+++ b/.auto-resolution/PWGLF/TableProducer/Strangeness/Converters/stramccollisionconverter.cxx
@@ -8,11 +8,12 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.auto-resolution/PWGLF/TableProducer/Strangeness/Converters/stramccollisionconverter2.cxx b/.auto-resolution/PWGLF/TableProducer/Strangeness/Converters/stramccollisionconverter2.cxx
index c821c6fb5fe..2f330820509 100644
--- a/.auto-resolution/PWGLF/TableProducer/Strangeness/Converters/stramccollisionconverter2.cxx
+++ b/.auto-resolution/PWGLF/TableProducer/Strangeness/Converters/stramccollisionconverter2.cxx
@@ -16,11 +16,12 @@
 /// \author Romain Schotter <romain.schotter@cern.ch>, Austrian Academy of Sciences & SMI
 //
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.auto-resolution/PWGLF/TableProducer/Strangeness/Converters/stramccollmultconverter.cxx b/.auto-resolution/PWGLF/TableProducer/Strangeness/Converters/stramccollmultconverter.cxx
index 411e3c15da5..2b25192cce1 100644
--- a/.auto-resolution/PWGLF/TableProducer/Strangeness/Converters/stramccollmultconverter.cxx
+++ b/.auto-resolution/PWGLF/TableProducer/Strangeness/Converters/stramccollmultconverter.cxx
@@ -8,11 +8,12 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.auto-resolution/PWGLF/TableProducer/Strangeness/Converters/strarawcentsconverter.cxx b/.auto-resolution/PWGLF/TableProducer/Strangeness/Converters/strarawcentsconverter.cxx
index e912c724870..7986a02ca1e 100644
--- a/.auto-resolution/PWGLF/TableProducer/Strangeness/Converters/strarawcentsconverter.cxx
+++ b/.auto-resolution/PWGLF/TableProducer/Strangeness/Converters/strarawcentsconverter.cxx
@@ -8,11 +8,12 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.auto-resolution/PWGLF/TableProducer/Strangeness/Converters/strarawcentsconverter2v4.cxx b/.auto-resolution/PWGLF/TableProducer/Strangeness/Converters/strarawcentsconverter2v4.cxx
index c94227e31cd..1eeb4b20ec9 100644
--- a/.auto-resolution/PWGLF/TableProducer/Strangeness/Converters/strarawcentsconverter2v4.cxx
+++ b/.auto-resolution/PWGLF/TableProducer/Strangeness/Converters/strarawcentsconverter2v4.cxx
@@ -8,11 +8,12 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.auto-resolution/PWGLF/TableProducer/Strangeness/Converters/strastampsconverter.cxx b/.auto-resolution/PWGLF/TableProducer/Strangeness/Converters/strastampsconverter.cxx
index 7f5f129d623..8a6ee0c52d0 100644
--- a/.auto-resolution/PWGLF/TableProducer/Strangeness/Converters/strastampsconverter.cxx
+++ b/.auto-resolution/PWGLF/TableProducer/Strangeness/Converters/strastampsconverter.cxx
@@ -8,11 +8,12 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.auto-resolution/PWGLF/TableProducer/Strangeness/Converters/v0coresconverter.cxx b/.auto-resolution/PWGLF/TableProducer/Strangeness/Converters/v0coresconverter.cxx
index 06fafc1cc1a..9fa5142bc6d 100644
--- a/.auto-resolution/PWGLF/TableProducer/Strangeness/Converters/v0coresconverter.cxx
+++ b/.auto-resolution/PWGLF/TableProducer/Strangeness/Converters/v0coresconverter.cxx
@@ -8,11 +8,12 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.auto-resolution/PWGLF/TableProducer/Strangeness/Converters/v0coresconverter2.cxx b/.auto-resolution/PWGLF/TableProducer/Strangeness/Converters/v0coresconverter2.cxx
index c918f227525..66cafa8eeb6 100644
--- a/.auto-resolution/PWGLF/TableProducer/Strangeness/Converters/v0coresconverter2.cxx
+++ b/.auto-resolution/PWGLF/TableProducer/Strangeness/Converters/v0coresconverter2.cxx
@@ -8,11 +8,12 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.auto-resolution/PWGLF/TableProducer/Strangeness/Converters/v0mlscoresconverter.cxx b/.auto-resolution/PWGLF/TableProducer/Strangeness/Converters/v0mlscoresconverter.cxx
index 9f2020bf20d..6cc3f4536fb 100644
--- a/.auto-resolution/PWGLF/TableProducer/Strangeness/Converters/v0mlscoresconverter.cxx
+++ b/.auto-resolution/PWGLF/TableProducer/Strangeness/Converters/v0mlscoresconverter.cxx
@@ -8,11 +8,12 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "PWGLF/DataModel/LFStrangenessMLTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/TableProducer/Strangeness/Converters/zdcneutronsconverter.cxx b/.auto-resolution/PWGLF/TableProducer/Strangeness/Converters/zdcneutronsconverter.cxx
index ad081a43052..7ee0c368480 100644
--- a/.auto-resolution/PWGLF/TableProducer/Strangeness/Converters/zdcneutronsconverter.cxx
+++ b/.auto-resolution/PWGLF/TableProducer/Strangeness/Converters/zdcneutronsconverter.cxx
@@ -8,11 +8,12 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "PWGLF/DataModel/LFStrangenessMLTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/TableProducer/Strangeness/LambdaLambdatable.cxx b/.auto-resolution/PWGLF/TableProducer/Strangeness/LambdaLambdatable.cxx
index 778f39ed442..bb7c517e1e7 100644
--- a/.auto-resolution/PWGLF/TableProducer/Strangeness/LambdaLambdatable.cxx
+++ b/.auto-resolution/PWGLF/TableProducer/Strangeness/LambdaLambdatable.cxx
@@ -11,38 +11,37 @@
 ///
 /// \author Junlee Kim, (junlee.kim@cern.ch)
 
-#include <Framework/Configurable.h>
-#include <Math/GenVector/Boost.h>
-#include <Math/Vector4D.h>
-#include <TMath.h>
-#include <fairlogger/Logger.h>
-
-#include <iostream>
-#include <iterator>
-#include <string>
-#include <vector>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/DataModel/ReducedLambdaLambdaTables.h"
 
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 #include "EventFiltering/Zorro.h"
 #include "EventFiltering/ZorroSummary.h"
 
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
+#include "CommonConstants/MathConstants.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
+#include <Framework/Configurable.h>
 
-#include "CommonConstants/MathConstants.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/PIDResponse.h"
+#include <Math/GenVector/Boost.h>
+#include <Math/Vector4D.h>
+#include <TMath.h>
 
-#include "CCDB/BasicCCDBManager.h"
-#include "CCDB/CcdbApi.h"
+#include <fairlogger/Logger.h>
 
-#include "PWGLF/DataModel/ReducedLambdaLambdaTables.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include <iostream>
+#include <iterator>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/TableProducer/Strangeness/cascadeMLSelectionTreeCreator.cxx b/.auto-resolution/PWGLF/TableProducer/Strangeness/cascadeMLSelectionTreeCreator.cxx
index f3bfc813c89..9eefdea0c8a 100644
--- a/.auto-resolution/PWGLF/TableProducer/Strangeness/cascadeMLSelectionTreeCreator.cxx
+++ b/.auto-resolution/PWGLF/TableProducer/Strangeness/cascadeMLSelectionTreeCreator.cxx
@@ -23,37 +23,40 @@
 //    david.dobrigkeit.chinellato@cern.ch
 //
 
-#include <Math/Vector4D.h> // C system
-#include <cmath>           // C++ system
-#include <array>           // C++ system
-#include <cstdlib>         // C++ system
+#include "PWGLF/DataModel/LFStrangenessMLTables.h"
+#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/ASoA.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
-#include "PWGLF/DataModel/LFStrangenessMLTables.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/TableProducer/PID/pidTOFBase.h"
+
 #include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/PhysicsConstants.h"
-#include "Common/TableProducer/PID/pidTOFBase.h"
+#include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <Math/Vector4D.h> // C system
+#include <TDatabasePDG.h>
 #include <TFile.h>
 #include <TH2F.h>
-#include <TProfile.h>
 #include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
+#include <TProfile.h>
+
+#include <array>   // C++ system
+#include <cmath>   // C++ system
+#include <cstdlib> // C++ system
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/TableProducer/Strangeness/cascadebuilder.cxx b/.auto-resolution/PWGLF/TableProducer/Strangeness/cascadebuilder.cxx
index b4a19e6660b..607445f0fda 100644
--- a/.auto-resolution/PWGLF/TableProducer/Strangeness/cascadebuilder.cxx
+++ b/.auto-resolution/PWGLF/TableProducer/Strangeness/cascadebuilder.cxx
@@ -36,47 +36,47 @@
 //    david.dobrigkeit.chinellato@cern.ch
 //
 
-#include <string>
-#include <vector>
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <map>
-#include <iterator>
-#include <utility>
-#include <string>
-#include <vector>
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/LFStrangenessMLTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFStrangenessMLTables.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
 #include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
 #include "Tools/ML/MlResponse.h"
 #include "Tools/ML/model.h"
 
+#include "CCDB/BasicCCDBManager.h"
+#include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <iterator>
+#include <map>
+#include <string>
+#include <utility>
+#include <vector>
+
 #ifndef HomogeneousField
 #define HomogeneousField
 #endif
 
 /// includes KFParticle
-#include "KFParticle.h"
 #include "KFPTrack.h"
 #include "KFPVertex.h"
+#include "KFParticle.h"
 #include "KFParticleBase.h"
 #include "KFVertex.h"
 
@@ -2202,11 +2202,11 @@ struct cascadePreselector {
                   }
                 }
               } // end conditional V0-bach pair
-            }   // end neg = pos mother conditional
+            } // end neg = pos mother conditional
           }
         } // end loop neg/pos mothers
-      }   // end conditional of mothers existing
-    }     // end association check
+      } // end conditional of mothers existing
+    } // end association check
     // Construct tag table (note: this will be joinable with CascDatas)
     if (lPDG == 3312)
       bitset(maskElement, bitTrueXiMinus);
diff --git a/.auto-resolution/PWGLF/TableProducer/Strangeness/cascadefinder.cxx b/.auto-resolution/PWGLF/TableProducer/Strangeness/cascadefinder.cxx
index 3901d3f14c3..4d6de573b2a 100644
--- a/.auto-resolution/PWGLF/TableProducer/Strangeness/cascadefinder.cxx
+++ b/.auto-resolution/PWGLF/TableProducer/Strangeness/cascadefinder.cxx
@@ -28,33 +28,36 @@
 //    david.dobrigkeit.chinellato@cern.ch
 //
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
 #include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "ReconstructionDataFormats/Track.h"
+#include "PWGLF/DataModel/LFStrangenessFinderTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFStrangenessFinderTables.h"
-#include "Common/Core/TrackSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
 
+#include "DCAFitter/DCAFitterN.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <Math/Vector4D.h>
+#include <TDatabasePDG.h>
 #include <TFile.h>
-#include <TLorentzVector.h>
 #include <TH1F.h>
 #include <TH2F.h>
-#include <TProfile.h>
-#include <Math/Vector4D.h>
+#include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
-#include <cmath>
+#include <TProfile.h>
+
 #include <array>
+#include <cmath>
 #include <cstdlib>
 
 using namespace o2;
@@ -270,9 +273,9 @@ struct cascadefinder {
                      t0id.dcaXY(),
                      dcaInfo[0], dcaInfo[1]);
           } // end if cascade recoed
-        }   // end loop over bachelor
-      }     // end if v0 recoed
-    }       // end loop over cascades
+        } // end loop over bachelor
+      } // end if v0 recoed
+    } // end loop over cascades
 
     // Anticascades
     for (auto& v0id : antiLambdas) {
@@ -361,9 +364,9 @@ struct cascadefinder {
                      t0id.dcaXY(),
                      dcaInfo[0], dcaInfo[1]);
           } // end if cascade recoed
-        }   // end loop over bachelor
-      }     // end if v0 recoed
-    }       // end loop over anticascades
+        } // end loop over bachelor
+      } // end if v0 recoed
+    } // end loop over anticascades
 
     hCandPerEvent->Fill(lNCand);
   }
diff --git a/.auto-resolution/PWGLF/TableProducer/Strangeness/cascadeflow.cxx b/.auto-resolution/PWGLF/TableProducer/Strangeness/cascadeflow.cxx
index c66a1db16fd..a8135e5c1b5 100644
--- a/.auto-resolution/PWGLF/TableProducer/Strangeness/cascadeflow.cxx
+++ b/.auto-resolution/PWGLF/TableProducer/Strangeness/cascadeflow.cxx
@@ -12,25 +12,29 @@
 /// \brief Task to create derived data for cascade flow analyses
 /// \authors: Chiara De Martin (chiara.de.martin@cern.ch), Maximiliano Puccio (maximiliano.puccio@cern.ch)
 
-#include <vector>
-#include <string>
-#include <memory>
-#include "Math/Vector3D.h"
-#include "TRandom3.h"
+#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/DataModel/cascqaanalysis.h"
+
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Framework/AnalysisTask.h"
+#include "Tools/ML/MlResponse.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/cascqaanalysis.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
-#include "Tools/ML/MlResponse.h"
-#include "CCDB/BasicCCDBManager.h"
+
+#include "Math/Vector3D.h"
+#include "TRandom3.h"
+
+#include <memory>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/TableProducer/Strangeness/cascademcbuilder.cxx b/.auto-resolution/PWGLF/TableProducer/Strangeness/cascademcbuilder.cxx
index 3d4a5642004..384707d3d57 100644
--- a/.auto-resolution/PWGLF/TableProducer/Strangeness/cascademcbuilder.cxx
+++ b/.auto-resolution/PWGLF/TableProducer/Strangeness/cascademcbuilder.cxx
@@ -18,23 +18,25 @@
 //    david.dobrigkeit.chinellato@cern.ch
 //
 
-#include <cmath>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/trackUtilities.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
 #include <array>
+#include <cmath>
 #include <cstdlib>
-#include <map>
 #include <iterator>
+#include <map>
 #include <utility>
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
@@ -45,11 +47,11 @@ using LabeledTracks = soa::Join<aod::Tracks, aod::McTrackLabels>;
 
 //*+-+*+-+*+-+*+-+*+-+*+-+*+-+*+-+*+-+*+-+*
 struct cascademcbuilder {
-  Produces<aod::McCascLabels> casclabels;       // MC labels for cascades
-  Produces<aod::McKFCascLabels> kfcasclabels;   // MC labels for tracked cascades
-  Produces<aod::McTraCascLabels> tracasclabels; // MC labels for tracked cascades
-  Produces<aod::McCascBBTags> bbtags;           // bb tags (inv structure tagging)
-  Produces<aod::CascMCCores> cascmccores;       // optionally aggregate information from MC side for posterior analysis (derived data)
+  Produces<aod::McCascLabels> casclabels;           // MC labels for cascades
+  Produces<aod::McKFCascLabels> kfcasclabels;       // MC labels for tracked cascades
+  Produces<aod::McTraCascLabels> tracasclabels;     // MC labels for tracked cascades
+  Produces<aod::McCascBBTags> bbtags;               // bb tags (inv structure tagging)
+  Produces<aod::CascMCCores> cascmccores;           // optionally aggregate information from MC side for posterior analysis (derived data)
   Produces<aod::CascCoreMCLabels> cascCoreMClabels; // optionally aggregate information from MC side for posterior analysis (derived data)
   Produces<aod::CascMCCollRefs> cascmccollrefs;     // references MC collisions from MC cascades
 
@@ -225,7 +227,7 @@ struct cascademcbuilder {
             } // end v0 mother loop
           } // end has_mothers check for V0
         } // end conditional of pos/neg originating being the same
-      }     // end association check
+      } // end association check
       // Construct label table (note: this will be joinable with CascDatas)
       casclabels(
         thisInfo.label, thisInfo.motherLabel);
@@ -421,11 +423,11 @@ struct cascademcbuilder {
                     }
                   }
                 } // end conditional V0-bach pair
-              }   // end neg = pos mother conditional
+              } // end neg = pos mother conditional
             }
           } // end loop neg/pos mothers
-        }   // end conditional of mothers existing
-      }     // end association check
+        } // end conditional of mothers existing
+      } // end association check
       // Construct label table (note: this will be joinable with CascDatas)
       kfcasclabels(
         lLabel);
@@ -464,11 +466,11 @@ struct cascademcbuilder {
                     }
                   }
                 } // end conditional V0-bach pair
-              }   // end neg = pos mother conditional
+              } // end neg = pos mother conditional
             }
           } // end loop neg/pos mothers
-        }   // end conditional of mothers existing
-      }     // end association check
+        } // end conditional of mothers existing
+      } // end association check
       // Construct label table (note: this will be joinable with CascDatas)
       tracasclabels(
         lLabel);
@@ -505,7 +507,7 @@ struct cascademcbuilder {
               }
             }
           }
-        }                                         // end if-pion
+        } // end if-pion
         if (bachelorParticle.pdgCode() == -211) { // pi-, look for proton in positive prong
           if (lNegTrack.has_mcParticle()) {
             auto baryonParticle = lPosTrack.mcParticle_as<aod::McParticles>();
@@ -520,7 +522,7 @@ struct cascademcbuilder {
             }
           }
         } // end if-pion
-      }   // end bachelor has mcparticle
+      } // end bachelor has mcparticle
       // Construct label table (note: this will be joinable with CascDatas)
       bbtags(bbTag);
     } // end casctable loop
diff --git a/.auto-resolution/PWGLF/TableProducer/Strangeness/cascademcfinder.cxx b/.auto-resolution/PWGLF/TableProducer/Strangeness/cascademcfinder.cxx
index 8d26f0ea33c..41bb2863a47 100644
--- a/.auto-resolution/PWGLF/TableProducer/Strangeness/cascademcfinder.cxx
+++ b/.auto-resolution/PWGLF/TableProducer/Strangeness/cascademcfinder.cxx
@@ -24,37 +24,39 @@
 //    david.dobrigkeit.chinellato@cern.ch
 //
 
-#include <Math/Vector4D.h>
-#include <cmath>
-#include <array>
-#include <cstdlib>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/McCollisionExtra.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "Common/Core/TrackSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
+#include <Math/Vector4D.h>
+#include <TDatabasePDG.h>
 #include <TFile.h>
-#include <TLorentzVector.h>
 #include <TH1F.h>
 #include <TH2F.h>
-#include <TProfile.h>
+#include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
+#include <TProfile.h>
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/TableProducer/Strangeness/cascademlselection.cxx b/.auto-resolution/PWGLF/TableProducer/Strangeness/cascademlselection.cxx
index 6da4bc669e4..f8710e5e3ff 100644
--- a/.auto-resolution/PWGLF/TableProducer/Strangeness/cascademlselection.cxx
+++ b/.auto-resolution/PWGLF/TableProducer/Strangeness/cascademlselection.cxx
@@ -20,37 +20,40 @@
 //    david.dobrigkeit.chinellato@cern.ch
 //
 
-#include <Math/Vector4D.h>
-#include <cmath>
-#include <array>
-#include <cstdlib>
+#include "PWGLF/DataModel/LFStrangenessMLTables.h"
+#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/ASoA.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
-#include "PWGLF/DataModel/LFStrangenessMLTables.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+#include "Tools/ML/MlResponse.h"
+#include "Tools/ML/model.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <Math/Vector4D.h>
+#include <TDatabasePDG.h>
 #include <TFile.h>
 #include <TH2F.h>
-#include <TProfile.h>
 #include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
-#include "Tools/ML/MlResponse.h"
-#include "Tools/ML/model.h"
+#include <TProfile.h>
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
 
 using namespace o2;
 using namespace o2::analysis;
diff --git a/.auto-resolution/PWGLF/TableProducer/Strangeness/cascadepid.cxx b/.auto-resolution/PWGLF/TableProducer/Strangeness/cascadepid.cxx
index 3c7c82dacdd..830d5ca1577 100644
--- a/.auto-resolution/PWGLF/TableProducer/Strangeness/cascadepid.cxx
+++ b/.auto-resolution/PWGLF/TableProducer/Strangeness/cascadepid.cxx
@@ -23,35 +23,37 @@
 // (strange, weakly-decaying) particle. This task is meant to be a test, as
 // it hasn't been fully tested yet! Use at your own peril for now :-)
 
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <map>
-#include <iterator>
-#include <utility>
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
 #include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+#include "Common/TableProducer/PID/pidTOFBase.h"
+
 #include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/PhysicsConstants.h"
-#include "Common/TableProducer/PID/pidTOFBase.h"
-#include "Common/DataModel/PIDResponse.h"
+#include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <iterator>
+#include <map>
+#include <utility>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/TableProducer/Strangeness/cascadespawner.cxx b/.auto-resolution/PWGLF/TableProducer/Strangeness/cascadespawner.cxx
index ab3f4cb7c3d..3b10901349b 100644
--- a/.auto-resolution/PWGLF/TableProducer/Strangeness/cascadespawner.cxx
+++ b/.auto-resolution/PWGLF/TableProducer/Strangeness/cascadespawner.cxx
@@ -16,19 +16,20 @@
 //  Creates Cascade extension tables for derived data.
 //  A minimal task that saves a lot of disk space.
 
-#include <cmath>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+
 #include <array>
+#include <cmath>
 #include <cstdlib>
 #include <iterator>
 #include <utility>
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.auto-resolution/PWGLF/TableProducer/Strangeness/cascqaanalysis.cxx b/.auto-resolution/PWGLF/TableProducer/Strangeness/cascqaanalysis.cxx
index 6a3310d316f..e051501d18f 100644
--- a/.auto-resolution/PWGLF/TableProducer/Strangeness/cascqaanalysis.cxx
+++ b/.auto-resolution/PWGLF/TableProducer/Strangeness/cascqaanalysis.cxx
@@ -13,23 +13,27 @@
 /// \brief Analysis of cascades in pp collisions
 /// \author Roman Nepeivoda (roman.nepeivoda@cern.ch)
 
-#include <algorithm>
-#include <vector>
-#include <TPDGCode.h>
+#include "PWGLF/DataModel/cascqaanalysis.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/DataModel/mcCentrality.h"
+#include "PWGLF/Utils/inelGt.h"
+
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "PWGLF/DataModel/cascqaanalysis.h"
-#include "TRandom2.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "PWGLF/Utils/inelGt.h"
-#include "PWGLF/DataModel/mcCentrality.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TRandom2.h"
+#include <TPDGCode.h>
+
+#include <algorithm>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/TableProducer/Strangeness/doubleCascTreeCreator.cxx b/.auto-resolution/PWGLF/TableProducer/Strangeness/doubleCascTreeCreator.cxx
index 5ecffca742f..80b95b1c34a 100644
--- a/.auto-resolution/PWGLF/TableProducer/Strangeness/doubleCascTreeCreator.cxx
+++ b/.auto-resolution/PWGLF/TableProducer/Strangeness/doubleCascTreeCreator.cxx
@@ -9,38 +9,38 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <vector>
-#include <utility>
-#include <random>
+#include "PWGLF/DataModel/LFDoubleCascTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Multiplicity.h"
+#include "Common/Core/PID/TPCPIDResponse.h"
 #include "Common/Core/RecoDecay.h"
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
-
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 #include "EventFiltering/Zorro.h"
 #include "EventFiltering/ZorroSummary.h"
 
-#include "Common/Core/PID/TPCPIDResponse.h"
-#include "Common/DataModel/PIDResponse.h"
+#include "CCDB/BasicCCDBManager.h"
 #include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
-#include "PWGLF/DataModel/LFDoubleCascTables.h"
 #include "TDatabasePDG.h"
 
+#include <random>
+#include <utility>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.auto-resolution/PWGLF/TableProducer/Strangeness/hStrangeCorrelationFilter.cxx b/.auto-resolution/PWGLF/TableProducer/Strangeness/hStrangeCorrelationFilter.cxx
index 61f9e2f5086..6bb0ac92517 100644
--- a/.auto-resolution/PWGLF/TableProducer/Strangeness/hStrangeCorrelationFilter.cxx
+++ b/.auto-resolution/PWGLF/TableProducer/Strangeness/hStrangeCorrelationFilter.cxx
@@ -18,23 +18,26 @@
 /// \author David Dobrigkeit Chinellato (david.dobrigkeit.chinellato@cern.ch)
 /// \author Zhongbao Yin (Zhong-Bao.Yin@cern.ch)
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "PWGLF/DataModel/LFHStrangeCorrelationTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Framework/ASoAHelpers.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+#include "EventFiltering/Zorro.h"
+#include "EventFiltering/ZorroSummary.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TF1.h"
-#include <string>
 #include <TPDGCode.h>
 
-#include "EventFiltering/Zorro.h"
-#include "EventFiltering/ZorroSummary.h"
+#include <string>
 
 using namespace o2;
 using namespace o2::constants::math;
diff --git a/.auto-resolution/PWGLF/TableProducer/Strangeness/lambdaJetpolarizationbuilder.cxx b/.auto-resolution/PWGLF/TableProducer/Strangeness/lambdaJetpolarizationbuilder.cxx
index cc21c8def05..579177eecf2 100644
--- a/.auto-resolution/PWGLF/TableProducer/Strangeness/lambdaJetpolarizationbuilder.cxx
+++ b/.auto-resolution/PWGLF/TableProducer/Strangeness/lambdaJetpolarizationbuilder.cxx
@@ -12,25 +12,29 @@
 
 /// \author Youpeng Su (yousu@cern.ch)
 
-#include <iostream>
-#include <string>
-#include <vector>
-#include <cmath>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/EventSelection.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Framework/O2DatabasePDGPlugin.h"
 #include "PWGJE/Core/JetDerivedDataUtilities.h"
 #include "PWGJE/DataModel/Jet.h"
-#include <TLorentzVector.h>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/DataModel/lambdaJetpolarization.h"
+
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+
 #include "Framework/ASoA.h"
 #include "Framework/AnalysisDataModel.h"
-#include <TTree.h>
+#include "Framework/AnalysisTask.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
 #include <TFile.h>
+#include <TLorentzVector.h>
 #include <TMatrixD.h>
-#include "PWGLF/DataModel/lambdaJetpolarization.h"
+#include <TTree.h>
+
+#include <cmath>
+#include <iostream>
+#include <string>
+#include <vector>
 
 using std::cout;
 using std::endl;
diff --git a/.auto-resolution/PWGLF/TableProducer/Strangeness/lambdakzeroMLSelectionTreeCreator.cxx b/.auto-resolution/PWGLF/TableProducer/Strangeness/lambdakzeroMLSelectionTreeCreator.cxx
index d70552c4c71..d965f6490b9 100644
--- a/.auto-resolution/PWGLF/TableProducer/Strangeness/lambdakzeroMLSelectionTreeCreator.cxx
+++ b/.auto-resolution/PWGLF/TableProducer/Strangeness/lambdakzeroMLSelectionTreeCreator.cxx
@@ -24,37 +24,40 @@
 //    david.dobrigkeit.chinellato@cern.ch
 //
 
-#include <Math/Vector4D.h> // C system
-#include <cmath>           // C++ system
-#include <array>           // C++ system
-#include <cstdlib>         // C++ system
+#include "PWGLF/DataModel/LFStrangenessMLTables.h"
+#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/ASoA.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
-#include "PWGLF/DataModel/LFStrangenessMLTables.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/TableProducer/PID/pidTOFBase.h"
+
 #include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/PhysicsConstants.h"
-#include "Common/TableProducer/PID/pidTOFBase.h"
+#include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <Math/Vector4D.h> // C system
+#include <TDatabasePDG.h>
 #include <TFile.h>
 #include <TH2F.h>
-#include <TProfile.h>
 #include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
+#include <TProfile.h>
+
+#include <array>   // C++ system
+#include <cmath>   // C++ system
+#include <cstdlib> // C++ system
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/TableProducer/Strangeness/lambdakzerobuilder.cxx b/.auto-resolution/PWGLF/TableProducer/Strangeness/lambdakzerobuilder.cxx
index 7b898bfa98e..912a64e6176 100644
--- a/.auto-resolution/PWGLF/TableProducer/Strangeness/lambdakzerobuilder.cxx
+++ b/.auto-resolution/PWGLF/TableProducer/Strangeness/lambdakzerobuilder.cxx
@@ -36,40 +36,44 @@
 //    david.dobrigkeit.chinellato@cern.ch
 //
 
-#include <string>
-#include <vector>
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <map>
-#include <iterator>
-#include <utility>
+#include "TableHelper.h"
 
-#include "TRandom3.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFStrangenessMLTables.h"
 #include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/LFStrangenessMLTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsCalibration/MeanVertexObject.h"
-#include "TableHelper.h"
 #include "Tools/ML/MlResponse.h"
 #include "Tools/ML/model.h"
 
+#include "CCDB/BasicCCDBManager.h"
+#include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsCalibration/MeanVertexObject.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include "TRandom3.h"
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <iterator>
+#include <map>
+#include <string>
+#include <utility>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.auto-resolution/PWGLF/TableProducer/Strangeness/lambdakzerofinder.cxx b/.auto-resolution/PWGLF/TableProducer/Strangeness/lambdakzerofinder.cxx
index e75c72c77f4..9be2f0238ae 100644
--- a/.auto-resolution/PWGLF/TableProducer/Strangeness/lambdakzerofinder.cxx
+++ b/.auto-resolution/PWGLF/TableProducer/Strangeness/lambdakzerofinder.cxx
@@ -28,37 +28,39 @@
 //    david.dobrigkeit.chinellato@cern.ch
 //
 
-#include <Math/Vector4D.h>
-#include <cmath>
-#include <array>
-#include <cstdlib>
-
-#include <TFile.h>
-#include <TLorentzVector.h>
-#include <TH1F.h>
-#include <TH2F.h>
-#include <TProfile.h>
-#include <TPDGCode.h>
-#include <TDatabasePDG.h>
+#include "PWGLF/DataModel/LFStrangenessFinderTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFStrangenessFinderTables.h"
-#include "Common/Core/TrackSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <Math/Vector4D.h>
+#include <TDatabasePDG.h>
+#include <TFile.h>
+#include <TH1F.h>
+#include <TH2F.h>
+#include <TLorentzVector.h>
+#include <TPDGCode.h>
+#include <TProfile.h>
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/TableProducer/Strangeness/lambdakzeromcbuilder.cxx b/.auto-resolution/PWGLF/TableProducer/Strangeness/lambdakzeromcbuilder.cxx
index 1d7b1c29490..51c3045cca2 100644
--- a/.auto-resolution/PWGLF/TableProducer/Strangeness/lambdakzeromcbuilder.cxx
+++ b/.auto-resolution/PWGLF/TableProducer/Strangeness/lambdakzeromcbuilder.cxx
@@ -18,23 +18,25 @@
 //    david.dobrigkeit.chinellato@cern.ch
 //
 
-#include <cmath>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/trackUtilities.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
 #include <array>
+#include <cmath>
 #include <cstdlib>
-#include <map>
 #include <iterator>
+#include <map>
 #include <utility>
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
@@ -42,8 +44,8 @@ using std::array;
 
 //*+-+*+-+*+-+*+-+*+-+*+-+*+-+*+-+*+-+*+-+*
 struct lambdakzeromcbuilder {
-  Produces<aod::McV0Labels> v0labels; // MC labels for V0s
-  Produces<aod::V0MCCores> v0mccores; // optionally aggregate information from MC side for posterior analysis (derived data)
+  Produces<aod::McV0Labels> v0labels;           // MC labels for V0s
+  Produces<aod::V0MCCores> v0mccores;           // optionally aggregate information from MC side for posterior analysis (derived data)
   Produces<aod::V0CoreMCLabels> v0CoreMCLabels; // interlink V0Cores -> V0MCCores in asymmetric mode
   Produces<aod::V0MCCollRefs> v0mccollref;      // references collisions from V0MCCores
 
@@ -152,7 +154,7 @@ struct lambdakzeromcbuilder {
   void process(aod::V0Datas const& v0table, aod::McTrackLabels const&, aod::McParticles const& mcParticles)
   {
     // to be used if using the populateV0MCCoresAsymmetric mode, kept empty otherwise
-    std::vector<mcV0info> mcV0infos; // V0MCCore information
+    std::vector<mcV0info> mcV0infos;                               // V0MCCore information
     std::vector<bool> mcParticleIsReco(mcParticles.size(), false); // mc Particle not recoed by V0s
 
     for (auto& v0 : v0table) {
diff --git a/.auto-resolution/PWGLF/TableProducer/Strangeness/lambdakzeromcfinder.cxx b/.auto-resolution/PWGLF/TableProducer/Strangeness/lambdakzeromcfinder.cxx
index 0a0db73ea6d..db38d03437a 100644
--- a/.auto-resolution/PWGLF/TableProducer/Strangeness/lambdakzeromcfinder.cxx
+++ b/.auto-resolution/PWGLF/TableProducer/Strangeness/lambdakzeromcfinder.cxx
@@ -24,39 +24,41 @@
 //    david.dobrigkeit.chinellato@cern.ch
 //
 
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <vector>
-
-#include "Math/Vector4D.h"
-#include <TFile.h>
-#include <TLorentzVector.h>
-#include <TH1F.h>
-#include <TH2F.h>
-#include <TProfile.h>
-#include <TPDGCode.h>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGMM/Mult/DataModel/Index.h" // for Particles2Tracks table
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/McCollisionExtra.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "Common/Core/TrackSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+
 #include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/PhysicsConstants.h"
-#include "PWGMM/Mult/DataModel/Index.h" // for Particles2Tracks table
+#include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include "Math/Vector4D.h"
+#include <TFile.h>
+#include <TH1F.h>
+#include <TH2F.h>
+#include <TLorentzVector.h>
+#include <TPDGCode.h>
+#include <TProfile.h>
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
@@ -228,7 +230,7 @@ struct lambdakzeromcfinder {
                 nPosReco++;
               }
             } // end track list loop
-          }   // end positive pdg check
+          } // end positive pdg check
           if (daughter.pdgCode() == negativePdg) {
             auto const& thisDaughterTracks = daughter.template tracks_as<LabeledTracks>();
             bool tpcOnlyFound = false;
@@ -245,7 +247,7 @@ struct lambdakzeromcfinder {
                 nNegReco++;
               }
             } // end track list loop
-          }   // end negative pdg check
+          } // end negative pdg check
         }
       }
     }
diff --git a/.auto-resolution/PWGLF/TableProducer/Strangeness/lambdakzeromlselection.cxx b/.auto-resolution/PWGLF/TableProducer/Strangeness/lambdakzeromlselection.cxx
index 412161ebe52..ff52e6918c4 100644
--- a/.auto-resolution/PWGLF/TableProducer/Strangeness/lambdakzeromlselection.cxx
+++ b/.auto-resolution/PWGLF/TableProducer/Strangeness/lambdakzeromlselection.cxx
@@ -20,37 +20,40 @@
 //    david.dobrigkeit.chinellato@cern.ch
 //
 
-#include <Math/Vector4D.h>
-#include <cmath>
-#include <array>
-#include <cstdlib>
+#include "PWGLF/DataModel/LFStrangenessMLTables.h"
+#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/ASoA.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
-#include "PWGLF/DataModel/LFStrangenessMLTables.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+#include "Tools/ML/MlResponse.h"
+#include "Tools/ML/model.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <Math/Vector4D.h>
+#include <TDatabasePDG.h>
 #include <TFile.h>
 #include <TH2F.h>
-#include <TProfile.h>
 #include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
-#include "Tools/ML/MlResponse.h"
-#include "Tools/ML/model.h"
+#include <TProfile.h>
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
 
 using namespace o2;
 using namespace o2::analysis;
@@ -75,8 +78,8 @@ struct lambdakzeromlselection {
 
   std::map<std::string, std::string> metadata;
 
-  Produces<aod::V0GammaMLScores> gammaMLSelections;   // optionally aggregate information from ML output for posterior analysis (derived data)
-  Produces<aod::V0LambdaMLScores> lambdaMLSelections; // optionally aggregate information from ML output for posterior analysis (derived data)
+  Produces<aod::V0GammaMLScores> gammaMLSelections;           // optionally aggregate information from ML output for posterior analysis (derived data)
+  Produces<aod::V0LambdaMLScores> lambdaMLSelections;         // optionally aggregate information from ML output for posterior analysis (derived data)
   Produces<aod::V0AntiLambdaMLScores> antiLambdaMLSelections; // optionally aggregate information from ML output for posterior analysis (derived data)
   Produces<aod::V0K0ShortMLScores> kzeroShortMLSelections;    // optionally aggregate information from ML output for posterior analysis (derived data)
 
diff --git a/.auto-resolution/PWGLF/TableProducer/Strangeness/lambdakzeropid.cxx b/.auto-resolution/PWGLF/TableProducer/Strangeness/lambdakzeropid.cxx
index c6041aa0e02..5fa295cbd07 100644
--- a/.auto-resolution/PWGLF/TableProducer/Strangeness/lambdakzeropid.cxx
+++ b/.auto-resolution/PWGLF/TableProducer/Strangeness/lambdakzeropid.cxx
@@ -23,36 +23,38 @@
 // (strange, weakly-decaying) particle. This task is meant to be a test, as
 // it hasn't been fully tested yet! Use at your own peril for now :-)
 
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <map>
-#include <iterator>
-#include <utility>
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
 #include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+#include "Common/TableProducer/PID/pidTOFBase.h"
+
 #include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsCalibration/MeanVertexObject.h"
 #include "CommonConstants/PhysicsConstants.h"
-#include "Common/TableProducer/PID/pidTOFBase.h"
-#include "Common/DataModel/PIDResponse.h"
+#include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsCalibration/MeanVertexObject.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <iterator>
+#include <map>
+#include <utility>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/TableProducer/Strangeness/lambdakzerospawner.cxx b/.auto-resolution/PWGLF/TableProducer/Strangeness/lambdakzerospawner.cxx
index 19c174aef7f..ae22362ace9 100644
--- a/.auto-resolution/PWGLF/TableProducer/Strangeness/lambdakzerospawner.cxx
+++ b/.auto-resolution/PWGLF/TableProducer/Strangeness/lambdakzerospawner.cxx
@@ -16,19 +16,20 @@
 //  Creates V0 extension tables for derived data.
 //  A minimal task that saves a lot of disk space.
 
-#include <cmath>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+
 #include <array>
+#include <cmath>
 #include <cstdlib>
 #include <iterator>
 #include <utility>
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.auto-resolution/PWGLF/TableProducer/Strangeness/sigma0builder.cxx b/.auto-resolution/PWGLF/TableProducer/Strangeness/sigma0builder.cxx
index 32ed292dddd..51e8386e96c 100644
--- a/.auto-resolution/PWGLF/TableProducer/Strangeness/sigma0builder.cxx
+++ b/.auto-resolution/PWGLF/TableProducer/Strangeness/sigma0builder.cxx
@@ -20,36 +20,39 @@
 //    gianni.shigeru.setoue.liveraro@cern.ch
 //
 
-#include <Math/Vector4D.h>
-#include <cmath>
-#include <array>
-#include <cstdlib>
+#include "PWGLF/DataModel/LFSigmaTables.h"
+#include "PWGLF/DataModel/LFStrangenessMLTables.h"
+#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/ASoA.h"
-#include "ReconstructionDataFormats/Track.h"
+#include "Common/CCDB/ctpRateFetcher.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "Common/CCDB/ctpRateFetcher.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
-#include "PWGLF/DataModel/LFStrangenessMLTables.h"
-#include "PWGLF/DataModel/LFSigmaTables.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <Math/Vector4D.h>
+#include <TDatabasePDG.h>
 #include <TFile.h>
 #include <TH2F.h>
-#include <TProfile.h>
 #include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
+#include <TProfile.h>
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
 
 using namespace o2;
 using namespace o2::framework;
@@ -1188,8 +1191,8 @@ struct sigma0builder {
         if (v0MC.pdgCode() == 22) {
           histos.fill(HIST("MC/h2dGammaXYConversion"), v0.x(), v0.y());
           float GammaY = TMath::Abs(RecoDecay::y(std::array{v0.px(), v0.py(), v0.pz()}, o2::constants::physics::MassGamma));
-          if (GammaY < 0.5) {                                                                                                                // rapidity selection
-            histos.fill(HIST("MC/h2dPtVsCentralityBeforeSel_MCAssocGamma"), centrality, v0.pt());                                            // isgamma
+          if (GammaY < 0.5) {                                                                     // rapidity selection
+            histos.fill(HIST("MC/h2dPtVsCentralityBeforeSel_MCAssocGamma"), centrality, v0.pt()); // isgamma
           }
         }
 
diff --git a/.auto-resolution/PWGLF/TableProducer/Strangeness/stCollIds.cxx b/.auto-resolution/PWGLF/TableProducer/Strangeness/stCollIds.cxx
index 3cc94389197..f08650fa3c4 100644
--- a/.auto-resolution/PWGLF/TableProducer/Strangeness/stCollIds.cxx
+++ b/.auto-resolution/PWGLF/TableProducer/Strangeness/stCollIds.cxx
@@ -14,11 +14,12 @@
 ///
 /// \author Jochen Klein
 
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Framework/ASoA.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/ASoA.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/TableProducer/Strangeness/stracents.cxx b/.auto-resolution/PWGLF/TableProducer/Strangeness/stracents.cxx
index ce5597563da..9b58d541ddc 100644
--- a/.auto-resolution/PWGLF/TableProducer/Strangeness/stracents.cxx
+++ b/.auto-resolution/PWGLF/TableProducer/Strangeness/stracents.cxx
@@ -15,25 +15,29 @@
 /// \author ALICE
 //
 
-#include <string>
-#include <vector>
-#include <algorithm>
-#include <map>
+#include "MetadataHelper.h"
+#include "TableHelper.h"
 
-#include <CCDB/BasicCCDBManager.h>
-#include <TH1F.h>
-#include <TFormula.h>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/RunningWorkflowInfo.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "Framework/HistogramRegistry.h"
-#include "Common/DataModel/Multiplicity.h"
+
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "MetadataHelper.h"
-#include "TableHelper.h"
+#include "Common/DataModel/Multiplicity.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include <CCDB/BasicCCDBManager.h>
+
 #include "TList.h"
+#include <TFormula.h>
+#include <TH1F.h>
+
+#include <algorithm>
+#include <map>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/TableProducer/Strangeness/strangederivedbuilder.cxx b/.auto-resolution/PWGLF/TableProducer/Strangeness/strangederivedbuilder.cxx
index 8140448576a..0d2f8a5cdce 100644
--- a/.auto-resolution/PWGLF/TableProducer/Strangeness/strangederivedbuilder.cxx
+++ b/.auto-resolution/PWGLF/TableProducer/Strangeness/strangederivedbuilder.cxx
@@ -15,42 +15,44 @@
 // It is meant to help with providing auxiliary information
 // when dealing with derived data.
 
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <map>
-#include <iterator>
-#include <utility>
-#include <string>
-#include <vector>
+#include "PWGLF/DataModel/EPCalibrationTables.h"
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
 #include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/McCollisionExtra.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/Qvectors.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+#include "Common/TableProducer/PID/pidTOFBase.h"
+
 #include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/PhysicsConstants.h"
-#include "Common/TableProducer/PID/pidTOFBase.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Qvectors.h"
-#include "Framework/StaticFor.h"
+#include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "Common/DataModel/McCollisionExtra.h"
-#include "PWGLF/DataModel/EPCalibrationTables.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <iterator>
+#include <map>
+#include <string>
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/TableProducer/Strangeness/strangenessbuilder.cxx b/.auto-resolution/PWGLF/TableProducer/Strangeness/strangenessbuilder.cxx
index 800b1105732..38da9798864 100644
--- a/.auto-resolution/PWGLF/TableProducer/Strangeness/strangenessbuilder.cxx
+++ b/.auto-resolution/PWGLF/TableProducer/Strangeness/strangenessbuilder.cxx
@@ -32,22 +32,25 @@
 //  -- v0builderopts ......: V0-specific building options (topological, deduplication, etc)
 //  -- cascadebuilderopts .: cascade-specific building options (topological, etc)
 
-#include <string>
-#include <vector>
-
-#include "Framework/DataSpecUtils.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "TableHelper.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "PWGLF/Utils/strangenessBuilderHelper.h"
+
+#include "Common/Core/TPCVDriftManager.h"
+#include "Common/DataModel/PIDResponse.h"
+
 #include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPObject.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include "Common/Core/TPCVDriftManager.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/DataSpecUtils.h"
+#include "Framework/runDataProcessing.h"
+
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/TableProducer/Strangeness/v0qaanalysis.cxx b/.auto-resolution/PWGLF/TableProducer/Strangeness/v0qaanalysis.cxx
index bafe557c237..547570ba7df 100644
--- a/.auto-resolution/PWGLF/TableProducer/Strangeness/v0qaanalysis.cxx
+++ b/.auto-resolution/PWGLF/TableProducer/Strangeness/v0qaanalysis.cxx
@@ -13,21 +13,24 @@
 ///
 /// \author Francesca Ercolessi (francesca.ercolessi@cern.ch)
 
-#include <vector>
-#include <utility>
+#include "PWGLF/DataModel/v0qaanalysis.h"
 
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/v0qaanalysis.h"
+#include "PWGLF/DataModel/mcCentrality.h"
+#include "PWGLF/Utils/inelGt.h"
+
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CommonConstants/PhysicsConstants.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "PWGLF/DataModel/mcCentrality.h"
-#include "PWGLF/Utils/inelGt.h"
+
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/TableProducer/Strangeness/v0selector.cxx b/.auto-resolution/PWGLF/TableProducer/Strangeness/v0selector.cxx
index 7d06871d78c..3d6a227609d 100644
--- a/.auto-resolution/PWGLF/TableProducer/Strangeness/v0selector.cxx
+++ b/.auto-resolution/PWGLF/TableProducer/Strangeness/v0selector.cxx
@@ -13,21 +13,22 @@
 ///
 /// \author Gijs van Weelden <g.van.weelden@cern.ch>
 
-#include <vector>
-#include <string>
-#include <algorithm>
-#include <TRandom3.h>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/DataModel/V0SelectorTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoA.h"
+#include "Common/Core/RecoDecay.h"
 
 #include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/RecoDecay.h"
+#include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/V0SelectorTables.h"
+#include <TRandom3.h>
+
+#include <algorithm>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/Tasks/GlobalEventProperties/heavyionMultiplicity.cxx b/.auto-resolution/PWGLF/Tasks/GlobalEventProperties/heavyionMultiplicity.cxx
index b91db8d09e0..be8a1a6e2d7 100644
--- a/.auto-resolution/PWGLF/Tasks/GlobalEventProperties/heavyionMultiplicity.cxx
+++ b/.auto-resolution/PWGLF/Tasks/GlobalEventProperties/heavyionMultiplicity.cxx
@@ -15,20 +15,20 @@
 /// \author Abhi Modak (abhi.modak@cern.ch)
 /// \since September 15, 2023
 
-#include <cmath>
-#include <cstdlib>
-#include <TPDGCode.h>
-#include <vector>
-
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGMM/Mult/DataModel/Index.h"
 #include "PWGMM/Mult/DataModel/bestCollisionTable.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "Common/Core/trackUtilities.h"
+
 #include "Common/CCDB/EventSelectionParams.h"
 #include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/MathConstants.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
@@ -38,9 +38,12 @@
 #include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/GlobalTrackID.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "PWGMM/Mult/DataModel/Index.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include <TPDGCode.h>
+
+#include <cmath>
+#include <cstdlib>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/Tasks/Nuspex/AntimatterAbsorptionHMPID.cxx b/.auto-resolution/PWGLF/Tasks/Nuspex/AntimatterAbsorptionHMPID.cxx
index b5a5a2c3ee4..68af7268e35 100644
--- a/.auto-resolution/PWGLF/Tasks/Nuspex/AntimatterAbsorptionHMPID.cxx
+++ b/.auto-resolution/PWGLF/Tasks/Nuspex/AntimatterAbsorptionHMPID.cxx
@@ -12,33 +12,34 @@
 /// \author Alberto Caliva (alberto.caliva@cern.ch)
 /// \since June 27, 2023
 
-#include <TMath.h>
-#include <TPDGCode.h>
-#include <TRandom.h>
-#include <TDatabasePDG.h>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoA.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/DataTypes.h"
+#include "Common/Core/PID/PIDTOF.h"
 #include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/Core/PID/PIDTOF.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "ReconstructionDataFormats/TrackParametrization.h"
-#include "ReconstructionDataFormats/DCA.h"
-#include "DetectorsBase/Propagator.h"
-#include "Common/Core/trackUtilities.h"
-#include "ReconstructionDataFormats/PID.h"
+
 #include "CCDB/BasicCCDBManager.h"
 #include "CCDB/CcdbApi.h"
 #include "DataFormatsParameters/GRPMagField.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/DataTypes.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/DCA.h"
+#include "ReconstructionDataFormats/PID.h"
+#include "ReconstructionDataFormats/Track.h"
+#include "ReconstructionDataFormats/TrackParametrization.h"
+
+#include <TDatabasePDG.h>
+#include <TMath.h>
+#include <TPDGCode.h>
+#include <TRandom.h>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/Tasks/Nuspex/NucleiEfficiencyTask.cxx b/.auto-resolution/PWGLF/Tasks/Nuspex/NucleiEfficiencyTask.cxx
index 4ca2bd51c6f..23f968e3fc9 100644
--- a/.auto-resolution/PWGLF/Tasks/Nuspex/NucleiEfficiencyTask.cxx
+++ b/.auto-resolution/PWGLF/Tasks/Nuspex/NucleiEfficiencyTask.cxx
@@ -12,37 +12,40 @@
 // Authors: Rafael Manhart,
 // Date: 06.05.2024
 
-#include <cmath>
-#include <TLorentzVector.h>
-#include <TMath.h>
-#include <TObjArray.h>
-#include <vector>
-#include <TF1.h>
-#include <string>
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/mcCentrality.h"
+#include "PWGLF/DataModel/spectraTOF.h"
+#include "PWGLF/Utils/inelGt.h"
 
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/McCollisionExtra.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/McCollisionExtra.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "TPDGCode.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/Core/TrackSelection.h"
-#include "Framework/StaticFor.h"
-#include "Common/Core/TrackSelectionDefaults.h"
-#include "PWGLF/DataModel/spectraTOF.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "PWGLF/Utils/inelGt.h"
-#include "PWGLF/DataModel/mcCentrality.h"
-#include "Common/Core/RecoDecay.h"
+#include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include "TPDGCode.h"
+#include <TF1.h>
+#include <TLorentzVector.h>
+#include <TMath.h>
+#include <TObjArray.h>
+
+#include <cmath>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::track;
diff --git a/.auto-resolution/PWGLF/Tasks/Nuspex/NucleiHistTask.cxx b/.auto-resolution/PWGLF/Tasks/Nuspex/NucleiHistTask.cxx
index e3152c05cfb..b4f0ba70aed 100644
--- a/.auto-resolution/PWGLF/Tasks/Nuspex/NucleiHistTask.cxx
+++ b/.auto-resolution/PWGLF/Tasks/Nuspex/NucleiHistTask.cxx
@@ -12,37 +12,40 @@
 // Authors: Rafael Manhart,
 // Date: 30.11.2022
 
-#include <cmath>
-#include <TLorentzVector.h>
-#include <TMath.h>
-#include <TObjArray.h>
-#include <vector>
-#include <TF1.h>
-#include <string>
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/mcCentrality.h"
+#include "PWGLF/DataModel/spectraTOF.h"
+#include "PWGLF/Utils/inelGt.h"
 
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/McCollisionExtra.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/McCollisionExtra.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "TPDGCode.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/Core/TrackSelection.h"
-#include "Framework/StaticFor.h"
-#include "Common/Core/TrackSelectionDefaults.h"
-#include "PWGLF/DataModel/spectraTOF.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "PWGLF/Utils/inelGt.h"
-#include "PWGLF/DataModel/mcCentrality.h"
-#include "Common/Core/RecoDecay.h"
+#include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include "TPDGCode.h"
+#include <TF1.h>
+#include <TLorentzVector.h>
+#include <TMath.h>
+#include <TObjArray.h>
+
+#include <cmath>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::track;
diff --git a/.auto-resolution/PWGLF/Tasks/Nuspex/QAHistTask.cxx b/.auto-resolution/PWGLF/Tasks/Nuspex/QAHistTask.cxx
index 2afc40a7261..ff902ace030 100644
--- a/.auto-resolution/PWGLF/Tasks/Nuspex/QAHistTask.cxx
+++ b/.auto-resolution/PWGLF/Tasks/Nuspex/QAHistTask.cxx
@@ -12,30 +12,30 @@
 // Authors: Rafael Manhart,
 // Date: 05.10.2023
 
-#include <cmath>
-#include <TLorentzVector.h>
-#include <TMath.h>
-#include <TObjArray.h>
-#include <string>
-#include <vector>
-
-#include "ReconstructionDataFormats/Track.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+#include "PWGLF/DataModel/LFParticleIdentification.h"
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
 #include "TPDGCode.h"
 #include <TH1F.h>
-#include "Framework/runDataProcessing.h"
+#include <TLorentzVector.h>
+#include <TMath.h>
+#include <TObjArray.h>
+
+#include <cmath>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/Tasks/Nuspex/QCspectraTPC.cxx b/.auto-resolution/PWGLF/Tasks/Nuspex/QCspectraTPC.cxx
index 079b0d44a31..afe0d07b608 100644
--- a/.auto-resolution/PWGLF/Tasks/Nuspex/QCspectraTPC.cxx
+++ b/.auto-resolution/PWGLF/Tasks/Nuspex/QCspectraTPC.cxx
@@ -9,22 +9,24 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/runDataProcessing.h"
+#include "PWGLF/DataModel/LFParticleIdentification.h"
 
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/McCollisionExtra.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/StaticFor.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/McCollisionExtra.h"
-#include "Common/Core/TrackSelectionDefaults.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
 #include "TPDGCode.h"
 
 using namespace o2;
@@ -496,7 +498,7 @@ struct QCspectraTPC {
             histos.fill(HIST("MC/pr/neg/prm/pt/numtof"), track.pt(), multiplicity, track.dcaXY());
           }
         }
-      }                                      // primaries
+      } // primaries
       if (!mcParticle.isPhysicalPrimary()) { // secondaries loop start
         if (mcParticle.pdgCode() == 211) {
           if (std::abs(mcParticle.y()) > cfgCutY) {
diff --git a/.auto-resolution/PWGLF/Tasks/Nuspex/angularCorrelationsInJets.cxx b/.auto-resolution/PWGLF/Tasks/Nuspex/angularCorrelationsInJets.cxx
index 20e1604e206..a6fc4bf6032 100644
--- a/.auto-resolution/PWGLF/Tasks/Nuspex/angularCorrelationsInJets.cxx
+++ b/.auto-resolution/PWGLF/Tasks/Nuspex/angularCorrelationsInJets.cxx
@@ -14,33 +14,36 @@
 /// \author Lars Jörgensen (lars.christian.joergensen@cern.ch)
 /// \brief task for analysis of angular correlations in jets using Fastjet
 
-#include <vector>
-#include <utility>
-#include <map>
-#include <string>
-#include <random>
-#include <algorithm>
+#include "PWGJE/Core/JetBkgSubUtils.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/Core/PID/PIDTOF.h"
+#include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/PID/PIDTOF.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/TableProducer/PID/pidTOFBase.h"
-#include "Common/Core/RecoDecay.h"
 
-#include "fastjet/PseudoJet.hh"
+#include "CCDB/BasicCCDBManager.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include "TPDGCode.h"
+#include "TVector3.h"
+
 #include "fastjet/AreaDefinition.hh"
 #include "fastjet/ClusterSequenceArea.hh"
 #include "fastjet/GhostedAreaSpec.hh"
-#include "PWGJE/Core/JetBkgSubUtils.h"
-#include "TVector3.h"
-#include "TPDGCode.h"
+#include "fastjet/PseudoJet.hh"
+
+#include <algorithm>
+#include <map>
+#include <random>
+#include <string>
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/Tasks/Nuspex/deutRtTask.cxx b/.auto-resolution/PWGLF/Tasks/Nuspex/deutRtTask.cxx
index f0092793232..18e5b9cd5d3 100644
--- a/.auto-resolution/PWGLF/Tasks/Nuspex/deutRtTask.cxx
+++ b/.auto-resolution/PWGLF/Tasks/Nuspex/deutRtTask.cxx
@@ -9,21 +9,23 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/runDataProcessing.h"
-#include "TVector2.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/Core/TrackSelection.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
-#include "Common/Core/TrackSelectionDefaults.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "TVector2.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/Tasks/Nuspex/he3LambdaDerivedAnalysis.cxx b/.auto-resolution/PWGLF/Tasks/Nuspex/he3LambdaDerivedAnalysis.cxx
index 682d0f5a85e..6963186ed4b 100644
--- a/.auto-resolution/PWGLF/Tasks/Nuspex/he3LambdaDerivedAnalysis.cxx
+++ b/.auto-resolution/PWGLF/Tasks/Nuspex/he3LambdaDerivedAnalysis.cxx
@@ -11,8 +11,8 @@
 
 #include "PWGLF/DataModel/LFSlimHeLambda.h"
 
-#include <Framework/AnalysisTask.h>
 #include <Framework/ASoAHelpers.h>
+#include <Framework/AnalysisTask.h>
 #include <Framework/HistogramRegistry.h>
 #include <Framework/runDataProcessing.h>
 
@@ -20,17 +20,18 @@
 
 #include <memory>
 
-namespace {
-  std::shared_ptr<TH2> hInvariantMassUS[2];
-  std::shared_ptr<TH2> hInvariantMassLS[2];
-  std::shared_ptr<TH2> hRotationInvariantMassUS[2];
-  std::shared_ptr<TH2> hRotationInvariantMassLS[2];
-  std::shared_ptr<TH2> hRotationInvariantMassAntiLSeta[2];
-  std::shared_ptr<TH2> hInvariantMassLambda[2];
-  std::shared_ptr<TH2> hCosPALambda;
-  std::shared_ptr<TH2> hNsigmaHe3;
-  std::shared_ptr<TH2> hNsigmaProton;
-};
+namespace
+{
+std::shared_ptr<TH2> hInvariantMassUS[2];
+std::shared_ptr<TH2> hInvariantMassLS[2];
+std::shared_ptr<TH2> hRotationInvariantMassUS[2];
+std::shared_ptr<TH2> hRotationInvariantMassLS[2];
+std::shared_ptr<TH2> hRotationInvariantMassAntiLSeta[2];
+std::shared_ptr<TH2> hInvariantMassLambda[2];
+std::shared_ptr<TH2> hCosPALambda;
+std::shared_ptr<TH2> hNsigmaHe3;
+std::shared_ptr<TH2> hNsigmaProton;
+}; // namespace
 
 using namespace o2;
 using namespace o2::framework;
@@ -51,13 +52,12 @@ struct he3LambdaDerivedAnalysis {
   {
     constexpr double ConstituentsMass = o2::constants::physics::MassProton + o2::constants::physics::MassNeutron * 2 + o2::constants::physics::MassSigmaPlus;
     for (int i = 0; i < 2; ++i) {
-      hInvariantMassUS[i] = mRegistry.add<TH2>(Form("hInvariantMassUS%i",i), "Invariant Mass", {HistType::kTH2D, {{45, 1., 10}, {100, ConstituentsMass - 0.05, ConstituentsMass + 0.05}}});
-      hInvariantMassLS[i] = mRegistry.add<TH2>(Form("hInvariantMassLS%i",i), "Invariant Mass", {HistType::kTH2D, {{45, 1., 10}, {100, ConstituentsMass - 0.05, ConstituentsMass + 0.05}}});
-      hRotationInvariantMassUS[i] = mRegistry.add<TH2>(Form("hRotationInvariantMassUS%i",i), "Rotation Invariant Mass", {HistType::kTH2D, {{45, 1., 10}, {100, ConstituentsMass - 0.05, ConstituentsMass + 0.05}}});
-      hRotationInvariantMassLS[i] = mRegistry.add<TH2>(Form("hRotationInvariantMassLS%i",i), "Rotation Invariant Mass", {HistType::kTH2D, {{45, 1., 10}, {100, ConstituentsMass - 0.05, ConstituentsMass + 0.05}}});
-      hInvariantMassLambda[i] = mRegistry.add<TH2>(Form("hInvariantMassLambda%i",i), "Invariant Mass Lambda", {HistType::kTH2D, {{50, 0., 10.}, {30, o2::constants::physics::MassLambda0 - 0.015, o2::constants::physics::MassLambda0 + 0.015}}});
-      hRotationInvariantMassAntiLSeta[i] = mRegistry.add<TH2>(Form("hRotationInvariantMassAntiLSeta%i",i), "Rotation Invariant Mass Anti-Lambda", {HistType::kTH2D, {{45, 1., 10}, {100, ConstituentsMass - 0.05, ConstituentsMass + 0.05}}});
-
+      hInvariantMassUS[i] = mRegistry.add<TH2>(Form("hInvariantMassUS%i", i), "Invariant Mass", {HistType::kTH2D, {{45, 1., 10}, {100, ConstituentsMass - 0.05, ConstituentsMass + 0.05}}});
+      hInvariantMassLS[i] = mRegistry.add<TH2>(Form("hInvariantMassLS%i", i), "Invariant Mass", {HistType::kTH2D, {{45, 1., 10}, {100, ConstituentsMass - 0.05, ConstituentsMass + 0.05}}});
+      hRotationInvariantMassUS[i] = mRegistry.add<TH2>(Form("hRotationInvariantMassUS%i", i), "Rotation Invariant Mass", {HistType::kTH2D, {{45, 1., 10}, {100, ConstituentsMass - 0.05, ConstituentsMass + 0.05}}});
+      hRotationInvariantMassLS[i] = mRegistry.add<TH2>(Form("hRotationInvariantMassLS%i", i), "Rotation Invariant Mass", {HistType::kTH2D, {{45, 1., 10}, {100, ConstituentsMass - 0.05, ConstituentsMass + 0.05}}});
+      hInvariantMassLambda[i] = mRegistry.add<TH2>(Form("hInvariantMassLambda%i", i), "Invariant Mass Lambda", {HistType::kTH2D, {{50, 0., 10.}, {30, o2::constants::physics::MassLambda0 - 0.015, o2::constants::physics::MassLambda0 + 0.015}}});
+      hRotationInvariantMassAntiLSeta[i] = mRegistry.add<TH2>(Form("hRotationInvariantMassAntiLSeta%i", i), "Rotation Invariant Mass Anti-Lambda", {HistType::kTH2D, {{45, 1., 10}, {100, ConstituentsMass - 0.05, ConstituentsMass + 0.05}}});
     }
     hCosPALambda = mRegistry.add<TH2>("hCosPALambda", "Cosine of Pointing Angle for Lambda", {HistType::kTH2D, {{50, 0., 10.}, {500, 0.9, 1.}}});
     hNsigmaHe3 = mRegistry.add<TH2>("hNsigmaHe3", "nSigma TPC for He3", {HistType::kTH2D, {{100, -10., 10.}, {200, -5, 5.}}});
@@ -128,7 +128,6 @@ struct he3LambdaDerivedAnalysis {
           }
         }
       }
-
     }
   }
   PROCESS_SWITCH(he3LambdaDerivedAnalysis, processSameEvent, "Process same event", true);
diff --git a/.auto-resolution/PWGLF/Tasks/Nuspex/helium_flow.cxx b/.auto-resolution/PWGLF/Tasks/Nuspex/helium_flow.cxx
index cc791f7fb2f..380e820ff96 100644
--- a/.auto-resolution/PWGLF/Tasks/Nuspex/helium_flow.cxx
+++ b/.auto-resolution/PWGLF/Tasks/Nuspex/helium_flow.cxx
@@ -12,30 +12,33 @@
 /// \author Alberto Caliva (alberto.caliva@cern.ch)
 /// \since November 27, 2023
 
-#include <vector>
-#include <TMath.h>
-#include <TPDGCode.h>
-#include <TRandom.h>
-#include <TVector2.h>
-#include <TVector3.h>
-#include <TDatabasePDG.h>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoA.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/DataTypes.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/RunningWorkflowInfo.h"
-#include "Framework/DataTypes.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "ReconstructionDataFormats/PID.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/DCA.h"
-#include "Common/Core/trackUtilities.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/PIDResponse.h"
+#include "ReconstructionDataFormats/PID.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <TDatabasePDG.h>
+#include <TMath.h>
+#include <TPDGCode.h>
+#include <TRandom.h>
+#include <TVector2.h>
+#include <TVector3.h>
+
+#include <vector>
 
 using namespace std;
 using namespace o2;
diff --git a/.auto-resolution/PWGLF/Tasks/Nuspex/hyhe4analysis.cxx b/.auto-resolution/PWGLF/Tasks/Nuspex/hyhe4analysis.cxx
index 3766e57a61b..5a180dacdac 100644
--- a/.auto-resolution/PWGLF/Tasks/Nuspex/hyhe4analysis.cxx
+++ b/.auto-resolution/PWGLF/Tasks/Nuspex/hyhe4analysis.cxx
@@ -19,32 +19,34 @@
 // --- kumar.lokesh@cern.ch
 // --- david.dobrigkeit.chinellato@cern.ch
 
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <map>
-#include <iterator>
-#include <utility>
+#include "PWGLF/DataModel/LFHyperhelium4Tables.h"
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
 #include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+
 #include "CCDB/BasicCCDBManager.h"
-#include "PWGLF/DataModel/LFHyperhelium4Tables.h"
+#include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <iterator>
+#include <map>
+#include <utility>
 
 using namespace std;
 using namespace o2;
diff --git a/.auto-resolution/PWGLF/Tasks/Nuspex/hypertritonAnalysis.cxx b/.auto-resolution/PWGLF/Tasks/Nuspex/hypertritonAnalysis.cxx
index 42470a606b0..9290648a12e 100644
--- a/.auto-resolution/PWGLF/Tasks/Nuspex/hypertritonAnalysis.cxx
+++ b/.auto-resolution/PWGLF/Tasks/Nuspex/hypertritonAnalysis.cxx
@@ -18,37 +18,39 @@
 //    Please write to:
 //    david.dobrigkeit.chinellato@cern.ch
 //
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
+#include <Math/Vector4D.h>
+#include <TDatabasePDG.h>
 #include <TFile.h>
 #include <TH2F.h>
-#include <TProfile.h>
 #include <TLorentzVector.h>
-#include <Math/Vector4D.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
-#include <cmath>
+#include <TProfile.h>
+
 #include <array>
+#include <cmath>
 #include <cstdlib>
-#include "Framework/ASoAHelpers.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/Tasks/Nuspex/identifiedraa.cxx b/.auto-resolution/PWGLF/Tasks/Nuspex/identifiedraa.cxx
index 3086152d226..bbaff5350c5 100644
--- a/.auto-resolution/PWGLF/Tasks/Nuspex/identifiedraa.cxx
+++ b/.auto-resolution/PWGLF/Tasks/Nuspex/identifiedraa.cxx
@@ -30,6 +30,7 @@
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/AnalysisTask.h"
 
 using namespace o2;
diff --git a/.auto-resolution/PWGLF/Tasks/Nuspex/mcspectraefficiency.cxx b/.auto-resolution/PWGLF/Tasks/Nuspex/mcspectraefficiency.cxx
index 3442b00ab33..0beffe622c5 100644
--- a/.auto-resolution/PWGLF/Tasks/Nuspex/mcspectraefficiency.cxx
+++ b/.auto-resolution/PWGLF/Tasks/Nuspex/mcspectraefficiency.cxx
@@ -10,14 +10,15 @@
 // or submit itself to any jurisdiction.
 
 // O2 includes
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+
 // ROOT includes
-#include <TH1F.h>
 #include "TPDGCode.h"
+#include <TH1F.h>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/Tasks/Nuspex/nucleiEbye.cxx b/.auto-resolution/PWGLF/Tasks/Nuspex/nucleiEbye.cxx
index 681d8b2892e..177454e57ec 100644
--- a/.auto-resolution/PWGLF/Tasks/Nuspex/nucleiEbye.cxx
+++ b/.auto-resolution/PWGLF/Tasks/Nuspex/nucleiEbye.cxx
@@ -9,22 +9,22 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <vector>
-#include <utility>
-#include <random>
-#include <iostream>
-#include <memory>
-#include <algorithm>
+#include "PWGLF/DataModel/LFEbyeTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
-
-#include "PWGLF/DataModel/LFEbyeTables.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 #include "TDatabasePDG.h"
 
+#include <algorithm>
+#include <iostream>
+#include <memory>
+#include <random>
+#include <utility>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.auto-resolution/PWGLF/Tasks/Nuspex/nucleiFromHypertritonMap.cxx b/.auto-resolution/PWGLF/Tasks/Nuspex/nucleiFromHypertritonMap.cxx
index 2d959f9488d..1becfae15f4 100644
--- a/.auto-resolution/PWGLF/Tasks/Nuspex/nucleiFromHypertritonMap.cxx
+++ b/.auto-resolution/PWGLF/Tasks/Nuspex/nucleiFromHypertritonMap.cxx
@@ -12,30 +12,33 @@
 /// \author Roberta Ferioli (roberta.ferioli@cern.ch)
 /// \since November, 2024
 
-#include <vector>
-#include <TMath.h>
-#include <TPDGCode.h>
-#include <TRandom.h>
-#include <TVector2.h>
-#include <TVector3.h>
-#include <TDatabasePDG.h>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoA.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/DataTypes.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/RunningWorkflowInfo.h"
-#include "Framework/DataTypes.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "ReconstructionDataFormats/PID.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/DCA.h"
-#include "Common/Core/trackUtilities.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/PIDResponse.h"
+#include "ReconstructionDataFormats/PID.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <TDatabasePDG.h>
+#include <TMath.h>
+#include <TPDGCode.h>
+#include <TRandom.h>
+#include <TVector2.h>
+#include <TVector3.h>
+
+#include <vector>
 
 using namespace std;
 using namespace o2;
diff --git a/.auto-resolution/PWGLF/Tasks/Nuspex/nuclei_in_toward_transv_regions.cxx b/.auto-resolution/PWGLF/Tasks/Nuspex/nuclei_in_toward_transv_regions.cxx
index a64ba6dc09c..103b2200f4a 100644
--- a/.auto-resolution/PWGLF/Tasks/Nuspex/nuclei_in_toward_transv_regions.cxx
+++ b/.auto-resolution/PWGLF/Tasks/Nuspex/nuclei_in_toward_transv_regions.cxx
@@ -12,31 +12,34 @@
 /// \author Alberto Caliva (alberto.caliva@cern.ch)
 /// \since August 22, 2024
 
-#include <vector>
-#include <TMath.h>
-#include <TPDGCode.h>
-#include <TRandom.h>
-#include <TVector2.h>
-#include <TVector3.h>
-#include <TLorentzVector.h>
-#include <TDatabasePDG.h>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoA.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/DataTypes.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/RunningWorkflowInfo.h"
-#include "Framework/DataTypes.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "ReconstructionDataFormats/PID.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/DCA.h"
-#include "Common/Core/trackUtilities.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/PIDResponse.h"
+#include "ReconstructionDataFormats/PID.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <TDatabasePDG.h>
+#include <TLorentzVector.h>
+#include <TMath.h>
+#include <TPDGCode.h>
+#include <TRandom.h>
+#include <TVector2.h>
+#include <TVector3.h>
+
+#include <vector>
 
 using namespace std;
 using namespace o2;
diff --git a/.auto-resolution/PWGLF/Tasks/Nuspex/spectraCharged.cxx b/.auto-resolution/PWGLF/Tasks/Nuspex/spectraCharged.cxx
index 94e3b30dc4a..a7a0453c395 100644
--- a/.auto-resolution/PWGLF/Tasks/Nuspex/spectraCharged.cxx
+++ b/.auto-resolution/PWGLF/Tasks/Nuspex/spectraCharged.cxx
@@ -12,14 +12,16 @@
 // task for charged particle pt spectra vs multiplicity analysis with 2d unfolding for run3+
 // mimics https://github.com/alisw/AliPhysics/blob/master/PWGLF/SPECTRA/ChargedHadrons/MultDepSpec/AliMultDepSpecAnalysisTask.cxx
 
-#include "Framework/HistogramRegistry.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
 #include "TDatabasePDG.h"
 
 using namespace o2;
diff --git a/.auto-resolution/PWGLF/Tasks/Nuspex/spectraTOF.cxx b/.auto-resolution/PWGLF/Tasks/Nuspex/spectraTOF.cxx
index f80b2870959..e8b29ba35ae 100644
--- a/.auto-resolution/PWGLF/Tasks/Nuspex/spectraTOF.cxx
+++ b/.auto-resolution/PWGLF/Tasks/Nuspex/spectraTOF.cxx
@@ -19,28 +19,33 @@
 
 // O2 includes
 
-#include <string>
-#include <vector>
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/McCollisionExtra.h"
-#include "Common/Core/TrackSelection.h"
-#include "Framework/StaticFor.h"
-#include "Common/Core/TrackSelectionDefaults.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
 #include "PWGLF/DataModel/spectraTOF.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "PWGLF/Utils/inelGt.h"
+
+#include "PWGLF/DataModel/LFParticleIdentification.h"
 #include "PWGLF/DataModel/mcCentrality.h"
+#include "PWGLF/Utils/inelGt.h"
+
 #include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/McCollisionExtra.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
 #include "TPDGCode.h"
+
+#include <string>
+#include <vector>
 using namespace o2;
 using namespace o2::track;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/Tasks/Nuspex/spectraTOFRun2.cxx b/.auto-resolution/PWGLF/Tasks/Nuspex/spectraTOFRun2.cxx
index 9c31160f0a1..cb287907b9e 100644
--- a/.auto-resolution/PWGLF/Tasks/Nuspex/spectraTOFRun2.cxx
+++ b/.auto-resolution/PWGLF/Tasks/Nuspex/spectraTOFRun2.cxx
@@ -18,20 +18,22 @@
 ///
 
 // O2 includes
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/spectraTOF.h"
+
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
 #include "Framework/StaticFor.h"
-#include "Common/Core/TrackSelectionDefaults.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
-#include "PWGLF/DataModel/spectraTOF.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
 #include "TPDGCode.h"
 
diff --git a/.auto-resolution/PWGLF/Tasks/Nuspex/spectraTPC.cxx b/.auto-resolution/PWGLF/Tasks/Nuspex/spectraTPC.cxx
index fd929553fb6..5488378dc9f 100644
--- a/.auto-resolution/PWGLF/Tasks/Nuspex/spectraTPC.cxx
+++ b/.auto-resolution/PWGLF/Tasks/Nuspex/spectraTPC.cxx
@@ -18,14 +18,15 @@
 ///
 
 // O2 includes
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "ReconstructionDataFormats/Track.h"
 
 using namespace o2;
 using namespace o2::track;
@@ -186,7 +187,7 @@ struct tpcSpectra {
       fillParticleHistos<PID::Alpha>(track);
     }
   } // end of the process function
-};  // end of spectra task
+}; // end of spectra task
 
 struct tpcPidQaSignalwTof {
   static constexpr int Np = 9;
diff --git a/.auto-resolution/PWGLF/Tasks/Nuspex/spectraTPCPiKaPr.cxx b/.auto-resolution/PWGLF/Tasks/Nuspex/spectraTPCPiKaPr.cxx
index 0b856a92e6b..6f1b0b21c7d 100644
--- a/.auto-resolution/PWGLF/Tasks/Nuspex/spectraTPCPiKaPr.cxx
+++ b/.auto-resolution/PWGLF/Tasks/Nuspex/spectraTPCPiKaPr.cxx
@@ -17,13 +17,14 @@
 ///
 
 // O2 includes
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/HistogramRegistry.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.auto-resolution/PWGLF/Tasks/Nuspex/spectraTPCtiny.cxx b/.auto-resolution/PWGLF/Tasks/Nuspex/spectraTPCtiny.cxx
index d58a8777771..3a1249c48ae 100644
--- a/.auto-resolution/PWGLF/Tasks/Nuspex/spectraTPCtiny.cxx
+++ b/.auto-resolution/PWGLF/Tasks/Nuspex/spectraTPCtiny.cxx
@@ -17,13 +17,14 @@
 ///
 
 // O2 includes
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.auto-resolution/PWGLF/Tasks/Nuspex/spectraTPCtinyPiKaPr.cxx b/.auto-resolution/PWGLF/Tasks/Nuspex/spectraTPCtinyPiKaPr.cxx
index 9c9a340bfcf..9b0fbe79352 100644
--- a/.auto-resolution/PWGLF/Tasks/Nuspex/spectraTPCtinyPiKaPr.cxx
+++ b/.auto-resolution/PWGLF/Tasks/Nuspex/spectraTPCtinyPiKaPr.cxx
@@ -17,13 +17,14 @@
 ///
 
 // O2 includes
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/HistogramRegistry.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.auto-resolution/PWGLF/Tasks/QC/efficiencyQA.cxx b/.auto-resolution/PWGLF/Tasks/QC/efficiencyQA.cxx
index 4a0257bb6e5..969c71000ef 100644
--- a/.auto-resolution/PWGLF/Tasks/QC/efficiencyQA.cxx
+++ b/.auto-resolution/PWGLF/Tasks/QC/efficiencyQA.cxx
@@ -9,27 +9,27 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <array>
-#include <vector>
-#include <random>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
+#include "Common/Core/PID/TPCPIDResponse.h"
 #include "Common/Core/RecoDecay.h"
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/EventSelection.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
-
-#include "Common/Core/PID/TPCPIDResponse.h"
 #include "Common/DataModel/PIDResponse.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <array>
+#include <random>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/Tasks/QC/findableStudy.cxx b/.auto-resolution/PWGLF/Tasks/QC/findableStudy.cxx
index d8ca8cc8c80..51fd1efde22 100644
--- a/.auto-resolution/PWGLF/Tasks/QC/findableStudy.cxx
+++ b/.auto-resolution/PWGLF/Tasks/QC/findableStudy.cxx
@@ -19,42 +19,44 @@
 //    david.dobrigkeit.chinellato@cern.ch
 //
 
-#include <Math/Vector4D.h>
-#include <cmath>
-#include <array>
-#include <cstdlib>
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/Utils/v0SelectionBits.h"
+#include "PWGLF/Utils/v0SelectionGroup.h"
+#include "PWGLF/Utils/v0SelectionTools.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/McCollisionExtra.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/McCollisionExtra.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
-#include "PWGLF/Utils/v0SelectionBits.h"
-#include "PWGLF/Utils/v0SelectionGroup.h"
-#include "PWGLF/Utils/v0SelectionTools.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
+#include <Math/Vector4D.h>
+#include <TDatabasePDG.h>
 #include <TFile.h>
 #include <TH2F.h>
-#include <TProfile.h>
 #include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
+#include <TProfile.h>
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/Tasks/QC/kfPerformanceStudy.cxx b/.auto-resolution/PWGLF/Tasks/QC/kfPerformanceStudy.cxx
index 5a9f49ecabf..5a26c7d1f36 100644
--- a/.auto-resolution/PWGLF/Tasks/QC/kfPerformanceStudy.cxx
+++ b/.auto-resolution/PWGLF/Tasks/QC/kfPerformanceStudy.cxx
@@ -13,22 +13,24 @@
 //         cascades computed with standard DCAFitter methods and the KFparticle
 //         package. It is meant for the purposes of larger-scale QA of KF reco.
 
-#include <cmath>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <cmath>
 
 using namespace o2;
 using namespace o2::framework;
@@ -151,8 +153,8 @@ struct kfPerformanceStudy {
       }
 
       histos.fill(HIST("hPtCorrelation"), pt, ptKF);
-      histos.fill(HIST("h3dMassLambda"), pt, massLambda, massLambdaKF); // <- implicit pT choice, beware
-      histos.fill(HIST("h3dDCAxy"), pt, dcaXY, dcaXYKF);                // <- implicit pT choice, beware
+      histos.fill(HIST("h3dMassLambda"), pt, massLambda, massLambdaKF);          // <- implicit pT choice, beware
+      histos.fill(HIST("h3dDCAxy"), pt, dcaXY, dcaXYKF);                         // <- implicit pT choice, beware
       histos.fill(HIST("h3dPointingAngle"), pt, pointingAngle, pointingAngleKF); // <- implicit pT choice, beware
 
       histos.fill(HIST("hPointingAngle"), pointingAngle);
diff --git a/.auto-resolution/PWGLF/Tasks/QC/kfStrangenessStudy.cxx b/.auto-resolution/PWGLF/Tasks/QC/kfStrangenessStudy.cxx
index 24c5621e948..ecf18910f5e 100644
--- a/.auto-resolution/PWGLF/Tasks/QC/kfStrangenessStudy.cxx
+++ b/.auto-resolution/PWGLF/Tasks/QC/kfStrangenessStudy.cxx
@@ -15,26 +15,29 @@
 
 /// \brief cascadebuilder.cxx and lambdakzerobuilder.cxx tasks need to be added to the workflow. Flag createCascCovMats needs to be enabled!
 
-#include <cmath>
-#include <iostream>
+#include "PWGLF/DataModel/kfStrangenessStudy.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/kfStrangenessStudy.h"
+
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/EventSelection.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <cmath>
+#include <iostream>
 
 using namespace o2;
 using namespace o2::framework;
@@ -462,9 +465,9 @@ struct kfStrangenessStudy {
           } else {
             LOG(debug) << "Daughter is no Lambda and/or has no daughters. V0 PDG code: " << MCv0.pdgCode();
           } // end v0 has daughters and is Lambda
-        }   // end loop cascade daughters
-      }     // end cascade has daughters
-    }       // end cascade has MC particle
+        } // end loop cascade daughters
+      } // end cascade has daughters
+    } // end cascade has MC particle
   }
 
   template <typename TCollision>
@@ -699,7 +702,7 @@ struct kfStrangenessStudy {
         fillCascDataTable(collision);
       }
     } // end cascade loop
-  }   // end process
+  } // end process
   PROCESS_SWITCH(kfStrangenessStudy, processData, "process data", false);
 
   void processMC(soa::Filtered<soa::Join<aod::Collisions, aod::EvSels>>::iterator const& collision,
@@ -801,7 +804,7 @@ struct kfStrangenessStudy {
       }
 
     } // end cascade loop
-  }   // end process
+  } // end process
   PROCESS_SWITCH(kfStrangenessStudy, processMC, "process MC", true);
 };
 
diff --git a/.auto-resolution/PWGLF/Tasks/QC/lfITSTPCMatchingQA.cxx b/.auto-resolution/PWGLF/Tasks/QC/lfITSTPCMatchingQA.cxx
index c31258d51ae..311db578caa 100644
--- a/.auto-resolution/PWGLF/Tasks/QC/lfITSTPCMatchingQA.cxx
+++ b/.auto-resolution/PWGLF/Tasks/QC/lfITSTPCMatchingQA.cxx
@@ -9,26 +9,27 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <vector>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
+#include "Common/Core/PID/PIDTOF.h"
+#include "Common/Core/PID/TPCPIDResponse.h"
 #include "Common/Core/RecoDecay.h"
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "DataFormatsTPC/BetheBlochAleph.h"
-#include "Common/Core/PID/PIDTOF.h"
 #include "Common/TableProducer/PID/pidTOFBase.h"
+
+#include "DataFormatsTPC/BetheBlochAleph.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "Common/Core/PID/TPCPIDResponse.h"
-#include "Common/DataModel/PIDResponse.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
 #include "TDatabasePDG.h"
 
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.auto-resolution/PWGLF/Tasks/QC/lfITSTPCMatchingSecondaryTracksQA.cxx b/.auto-resolution/PWGLF/Tasks/QC/lfITSTPCMatchingSecondaryTracksQA.cxx
index 14aebdb354a..803d3ccfb4d 100644
--- a/.auto-resolution/PWGLF/Tasks/QC/lfITSTPCMatchingSecondaryTracksQA.cxx
+++ b/.auto-resolution/PWGLF/Tasks/QC/lfITSTPCMatchingSecondaryTracksQA.cxx
@@ -15,28 +15,32 @@
 /// \author Alberto Caliva (alberto.caliva@cern.ch), Francesca Ercolessi (francesca.ercolessi@cern.ch), Nicolò Jacazio (nicolo.jacazio@cern.ch)
 /// \since Feb 11, 2025
 
-#include <TLorentzVector.h>
-#include <TMath.h>
-#include <TObjArray.h>
-#include <TPDGCode.h>
-#include <TVector2.h>
-#include <TVector3.h>
-#include <cmath>
-#include <vector>
-#include <string>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "Common/Core/RecoDecay.h"
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "ReconstructionDataFormats/Track.h"
 
+#include <TLorentzVector.h>
+#include <TMath.h>
+#include <TObjArray.h>
+#include <TPDGCode.h>
+#include <TVector2.h>
+#include <TVector3.h>
+
+#include <cmath>
+#include <string>
+#include <vector>
+
 using namespace std;
 using namespace o2;
 using namespace o2::soa;
diff --git a/.auto-resolution/PWGLF/Tasks/QC/lfpidqa.cxx b/.auto-resolution/PWGLF/Tasks/QC/lfpidqa.cxx
index 746473fd0a7..b82bdb2cd85 100644
--- a/.auto-resolution/PWGLF/Tasks/QC/lfpidqa.cxx
+++ b/.auto-resolution/PWGLF/Tasks/QC/lfpidqa.cxx
@@ -17,21 +17,23 @@
 /// \brief  Task to produce the PID QA information for the TPC for the purpose of the Light flavor PWG
 ///
 
-#include <string_view>
+#include "PWGLF/DataModel/LFParticleIdentification.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/StaticFor.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
+#include "Common/Core/TrackSelection.h"
 #include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/Core/TrackSelection.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
+
+#include <string_view>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/Tasks/QC/lfpropStudy.cxx b/.auto-resolution/PWGLF/Tasks/QC/lfpropStudy.cxx
index ab3c88ebbb3..b3995b496f8 100644
--- a/.auto-resolution/PWGLF/Tasks/QC/lfpropStudy.cxx
+++ b/.auto-resolution/PWGLF/Tasks/QC/lfpropStudy.cxx
@@ -14,20 +14,22 @@
 /// \author Carolina Reetz <c.reetz@cern.ch>
 /// \brief QA task to study properties of propagated tracks
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "ReconstructionDataFormats/DCA.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/DCA.h"
+#include "ReconstructionDataFormats/Track.h"
+
 #include "TPDGCode.h"
 
 using namespace o2;
diff --git a/.auto-resolution/PWGLF/Tasks/QC/mcParticlePrediction.cxx b/.auto-resolution/PWGLF/Tasks/QC/mcParticlePrediction.cxx
index 0c1fca899f3..958773e0412 100644
--- a/.auto-resolution/PWGLF/Tasks/QC/mcParticlePrediction.cxx
+++ b/.auto-resolution/PWGLF/Tasks/QC/mcParticlePrediction.cxx
@@ -16,18 +16,20 @@
 /// \brief Task to build the predictions from the models based on the generated particles
 ///
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/StaticFor.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "Common/DataModel/FT0Corrected.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/Utils/inelGt.h"
+#include "PWGLF/Utils/mcParticle.h"
+
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/FT0Corrected.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "PWGLF/Utils/mcParticle.h"
-#include "PWGLF/Utils/inelGt.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "CommonConstants/LHCConstants.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
 
 #include "TPDGCode.h"
 
@@ -60,9 +62,9 @@ struct Estimators {
   static constexpr estID ITSIB = 13;
   static constexpr estID ETA05 = 14;
   static constexpr estID ETA08 = 15;
-  static constexpr estID V0A = 16;  // (Run2)
-  static constexpr estID V0C = 17;  // (Run2)
-  static constexpr estID V0AC = 18; // (Run2 V0M)
+  static constexpr estID V0A = 16;             // (Run2)
+  static constexpr estID V0C = 17;             // (Run2)
+  static constexpr estID V0AC = 18;            // (Run2 V0M)
   static constexpr estID ImpactParameter = 19; // (Run2 V0M)
   static constexpr estID nEstimators = 20;
 
diff --git a/.auto-resolution/PWGLF/Tasks/QC/mcSignalLoss.cxx b/.auto-resolution/PWGLF/Tasks/QC/mcSignalLoss.cxx
index aefb6c98c1b..68909d4f610 100644
--- a/.auto-resolution/PWGLF/Tasks/QC/mcSignalLoss.cxx
+++ b/.auto-resolution/PWGLF/Tasks/QC/mcSignalLoss.cxx
@@ -24,25 +24,27 @@
 //
 // Build hypertriton candidates from V0s and tracks
 
-#include <vector>
+#include "PWGLF/Utils/inelGt.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
+#include "Common/Core/PID/PIDTOF.h"
+#include "Common/Core/PID/TPCPIDResponse.h"
 #include "Common/Core/RecoDecay.h"
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "DataFormatsTPC/BetheBlochAleph.h"
-#include "Common/Core/PID/PIDTOF.h"
 #include "Common/TableProducer/PID/pidTOFBase.h"
+
+#include "DataFormatsTPC/BetheBlochAleph.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "Common/Core/PID/TPCPIDResponse.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "PWGLF/Utils/inelGt.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/Tasks/QC/mcinelgt0.cxx b/.auto-resolution/PWGLF/Tasks/QC/mcinelgt0.cxx
index 40acd66a67f..63c2287abd1 100644
--- a/.auto-resolution/PWGLF/Tasks/QC/mcinelgt0.cxx
+++ b/.auto-resolution/PWGLF/Tasks/QC/mcinelgt0.cxx
@@ -9,11 +9,12 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
+#include "PWGLF/Utils/inelGt.h"
+
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "PWGLF/Utils/inelGt.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/Tasks/QC/resonanceqa.cxx b/.auto-resolution/PWGLF/Tasks/QC/resonanceqa.cxx
index 21c17a6e31b..7e102359590 100644
--- a/.auto-resolution/PWGLF/Tasks/QC/resonanceqa.cxx
+++ b/.auto-resolution/PWGLF/Tasks/QC/resonanceqa.cxx
@@ -16,38 +16,38 @@
 // (5) particle = 2 --> lambdastar
 // (6) 4 process function (a) Data same event (b) Data mixed event (c) MC generated (d) MC reconstructed
 
-#include <TH1F.h>
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <TDatabasePDG.h>
 #include <TDirectory.h>
+#include <TFile.h>
+#include <TH1F.h>
+#include <TH2F.h>
 #include <THn.h>
 #include <TLorentzVector.h>
 #include <TMath.h>
 #include <TObjArray.h>
-#include <TFile.h>
-#include <TH2F.h>
-#include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
 
-#include <cmath>
 #include <array>
+#include <cmath>
 #include <cstdlib>
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/StepTHn.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/Core/trackUtilities.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/TrackSelection.h"
-#include "Framework/ASoAHelpers.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.auto-resolution/PWGLF/Tasks/QC/stqa.cxx b/.auto-resolution/PWGLF/Tasks/QC/stqa.cxx
index 0ab354233ff..fac64b91e1c 100644
--- a/.auto-resolution/PWGLF/Tasks/QC/stqa.cxx
+++ b/.auto-resolution/PWGLF/Tasks/QC/stqa.cxx
@@ -9,14 +9,16 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/Core/trackUtilities.h"
 #include "ReconstructionDataFormats/DCA.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/Tasks/QC/straRecoStudy.cxx b/.auto-resolution/PWGLF/Tasks/QC/straRecoStudy.cxx
index 1f7851cdbef..6caa238aea0 100644
--- a/.auto-resolution/PWGLF/Tasks/QC/straRecoStudy.cxx
+++ b/.auto-resolution/PWGLF/Tasks/QC/straRecoStudy.cxx
@@ -20,38 +20,40 @@
 //    Please write to:
 //    david.dobrigkeit.chinellato@cern.ch
 //
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/McCollisionExtra.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/McCollisionExtra.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
+#include <Math/Vector4D.h>
+#include <TDatabasePDG.h>
 #include <TFile.h>
 #include <TH2F.h>
-#include <TProfile.h>
 #include <TLorentzVector.h>
-#include <Math/Vector4D.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
-#include <cmath>
+#include <TProfile.h>
+
 #include <array>
+#include <cmath>
 #include <cstdlib>
-#include "Framework/ASoAHelpers.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/Tasks/QC/strangederivedqa.cxx b/.auto-resolution/PWGLF/Tasks/QC/strangederivedqa.cxx
index 2e709e07338..0c252538858 100644
--- a/.auto-resolution/PWGLF/Tasks/QC/strangederivedqa.cxx
+++ b/.auto-resolution/PWGLF/Tasks/QC/strangederivedqa.cxx
@@ -14,26 +14,28 @@
 //
 // This code does basic QA of strangeness derived data
 
-#include <Math/Vector4D.h>
-#include <cmath>
-#include <array>
-#include <cstdlib>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/Core/trackUtilities.h"
 
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <Math/Vector4D.h>
+#include <TDatabasePDG.h>
 #include <TFile.h>
 #include <TH2F.h>
-#include <TProfile.h>
 #include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
+#include <TProfile.h>
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include <array>
+#include <cmath>
+#include <cstdlib>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/Tasks/QC/strangenessQCPP.cxx b/.auto-resolution/PWGLF/Tasks/QC/strangenessQCPP.cxx
index 6dab146b363..b9e3990149c 100644
--- a/.auto-resolution/PWGLF/Tasks/QC/strangenessQCPP.cxx
+++ b/.auto-resolution/PWGLF/Tasks/QC/strangenessQCPP.cxx
@@ -14,13 +14,15 @@
 /// In case of questions please write to:
 /// \author Roman Nepeivoda (roman.nepeivoda@cern.ch)
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
+#include "PWGLF/DataModel/QC/strangenessTablesQC.h"
+
 #include "Common/DataModel/EventSelection.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGLF/DataModel/QC/strangenessTablesQC.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
@@ -454,4 +456,5 @@ WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
   return WorkflowSpec{
     adaptAnalysisTask<strangenessQCPP>(cfgc, TaskName{"lf-strangenessqcpp"})};
-}
\ No newline at end of file
+}
+ 
\ No newline at end of file
diff --git a/.auto-resolution/PWGLF/Tasks/QC/strangenessTrackingQC.cxx b/.auto-resolution/PWGLF/Tasks/QC/strangenessTrackingQC.cxx
index 09c5698fd92..2458a769496 100644
--- a/.auto-resolution/PWGLF/Tasks/QC/strangenessTrackingQC.cxx
+++ b/.auto-resolution/PWGLF/Tasks/QC/strangenessTrackingQC.cxx
@@ -9,29 +9,31 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "CCDB/BasicCCDBManager.h"
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "DCAFitter/DCAFitterN.h"
 #include "DataFormatsParameters/GRPMagField.h"
 #include "DataFormatsParameters/GRPObject.h"
 #include "DataFormatsTPC/BetheBlochAleph.h"
-#include "DCAFitter/DCAFitterN.h"
 #include "DetectorsBase/Propagator.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoA.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
 // #include "PWGHF/Core/PDG.h"
+#include "PWGLF/DataModel/LFNonPromptCascadeTables.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "ReconstructionDataFormats/DCA.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "PWGLF/DataModel/LFNonPromptCascadeTables.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/Tasks/QC/strangepidqa.cxx b/.auto-resolution/PWGLF/Tasks/QC/strangepidqa.cxx
index c2bd9d89774..838b5bfc6b0 100644
--- a/.auto-resolution/PWGLF/Tasks/QC/strangepidqa.cxx
+++ b/.auto-resolution/PWGLF/Tasks/QC/strangepidqa.cxx
@@ -12,32 +12,34 @@
 // This task is designed to do QA to the TOF PID applied to strangeness
 // in the regular framework
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <Math/Vector4D.h>
+#include <TDatabasePDG.h>
 #include <TFile.h>
 #include <TH2F.h>
-#include <TProfile.h>
 #include <TLorentzVector.h>
-#include <Math/Vector4D.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
-#include <cmath>
+#include <TProfile.h>
+
 #include <array>
+#include <cmath>
 #include <cstdlib>
-#include "Framework/ASoAHelpers.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/Tasks/QC/strderivedGenQA.cxx b/.auto-resolution/PWGLF/Tasks/QC/strderivedGenQA.cxx
index 201dcd99ac2..73e6a214363 100644
--- a/.auto-resolution/PWGLF/Tasks/QC/strderivedGenQA.cxx
+++ b/.auto-resolution/PWGLF/Tasks/QC/strderivedGenQA.cxx
@@ -19,36 +19,38 @@
 //    gianni.shigeru.setoue.liveraro@cern.ch
 //
 
-#include <Math/Vector4D.h>
-#include <cmath>
-#include <array>
-#include <vector>
-#include <cstdlib>
-
-#include <TFile.h>
-#include <TH2F.h>
-#include <TProfile.h>
-#include <TLorentzVector.h>
-#include <TPDGCode.h>
-#include <TDatabasePDG.h>
+#include "PWGLF/DataModel/LFStrangenessMLTables.h"
+#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/trackUtilities.h"
 #include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
-#include "PWGLF/DataModel/LFStrangenessMLTables.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <Math/Vector4D.h>
+#include <TDatabasePDG.h>
+#include <TFile.h>
+#include <TH2F.h>
+#include <TLorentzVector.h>
+#include <TPDGCode.h>
+#include <TProfile.h>
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/Tasks/QC/tpc_dEdx_postcalibration.cxx b/.auto-resolution/PWGLF/Tasks/QC/tpc_dEdx_postcalibration.cxx
index 1e9fbd43851..c92c7f20251 100644
--- a/.auto-resolution/PWGLF/Tasks/QC/tpc_dEdx_postcalibration.cxx
+++ b/.auto-resolution/PWGLF/Tasks/QC/tpc_dEdx_postcalibration.cxx
@@ -12,17 +12,19 @@
 /// \author Alberto Caliva (alberto.caliva@cern.ch)
 /// \since June 27, 2023
 
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "ReconstructionDataFormats/Track.h"
 
 using namespace o2;
diff --git a/.auto-resolution/PWGLF/Tasks/QC/tpc_dedx_qa.cxx b/.auto-resolution/PWGLF/Tasks/QC/tpc_dedx_qa.cxx
index 38f73b8edcb..6d2da6aa5d8 100644
--- a/.auto-resolution/PWGLF/Tasks/QC/tpc_dedx_qa.cxx
+++ b/.auto-resolution/PWGLF/Tasks/QC/tpc_dedx_qa.cxx
@@ -12,19 +12,21 @@
 /// \author Alberto Caliva (alberto.caliva@cern.ch)
 /// \since September 19, 2023
 
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Multiplicity.h"
+
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "ReconstructionDataFormats/Track.h"
 
 using namespace o2;
diff --git a/.auto-resolution/PWGLF/Tasks/QC/trackchecks.cxx b/.auto-resolution/PWGLF/Tasks/QC/trackchecks.cxx
index 70eaa28dd3b..fb318965662 100644
--- a/.auto-resolution/PWGLF/Tasks/QC/trackchecks.cxx
+++ b/.auto-resolution/PWGLF/Tasks/QC/trackchecks.cxx
@@ -8,21 +8,22 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include <cmath>
-#include <array>
-#include <utility>
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
+#include "Framework/runDataProcessing.h"
 
 #include <TF1.h>
 
+#include <array>
+#include <cmath>
+#include <utility>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.auto-resolution/PWGLF/Tasks/QC/v0assoqa.cxx b/.auto-resolution/PWGLF/Tasks/QC/v0assoqa.cxx
index fcfd8d59b01..60030e421d5 100644
--- a/.auto-resolution/PWGLF/Tasks/QC/v0assoqa.cxx
+++ b/.auto-resolution/PWGLF/Tasks/QC/v0assoqa.cxx
@@ -11,40 +11,42 @@
 //
 // Strangeness-to-collision association tests
 //
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/Utils/strangenessBuilderHelper.h"
+
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/TPCVDriftManager.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/McCollisionExtra.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/McCollisionExtra.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
-#include "PWGLF/Utils/strangenessBuilderHelper.h"
-#include "Common/Core/TPCVDriftManager.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
+#include <Math/Vector4D.h>
+#include <TDatabasePDG.h>
 #include <TFile.h>
 #include <TH2F.h>
-#include <TProfile.h>
 #include <TLorentzVector.h>
-#include <Math/Vector4D.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
-#include <cmath>
+#include <TProfile.h>
+
 #include <array>
+#include <cmath>
 #include <cstdlib>
-#include "Framework/ASoAHelpers.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/Tasks/QC/v0cascadesqa.cxx b/.auto-resolution/PWGLF/Tasks/QC/v0cascadesqa.cxx
index 5be2b6d4ba5..a75a9b22959 100644
--- a/.auto-resolution/PWGLF/Tasks/QC/v0cascadesqa.cxx
+++ b/.auto-resolution/PWGLF/Tasks/QC/v0cascadesqa.cxx
@@ -18,20 +18,22 @@
 
 #include <cmath>
 // #include <cstdlib>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/trackUtilities.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/Tasks/QC/vertexQA.cxx b/.auto-resolution/PWGLF/Tasks/QC/vertexQA.cxx
index 66ae298813d..844c9f8df81 100644
--- a/.auto-resolution/PWGLF/Tasks/QC/vertexQA.cxx
+++ b/.auto-resolution/PWGLF/Tasks/QC/vertexQA.cxx
@@ -9,19 +9,20 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <algorithm>
-#include <cmath>
-#include <deque>
-#include <string>
-#include <vector>
-#include <utility>
+#include "Common/CCDB/ctpRateFetcher.h"
 
 #include "CCDB/BasicCCDBManager.h"
-#include "Common/CCDB/ctpRateFetcher.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
 
+#include <algorithm>
+#include <cmath>
+#include <deque>
+#include <string>
+#include <utility>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.auto-resolution/PWGLF/Tasks/Resonances/chargedkstaranalysis.cxx b/.auto-resolution/PWGLF/Tasks/Resonances/chargedkstaranalysis.cxx
index 8286f876bc8..7b729dcee7b 100644
--- a/.auto-resolution/PWGLF/Tasks/Resonances/chargedkstaranalysis.cxx
+++ b/.auto-resolution/PWGLF/Tasks/Resonances/chargedkstaranalysis.cxx
@@ -17,23 +17,8 @@
 
 #include "TF1.h"
 // #include <TDatabasePDG.h>
-#include <TDirectory.h>
-#include <TFile.h>
-#include <TH1F.h>
-#include <TH2F.h>
-#include <THn.h>
-#include <TLorentzVector.h>
-#include <TMath.h>
-#include <TObjArray.h>
-#include <TPDGCode.h>
-#include <string>
-
-#include <array>
-#include <cmath>
-#include <cstdlib>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "CCDB/BasicCCDBManager.h"
-#include "CCDB/CcdbApi.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
@@ -41,6 +26,9 @@
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
 #include "CommonConstants/PhysicsConstants.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
@@ -48,9 +36,23 @@
 #include "Framework/HistogramRegistry.h"
 #include "Framework/StepTHn.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "ReconstructionDataFormats/Track.h"
 
+#include <TDirectory.h>
+#include <TFile.h>
+#include <TH1F.h>
+#include <TH2F.h>
+#include <THn.h>
+#include <TLorentzVector.h>
+#include <TMath.h>
+#include <TObjArray.h>
+#include <TPDGCode.h>
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <string>
+
 // For charged kstarpp analysis
 #include "PWGLF/DataModel/LFResonanceTables.h"
 
diff --git a/.auto-resolution/PWGLF/Tasks/Resonances/chk892Flow.cxx b/.auto-resolution/PWGLF/Tasks/Resonances/chk892Flow.cxx
index 2c616d81406..f0dadbcdb7a 100644
--- a/.auto-resolution/PWGLF/Tasks/Resonances/chk892Flow.cxx
+++ b/.auto-resolution/PWGLF/Tasks/Resonances/chk892Flow.cxx
@@ -14,64 +14,58 @@
 /// \author Su-Jeong Ji <su-jeong.ji@cern.ch>, Bong-Hwi Lim <Bong-Hwi.Lim@cern.ch>
 ///
 
-#include <TH1F.h>
-#include <TH1D.h>
-#include <TDirectory.h>
-#include <THn.h>
-#include <TLorentzVector.h>
-#include <TObjArray.h>
-#include <TFile.h>
-#include <TH2F.h>
-
-#include <vector>
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <chrono>
-#include <string>
-
-#include "TRandom3.h"
-#include "TF1.h"
-#include "TVector2.h"
-#include "Math/Vector3D.h"
-#include "Math/Vector4D.h"
-#include "Math/GenVector/Boost.h"
-#include <TMath.h>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/StaticFor.h"
-#include "DCAFitter/DCAFitterN.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/Utils/collisionCuts.h"
 
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/Qvectors.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "Common/Core/trackUtilities.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/Core/RecoDecay.h"
-
-#include "CommonConstants/PhysicsConstants.h"
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
 #include "CommonConstants/MathConstants.h"
-
-#include "ReconstructionDataFormats/Track.h"
-
-#include "DataFormatsParameters/GRPObject.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "DCAFitter/DCAFitterN.h"
 #include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/StaticFor.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
-#include "CCDB/CcdbApi.h"
-#include "CCDB/BasicCCDBManager.h"
+#include "Math/GenVector/Boost.h"
+#include "Math/Vector3D.h"
+#include "Math/Vector4D.h"
+#include "TF1.h"
+#include "TRandom3.h"
+#include "TVector2.h"
+#include <TDirectory.h>
+#include <TFile.h>
+#include <TH1D.h>
+#include <TH1F.h>
+#include <TH2F.h>
+#include <THn.h>
+#include <TLorentzVector.h>
+#include <TMath.h>
+#include <TObjArray.h>
 
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/Utils/collisionCuts.h"
+#include <array>
+#include <chrono>
+#include <cmath>
+#include <cstdlib>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/Tasks/Resonances/chk892flow_pp.cxx b/.auto-resolution/PWGLF/Tasks/Resonances/chk892flow_pp.cxx
index 7e1d65bd7e8..916deec5193 100644
--- a/.auto-resolution/PWGLF/Tasks/Resonances/chk892flow_pp.cxx
+++ b/.auto-resolution/PWGLF/Tasks/Resonances/chk892flow_pp.cxx
@@ -15,65 +15,58 @@
 ///
 /// \author Su-Jeong Ji <su-jeong.ji@cern.ch>
 
-#include <TH1F.h>
-#include <TH1D.h>
-#include <TDirectory.h>
-#include <THn.h>
-#include <TLorentzVector.h>
-#include <TMath.h>
-#include <TObjArray.h>
-#include <TFile.h>
-#include <TH2F.h>
-#include <TDatabasePDG.h> // FIXME
-#include <TPDGCode.h>     // FIXME
-
-#include <vector>
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <chrono>
-#include <string>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/Utils/collisionCuts.h"
 
-#include "TRandom3.h"
-#include "TF1.h"
-#include "TVector2.h"
-#include "Math/Vector3D.h"
-#include "Math/Vector4D.h"
-#include "Math/GenVector/Boost.h"
-#include <TMath.h>
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/StepTHn.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/StaticFor.h"
-#include "DCAFitter/DCAFitterN.h"
-
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-
-#include "Common/Core/trackUtilities.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/Core/RecoDecay.h"
-
-#include "CommonConstants/PhysicsConstants.h"
-
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
 
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-
-#include "CCDB/CcdbApi.h"
-#include "CCDB/BasicCCDBManager.h"
+#include "Math/GenVector/Boost.h"
+#include "Math/Vector3D.h"
+#include "Math/Vector4D.h"
+#include "TF1.h"
+#include "TRandom3.h"
+#include "TVector2.h"
+#include <TDatabasePDG.h> // FIXME
+#include <TDirectory.h>
+#include <TFile.h>
+#include <TH1D.h>
+#include <TH1F.h>
+#include <TH2F.h>
+#include <THn.h>
+#include <TLorentzVector.h>
+#include <TMath.h>
+#include <TObjArray.h>
+#include <TPDGCode.h> // FIXME
 
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/Utils/collisionCuts.h"
+#include <array>
+#include <chrono>
+#include <cmath>
+#include <cstdlib>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/Tasks/Resonances/chk892pp.cxx b/.auto-resolution/PWGLF/Tasks/Resonances/chk892pp.cxx
index 269e8d0845d..c4cc01298ca 100644
--- a/.auto-resolution/PWGLF/Tasks/Resonances/chk892pp.cxx
+++ b/.auto-resolution/PWGLF/Tasks/Resonances/chk892pp.cxx
@@ -15,65 +15,58 @@
 ///
 /// \author Su-Jeong Ji <su-jeong.ji@cern.ch>
 
-#include <TH1F.h>
-#include <TH1D.h>
-#include <TDirectory.h>
-#include <THn.h>
-#include <TLorentzVector.h>
-#include <TMath.h>
-#include <TObjArray.h>
-#include <TFile.h>
-#include <TH2F.h>
-#include <TDatabasePDG.h> // FIXME
-#include <TPDGCode.h>     // FIXME
-
-#include <vector>
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <chrono>
-#include <string>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/Utils/collisionCuts.h"
 
-#include "TRandom3.h"
-#include "TF1.h"
-#include "TVector2.h"
-#include "Math/Vector3D.h"
-#include "Math/Vector4D.h"
-#include "Math/GenVector/Boost.h"
-#include <TMath.h>
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/StepTHn.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/StaticFor.h"
-#include "DCAFitter/DCAFitterN.h"
-
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-
-#include "Common/Core/trackUtilities.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/Core/RecoDecay.h"
-
-#include "CommonConstants/PhysicsConstants.h"
-
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
 
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-
-#include "CCDB/CcdbApi.h"
-#include "CCDB/BasicCCDBManager.h"
+#include "Math/GenVector/Boost.h"
+#include "Math/Vector3D.h"
+#include "Math/Vector4D.h"
+#include "TF1.h"
+#include "TRandom3.h"
+#include "TVector2.h"
+#include <TDatabasePDG.h> // FIXME
+#include <TDirectory.h>
+#include <TFile.h>
+#include <TH1D.h>
+#include <TH1F.h>
+#include <TH2F.h>
+#include <THn.h>
+#include <TLorentzVector.h>
+#include <TMath.h>
+#include <TObjArray.h>
+#include <TPDGCode.h> // FIXME
 
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/Utils/collisionCuts.h"
+#include <array>
+#include <chrono>
+#include <cmath>
+#include <cstdlib>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/Tasks/Resonances/deltaanalysis.cxx b/.auto-resolution/PWGLF/Tasks/Resonances/deltaanalysis.cxx
index 10c0d3071d2..0d52228cc8f 100644
--- a/.auto-resolution/PWGLF/Tasks/Resonances/deltaanalysis.cxx
+++ b/.auto-resolution/PWGLF/Tasks/Resonances/deltaanalysis.cxx
@@ -10,44 +10,43 @@
 // or submit itself to any jurisdiction.
 // Analysis task for delta analysis
 
-#include <TH1F.h>
-#include <TDirectory.h>
-#include <THn.h>
-#include <TLorentzVector.h>
-#include <TMath.h>
-#include <TObjArray.h>
-#include <TFile.h>
-#include <TH2F.h>
-#include <TLorentzVector.h>
-#include <TPDGCode.h>
-#include <TDatabasePDG.h>
-
-#include <cmath>
-#include <array>
-#include <cstdlib>
+#include "PWGLF/DataModel/LFLithium4Tables.h"
 
 #include "Common/Core/PID/PIDTOF.h"
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/TableProducer/PID/pidTOFBase.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
+#include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsTPC/BetheBlochAleph.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/Core/trackUtilities.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/TrackSelection.h"
-#include "Framework/ASoAHelpers.h"
-#include "DataFormatsTPC/BetheBlochAleph.h"
-#include "CCDB/BasicCCDBManager.h"
 
-#include "PWGLF/DataModel/LFLithium4Tables.h"
+#include <TDatabasePDG.h>
+#include <TDirectory.h>
+#include <TFile.h>
+#include <TH1F.h>
+#include <TH2F.h>
+#include <THn.h>
+#include <TLorentzVector.h>
+#include <TMath.h>
+#include <TObjArray.h>
+#include <TPDGCode.h>
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/Tasks/Resonances/doubleResonanceScan.cxx b/.auto-resolution/PWGLF/Tasks/Resonances/doubleResonanceScan.cxx
index 4b67171c448..48358d1b4ef 100644
--- a/.auto-resolution/PWGLF/Tasks/Resonances/doubleResonanceScan.cxx
+++ b/.auto-resolution/PWGLF/Tasks/Resonances/doubleResonanceScan.cxx
@@ -15,16 +15,17 @@
 /// \since 27/03/2025
 ///
 
-#include <vector>
-#include <TLorentzVector.h>
+#include "PWGLF/DataModel/LFResonanceTables.h"
 
-#include "Framework/AnalysisTask.h"
+#include "CommonConstants/MathConstants.h"
+#include "CommonConstants/PhysicsConstants.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
 
-#include "CommonConstants/PhysicsConstants.h"
-#include "CommonConstants/MathConstants.h"
+#include <TLorentzVector.h>
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/Tasks/Resonances/doublephimeson.cxx b/.auto-resolution/PWGLF/Tasks/Resonances/doublephimeson.cxx
index 0c8f9c2c780..07c86976f25 100644
--- a/.auto-resolution/PWGLF/Tasks/Resonances/doublephimeson.cxx
+++ b/.auto-resolution/PWGLF/Tasks/Resonances/doublephimeson.cxx
@@ -13,27 +13,31 @@
 /// \author sourav kundu
 /// \since 02/11/2023
 
+#include "PWGLF/DataModel/ReducedDoublePhiTables.h"
+
+#include "Common/Core/trackUtilities.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
 #include <Framework/Configurable.h>
-#include <TLorentzVector.h>
+
 #include <Math/GenVector/Boost.h>
-#include <Math/Vector4D.h>
 #include <Math/Vector3D.h>
+#include <Math/Vector4D.h>
+#include <TLorentzVector.h>
 #include <TMath.h>
+
 #include <fairlogger/Logger.h>
+
 #include <iostream>
 #include <iterator>
 #include <string>
 #include <vector>
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/StepTHn.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/ReducedDoublePhiTables.h"
-#include "CommonConstants/PhysicsConstants.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.auto-resolution/PWGLF/Tasks/Resonances/f1protoncorrelation.cxx b/.auto-resolution/PWGLF/Tasks/Resonances/f1protoncorrelation.cxx
index af45b89b8da..23e41a8f7f9 100644
--- a/.auto-resolution/PWGLF/Tasks/Resonances/f1protoncorrelation.cxx
+++ b/.auto-resolution/PWGLF/Tasks/Resonances/f1protoncorrelation.cxx
@@ -13,25 +13,29 @@
 /// \author sourav kundu
 /// \since 02/11/2023
 
+#include "PWGLF/DataModel/ReducedF1ProtonTables.h"
+
+#include "Common/Core/trackUtilities.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
 #include <Framework/Configurable.h>
-#include <TLorentzVector.h>
+
 #include <Math/GenVector/Boost.h>
 #include <Math/Vector4D.h>
+#include <TLorentzVector.h>
 #include <TMath.h>
+
 #include <fairlogger/Logger.h>
+
 #include <iostream>
 #include <iterator>
 #include <string>
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/StepTHn.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/ReducedF1ProtonTables.h"
-#include "CommonConstants/PhysicsConstants.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.auto-resolution/PWGLF/Tasks/Resonances/heptaquark.cxx b/.auto-resolution/PWGLF/Tasks/Resonances/heptaquark.cxx
index 407c3199073..4f3caaf197a 100644
--- a/.auto-resolution/PWGLF/Tasks/Resonances/heptaquark.cxx
+++ b/.auto-resolution/PWGLF/Tasks/Resonances/heptaquark.cxx
@@ -12,28 +12,32 @@
 /// \brief this is a starting point for the Resonances tutorial
 /// \author junlee kim
 
+#include "PWGLF/DataModel/ReducedHeptaQuarkTables.h"
+
+#include "Common/Core/trackUtilities.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
 #include <Framework/Configurable.h>
-#include <TLorentzVector.h>
+
 #include <Math/GenVector/Boost.h>
-#include <Math/Vector4D.h>
 #include <Math/Vector3D.h>
+#include <Math/Vector4D.h>
+#include <TLorentzVector.h>
 #include <TMath.h>
 #include <TRandom3.h>
+
 #include <fairlogger/Logger.h>
+
 #include <iostream>
 #include <iterator>
 #include <string>
 #include <vector>
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/StepTHn.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/ReducedHeptaQuarkTables.h"
-#include "CommonConstants/PhysicsConstants.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.auto-resolution/PWGLF/Tasks/Resonances/highmasslambda.cxx b/.auto-resolution/PWGLF/Tasks/Resonances/highmasslambda.cxx
index c799c1d0ba7..41e3a48e48a 100644
--- a/.auto-resolution/PWGLF/Tasks/Resonances/highmasslambda.cxx
+++ b/.auto-resolution/PWGLF/Tasks/Resonances/highmasslambda.cxx
@@ -11,57 +11,59 @@
 // Phi meson spin alignment task
 // sourav.kundu@cern.ch
 
-#include <TH1F.h>
+#include "PWGLF/DataModel/EPCalibrationTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/PIDResponseITS.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include "Math/GenVector/Boost.h"
+#include "Math/Vector3D.h"
+#include "Math/Vector4D.h"
+#include "TF1.h"
+#include "TRandom3.h"
+#include <TDatabasePDG.h>
 #include <TDirectory.h>
+#include <TFile.h>
+#include <TH1F.h>
+#include <TH2F.h>
 #include <THn.h>
 #include <TLorentzVector.h>
 #include <TMath.h>
 #include <TObjArray.h>
-#include <TFile.h>
-#include <TH2F.h>
-#include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
-#include <cmath>
+
 #include <array>
+#include <cmath>
 #include <cstdlib>
-#include <vector>
 #include <string>
-
-#include "TRandom3.h"
-#include "Math/Vector3D.h"
-#include "Math/Vector4D.h"
-#include "Math/GenVector/Boost.h"
-#include "TF1.h"
-
-#include "PWGLF/DataModel/EPCalibrationTables.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/Core/trackUtilities.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/TrackSelection.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "Common/DataModel/PIDResponseITS.h"
+#include <vector>
 // #include "PWGHF/Utils/utilsBfieldCCDB.h"
 #include "PWGHF/Utils/utilsEvSelHf.h"
 #include "PWGHF/Utils/utilsTrkCandHf.h"
+
+#include "DCAFitter/DCAFitterN.h"
 #include "ReconstructionDataFormats/DCA.h"
 #include "ReconstructionDataFormats/V0.h"
-#include "DCAFitter/DCAFitterN.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/Tasks/Resonances/highmasslambdasvx.cxx b/.auto-resolution/PWGLF/Tasks/Resonances/highmasslambdasvx.cxx
index d6405483d13..d285c487e26 100644
--- a/.auto-resolution/PWGLF/Tasks/Resonances/highmasslambdasvx.cxx
+++ b/.auto-resolution/PWGLF/Tasks/Resonances/highmasslambdasvx.cxx
@@ -11,55 +11,56 @@
 // Phi meson spin alignment task
 // sourav.kundu@cern.ch
 
-#include <TH1F.h>
-#include <TDirectory.h>
-#include <THn.h>
-#include <TLorentzVector.h>
-#include <TMath.h>
-#include <TObjArray.h>
-#include <TFile.h>
-#include <TH2F.h>
-#include <TLorentzVector.h>
-#include <TPDGCode.h>
-#include <TDatabasePDG.h>
-#include <cmath>
-#include <array>
-#include <cstdlib>
-
-#include "TRandom3.h"
-#include "Math/Vector3D.h"
-#include "Math/Vector4D.h"
-#include "Math/GenVector/Boost.h"
-#include "TF1.h"
+#include "PWGHF/Utils/utilsBfieldCCDB.h"
+#include "PWGHF/Utils/utilsEvSelHf.h"
+#include "PWGHF/Utils/utilsTrkCandHf.h"
+#include "PWGLF/DataModel/EPCalibrationTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Common/Core/TrackSelection.h"
 #include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/EPCalibrationTables.h"
-#include "Framework/runDataProcessing.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/TrackSelection.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "DataFormatsParameters/GRPObject.h"
+#include "DCAFitter/DCAFitterN.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGHF/Utils/utilsBfieldCCDB.h"
-#include "PWGHF/Utils/utilsEvSelHf.h"
-#include "PWGHF/Utils/utilsTrkCandHf.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/DCA.h"
+#include "ReconstructionDataFormats/Track.h"
 #include "ReconstructionDataFormats/V0.h"
 
+#include "Math/GenVector/Boost.h"
+#include "Math/Vector3D.h"
+#include "Math/Vector4D.h"
+#include "TF1.h"
+#include "TRandom3.h"
+#include <TDatabasePDG.h>
+#include <TDirectory.h>
+#include <TFile.h>
+#include <TH1F.h>
+#include <TH2F.h>
+#include <THn.h>
+#include <TLorentzVector.h>
+#include <TMath.h>
+#include <TObjArray.h>
+#include <TPDGCode.h>
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.auto-resolution/PWGLF/Tasks/Resonances/k1AnalysisMicro.cxx b/.auto-resolution/PWGLF/Tasks/Resonances/k1AnalysisMicro.cxx
index 35d6224da36..506365a642a 100644
--- a/.auto-resolution/PWGLF/Tasks/Resonances/k1AnalysisMicro.cxx
+++ b/.auto-resolution/PWGLF/Tasks/Resonances/k1AnalysisMicro.cxx
@@ -14,20 +14,23 @@
 /// \author Su-Jeong Ji <su-jeong.ji@cern.ch>, Bong-Hwi Lim <bong-hwi.lim@cern.ch>
 ///
 
-#include <vector>
-#include <TLorentzVector.h>
-#include <TDatabasePDG.h> // FIXME
-#include <TPDGCode.h>     // FIXME
+#include "PWGLF/DataModel/LFResonanceTables.h"
 
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Framework/AnalysisTask.h"
+#include "Common/DataModel/PIDResponse.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "DataFormatsParameters/GRPObject.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "CommonConstants/PhysicsConstants.h"
+
+#include <TDatabasePDG.h> // FIXME
+#include <TLorentzVector.h>
+#include <TPDGCode.h> // FIXME
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/Tasks/Resonances/k1analysis.cxx b/.auto-resolution/PWGLF/Tasks/Resonances/k1analysis.cxx
index 601227b666e..af106a29189 100644
--- a/.auto-resolution/PWGLF/Tasks/Resonances/k1analysis.cxx
+++ b/.auto-resolution/PWGLF/Tasks/Resonances/k1analysis.cxx
@@ -15,20 +15,23 @@
 ///
 /// \author Bong-Hwi Lim <bong-hwi.lim@cern.ch>
 
-#include <vector>
-#include <TLorentzVector.h>
-#include <TDatabasePDG.h> // FIXME
-#include <TPDGCode.h>     // FIXME
+#include "PWGLF/DataModel/LFResonanceTables.h"
 
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Framework/AnalysisTask.h"
+#include "Common/DataModel/PIDResponse.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "DataFormatsParameters/GRPObject.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "CommonConstants/PhysicsConstants.h"
+
+#include <TDatabasePDG.h> // FIXME
+#include <TLorentzVector.h>
+#include <TPDGCode.h> // FIXME
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/Tasks/Resonances/k892SpherocityAnalysis.cxx b/.auto-resolution/PWGLF/Tasks/Resonances/k892SpherocityAnalysis.cxx
index 7081f79c751..83f93a83134 100644
--- a/.auto-resolution/PWGLF/Tasks/Resonances/k892SpherocityAnalysis.cxx
+++ b/.auto-resolution/PWGLF/Tasks/Resonances/k892SpherocityAnalysis.cxx
@@ -13,17 +13,19 @@
 /// \brief Invariant Mass Reconstruction of K*(892) Resonance
 /// \author Sayan Dhani <sayan.dhani@cern.ch>
 
-#include <TLorentzVector.h>
-#include <TRandom.h>
+#include "PWGLF/DataModel/LFResonanceTables.h"
 
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Framework/AnalysisTask.h"
+#include "Common/DataModel/PIDResponse.h"
+
+#include "CommonConstants/PhysicsConstants.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
-#include "CommonConstants/PhysicsConstants.h"
+
+#include <TLorentzVector.h>
+#include <TRandom.h>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/Tasks/Resonances/k892analysis.cxx b/.auto-resolution/PWGLF/Tasks/Resonances/k892analysis.cxx
index 34e4cc662a0..83bca847de5 100644
--- a/.auto-resolution/PWGLF/Tasks/Resonances/k892analysis.cxx
+++ b/.auto-resolution/PWGLF/Tasks/Resonances/k892analysis.cxx
@@ -15,19 +15,21 @@
 ///
 /// \author Bong-Hwi Lim <bong-hwi.lim@cern.ch>, Sawan Sawan <sawan.sawan@cern.ch>
 
-#include <TLorentzVector.h>
-#include "TF1.h"
-#include "TRandom3.h"
+#include "PWGLF/DataModel/LFResonanceTables.h"
 
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Framework/AnalysisTask.h"
+#include "Common/DataModel/PIDResponse.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "DataFormatsParameters/GRPObject.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "CommonConstants/PhysicsConstants.h"
+
+#include "TF1.h"
+#include "TRandom3.h"
+#include <TLorentzVector.h>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/Tasks/Resonances/k892analysispbpb.cxx b/.auto-resolution/PWGLF/Tasks/Resonances/k892analysispbpb.cxx
index 303a6cd6fc9..b15bc0d7217 100644
--- a/.auto-resolution/PWGLF/Tasks/Resonances/k892analysispbpb.cxx
+++ b/.auto-resolution/PWGLF/Tasks/Resonances/k892analysispbpb.cxx
@@ -13,39 +13,40 @@
 /// \brief K*0 spectra in Pb-Pb
 /// \author Marta Urioni <marta.urioni@cern.ch>
 
-#include <TH1F.h>
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <Math/Vector4D.h>
 #include <TDirectory.h>
+#include <TFile.h>
+#include <TH1F.h>
+#include <TH2F.h>
 #include <THn.h>
 #include <TLorentzVector.h>
 #include <TMath.h>
 #include <TObjArray.h>
-#include <TFile.h>
-#include <TH2F.h>
-#include <TRandom3.h>
-#include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <Math/Vector4D.h>
-#include <cmath>
+#include <TRandom3.h>
+
 #include <array>
+#include <cmath>
 #include <cstdlib>
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/StepTHn.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/Core/trackUtilities.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/TrackSelection.h"
-#include "Framework/ASoAHelpers.h"
-#include "DataFormatsParameters/GRPObject.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.auto-resolution/PWGLF/Tasks/Resonances/k892pmanalysis.cxx b/.auto-resolution/PWGLF/Tasks/Resonances/k892pmanalysis.cxx
index 16963b77e6b..dcdfba8865c 100644
--- a/.auto-resolution/PWGLF/Tasks/Resonances/k892pmanalysis.cxx
+++ b/.auto-resolution/PWGLF/Tasks/Resonances/k892pmanalysis.cxx
@@ -15,17 +15,19 @@
 ///
 /// \author Bong-Hwi Lim <bong-hwi.lim@cern.ch>, Alessandro Sturniolo <a.sturniolo@cern.ch>
 
-#include <TLorentzVector.h>
+#include "PWGLF/DataModel/LFResonanceTables.h"
 
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Framework/AnalysisTask.h"
+#include "Common/DataModel/PIDResponse.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "DataFormatsParameters/GRPObject.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "CommonConstants/PhysicsConstants.h"
+
+#include <TLorentzVector.h>
 
 using namespace o2;
 using namespace o2::framework;
@@ -443,7 +445,7 @@ struct k892pmanalysis {
 
   void processMCTrue(aod::ResoMCParents& resoParents)
   {
-    for (auto& part : resoParents) {  // loop over all pre-filtered MC particles
+    for (auto& part : resoParents) {       // loop over all pre-filtered MC particles
       if (std::abs(part.pdgCode()) != 323) // K*892(pm)
         continue;
       if (std::abs(part.y()) > 0.5) // rapidity cut
diff --git a/.auto-resolution/PWGLF/Tasks/Resonances/kshortlambda.cxx b/.auto-resolution/PWGLF/Tasks/Resonances/kshortlambda.cxx
index 225ea15e447..304c2511bc6 100644
--- a/.auto-resolution/PWGLF/Tasks/Resonances/kshortlambda.cxx
+++ b/.auto-resolution/PWGLF/Tasks/Resonances/kshortlambda.cxx
@@ -13,6 +13,29 @@
 /// \brief higher mass resonance search in non-identical V0 pairs (K0s-L)
 /// \author  dukhishyam Mallick (dukhishyam.mallick@cern.ch)
 
+#include "PWGLF/DataModel/LFStrangenessTables.h" //
+
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h" //
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h" //
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h" //
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h" //
+#include "ReconstructionDataFormats/Track.h"
+
+#include "Math/GenVector/Boost.h"
+#include "Math/Vector3D.h"
+#include "Math/Vector4D.h"
+#include "TF1.h"
+#include "TRandom3.h"
 #include <TDirectory.h>
 #include <TFile.h>
 #include <TH1F.h>
@@ -22,32 +45,11 @@
 #include <TMath.h>
 #include <TObjArray.h>
 #include <TPDGCode.h>
+
 #include <array>
 #include <cmath>
 #include <cstdlib>
 #include <vector>
-#include "TF1.h"
-#include "TRandom3.h"
-#include "Math/Vector3D.h"
-#include "Math/Vector4D.h"
-#include "Math/GenVector/Boost.h"
-
-#include "Common/Core/TrackSelection.h"
-#include "Common/Core/trackUtilities.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/StepTHn.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/EventSelection.h" //
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/PIDResponse.h" //
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/AnalysisTask.h"              //
-#include "Framework/runDataProcessing.h"         //
-#include "PWGLF/DataModel/LFStrangenessTables.h" //
 
 using namespace o2;
 using namespace o2::framework;
@@ -795,11 +797,11 @@ struct Kshortlambda {
           lv1.SetPtEtaPhiM(t1.pt(), t1.eta(), t1.phi(), massK0s);
           lvLambda.SetPtEtaPhiM(lambdaVec.pt(), lambdaVec.eta(), lambdaVec.phi(), massLambda);
           lv3 = lv1 + lvLambda;
-          fourVecDau = ROOT::Math::PxPyPzMVector(daughter1.Px(), daughter1.Py(), daughter1.Pz(), massK0s);                           // Kshort
-          fourVecMother = ROOT::Math::PxPyPzMVector(lv3.Px(), lv3.Py(), lv3.Pz(), lv3.M());                                          // mass of KshortKshort pair
-          ROOT::Math::Boost boost{fourVecMother.BoostToCM()};                                                                        // boost mother to center of mass frame
-          fourVecDauCM = boost(fourVecDau);                                                                                          // boost the frame of daughter same as mother
-          threeVecDauCM = fourVecDauCM.Vect();                                                                                       // get the 3 vector of daughter in the frame of mother
+          fourVecDau = ROOT::Math::PxPyPzMVector(daughter1.Px(), daughter1.Py(), daughter1.Pz(), massK0s); // Kshort
+          fourVecMother = ROOT::Math::PxPyPzMVector(lv3.Px(), lv3.Py(), lv3.Pz(), lv3.M());                // mass of KshortKshort pair
+          ROOT::Math::Boost boost{fourVecMother.BoostToCM()};                                              // boost mother to center of mass frame
+          fourVecDauCM = boost(fourVecDau);                                                                // boost the frame of daughter same as mother
+          threeVecDauCM = fourVecDauCM.Vect();                                                             // get the 3 vector of daughter in the frame of mother
 
           if (std::abs(lv3.Rapidity()) < 0.5) {
             if (activateTHnSparseCosThStarHelicity) {
@@ -901,11 +903,11 @@ struct Kshortlambda {
           lvLambda.SetPtEtaPhiM(lambdaVec.pt(), lambdaVec.eta(), lambdaVec.phi(), massLambda);
           lv3 = lv1 + lvLambda;
 
-          fourVecDau = ROOT::Math::PxPyPzMVector(daughter1.Px(), daughter1.Py(), daughter1.Pz(), massK0s);            // Kshort
-          fourVecMother = ROOT::Math::PxPyPzMVector(lv3.Px(), lv3.Py(), lv3.Pz(), lv3.M());                           // mass of KshortKshort pair
-          ROOT::Math::Boost boost{fourVecMother.BoostToCM()};                                                         // boost mother to center of mass frame
-          fourVecDauCM = boost(fourVecDau);                                                                           // boost the frame of daughter same as mother
-          threeVecDauCM = fourVecDauCM.Vect();                                                                        // get the 3 vector of daughter in the frame of mother
+          fourVecDau = ROOT::Math::PxPyPzMVector(daughter1.Px(), daughter1.Py(), daughter1.Pz(), massK0s); // Kshort
+          fourVecMother = ROOT::Math::PxPyPzMVector(lv3.Px(), lv3.Py(), lv3.Pz(), lv3.M());                // mass of KshortKshort pair
+          ROOT::Math::Boost boost{fourVecMother.BoostToCM()};                                              // boost mother to center of mass frame
+          fourVecDauCM = boost(fourVecDau);                                                                // boost the frame of daughter same as mother
+          threeVecDauCM = fourVecDauCM.Vect();                                                             // get the 3 vector of daughter in the frame of mother
 
           if (std::abs(lv3.Rapidity()) < 0.5) {
 
diff --git a/.auto-resolution/PWGLF/Tasks/Resonances/kstar892analysis.cxx b/.auto-resolution/PWGLF/Tasks/Resonances/kstar892analysis.cxx
index 0a43e73bb5b..74ee0c5496c 100644
--- a/.auto-resolution/PWGLF/Tasks/Resonances/kstar892analysis.cxx
+++ b/.auto-resolution/PWGLF/Tasks/Resonances/kstar892analysis.cxx
@@ -16,20 +16,23 @@
 /// adaped from k892analysis.cxx by Bong-Hwi Lim <bong-hwi.lim@cern.ch>, Sawan Sawan <sawan.sawan@cern.ch>
 /// \author Marta Urioni <marta.urioni@cern.ch>
 
-#include <TLorentzVector.h>
-#include "TF1.h"
-#include <vector>
+#include "PWGLF/DataModel/LFResonanceTables.h"
 
 #include "Common/Core/RecoDecay.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Framework/AnalysisTask.h"
+#include "Common/DataModel/PIDResponse.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "DataFormatsParameters/GRPObject.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "CommonConstants/PhysicsConstants.h"
+
+#include "TF1.h"
+#include <TLorentzVector.h>
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/Tasks/Resonances/kstarFlowv1.cxx b/.auto-resolution/PWGLF/Tasks/Resonances/kstarFlowv1.cxx
index 08139c3c2d2..ab860f966c4 100644
--- a/.auto-resolution/PWGLF/Tasks/Resonances/kstarFlowv1.cxx
+++ b/.auto-resolution/PWGLF/Tasks/Resonances/kstarFlowv1.cxx
@@ -14,53 +14,52 @@
 /// \author  Prottay Das <prottay.das@cern.ch>, Dukhishyam Mallick <dukhishyam.mallick@cern.ch>
 ///
 
-#include <TH1F.h>
 #include <TDirectory.h>
+#include <TFile.h>
+#include <TH1F.h>
+#include <TH2F.h>
 #include <THn.h>
 #include <TLorentzVector.h>
 #include <TMath.h>
 #include <TObjArray.h>
-#include <TFile.h>
-#include <TH2F.h>
-#include <TLorentzVector.h>
 #include <TPDGCode.h>
+
 #include <string>
 #include <vector>
 // #include <TDatabasePDG.h>
-#include <cmath>
-#include <array>
-#include <cstdlib>
-
-#include "TRandom3.h"
-#include "Math/Vector3D.h"
-#include "Math/Vector4D.h"
-#include "Math/GenVector/Boost.h"
-#include "TF1.h"
+#include "PWGLF/DataModel/SPCalibrationTables.h"
 
-#include "Common/Core/trackUtilities.h"
-#include "Common/Core/TrackSelection.h"
 #include "Common/Core/RecoDecay.h"
-
-#include "PWGLF/DataModel/SPCalibrationTables.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/TrackSelection.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
+
+#include "Math/GenVector/Boost.h"
+#include "Math/Vector3D.h"
+#include "Math/Vector4D.h"
+#include "TF1.h"
+#include "TRandom3.h"
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/Tasks/Resonances/lambda1520SpherocityAnalysis.cxx b/.auto-resolution/PWGLF/Tasks/Resonances/lambda1520SpherocityAnalysis.cxx
index b8d6cfeae29..7d53afebf5b 100644
--- a/.auto-resolution/PWGLF/Tasks/Resonances/lambda1520SpherocityAnalysis.cxx
+++ b/.auto-resolution/PWGLF/Tasks/Resonances/lambda1520SpherocityAnalysis.cxx
@@ -13,19 +13,22 @@
 /// \brief Invariant Mass Reconstruction of Lambda(1520) Resonance
 /// \author Yash Patley <yash.patley@cern.ch>
 
-#include <TLorentzVector.h>
-#include <TRandom.h>
-#include <vector>
+#include "PWGLF/DataModel/LFResonanceTables.h"
 
-#include "Common/DataModel/PIDResponse.h"
+#include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Framework/AnalysisTask.h"
+#include "Common/DataModel/PIDResponse.h"
+
+#include "CommonConstants/PhysicsConstants.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/RecoDecay.h"
+
+#include <TLorentzVector.h>
+#include <TRandom.h>
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/Tasks/Resonances/lambda1520_PbPb.cxx b/.auto-resolution/PWGLF/Tasks/Resonances/lambda1520_PbPb.cxx
index d032d0c90aa..1298ef07c4f 100644
--- a/.auto-resolution/PWGLF/Tasks/Resonances/lambda1520_PbPb.cxx
+++ b/.auto-resolution/PWGLF/Tasks/Resonances/lambda1520_PbPb.cxx
@@ -15,22 +15,25 @@
 /// \author Yash Patley <yash.patley@cern.ch>
 /// \author Nasir Mehdi Malik
 
+#include "PWGLF/DataModel/LFResonanceTables.h"
+
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 #include <Framework/ASoA.h>
 #include <Framework/AnalysisDataModel.h>
 #include <Framework/HistogramRegistry.h>
 #include <Framework/HistogramSpec.h>
+
 #include <TLorentzVector.h>
 #include <TRandom.h>
-#include <fairlogger/Logger.h>
 
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
-#include "CommonConstants/PhysicsConstants.h"
+#include <fairlogger/Logger.h>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/Tasks/Resonances/lambda1520analysis.cxx b/.auto-resolution/PWGLF/Tasks/Resonances/lambda1520analysis.cxx
index 3e6749d451d..12130bfe422 100644
--- a/.auto-resolution/PWGLF/Tasks/Resonances/lambda1520analysis.cxx
+++ b/.auto-resolution/PWGLF/Tasks/Resonances/lambda1520analysis.cxx
@@ -13,13 +13,15 @@
 /// \brief This task reconstructs track-track decay lambda(1520) resonance candidate
 /// \author Hirak Kumar Koley <hirak.koley@cern.ch>
 
-#include "TLorentzVector.h"
-#include "TF1.h"
-#include "TRandom3.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "PWGLF/DataModel/LFResonanceTables.h"
+
 #include "CommonConstants/PhysicsConstants.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TF1.h"
+#include "TLorentzVector.h"
+#include "TRandom3.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/Tasks/Resonances/lambdav2.cxx b/.auto-resolution/PWGLF/Tasks/Resonances/lambdav2.cxx
index ae8c1b6446c..3aebbb27334 100644
--- a/.auto-resolution/PWGLF/Tasks/Resonances/lambdav2.cxx
+++ b/.auto-resolution/PWGLF/Tasks/Resonances/lambdav2.cxx
@@ -11,50 +11,51 @@
 // Particle flow task
 // prottay.das@cern.ch
 
-#include <TH1F.h>
+#include "Math/GenVector/Boost.h"
+#include "Math/Vector3D.h"
+#include "Math/Vector4D.h"
+#include "TF1.h"
+#include "TRandom3.h"
+#include <TDatabasePDG.h>
 #include <TDirectory.h>
+#include <TFile.h>
+#include <TH1F.h>
+#include <TH2F.h>
 #include <THn.h>
 #include <TLorentzVector.h>
 #include <TMath.h>
 #include <TObjArray.h>
-#include <TFile.h>
-#include <TH2F.h>
-#include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
-#include <cmath>
+
 #include <array>
+#include <cmath>
 #include <cstdlib>
 
-#include "TRandom3.h"
-#include "Math/Vector3D.h"
-#include "Math/Vector4D.h"
-#include "Math/GenVector/Boost.h"
-#include "TF1.h"
-
 // #include "Common/DataModel/Qvectors.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "PWGLF/DataModel/SPCalibrationTables.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
+
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/FT0Corrected.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/TrackSelection.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "Common/DataModel/FT0Corrected.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/Tasks/Resonances/lstarpbpbv2.cxx b/.auto-resolution/PWGLF/Tasks/Resonances/lstarpbpbv2.cxx
index 4b9bdb5aede..ce6094b71ee 100644
--- a/.auto-resolution/PWGLF/Tasks/Resonances/lstarpbpbv2.cxx
+++ b/.auto-resolution/PWGLF/Tasks/Resonances/lstarpbpbv2.cxx
@@ -11,50 +11,51 @@
 // L* baryon v2
 // Prottay Das (prottay.das@cern.ch)
 
-#include <TH1F.h>
+#include "PWGLF/DataModel/EPCalibrationTables.h"
+
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/PIDResponseITS.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include "Math/GenVector/Boost.h"
+#include "Math/Vector3D.h"
+#include "Math/Vector4D.h"
+#include "TF1.h"
+#include "TRandom3.h"
+#include <TDatabasePDG.h>
 #include <TDirectory.h>
+#include <TFile.h>
+#include <TH1F.h>
+#include <TH2F.h>
 #include <THn.h>
 #include <TLorentzVector.h>
 #include <TMath.h>
 #include <TObjArray.h>
-#include <TFile.h>
-#include <TH2F.h>
-#include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <string>
-#include <vector>
-#include <TDatabasePDG.h>
-#include <cmath>
+
 #include <array>
+#include <cmath>
 #include <cstdlib>
-
-#include "TRandom3.h"
-#include "Math/Vector3D.h"
-#include "Math/Vector4D.h"
-#include "Math/GenVector/Boost.h"
-#include "TF1.h"
-
-#include "PWGLF/DataModel/EPCalibrationTables.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/Core/trackUtilities.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/TrackSelection.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "Common/DataModel/PIDResponseITS.h"
-#include "CCDB/BasicCCDBManager.h"
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/Tasks/Resonances/phianalysis.cxx b/.auto-resolution/PWGLF/Tasks/Resonances/phianalysis.cxx
index b529cc1fb81..7bbe03013c6 100644
--- a/.auto-resolution/PWGLF/Tasks/Resonances/phianalysis.cxx
+++ b/.auto-resolution/PWGLF/Tasks/Resonances/phianalysis.cxx
@@ -15,17 +15,19 @@
 ///
 /// \author Bong-Hwi Lim <bong-hwi.lim@cern.ch>
 
-#include <TLorentzVector.h>
+#include "PWGLF/DataModel/LFResonanceTables.h"
 
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Framework/AnalysisTask.h"
+#include "Common/DataModel/PIDResponse.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "DataFormatsParameters/GRPObject.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "CommonConstants/PhysicsConstants.h"
+
+#include <TLorentzVector.h>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/Tasks/Resonances/phianalysisTHnSparse.cxx b/.auto-resolution/PWGLF/Tasks/Resonances/phianalysisTHnSparse.cxx
index f9fa43c1d7f..09b6f505843 100644
--- a/.auto-resolution/PWGLF/Tasks/Resonances/phianalysisTHnSparse.cxx
+++ b/.auto-resolution/PWGLF/Tasks/Resonances/phianalysisTHnSparse.cxx
@@ -13,21 +13,24 @@
 /// \brief Analysis of phi resonance using THnSparse histograms.
 /// \author Veronika Barbasova (veronika.barbasova@cern.ch)
 
-#include <TLorentzVector.h>
-#include <vector>
-#include <string>
+#include "PWGLF/Utils/rsnOutput.h"
 
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/PID.h"
-#include "PWGLF/Utils/rsnOutput.h"
+
+#include <TLorentzVector.h>
+
+#include <string>
+#include <vector>
 // #include "TDatabasePDG.h"
 
 using namespace o2;
diff --git a/.auto-resolution/PWGLF/Tasks/Resonances/phianalysisrun3.cxx b/.auto-resolution/PWGLF/Tasks/Resonances/phianalysisrun3.cxx
index a865482393a..05e2b0e414e 100644
--- a/.auto-resolution/PWGLF/Tasks/Resonances/phianalysisrun3.cxx
+++ b/.auto-resolution/PWGLF/Tasks/Resonances/phianalysisrun3.cxx
@@ -16,38 +16,39 @@
 // (5) particle = 2 --> lambdastar
 // (6) 4 process function (a) Data same event (b) Data mixed event (c) MC generated (d) MC reconstructed
 
-#include <TH1F.h>
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <Math/Vector4D.h>
+#include <TDatabasePDG.h>
 #include <TDirectory.h>
+#include <TFile.h>
+#include <TH1F.h>
+#include <TH2F.h>
 #include <THn.h>
 #include <TLorentzVector.h>
 #include <TMath.h>
 #include <TObjArray.h>
-#include <TFile.h>
-#include <TH2F.h>
-#include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
-#include <Math/Vector4D.h>
-#include <cmath>
+
 #include <array>
+#include <cmath>
 #include <cstdlib>
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/StepTHn.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/Core/trackUtilities.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/TrackSelection.h"
-#include "Framework/ASoAHelpers.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.auto-resolution/PWGLF/Tasks/Resonances/rho770analysis.cxx b/.auto-resolution/PWGLF/Tasks/Resonances/rho770analysis.cxx
index 07531afc724..fb4d9cbf643 100644
--- a/.auto-resolution/PWGLF/Tasks/Resonances/rho770analysis.cxx
+++ b/.auto-resolution/PWGLF/Tasks/Resonances/rho770analysis.cxx
@@ -14,19 +14,21 @@
 /// \author Hyunji Lim (hyunji.lim@cern.ch)
 /// \since 03/12/2025
 
-#include <Framework/Configurable.h>
-#include <TLorentzVector.h>
-#include "TVector2.h"
+#include "PWGLF/DataModel/LFResonanceTables.h"
 
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+
+#include "CommonConstants/PhysicsConstants.h"
 #include "DataFormatsParameters/GRPObject.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
-#include "CommonConstants/PhysicsConstants.h"
+#include <Framework/Configurable.h>
+
+#include "TVector2.h"
+#include <TLorentzVector.h>
 
 using namespace o2;
 using namespace o2::framework;
@@ -67,8 +69,8 @@ struct rho770analysis {
   Configurable<bool> cfgHasTOF{"cfgHasTOF", false, "Require TOF"};
 
   // PID
-  Configurable<double> cMaxTOFnSigmaPion{"cMaxTOFnSigmaPion", 3.0, "TOF nSigma cut for Pion"}; // TOF
-  Configurable<double> cMaxTPCnSigmaPion{"cMaxTPCnSigmaPion", 5.0, "TPC nSigma cut for Pion"}; // TPC
+  Configurable<double> cMaxTOFnSigmaPion{"cMaxTOFnSigmaPion", 3.0, "TOF nSigma cut for Pion"};                          // TOF
+  Configurable<double> cMaxTPCnSigmaPion{"cMaxTPCnSigmaPion", 5.0, "TPC nSigma cut for Pion"};                          // TPC
   Configurable<double> cMaxTPCnSigmaPionnoTOF{"cMaxTPCnSigmaPionnoTOF", 2.0, "TPC nSigma cut for Pion in no TOF case"}; // TPC
   Configurable<double> nsigmaCutCombinedPion{"nsigmaCutCombinedPion", 3.0, "Combined nSigma cut for Pion"};
   Configurable<int> selectType{"selectType", 0, "PID selection type"};
diff --git a/.auto-resolution/PWGLF/Tasks/Resonances/rhoanalysis.cxx b/.auto-resolution/PWGLF/Tasks/Resonances/rhoanalysis.cxx
index ab1112f4995..e6bfac44bf1 100644
--- a/.auto-resolution/PWGLF/Tasks/Resonances/rhoanalysis.cxx
+++ b/.auto-resolution/PWGLF/Tasks/Resonances/rhoanalysis.cxx
@@ -15,23 +15,25 @@
 ///
 /// \author Nasir Mehdi Malik
 
-#include <array>
+#include "RecoDecay.h"
 
-#include <TPDGCode.h>
+#include "Common/Core/RecoDecay.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
-#include "Framework/DataProcessorSpec.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/RecoDecay.h"
+#include "Framework/DataProcessorSpec.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "RecoDecay.h"
+#include "Framework/runDataProcessing.h"
+
+#include <TPDGCode.h>
+
+#include <array>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/Tasks/Resonances/rsnanalysis.cxx b/.auto-resolution/PWGLF/Tasks/Resonances/rsnanalysis.cxx
index 7a672fe59a8..0e662918f5d 100644
--- a/.auto-resolution/PWGLF/Tasks/Resonances/rsnanalysis.cxx
+++ b/.auto-resolution/PWGLF/Tasks/Resonances/rsnanalysis.cxx
@@ -17,9 +17,11 @@
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "Framework/ASoAHelpers.h"
+
 #include "TLorentzVector.h"
 
 using namespace std;
diff --git a/.auto-resolution/PWGLF/Tasks/Resonances/sigma.cxx b/.auto-resolution/PWGLF/Tasks/Resonances/sigma.cxx
index 9bcad07c143..5245c2eb5ae 100644
--- a/.auto-resolution/PWGLF/Tasks/Resonances/sigma.cxx
+++ b/.auto-resolution/PWGLF/Tasks/Resonances/sigma.cxx
@@ -11,23 +11,8 @@
 ///
 /// \brief sigma resonance
 /// \author sarjeeta gami (sarjeeta.gami@cern.ch)
-#include <TDatabasePDG.h>
-#include <TDirectory.h>
-#include <TFile.h>
-#include <TH1F.h>
-#include <TH2F.h>
-#include <THn.h>
-#include <TLorentzVector.h>
-#include <TMath.h>
-#include <TObjArray.h>
-#include <TPDGCode.h>
-
-#include <array>
-#include <cmath>
-#include <cstdlib>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "CCDB/BasicCCDBManager.h"
-#include "CCDB/CcdbApi.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
@@ -35,6 +20,9 @@
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
 #include "CommonConstants/PhysicsConstants.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
@@ -42,9 +30,23 @@
 #include "Framework/HistogramRegistry.h"
 #include "Framework/StepTHn.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "ReconstructionDataFormats/Track.h"
 
+#include <TDatabasePDG.h>
+#include <TDirectory.h>
+#include <TFile.h>
+#include <TH1F.h>
+#include <TH2F.h>
+#include <THn.h>
+#include <TLorentzVector.h>
+#include <TMath.h>
+#include <TObjArray.h>
+#include <TPDGCode.h>
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.auto-resolution/PWGLF/Tasks/Resonances/xi1530Analysis.cxx b/.auto-resolution/PWGLF/Tasks/Resonances/xi1530Analysis.cxx
index 73694dda058..ada855ae4fb 100644
--- a/.auto-resolution/PWGLF/Tasks/Resonances/xi1530Analysis.cxx
+++ b/.auto-resolution/PWGLF/Tasks/Resonances/xi1530Analysis.cxx
@@ -13,20 +13,23 @@
 /// \brief Invariant Mass Reconstruction of Xi(1530) Resonance
 /// \author Yash Patley <yash.patley@cern.ch>
 
-#include <TLorentzVector.h>
-#include <TRandom.h>
-#include <vector>
+#include "PWGLF/DataModel/LFResonanceTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Common/DataModel/PIDResponse.h"
+#include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Framework/AnalysisTask.h"
+#include "Common/DataModel/PIDResponse.h"
+
+#include "CommonConstants/PhysicsConstants.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/RecoDecay.h"
+
+#include <TLorentzVector.h>
+#include <TRandom.h>
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/Tasks/Resonances/xi1530Analysisqa.cxx b/.auto-resolution/PWGLF/Tasks/Resonances/xi1530Analysisqa.cxx
index 42773fa2947..0fa785a0579 100644
--- a/.auto-resolution/PWGLF/Tasks/Resonances/xi1530Analysisqa.cxx
+++ b/.auto-resolution/PWGLF/Tasks/Resonances/xi1530Analysisqa.cxx
@@ -14,21 +14,23 @@
 ///
 /// \author Min-jae Kim <minjae.kim@cern.ch>, Bong-Hwi Lim <bong-hwi.lim@cern.ch>
 // #include <TLorentzVector.h>
-#include "Math/Vector4D.h"
-#include "TF1.h"
-#include "TRandom3.h"
+#include "PWGLF/DataModel/LFResonanceTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Common/DataModel/PIDResponse.h"
+#include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "Common/DataModel/PIDResponse.h"
+
 #include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/RecoDecay.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
+#include "Math/Vector4D.h"
+#include "TF1.h"
+#include "TRandom3.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/Tasks/Strangeness/cascadeanalysis.cxx b/.auto-resolution/PWGLF/Tasks/Strangeness/cascadeanalysis.cxx
index baf37b72717..4f9de5dbb74 100644
--- a/.auto-resolution/PWGLF/Tasks/Strangeness/cascadeanalysis.cxx
+++ b/.auto-resolution/PWGLF/Tasks/Strangeness/cascadeanalysis.cxx
@@ -28,31 +28,33 @@
 //    david.dobrigkeit.chinellato@cern.ch
 //
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
+#include <Math/Vector4D.h>
+#include <TDatabasePDG.h>
 #include <TFile.h>
 #include <TH2F.h>
-#include <TProfile.h>
 #include <TLorentzVector.h>
-#include <Math/Vector4D.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
-#include <cmath>
+#include <TProfile.h>
+
 #include <array>
+#include <cmath>
 #include <cstdlib>
-#include "Framework/ASoAHelpers.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/Tasks/Strangeness/cascadeanalysisMC.cxx b/.auto-resolution/PWGLF/Tasks/Strangeness/cascadeanalysisMC.cxx
index a1947c8b6b5..e4fe51055bd 100644
--- a/.auto-resolution/PWGLF/Tasks/Strangeness/cascadeanalysisMC.cxx
+++ b/.auto-resolution/PWGLF/Tasks/Strangeness/cascadeanalysisMC.cxx
@@ -31,31 +31,33 @@
 //    david.dobrigkeit.chinellato@cern.ch
 //
 
-#include <Math/Vector4D.h>
-#include <cmath>
-#include <array>
-#include <cstdlib>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
+#include <Math/Vector4D.h>
+#include <TDatabasePDG.h>
 #include <TFile.h>
 #include <TH2F.h>
-#include <TProfile.h>
 #include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
+#include <TProfile.h>
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/Tasks/Strangeness/cascpolsp.cxx b/.auto-resolution/PWGLF/Tasks/Strangeness/cascpolsp.cxx
index 237fe8ba375..68fa15f699e 100644
--- a/.auto-resolution/PWGLF/Tasks/Strangeness/cascpolsp.cxx
+++ b/.auto-resolution/PWGLF/Tasks/Strangeness/cascpolsp.cxx
@@ -11,52 +11,53 @@
 // Cascade polarisation task
 // prottay.das@cern.ch
 
-#include <TH1F.h>
+#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/DataModel/SPCalibrationTables.h"
+#include "PWGLF/DataModel/cascqaanalysis.h"
+
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/FT0Corrected.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include "Math/GenVector/Boost.h"
+#include "Math/Vector3D.h"
+#include "Math/Vector4D.h"
+#include "TF1.h"
+#include "TRandom3.h"
+#include <TDatabasePDG.h>
 #include <TDirectory.h>
+#include <TFile.h>
+#include <TH1F.h>
+#include <TH2F.h>
 #include <THn.h>
 #include <TLorentzVector.h>
 #include <TMath.h>
 #include <TObjArray.h>
-#include <TFile.h>
-#include <TH2F.h>
-#include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
-#include <cmath>
+
 #include <array>
+#include <cmath>
 #include <cstdlib>
 
-#include "TRandom3.h"
-#include "Math/Vector3D.h"
-#include "Math/Vector4D.h"
-#include "Math/GenVector/Boost.h"
-#include "TF1.h"
-
-#include "PWGLF/DataModel/SPCalibrationTables.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/Core/trackUtilities.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/TrackSelection.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
-#include "Common/DataModel/FT0Corrected.h"
-#include "PWGLF/DataModel/cascqaanalysis.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.auto-resolution/PWGLF/Tasks/Strangeness/cascpostprocessing.cxx b/.auto-resolution/PWGLF/Tasks/Strangeness/cascpostprocessing.cxx
index d92e48733b5..5d521b5348a 100644
--- a/.auto-resolution/PWGLF/Tasks/Strangeness/cascpostprocessing.cxx
+++ b/.auto-resolution/PWGLF/Tasks/Strangeness/cascpostprocessing.cxx
@@ -16,14 +16,16 @@
 /// \modified by Roman Nepeivoda (roman.nepeivoda@cern.ch)
 /// \since June 1, 2023
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/DataModel/cascqaanalysis.h"
+
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGLF/DataModel/cascqaanalysis.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 
 // constants
 const float ctauxiPDG = 4.91;     // from PDG
diff --git a/.auto-resolution/PWGLF/Tasks/Strangeness/derivedcascadeanalysis.cxx b/.auto-resolution/PWGLF/Tasks/Strangeness/derivedcascadeanalysis.cxx
index 95a25f589e3..b49650dce88 100644
--- a/.auto-resolution/PWGLF/Tasks/Strangeness/derivedcascadeanalysis.cxx
+++ b/.auto-resolution/PWGLF/Tasks/Strangeness/derivedcascadeanalysis.cxx
@@ -13,44 +13,47 @@
 /// \brief Tasks processing derived data for Cascade analysis in PbPb collisions
 /// \author Lucia Anna Tarasovicova (lucia.anna.husova@cern.ch)
 
-#include <string>
-#include <vector>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "Common/CCDB/ctpRateFetcher.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "MetadataHelper.h"
+
 #include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/CCDB/EventSelectionParams.h"
+#include "Common/CCDB/TriggerAliases.h"
+#include "Common/CCDB/ctpRateFetcher.h"
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "Framework/StaticFor.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "Framework/ConfigParamSpec.h"
-#include "Common/CCDB/EventSelectionParams.h"
-#include "Common/CCDB/TriggerAliases.h"
 #include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/LHCConstants.h"
-#include "Framework/HistogramRegistry.h"
 #include "DataFormatsFT0/Digit.h"
-#include "DataFormatsParameters/GRPLHCIFData.h"
+#include "DataFormatsParameters/AggregatedRunInfo.h"
 #include "DataFormatsParameters/GRPECSObject.h"
+#include "DataFormatsParameters/GRPLHCIFData.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/ConfigParamSpec.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
 #include "ITSMFTBase/DPLAlpideParam.h"
-#include "MetadataHelper.h"
-#include "DataFormatsParameters/AggregatedRunInfo.h"
+#include "ReconstructionDataFormats/Track.h"
 
 #include <TFile.h>
 #include <TH2F.h>
-#include <TProfile.h>
 #include <TLorentzVector.h>
 #include <TPDGCode.h>
+#include <TProfile.h>
+
+#include <string>
+#include <vector>
 
 // constants
 const float ctauxiPDG = 4.91;     // from PDG
diff --git a/.auto-resolution/PWGLF/Tasks/Strangeness/derivedlambdakzeroanalysis.cxx b/.auto-resolution/PWGLF/Tasks/Strangeness/derivedlambdakzeroanalysis.cxx
index 544ed23807a..97ab9a0ad53 100644
--- a/.auto-resolution/PWGLF/Tasks/Strangeness/derivedlambdakzeroanalysis.cxx
+++ b/.auto-resolution/PWGLF/Tasks/Strangeness/derivedlambdakzeroanalysis.cxx
@@ -28,44 +28,45 @@
 //    david.dobrigkeit.chinellato@cern.ch
 //
 
-#include <Math/Vector4D.h>
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <string>
-#include <map>
-#include <algorithm>
-#include <vector>
-
-#include <TFile.h>
-#include <TH2D.h>
-#include <TProfile.h>
-#include <TLorentzVector.h>
-#include <TPDGCode.h>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "CommonConstants/MathConstants.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/trackUtilities.h"
-#include "Common/CCDB/ctpRateFetcher.h"
-#include "Common/DataModel/EventSelection.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "PWGLF/DataModel/LFStrangenessMLTables.h"
 #include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGUD/Core/SGSelector.h"
+
+#include "Common/CCDB/ctpRateFetcher.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/Core/SGSelector.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 #include "Tools/ML/MlResponse.h"
 #include "Tools/ML/model.h"
 
+#include "CommonConstants/MathConstants.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <Math/Vector4D.h>
+#include <TFile.h>
+#include <TH2D.h>
+#include <TLorentzVector.h>
+#include <TPDGCode.h>
+#include <TProfile.h>
+
+#include <algorithm>
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <map>
+#include <string>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.auto-resolution/PWGLF/Tasks/Strangeness/derivedupcanalysis.cxx b/.auto-resolution/PWGLF/Tasks/Strangeness/derivedupcanalysis.cxx
index b3021033d32..386a61a1e25 100644
--- a/.auto-resolution/PWGLF/Tasks/Strangeness/derivedupcanalysis.cxx
+++ b/.auto-resolution/PWGLF/Tasks/Strangeness/derivedupcanalysis.cxx
@@ -13,34 +13,37 @@
 /// \brief Analysis of strangeness production in UPC collisions
 /// \author Roman Nepeivoda (roman.nepeivoda@cern.ch)
 
-#include <bitset>
-#include <TFile.h>
-#include <TH2F.h>
-#include <TProfile.h>
-#include <TPDGCode.h>
-#include <vector>
-#include <algorithm>
-#include <cmath>
-#include <string>
+#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/Utils/strangenessMasks.h"
+#include "PWGUD/Core/SGSelector.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/StaticFor.h"
-#include "PWGUD/Core/SGSelector.h"
-#include "PWGLF/Utils/strangenessMasks.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <TFile.h>
+#include <TH2F.h>
+#include <TPDGCode.h>
+#include <TProfile.h>
+
+#include <algorithm>
+#include <bitset>
+#include <cmath>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/Tasks/Strangeness/hyperon-reco-test.cxx b/.auto-resolution/PWGLF/Tasks/Strangeness/hyperon-reco-test.cxx
index 5605730d709..85054f07f7b 100644
--- a/.auto-resolution/PWGLF/Tasks/Strangeness/hyperon-reco-test.cxx
+++ b/.auto-resolution/PWGLF/Tasks/Strangeness/hyperon-reco-test.cxx
@@ -9,31 +9,31 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <cmath>
-#include <vector>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
 
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/Core/trackUtilities.h"
-#include "Common/DataModel/Centrality.h"
-#include "Framework/ASoAHelpers.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-
 #include "TMath.h"
-
 #include <TDatabasePDG.h>
 #include <TH2F.h>
 #include <TPDGCode.h>
 
+#include <cmath>
+#include <vector>
+
 using namespace std;
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/Tasks/Strangeness/k0_mixed_events.cxx b/.auto-resolution/PWGLF/Tasks/Strangeness/k0_mixed_events.cxx
index 5de8a32c122..73fc5ac67f7 100644
--- a/.auto-resolution/PWGLF/Tasks/Strangeness/k0_mixed_events.cxx
+++ b/.auto-resolution/PWGLF/Tasks/Strangeness/k0_mixed_events.cxx
@@ -14,40 +14,40 @@
 /// \author Sofia Tomassini, Gleb Romanenko, Nicolò Jacazio
 /// \since 31 May 2023
 
-#include <vector>
-#include <map>
-#include <memory>
-#include <string>
-#include <utility>
+#include "PWGCF/Femto3D/Core/femto3dPairTask.h"
+#include "PWGCF/Femto3D/DataModel/singletrackselector.h"
+#include "PWGLF/DataModel/mcCentrality.h"
+#include "PWGLF/Utils/inelGt.h"
 
-#include <TParameter.h>
-#include <TH1F.h>
-#include <TLorentzVector.h>
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
+#include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/Propagator.h"
 #include "Framework/ASoA.h"
-#include "Framework/DataTypes.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/DataTypes.h"
 #include "Framework/Expressions.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/StaticFor.h"
-
+#include "Framework/runDataProcessing.h"
 #include "MathUtils/Utils.h"
-#include "Common/DataModel/Multiplicity.h"
 
-#include "PWGCF/Femto3D/DataModel/singletrackselector.h"
-#include "PWGCF/Femto3D/Core/femto3dPairTask.h"
-#include "Common/DataModel/Centrality.h"
-#include "PWGLF/DataModel/mcCentrality.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "PWGLF/Utils/inelGt.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "DetectorsBase/Propagator.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+#include <TH1F.h>
+#include <TLorentzVector.h>
+#include <TParameter.h>
+
+#include <map>
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::soa;
diff --git a/.auto-resolution/PWGLF/Tasks/Strangeness/lambdaJetpolarization.cxx b/.auto-resolution/PWGLF/Tasks/Strangeness/lambdaJetpolarization.cxx
index cca1bdf193e..62420403d65 100644
--- a/.auto-resolution/PWGLF/Tasks/Strangeness/lambdaJetpolarization.cxx
+++ b/.auto-resolution/PWGLF/Tasks/Strangeness/lambdaJetpolarization.cxx
@@ -11,41 +11,46 @@
 ///
 
 /// \author Youpeng Su (yousu@cern.ch)
-#include <iostream>
-#include <string>
-#include <vector>
-#include <cmath>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/EventSelection.h"
+#include "PWGLF/DataModel/lambdaJetpolarization.h"
+
+#include "PWGJE/Core/JetBkgSubUtils.h"
+#include "PWGJE/Core/JetDerivedDataUtilities.h"
+#include "PWGJE/DataModel/Jet.h"
+#include "PWGJE/DataModel/JetReducedData.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include <TLorentzVector.h>
+
 #include "Framework/ASoA.h"
 #include "Framework/AnalysisDataModel.h"
-#include <TTree.h>
-#include <TFile.h>
-#include <TMatrixD.h>
-#include "TProfile2D.h"
-#include "PWGLF/DataModel/lambdaJetpolarization.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
+#include "Math/GenVector/Boost.h"
 #include "Math/Vector3D.h"
 #include "Math/Vector4D.h"
-#include "Math/GenVector/Boost.h"
+#include "TProfile2D.h"
+#include <TFile.h>
+#include <TLorentzVector.h>
+#include <TMatrixD.h>
+#include <TTree.h>
 
+#include <fastjet/AreaDefinition.hh>
 #include <fastjet/ClusterSequence.hh>
 #include <fastjet/ClusterSequenceArea.hh>
+#include <fastjet/GhostedAreaSpec.hh>
+#include <fastjet/PseudoJet.hh>
+#include <fastjet/Selector.hh>
 #include <fastjet/tools/JetMedianBackgroundEstimator.hh>
 #include <fastjet/tools/Subtractor.hh>
-#include <fastjet/Selector.hh>
-#include <fastjet/PseudoJet.hh>
-#include <fastjet/AreaDefinition.hh>
-#include <fastjet/GhostedAreaSpec.hh>
-#include "PWGJE/Core/JetBkgSubUtils.h"
-#include "PWGJE/Core/JetDerivedDataUtilities.h"
-#include "PWGJE/DataModel/JetReducedData.h"
-#include "PWGJE/DataModel/Jet.h"
-#include "Common/Core/trackUtilities.h"
+
+#include <cmath>
+#include <iostream>
+#include <string>
+#include <vector>
 
 using std::cout;
 using std::endl;
diff --git a/.auto-resolution/PWGLF/Tasks/Strangeness/lambdak0sflattenicity.cxx b/.auto-resolution/PWGLF/Tasks/Strangeness/lambdak0sflattenicity.cxx
index 4114d614b90..e8fa858b0b4 100755
--- a/.auto-resolution/PWGLF/Tasks/Strangeness/lambdak0sflattenicity.cxx
+++ b/.auto-resolution/PWGLF/Tasks/Strangeness/lambdak0sflattenicity.cxx
@@ -17,26 +17,27 @@
 /// \brief V0 task for production of strange hadrons as a function of flattenicity
 /// \author Suraj Prasad (suraj.prasad@cern.ch)
 
-#include <CommonConstants/MathConstants.h>
-#include <Framework/Configurable.h>
-#include <cmath>
-#include <vector>
-#include <TGraph.h>
-#include <TRandom2.h>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/Utils/inelGt.h"
+
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+#include <CommonConstants/MathConstants.h>
+#include <Framework/Configurable.h>
 
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
+#include <TGraph.h>
+#include <TRandom2.h>
 
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/Utils/inelGt.h"
+#include <cmath>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/Tasks/Strangeness/lambdakzeroanalysisMC.cxx b/.auto-resolution/PWGLF/Tasks/Strangeness/lambdakzeroanalysisMC.cxx
index afbe1a8a061..7451c31dcf9 100644
--- a/.auto-resolution/PWGLF/Tasks/Strangeness/lambdakzeroanalysisMC.cxx
+++ b/.auto-resolution/PWGLF/Tasks/Strangeness/lambdakzeroanalysisMC.cxx
@@ -22,31 +22,33 @@
 //    aimeric.landou@cern.ch (MC adaptation)
 //    david.dobrigkeit.chinellato@cern.ch (original lambdakzeroanalysis task)
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/trackUtilities.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
+#include <Math/Vector4D.h>
+#include <TDatabasePDG.h>
 #include <TFile.h>
 #include <TH2F.h>
-#include <TProfile.h>
 #include <TLorentzVector.h>
-#include <Math/Vector4D.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
-#include <cmath>
+#include <TProfile.h>
+
 #include <array>
+#include <cmath>
 #include <cstdlib>
-#include "Framework/ASoAHelpers.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/Tasks/Strangeness/lambdalambda.cxx b/.auto-resolution/PWGLF/Tasks/Strangeness/lambdalambda.cxx
index bf8579f105d..0b43d1e85c1 100644
--- a/.auto-resolution/PWGLF/Tasks/Strangeness/lambdalambda.cxx
+++ b/.auto-resolution/PWGLF/Tasks/Strangeness/lambdalambda.cxx
@@ -11,51 +11,46 @@
 
 /// \author Junlee Kim (jikim1290@gmail.com)
 
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <chrono>
-#include <string>
-#include <vector>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "TLorentzVector.h"
-#include "TRandom3.h"
-#include "TF1.h"
-#include "TVector3.h"
-#include "Math/Vector3D.h"
-#include "Math/Vector4D.h"
-#include "Math/GenVector/Boost.h"
-#include <TMath.h>
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/StepTHn.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/StaticFor.h"
-
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-
-#include "Common/Core/trackUtilities.h"
-#include "Common/Core/TrackSelection.h"
-
-#include "CommonConstants/PhysicsConstants.h"
-
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
 
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-
-#include "CCDB/CcdbApi.h"
-#include "CCDB/BasicCCDBManager.h"
+#include "Math/GenVector/Boost.h"
+#include "Math/Vector3D.h"
+#include "Math/Vector4D.h"
+#include "TF1.h"
+#include "TLorentzVector.h"
+#include "TRandom3.h"
+#include "TVector3.h"
+#include <TMath.h>
 
-#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include <array>
+#include <chrono>
+#include <cmath>
+#include <cstdlib>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/Tasks/Strangeness/lambdapolarization.cxx b/.auto-resolution/PWGLF/Tasks/Strangeness/lambdapolarization.cxx
index 38e17ba338a..8a09414f37d 100644
--- a/.auto-resolution/PWGLF/Tasks/Strangeness/lambdapolarization.cxx
+++ b/.auto-resolution/PWGLF/Tasks/Strangeness/lambdapolarization.cxx
@@ -11,54 +11,49 @@
 
 /// \author Junlee Kim (jikim1290@gmail.com)
 
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <chrono>
-#include <string>
-#include <vector>
-
-#include "TLorentzVector.h"
-#include "TRandom3.h"
-#include "TF1.h"
-#include "TVector2.h"
-#include "Math/Vector3D.h"
-#include "Math/Vector4D.h"
-#include "Math/GenVector/Boost.h"
-#include <TMath.h>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/StaticFor.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGMM/Mult/DataModel/Index.h" // for Particles2Tracks table
 
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Qvectors.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/PIDResponseITS.h"
+#include "Common/DataModel/Qvectors.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "Common/Core/trackUtilities.h"
-#include "Common/Core/TrackSelection.h"
-
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
 #include "CommonConstants/PhysicsConstants.h"
-
-#include "ReconstructionDataFormats/Track.h"
-
-#include "DataFormatsParameters/GRPObject.h"
 #include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/StaticFor.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
-#include "CCDB/CcdbApi.h"
-#include "CCDB/BasicCCDBManager.h"
+#include "Math/GenVector/Boost.h"
+#include "Math/Vector3D.h"
+#include "Math/Vector4D.h"
+#include "TF1.h"
+#include "TLorentzVector.h"
+#include "TRandom3.h"
+#include "TVector2.h"
+#include <TMath.h>
 
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGMM/Mult/DataModel/Index.h" // for Particles2Tracks table
+#include <array>
+#include <chrono>
+#include <cmath>
+#include <cstdlib>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/Tasks/Strangeness/nonPromptCascade.cxx b/.auto-resolution/PWGLF/Tasks/Strangeness/nonPromptCascade.cxx
index 79e8ad6f4e0..ec4c573a644 100644
--- a/.auto-resolution/PWGLF/Tasks/Strangeness/nonPromptCascade.cxx
+++ b/.auto-resolution/PWGLF/Tasks/Strangeness/nonPromptCascade.cxx
@@ -9,41 +9,43 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <cmath>
-#include <memory>
-#include <string>
-#include <vector>
-
-#include "Math/Vector4D.h"
-
-#include "CCDB/BasicCCDBManager.h"
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "DetectorsVertexing/PVertexer.h"
-#include "ReconstructionDataFormats/Vertex.h"
+#include "EventFiltering/Zorro.h"
+#include "EventFiltering/ZorroSummary.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "DCAFitter/DCAFitterN.h"
 #include "DataFormatsParameters/GRPMagField.h"
 #include "DataFormatsParameters/GRPObject.h"
 #include "DataFormatsTPC/BetheBlochAleph.h"
-#include "DCAFitter/DCAFitterN.h"
 #include "DetectorsBase/Propagator.h"
-#include "EventFiltering/Zorro.h"
-#include "EventFiltering/ZorroSummary.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "DetectorsVertexing/PVertexer.h"
 #include "Framework/ASoA.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Vertex.h"
+
+#include "Math/Vector4D.h"
+
+#include <cmath>
+#include <memory>
+#include <string>
+#include <vector>
 // #include "PWGHF/Core/PDG.h"
+#include "PWGLF/DataModel/LFNonPromptCascadeTables.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "ReconstructionDataFormats/DCA.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "PWGLF/DataModel/LFNonPromptCascadeTables.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/Tasks/Strangeness/sigmaanalysis.cxx b/.auto-resolution/PWGLF/Tasks/Strangeness/sigmaanalysis.cxx
index c01a0a71cae..eb16b8f4b04 100644
--- a/.auto-resolution/PWGLF/Tasks/Strangeness/sigmaanalysis.cxx
+++ b/.auto-resolution/PWGLF/Tasks/Strangeness/sigmaanalysis.cxx
@@ -19,35 +19,39 @@
 //    gianni.shigeru.setoue.liveraro@cern.ch
 //
 
-#include <Math/Vector4D.h>
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <string>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/ASoA.h"
-#include "ReconstructionDataFormats/Track.h"
+#include "PWGLF/DataModel/LFSigmaTables.h"
+#include "PWGLF/DataModel/LFStrangenessMLTables.h"
+#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
-#include "PWGLF/DataModel/LFStrangenessMLTables.h"
-#include "PWGLF/DataModel/LFSigmaTables.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <Math/Vector4D.h>
+#include <TDatabasePDG.h>
 #include <TFile.h>
 #include <TH2F.h>
-#include <TProfile.h>
 #include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
+#include <TProfile.h>
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <string>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/Tasks/Strangeness/v0postprocessing.cxx b/.auto-resolution/PWGLF/Tasks/Strangeness/v0postprocessing.cxx
index 4f6ab094f46..43e93b06ec6 100644
--- a/.auto-resolution/PWGLF/Tasks/Strangeness/v0postprocessing.cxx
+++ b/.auto-resolution/PWGLF/Tasks/Strangeness/v0postprocessing.cxx
@@ -13,14 +13,16 @@
 /// \author Francesca Ercolessi (francesca.ercolessi@cern.ch)
 /// \since
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "PWGLF/DataModel/v0qaanalysis.h"
+
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CommonConstants/PhysicsConstants.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/Tasks/Strangeness/v0topologicalcuts.cxx b/.auto-resolution/PWGLF/Tasks/Strangeness/v0topologicalcuts.cxx
index fd351646bee..d04a84c114d 100644
--- a/.auto-resolution/PWGLF/Tasks/Strangeness/v0topologicalcuts.cxx
+++ b/.auto-resolution/PWGLF/Tasks/Strangeness/v0topologicalcuts.cxx
@@ -22,15 +22,18 @@ that are filled with the V0 invariant mass under the K0, Lambda and Antilambda m
 The cuts are passed as configurable strings for convenience.
 This analysis includes two processes, one for Real Data and one for MC Data switchable at the end of the code, only run one at a time*/
 
-#include <memory>
-#include <vector>
-#include <string>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/EventSelection.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+
 #include "CommonUtils/StringUtils.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include <memory>
+#include <string>
+#include <vector>
 
 // namespaces to be used for the plot names and topological cuts that will be given by a configurable string
 namespace cuthistoskzerosh
diff --git a/.auto-resolution/PWGLF/Tasks/Strangeness/vzero_cascade_absorption.cxx b/.auto-resolution/PWGLF/Tasks/Strangeness/vzero_cascade_absorption.cxx
index 6ca2e43ba69..3d83711e27b 100644
--- a/.auto-resolution/PWGLF/Tasks/Strangeness/vzero_cascade_absorption.cxx
+++ b/.auto-resolution/PWGLF/Tasks/Strangeness/vzero_cascade_absorption.cxx
@@ -12,25 +12,28 @@
 /// \author Alberto Caliva (alberto.caliva@cern.ch)
 /// \since September 26, 2023
 
-#include <cmath>
-#include <TMath.h>
-#include <TPDGCode.h>
-#include <TObjArray.h>
-#include <TLorentzVector.h>
-#include <TDatabasePDG.h>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <TDatabasePDG.h>
+#include <TLorentzVector.h>
+#include <TMath.h>
+#include <TObjArray.h>
+#include <TPDGCode.h>
+
+#include <cmath>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGLF/Utils/collisionCuts.h b/.auto-resolution/PWGLF/Utils/collisionCuts.h
index 399454e9368..c676edd995e 100644
--- a/.auto-resolution/PWGLF/Utils/collisionCuts.h
+++ b/.auto-resolution/PWGLF/Utils/collisionCuts.h
@@ -20,11 +20,12 @@
 #ifndef PWGLF_UTILS_COLLISIONCUTS_H_
 #define PWGLF_UTILS_COLLISIONCUTS_H_
 
-#include <vector>
+#include "Common/DataModel/EventSelection.h"
 
 #include "Framework/HistogramRegistry.h"
 #include "Framework/Logger.h"
-#include "Common/DataModel/EventSelection.h"
+
+#include <vector>
 
 namespace o2::analysis
 {
diff --git a/.auto-resolution/PWGLF/Utils/mcParticle.h b/.auto-resolution/PWGLF/Utils/mcParticle.h
index e85d98ca5f0..b8a9ffd5def 100644
--- a/.auto-resolution/PWGLF/Utils/mcParticle.h
+++ b/.auto-resolution/PWGLF/Utils/mcParticle.h
@@ -20,11 +20,11 @@
 #ifndef PWGLF_UTILS_MCPARTICLE_H_
 #define PWGLF_UTILS_MCPARTICLE_H_
 
+#include "ReconstructionDataFormats/PID.h"
+
 #include <string>
 #include <vector>
 
-#include "ReconstructionDataFormats/PID.h"
-
 namespace o2
 {
 namespace pwglf
diff --git a/.auto-resolution/PWGLF/Utils/rsnOutput.h b/.auto-resolution/PWGLF/Utils/rsnOutput.h
index 592eaef40cc..6915aedd052 100644
--- a/.auto-resolution/PWGLF/Utils/rsnOutput.h
+++ b/.auto-resolution/PWGLF/Utils/rsnOutput.h
@@ -16,13 +16,13 @@
 #ifndef PWGLF_UTILS_RSNOUTPUT_H_
 #define PWGLF_UTILS_RSNOUTPUT_H_
 
-#include <utility>
-#include <string>
-#include <vector>
-
 #include "Framework/HistogramRegistry.h"
 #include "Framework/Logger.h"
 
+#include <string>
+#include <utility>
+#include <vector>
+
 namespace o2::analysis
 {
 namespace rsn
diff --git a/.auto-resolution/PWGLF/Utils/strangenessBuilderHelper.h b/.auto-resolution/PWGLF/Utils/strangenessBuilderHelper.h
index 85257418e0a..5e693ab941f 100644
--- a/.auto-resolution/PWGLF/Utils/strangenessBuilderHelper.h
+++ b/.auto-resolution/PWGLF/Utils/strangenessBuilderHelper.h
@@ -12,25 +12,27 @@
 #ifndef PWGLF_UTILS_STRANGENESSBUILDERHELPER_H_
 #define PWGLF_UTILS_STRANGENESSBUILDERHELPER_H_
 
-#include <cstdlib>
-#include <cmath>
-#include <array>
+#include "Common/Core/trackUtilities.h"
+#include "Tools/KFparticle/KFUtilities.h"
+
+#include "CommonConstants/PhysicsConstants.h"
 #include "DCAFitter/DCAFitterN.h"
+#include "DetectorsBase/GeometryManager.h"
 #include "Framework/AnalysisDataModel.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/trackUtilities.h"
-#include "Tools/KFparticle/KFUtilities.h"
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
 
 #ifndef HomogeneousField
 #define HomogeneousField
 #endif
 
 /// includes KFParticle
-#include "KFParticle.h"
 #include "KFPTrack.h"
 #include "KFPVertex.h"
+#include "KFParticle.h"
 #include "KFParticleBase.h"
 #include "KFVertex.h"
 
diff --git a/.auto-resolution/PWGLF/Utils/svPoolCreator.h b/.auto-resolution/PWGLF/Utils/svPoolCreator.h
index c0b32c2574e..0a4c3c2d75a 100644
--- a/.auto-resolution/PWGLF/Utils/svPoolCreator.h
+++ b/.auto-resolution/PWGLF/Utils/svPoolCreator.h
@@ -12,15 +12,17 @@
 #ifndef PWGLF_UTILS_SVPOOLCREATOR_H_
 #define PWGLF_UTILS_SVPOOLCREATOR_H_
 
-#include <array>
-#include <unordered_map>
-#include <vector>
-#include <utility>
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
 #include "Common/Core/trackUtilities.h"
+
 #include "DCAFitter/DCAFitterN.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+
+#include <array>
+#include <unordered_map>
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::constants;
diff --git a/.auto-resolution/PWGLF/Utils/v0SelectionGroup.h b/.auto-resolution/PWGLF/Utils/v0SelectionGroup.h
index a353a86c742..298342d1076 100644
--- a/.auto-resolution/PWGLF/Utils/v0SelectionGroup.h
+++ b/.auto-resolution/PWGLF/Utils/v0SelectionGroup.h
@@ -12,12 +12,16 @@
 #ifndef PWGLF_UTILS_V0SELECTIONGROUP_H_
 #define PWGLF_UTILS_V0SELECTIONGROUP_H_
 
-#include <iosfwd>
-#include <Rtypes.h>
-#include <TMath.h>
 #include "v0SelectionBits.h"
-#include "Framework/Logger.h"
+
 #include "CommonConstants/PhysicsConstants.h"
+#include "Framework/Logger.h"
+
+#include <TMath.h>
+
+#include <Rtypes.h>
+
+#include <iosfwd>
 
 class v0SelectionGroup
 {
diff --git a/.auto-resolution/PWGMM/Lumi/Tasks/LumiFDDFT0.cxx b/.auto-resolution/PWGMM/Lumi/Tasks/LumiFDDFT0.cxx
index 878e0482f7c..c51de496afe 100644
--- a/.auto-resolution/PWGMM/Lumi/Tasks/LumiFDDFT0.cxx
+++ b/.auto-resolution/PWGMM/Lumi/Tasks/LumiFDDFT0.cxx
@@ -10,41 +10,38 @@
 // or submit itself to any jurisdiction.
 // author: akhuntia@cern.ch
 
-#include <array>
-#include <cmath>
-#include <iostream>
-#include <vector>
-
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "CommonUtils/NameConf.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
+#include "CommonConstants/GeomConstants.h"
+#include "CommonUtils/NameConf.h"
+#include "DataFormatsCalibration/MeanVertexObject.h"
+#include "DataFormatsFDD/Digit.h"
+#include "DataFormatsFIT/Triggers.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "DetectorsVertexing/PVertexer.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisDataModel.h"
-
-#include "DetectorsVertexing/PVertexer.h"
 #include "ReconstructionDataFormats/DCA.h"
 #include "ReconstructionDataFormats/PrimaryVertex.h"
 #include "ReconstructionDataFormats/Vertex.h"
 
-#include "DataFormatsFDD/Digit.h"
-#include "DataFormatsFIT/Triggers.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-
-#include "DetectorsBase/GeometryManager.h"
-#include "DetectorsBase/Propagator.h"
-#include "CommonConstants/GeomConstants.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "CCDB/CcdbApi.h"
-#include "DataFormatsCalibration/MeanVertexObject.h"
+#include <array>
+#include <cmath>
+#include <iostream>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGMM/Lumi/Tasks/fitLumi.cxx b/.auto-resolution/PWGMM/Lumi/Tasks/fitLumi.cxx
index a62771cda66..54e6d0dfc74 100644
--- a/.auto-resolution/PWGMM/Lumi/Tasks/fitLumi.cxx
+++ b/.auto-resolution/PWGMM/Lumi/Tasks/fitLumi.cxx
@@ -11,19 +11,20 @@
 
 // author: arvind.khuntia@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Common/DataModel/EventSelection.h"
-#include "DataFormatsFDD/Digit.h"
-#include "DataFormatsFIT/Triggers.h"
 #include "Common/DataModel/FT0Corrected.h"
 
+#include "CCDB/BasicCCDBManager.h"
 #include "CCDB/CcdbApi.h"
 #include "CommonDataFormat/BunchFilling.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPObject.h"
+#include "DataFormatsFDD/Digit.h"
+#include "DataFormatsFIT/Triggers.h"
 #include "DataFormatsParameters/GRPLHCIFData.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TH1F.h"
 #include "TH2F.h"
 
@@ -111,7 +112,7 @@ struct VdMAO2D {
           registry.get<TH1>(HIST("FT0/bcVertexCollBC"))->Fill(localBC);
         }
       } // vertex
-    }   // ft0
+    } // ft0
     nTF++;
   } // process
 
@@ -174,7 +175,7 @@ struct VdMAO2D {
         }
 
       } // vertex
-    }   // fdd
+    } // fdd
   }
   PROCESS_SWITCH(VdMAO2D, processFDD, "Process FDD trigger rates for VdM", true);
 
diff --git a/.auto-resolution/PWGMM/Lumi/Tasks/lumi.cxx b/.auto-resolution/PWGMM/Lumi/Tasks/lumi.cxx
index cc0149dbde7..f7d873cbbff 100644
--- a/.auto-resolution/PWGMM/Lumi/Tasks/lumi.cxx
+++ b/.auto-resolution/PWGMM/Lumi/Tasks/lumi.cxx
@@ -15,43 +15,35 @@
 // o2-analysis-trackselection -b --isRun3 0 | o2-analysis-mm-lumi -b
 // --configuration json://./config.json
 
-#include <array>
-#include <cmath>
-#include <iostream>
-#include <vector>
-
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
+#include "CommonConstants/GeomConstants.h"
 #include "CommonUtils/NameConf.h"
-
+#include "DataFormatsCalibration/MeanVertexObject.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "DetectorsVertexing/PVertexer.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/runDataProcessing.h"
-
-#include "DetectorsVertexing/PVertexer.h"
-
 #include "ReconstructionDataFormats/DCA.h"
 #include "ReconstructionDataFormats/PrimaryVertex.h"
 #include "ReconstructionDataFormats/Vertex.h"
 
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-
-#include "DetectorsBase/GeometryManager.h"
-#include "DetectorsBase/Propagator.h"
-
-#include "CommonConstants/GeomConstants.h"
-
-#include "CCDB/BasicCCDBManager.h"
-#include "CCDB/CcdbApi.h"
-
-#include "DataFormatsCalibration/MeanVertexObject.h"
+#include <array>
+#include <cmath>
+#include <iostream>
+#include <vector>
 
 namespace o2::aod
 {
diff --git a/.auto-resolution/PWGMM/Lumi/Tasks/lumiStability.cxx b/.auto-resolution/PWGMM/Lumi/Tasks/lumiStability.cxx
index 5938ec42cdd..3d57896d080 100644
--- a/.auto-resolution/PWGMM/Lumi/Tasks/lumiStability.cxx
+++ b/.auto-resolution/PWGMM/Lumi/Tasks/lumiStability.cxx
@@ -14,26 +14,27 @@
 ///
 /// \author Josue Martinez Garcia, josuem@cern.ch
 
-#include <utility>
-#include <map>
-#include <string>
-#include <vector>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "Common/CCDB/EventSelectionParams.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Framework/ASoAHelpers.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonDataFormat/BunchFilling.h"
 #include "DataFormatsFDD/Digit.h"
 #include "DataFormatsFT0/Digit.h"
 #include "DataFormatsFV0/Digit.h"
-#include "Framework/ASoA.h"
-#include "Common/CCDB/EventSelectionParams.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "CommonDataFormat/BunchFilling.h"
-#include "DataFormatsParameters/GRPLHCIFData.h"
 #include "DataFormatsParameters/GRPECSObject.h"
+#include "DataFormatsParameters/GRPLHCIFData.h"
+#include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include <map>
+#include <string>
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGMM/Mult/Core/include/Axes.h b/.auto-resolution/PWGMM/Mult/Core/include/Axes.h
index c215a8ba357..7cd9e1f8cc6 100644
--- a/.auto-resolution/PWGMM/Mult/Core/include/Axes.h
+++ b/.auto-resolution/PWGMM/Mult/Core/include/Axes.h
@@ -11,8 +11,8 @@
 
 #ifndef PWGMM_MULT_CORE_INCLUDE_AXES_H_
 #define PWGMM_MULT_CORE_INCLUDE_AXES_H_
-#include "Framework/HistogramSpec.h"
 #include "CommonConstants/MathConstants.h"
+#include "Framework/HistogramSpec.h"
 
 namespace pwgmm::mult
 {
diff --git a/.auto-resolution/PWGMM/Mult/Core/include/Histograms.h b/.auto-resolution/PWGMM/Mult/Core/include/Histograms.h
index 2b41c9ecefe..a173c0b9460 100644
--- a/.auto-resolution/PWGMM/Mult/Core/include/Histograms.h
+++ b/.auto-resolution/PWGMM/Mult/Core/include/Histograms.h
@@ -12,6 +12,7 @@
 #ifndef PWGMM_MULT_CORE_INCLUDE_HISTOGRAMS_H_
 #define PWGMM_MULT_CORE_INCLUDE_HISTOGRAMS_H_
 #include "TPDGCode.h"
+
 #include <array>
 #include <string_view>
 
diff --git a/.auto-resolution/PWGMM/Mult/DataModel/ReducedTables.h b/.auto-resolution/PWGMM/Mult/DataModel/ReducedTables.h
index fbdd68b89db..90ebdffbf1a 100644
--- a/.auto-resolution/PWGMM/Mult/DataModel/ReducedTables.h
+++ b/.auto-resolution/PWGMM/Mult/DataModel/ReducedTables.h
@@ -11,13 +11,14 @@
 
 #ifndef PWGMM_MULT_DATAMODEL_REDUCEDTABLES_H_
 #define PWGMM_MULT_DATAMODEL_REDUCEDTABLES_H_
-#include <vector>
-
-#include "Framework/AnalysisDataModel.h"
-#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+
+#include <vector>
+
 namespace o2::aod
 {
 
diff --git a/.auto-resolution/PWGMM/Mult/TableProducer/particles2tracks.cxx b/.auto-resolution/PWGMM/Mult/TableProducer/particles2tracks.cxx
index 6b7e7db6a17..70db2e8349b 100644
--- a/.auto-resolution/PWGMM/Mult/TableProducer/particles2tracks.cxx
+++ b/.auto-resolution/PWGMM/Mult/TableProducer/particles2tracks.cxx
@@ -16,11 +16,11 @@
 /// \brief  A task to create a reverse index from McParticles to Tracks
 ///
 
-#include "Framework/runDataProcessing.h"
+#include "Index.h"
+
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-
-#include "Index.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGMM/Mult/TableProducer/percentiles.cxx b/.auto-resolution/PWGMM/Mult/TableProducer/percentiles.cxx
index c11fca858f8..1df708f4298 100644
--- a/.auto-resolution/PWGMM/Mult/TableProducer/percentiles.cxx
+++ b/.auto-resolution/PWGMM/Mult/TableProducer/percentiles.cxx
@@ -8,20 +8,20 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
+#include "Gencentralities.h"
 #include "Selections.h"
 
+#include "Common/DataModel/Centrality.h"
+#include <Common/DataModel/EventSelection.h>
+#include <Common/DataModel/TrackSelectionTables.h>
+
+#include <CCDB/BasicCCDBManager.h>
 #include <Framework/AnalysisDataModel.h>
 #include <Framework/AnalysisTask.h>
 #include <Framework/Configurable.h>
-#include <Common/DataModel/EventSelection.h>
-#include "Common/DataModel/Centrality.h"
-#include <Common/DataModel/TrackSelectionTables.h>
 #include <Framework/O2DatabasePDGPlugin.h>
-#include <CCDB/BasicCCDBManager.h>
 #include <Framework/runDataProcessing.h>
 
-#include "Gencentralities.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.auto-resolution/PWGMM/Mult/TableProducer/reducer.cxx b/.auto-resolution/PWGMM/Mult/TableProducer/reducer.cxx
index de9d516703b..e507ca0d2c4 100644
--- a/.auto-resolution/PWGMM/Mult/TableProducer/reducer.cxx
+++ b/.auto-resolution/PWGMM/Mult/TableProducer/reducer.cxx
@@ -9,15 +9,15 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <random>
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-
-#include "Selections.h"
 #include "ReducedTables.h"
+#include "Selections.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
 
+#include <random>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.auto-resolution/PWGMM/Mult/TableProducer/reducerPostprocess.cxx b/.auto-resolution/PWGMM/Mult/TableProducer/reducerPostprocess.cxx
index d05f5534eb0..9d4b33a87da 100644
--- a/.auto-resolution/PWGMM/Mult/TableProducer/reducerPostprocess.cxx
+++ b/.auto-resolution/PWGMM/Mult/TableProducer/reducerPostprocess.cxx
@@ -9,10 +9,9 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/AnalysisTask.h"
-
 #include "ReducedTables.h"
 
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
 
 using namespace o2;
diff --git a/.auto-resolution/PWGMM/Mult/TableProducer/trackPropagation.cxx b/.auto-resolution/PWGMM/Mult/TableProducer/trackPropagation.cxx
index 8eaa59e850b..707c92b324a 100644
--- a/.auto-resolution/PWGMM/Mult/TableProducer/trackPropagation.cxx
+++ b/.auto-resolution/PWGMM/Mult/TableProducer/trackPropagation.cxx
@@ -17,25 +17,26 @@
 // collisions to this track, picks the one with the smallest DCAxy and puts it
 // in a table
 
-#include "CCDB/BasicCCDBManager.h"
+#include "bestCollisionTable.h"
+
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/CollisionAssociationTables.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/GeomConstants.h"
 #include "DataFormatsParameters/GRPMagField.h"
 #include "DetectorsBase/Propagator.h"
+#include "Field/MagneticField.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/TrackFwd.h"
+
 #include "Math/MatrixFunctions.h"
 #include "Math/SMatrix.h"
-
-#include "Field/MagneticField.h"
 #include "TGeoGlobalMagField.h"
 
-#include "Common/DataModel/CollisionAssociationTables.h"
-#include "bestCollisionTable.h"
-
 using SMatrix55 = ROOT::Math::SMatrix<double, 5, 5, ROOT::Math::MatRepSym<double, 5>>;
 using SMatrix5 = ROOT::Math::SVector<Double_t, 5>;
 
diff --git a/.auto-resolution/PWGMM/Mult/Tasks/assessment-mft.cxx b/.auto-resolution/PWGMM/Mult/Tasks/assessment-mft.cxx
index 70304229e1e..eb2cbba5a22 100644
--- a/.auto-resolution/PWGMM/Mult/Tasks/assessment-mft.cxx
+++ b/.auto-resolution/PWGMM/Mult/Tasks/assessment-mft.cxx
@@ -15,11 +15,10 @@
 // \brief This code loops over MFT tracks and fills basic histograms
 //        close to the QC ones
 
-#include "Framework/runDataProcessing.h"
+#include "CommonConstants/LHCConstants.h"
 #include "Framework/AnalysisTask.h"
-
+#include "Framework/runDataProcessing.h"
 #include "MathUtils/Utils.h"
-#include "CommonConstants/LHCConstants.h"
 
 using namespace o2;
 using namespace o2::framework;
@@ -35,7 +34,7 @@ struct AssessmentMFT {
       {"TracksChi2", "; #chi^{2}; tracks", {HistType::kTH1F, {{600, 0, 20}}}},                             //
       {"TracksNclustersEta", "; nClusters; #eta; tracks", {HistType::kTH2F, {{7, 4, 10}, {100, -8, 8}}}},  //
       {"TracksTime", "; time; #count", {HistType::kTH1D, {{6000000, 0, 60000}}}},                          //
-    }                                                                                                      //
+    } //
   };
 
   void process(aod::Collisions::iterator const& collision, aod::MFTTracks const& tracks, aod::BCs const& bcs)
diff --git a/.auto-resolution/PWGMM/Mult/Tasks/dndeta-hi.cxx b/.auto-resolution/PWGMM/Mult/Tasks/dndeta-hi.cxx
index 7ac1bc49bb5..f26376eff27 100644
--- a/.auto-resolution/PWGMM/Mult/Tasks/dndeta-hi.cxx
+++ b/.auto-resolution/PWGMM/Mult/Tasks/dndeta-hi.cxx
@@ -9,29 +9,25 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <Math/Vector4D.h>
-#include <array>
-#include <cmath>
-#include <chrono>
-#include <cstdlib>
-#include <iostream>
-#include <TFile.h>
-#include <TH2F.h>
-#include <TProfile.h>
-#include <TPDGCode.h>
-#include <TDatabasePDG.h>
-
+#include "Index.h"
 #include "bestCollisionTable.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
+
+#include "PWGHF/Core/SelectorCuts.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "Common/CCDB/EventSelectionParams.h"
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/PIDResponse.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/MathConstants.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
@@ -41,14 +37,21 @@
 #include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/RuntimeError.h"
 #include "Framework/runDataProcessing.h"
-#include "Index.h"
 #include "ReconstructionDataFormats/GlobalTrackID.h"
 #include "ReconstructionDataFormats/Track.h"
 
-#include "PWGHF/Core/SelectorCuts.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include <Math/Vector4D.h>
+#include <TDatabasePDG.h>
+#include <TFile.h>
+#include <TH2F.h>
+#include <TPDGCode.h>
+#include <TProfile.h>
+
+#include <array>
+#include <chrono>
+#include <cmath>
+#include <cstdlib>
+#include <iostream>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGMM/Mult/Tasks/dndeta-mft.cxx b/.auto-resolution/PWGMM/Mult/Tasks/dndeta-mft.cxx
index f70cc1d638a..e7c925f4a16 100644
--- a/.auto-resolution/PWGMM/Mult/Tasks/dndeta-mft.cxx
+++ b/.auto-resolution/PWGMM/Mult/Tasks/dndeta-mft.cxx
@@ -15,9 +15,14 @@
 // \brief This code loops over MFT tracks and collisions and fills histograms
 //        useful to compute dNdeta
 
-#include <chrono>
-#include <cmath>
+#include "bestCollisionTable.h"
+
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
+#include "CommonConstants/MathConstants.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
@@ -25,17 +30,13 @@
 #include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/RuntimeError.h"
 #include "Framework/runDataProcessing.h"
-
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "CommonConstants/MathConstants.h"
 #include "MathUtils/Utils.h"
 #include "ReconstructionDataFormats/GlobalTrackID.h"
+
 #include "TDatabasePDG.h"
 
-#include "bestCollisionTable.h"
+#include <chrono>
+#include <cmath>
 
 using namespace o2;
 using namespace o2::framework;
@@ -108,7 +109,7 @@ struct PseudorapidityDensityMFT {
       {"EventSelection",
        ";status;events",
        {HistType::kTH1F, {{7, 0.5, 7.5}}}}, //
-    }                                       //
+    } //
   };
 
   void init(InitContext&)
diff --git a/.auto-resolution/PWGMM/Mult/Tasks/dndeta.cxx b/.auto-resolution/PWGMM/Mult/Tasks/dndeta.cxx
index 220bdbdebb8..97ed3227b9b 100644
--- a/.auto-resolution/PWGMM/Mult/Tasks/dndeta.cxx
+++ b/.auto-resolution/PWGMM/Mult/Tasks/dndeta.cxx
@@ -9,27 +9,28 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
+#include "Axes.h"
+#include "Functions.h"
+#include "Gencentralities.h"
+#include "Histograms.h"
+#include "Index.h"
+#include "Selections.h"
+#include "bestCollisionTable.h"
+
 #include "Common/CCDB/EventSelectionParams.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Centrality.h"
+
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/Configurable.h"
 #include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/runDataProcessing.h"
+
 #include <TDatabasePDG.h>
 #include <TPDGCode.h>
 
-#include "Gencentralities.h"
-#include "Index.h"
-#include "bestCollisionTable.h"
-
-#include "Axes.h"
-#include "Functions.h"
-#include "Selections.h"
-#include "Histograms.h"
-
 using namespace o2;
 using namespace o2::aod::track;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGMM/Mult/Tasks/dndetaMFTPbPb.cxx b/.auto-resolution/PWGMM/Mult/Tasks/dndetaMFTPbPb.cxx
index 4cc9a98d524..35da69384d7 100644
--- a/.auto-resolution/PWGMM/Mult/Tasks/dndetaMFTPbPb.cxx
+++ b/.auto-resolution/PWGMM/Mult/Tasks/dndetaMFTPbPb.cxx
@@ -15,15 +15,19 @@
 /// \author Gyula Bencedi, gyula.bencedi@cern.ch
 /// \since  Nov 2024
 
-#include <algorithm>
-#include <chrono>
-#include <cmath>
-#include <numeric>
-#include <vector>
-#include <string>
+#include "Functions.h"
+#include "Index.h"
+#include "bestCollisionTable.h"
 
-#include "CCDB/BasicCCDBManager.h"
+#include "Common/CCDB/ctpRateFetcher.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/CollisionAssociationTables.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonConstants/MathConstants.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
@@ -31,22 +35,17 @@
 #include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/RuntimeError.h"
 #include "Framework/runDataProcessing.h"
-
-#include "Common/CCDB/ctpRateFetcher.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/CollisionAssociationTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "CommonConstants/MathConstants.h"
-
 #include "MathUtils/Utils.h"
 #include "ReconstructionDataFormats/GlobalTrackID.h"
+
 #include "TPDGCode.h"
 
-#include "Functions.h"
-#include "Index.h"
-#include "bestCollisionTable.h"
+#include <algorithm>
+#include <chrono>
+#include <cmath>
+#include <numeric>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGMM/Mult/Tasks/effpt-mft.cxx b/.auto-resolution/PWGMM/Mult/Tasks/effpt-mft.cxx
index 2d3a9919922..3b343e605a2 100644
--- a/.auto-resolution/PWGMM/Mult/Tasks/effpt-mft.cxx
+++ b/.auto-resolution/PWGMM/Mult/Tasks/effpt-mft.cxx
@@ -9,24 +9,27 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <cmath>
-#include "Framework/Configurable.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RuntimeError.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "Framework/runDataProcessing.h"
+#include "Index.h"
 
-#include "ReconstructionDataFormats/GlobalTrackID.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CommonConstants/MathConstants.h"
-#include "TDatabasePDG.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/Configurable.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/RuntimeError.h"
+#include "Framework/runDataProcessing.h"
 #include "MathUtils/Utils.h"
-#include "Index.h"
+#include "ReconstructionDataFormats/GlobalTrackID.h"
+
+#include "TDatabasePDG.h"
+
+#include <cmath>
 
 using namespace o2;
 using namespace o2::framework;
@@ -219,9 +222,9 @@ struct EffPtMFT {
             registry.fill(HIST("TracksPhiEtaGenDuplicates"), particle.phi(), particle.eta());
           }
         } // the particle has a track
-      }   // loop on particlesI
-    }     // loop on collisions
-  }       // end of processTrackEfficiencyIndexed
+      } // loop on particlesI
+    } // loop on collisions
+  } // end of processTrackEfficiencyIndexed
 
   PROCESS_SWITCH(EffPtMFT, processTrackEfficiencyIndexed, "Calculate tracking efficiency vs pt (indexed)", false);
 };
diff --git a/.auto-resolution/PWGMM/Mult/Tasks/flatenicityFV0.cxx b/.auto-resolution/PWGMM/Mult/Tasks/flatenicityFV0.cxx
index 3a403d9ea1b..61128107a83 100644
--- a/.auto-resolution/PWGMM/Mult/Tasks/flatenicityFV0.cxx
+++ b/.auto-resolution/PWGMM/Mult/Tasks/flatenicityFV0.cxx
@@ -8,8 +8,11 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include <cmath>
-#include <vector>
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
@@ -17,16 +20,13 @@
 #include "Framework/HistogramRegistry.h"
 #include "Framework/StaticFor.h"
 #include "Framework/runDataProcessing.h"
-
 #include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 
 #include <TGraph.h>
 
+#include <cmath>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.auto-resolution/PWGMM/Mult/Tasks/flattenicty-chrg.cxx b/.auto-resolution/PWGMM/Mult/Tasks/flattenicty-chrg.cxx
index fbfa4ab578d..9e49ff8918b 100644
--- a/.auto-resolution/PWGMM/Mult/Tasks/flattenicty-chrg.cxx
+++ b/.auto-resolution/PWGMM/Mult/Tasks/flattenicty-chrg.cxx
@@ -17,29 +17,29 @@
 //
 // \since 2024
 
-#include <cmath>
-#include <string>
-#include <string_view>
-#include <vector>
-
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 #include "EventFiltering/filterTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
+#include "DataFormatsFT0/Digit.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/StaticFor.h"
 #include "Framework/runDataProcessing.h"
-
-#include "CCDB/BasicCCDBManager.h"
-#include "CCDB/CcdbApi.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "DataFormatsFT0/Digit.h"
 #include "ReconstructionDataFormats/Track.h"
 
+#include <cmath>
+#include <string>
+#include <string_view>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.auto-resolution/PWGMM/Mult/Tasks/heavy-ion-mult.cxx b/.auto-resolution/PWGMM/Mult/Tasks/heavy-ion-mult.cxx
index bb12521502d..b6de125b7f0 100644
--- a/.auto-resolution/PWGMM/Mult/Tasks/heavy-ion-mult.cxx
+++ b/.auto-resolution/PWGMM/Mult/Tasks/heavy-ion-mult.cxx
@@ -18,22 +18,21 @@
 // 3. https://github.com/AliceO2Group/O2Physics/blob/master/PWGMM/Mult/Tasks/puremc-dndeta.cxx
 // 4. O2 analysis tutorial: https://indico.cern.ch/event/1267433/
 
-#include <cmath>
-#include <cstdlib>
-#include <iostream>
-#include <TPDGCode.h>
-#include <TDatabasePDG.h>
-#include <vector>
-
+#include "Index.h"
 #include "bestCollisionTable.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "Common/Core/trackUtilities.h"
+
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "Common/CCDB/EventSelectionParams.h"
 #include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/MathConstants.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
@@ -43,9 +42,14 @@
 #include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/GlobalTrackID.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "Index.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include <TDatabasePDG.h>
+#include <TPDGCode.h>
+
+#include <cmath>
+#include <cstdlib>
+#include <iostream>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGMM/Mult/Tasks/mcdata_split_test.cxx b/.auto-resolution/PWGMM/Mult/Tasks/mcdata_split_test.cxx
index 5d5194be4be..731e8877b8a 100644
--- a/.auto-resolution/PWGMM/Mult/Tasks/mcdata_split_test.cxx
+++ b/.auto-resolution/PWGMM/Mult/Tasks/mcdata_split_test.cxx
@@ -13,17 +13,15 @@
 ///
 /// \author hhesouno
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
-
-#include "ReconstructionDataFormats/GlobalTrackID.h"
-
-#include "Common/DataModel/EventSelection.h"
-
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/GlobalTrackID.h"
 
 #include <TRandom.h>
 
diff --git a/.auto-resolution/PWGMM/Mult/Tasks/multiplicityPbPb.cxx b/.auto-resolution/PWGMM/Mult/Tasks/multiplicityPbPb.cxx
index 367b7e991a6..c3a4d1baeab 100644
--- a/.auto-resolution/PWGMM/Mult/Tasks/multiplicityPbPb.cxx
+++ b/.auto-resolution/PWGMM/Mult/Tasks/multiplicityPbPb.cxx
@@ -13,17 +13,15 @@
 ///
 /// \author hhesouno
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
-
-#include "ReconstructionDataFormats/GlobalTrackID.h"
-
-#include "Common/DataModel/EventSelection.h"
-
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/GlobalTrackID.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGMM/Mult/Tasks/puremc-dndeta.cxx b/.auto-resolution/PWGMM/Mult/Tasks/puremc-dndeta.cxx
index 86e52b38850..bc033151387 100644
--- a/.auto-resolution/PWGMM/Mult/Tasks/puremc-dndeta.cxx
+++ b/.auto-resolution/PWGMM/Mult/Tasks/puremc-dndeta.cxx
@@ -9,17 +9,19 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
+#include "Axes.h"
+#include "Histograms.h"
+
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/runDataProcessing.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+
 #include <TDatabasePDG.h>
 #include <TPDGCode.h>
 
-#include "Axes.h"
-#include "Histograms.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.auto-resolution/PWGMM/Mult/Tasks/run2dndeta.cxx b/.auto-resolution/PWGMM/Mult/Tasks/run2dndeta.cxx
index 9db9fd291d9..f3b5012010b 100644
--- a/.auto-resolution/PWGMM/Mult/Tasks/run2dndeta.cxx
+++ b/.auto-resolution/PWGMM/Mult/Tasks/run2dndeta.cxx
@@ -8,25 +8,26 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include <cmath>
-#include "Framework/Configurable.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonConstants/MathConstants.h"
 #include "Framework/ASoAHelpers.h"
-#include "Framework/RuntimeError.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/Configurable.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/RuntimeError.h"
 #include "Framework/runDataProcessing.h"
-
 #include "ReconstructionDataFormats/GlobalTrackID.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "CommonConstants/MathConstants.h"
-#include "TDatabasePDG.h"
 
+#include "TDatabasePDG.h"
 #include <TF1.h>
 
+#include <cmath>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
@@ -56,7 +57,7 @@ struct PseudorapidityDensity {
       {"TracksEtaZvtx_gt0", "; #eta; Z_{vtx}; tracks", {HistType::kTH2F, {{21, -2.1, 2.1}, {201, -20.1, 20.1}}}},    //
       {"TracksPhiEta", "; #varphi; #eta; tracks", {HistType::kTH2F, {{600, 0, 2 * M_PI}, {21, -2.1, 2.1}}}},         //
       {"EventSelection", ";status;events", {HistType::kTH1F, {{4, 0.5, 4.5}}}}                                       //
-    }                                                                                                                //
+    } //
   };
 
   void init(InitContext&)
diff --git a/.auto-resolution/PWGMM/Mult/Tasks/vertexing-fwd.cxx b/.auto-resolution/PWGMM/Mult/Tasks/vertexing-fwd.cxx
index aecb9e7cd9c..cce0162eb7e 100644
--- a/.auto-resolution/PWGMM/Mult/Tasks/vertexing-fwd.cxx
+++ b/.auto-resolution/PWGMM/Mult/Tasks/vertexing-fwd.cxx
@@ -16,18 +16,19 @@
 // \brief This code loops over every ambiguous MFT tracks and associates
 // them to a collision that has the smallest DCAxy
 
-#include <cmath>
+#include "CommonConstants/LHCConstants.h"
+#include "CommonConstants/MathConstants.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/Configurable.h"
+#include "Framework/runDataProcessing.h"
+#include "MathUtils/Utils.h"
 #include "ReconstructionDataFormats/TrackFwd.h"
+
 #include "Math/MatrixFunctions.h"
 #include "Math/SMatrix.h"
-#include "MathUtils/Utils.h"
-#include "Framework/Configurable.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/runDataProcessing.h"
 
-#include "CommonConstants/MathConstants.h"
-#include "CommonConstants/LHCConstants.h"
+#include <cmath>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGMM/UE/Tasks/dedx_analysys.cxx b/.auto-resolution/PWGMM/UE/Tasks/dedx_analysys.cxx
index 13c8b32b20e..37b67cb01b6 100644
--- a/.auto-resolution/PWGMM/UE/Tasks/dedx_analysys.cxx
+++ b/.auto-resolution/PWGMM/UE/Tasks/dedx_analysys.cxx
@@ -12,19 +12,21 @@
 /// \author Paola Vargas
 /// \since January 8, 2025
 
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Multiplicity.h"
+
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "ReconstructionDataFormats/Track.h"
 
 using namespace o2;
diff --git a/.auto-resolution/PWGMM/UE/Tasks/ue-zdc-analysys.cxx b/.auto-resolution/PWGMM/UE/Tasks/ue-zdc-analysys.cxx
index ec5294f7248..9f7c48a0aaf 100644
--- a/.auto-resolution/PWGMM/UE/Tasks/ue-zdc-analysys.cxx
+++ b/.auto-resolution/PWGMM/UE/Tasks/ue-zdc-analysys.cxx
@@ -12,16 +12,17 @@
 /// \brief Task for ZDC
 /// \author
 /// \since
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/CCDB/EventSelectionParams.h"
 #include "Common/CCDB/TriggerAliases.h"
+#include "Common/Core/TrackSelection.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/Core/TrackSelection.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/GlobalTrackID.h"
 #include "ReconstructionDataFormats/Track.h"
 
diff --git a/.auto-resolution/PWGMM/UE/Tasks/uecharged.cxx b/.auto-resolution/PWGMM/UE/Tasks/uecharged.cxx
index 9cfaeb96022..8e2d6a01bc0 100644
--- a/.auto-resolution/PWGMM/UE/Tasks/uecharged.cxx
+++ b/.auto-resolution/PWGMM/UE/Tasks/uecharged.cxx
@@ -12,30 +12,30 @@
 /// \since November 2021
 /// \last update: July 2024
 
-#include <cmath>
-#include <vector>
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/StaticFor.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-
+#include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/Core/TrackSelectionDefaults.h"
 
 #include "TDatabasePDG.h"
+#include <TF1.h>
 #include <TH1F.h>
 #include <TH2F.h>
-#include <TF1.h>
 #include <TRandom.h>
 
+#include <cmath>
+#include <vector>
+
 // TODO: implement 50% stat for MC closure vs 50% for testing, add flag for weak decays
 
 using namespace o2;
diff --git a/.auto-resolution/PWGUD/AQC/FITtest.cxx b/.auto-resolution/PWGUD/AQC/FITtest.cxx
index bdeaaa34426..a522d758d4a 100644
--- a/.auto-resolution/PWGUD/AQC/FITtest.cxx
+++ b/.auto-resolution/PWGUD/AQC/FITtest.cxx
@@ -13,18 +13,19 @@
 /// \author Anisa Khatun, anisa.khatun@cern.ch
 /// \since  04.08.2023
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "ReconstructionDataFormats/BCRange.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/DataModel/FT0Corrected.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/DataModel/FT0Corrected.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "CommonConstants/LHCConstants.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
+#include "CommonConstants/LHCConstants.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/BCRange.h"
+
 #include "TLorentzVector.h"
 
 using namespace o2;
diff --git a/.auto-resolution/PWGUD/AQC/udQC.cxx b/.auto-resolution/PWGUD/AQC/udQC.cxx
index 3da67d1f683..0c1ad7dba40 100644
--- a/.auto-resolution/PWGUD/AQC/udQC.cxx
+++ b/.auto-resolution/PWGUD/AQC/udQC.cxx
@@ -14,18 +14,22 @@
 /// \author Paul Buehler, paul.buehler@oeaw.ac.at
 /// \since  04.05.2023
 
-#include <vector>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "ReconstructionDataFormats/BCRange.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/DataModel/FT0Corrected.h"
 #include "PWGUD/Core/UDHelpers.h"
+
+#include "Common/DataModel/FT0Corrected.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/BCRange.h"
+
 #include "TLorentzVector.h"
 #include "TMath.h"
 
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.auto-resolution/PWGUD/AQC/udQCmidRap.cxx b/.auto-resolution/PWGUD/AQC/udQCmidRap.cxx
index acb35f21f57..43643d33707 100644
--- a/.auto-resolution/PWGUD/AQC/udQCmidRap.cxx
+++ b/.auto-resolution/PWGUD/AQC/udQCmidRap.cxx
@@ -14,14 +14,17 @@
 /// \author Paul Buehler
 /// \since 17.01.2023
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "ReconstructionDataFormats/BCRange.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/DataModel/FT0Corrected.h"
 #include "PWGUD/Core/UDHelpers.h"
+
+#include "Common/DataModel/FT0Corrected.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/BCRange.h"
+
 #include "TLorentzVector.h"
 #include "TMath.h"
 
diff --git a/.auto-resolution/PWGUD/Core/DGCutparHolder.h b/.auto-resolution/PWGUD/Core/DGCutparHolder.h
index 8312d72ac32..a67aefc4080 100644
--- a/.auto-resolution/PWGUD/Core/DGCutparHolder.h
+++ b/.auto-resolution/PWGUD/Core/DGCutparHolder.h
@@ -13,6 +13,7 @@
 #define PWGUD_CORE_DGCUTPARHOLDER_H_
 
 #include <Rtypes.h>
+
 #include <vector>
 
 // object to hold customizable cut values
diff --git a/.auto-resolution/PWGUD/Core/DGPIDSelector.cxx b/.auto-resolution/PWGUD/Core/DGPIDSelector.cxx
index 04dab87ef7a..2efc0372916 100644
--- a/.auto-resolution/PWGUD/Core/DGPIDSelector.cxx
+++ b/.auto-resolution/PWGUD/Core/DGPIDSelector.cxx
@@ -8,11 +8,13 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include <vector>
-#include <string>
-#include "CommonConstants/PhysicsConstants.h"
 #include "DGPIDSelector.h"
 
+#include "CommonConstants/PhysicsConstants.h"
+
+#include <string>
+#include <vector>
+
 // -----------------------------------------------------------------------------
 float particleMass(TDatabasePDG* pdg, int pid)
 {
diff --git a/.auto-resolution/PWGUD/Core/DGPIDSelector.h b/.auto-resolution/PWGUD/Core/DGPIDSelector.h
index c130c2094ce..191396b1074 100644
--- a/.auto-resolution/PWGUD/Core/DGPIDSelector.h
+++ b/.auto-resolution/PWGUD/Core/DGPIDSelector.h
@@ -12,12 +12,15 @@
 #ifndef PWGUD_CORE_DGPIDSELECTOR_H_
 #define PWGUD_CORE_DGPIDSELECTOR_H_
 
-#include <gandiva/projector.h>
-#include <vector>
-#include <TVector3.h>
+#include "Framework/Logger.h"
+
 #include "TDatabasePDG.h"
 #include "TLorentzVector.h"
-#include "Framework/Logger.h"
+#include <TVector3.h>
+
+#include <gandiva/projector.h>
+
+#include <vector>
 
 const int numDGPIDCutParameters = 9;
 float particleMass(TDatabasePDG* pdg, int pid);
diff --git a/.auto-resolution/PWGUD/Core/DGSelector.h b/.auto-resolution/PWGUD/Core/DGSelector.h
index c9349da9247..bcf29920c5a 100644
--- a/.auto-resolution/PWGUD/Core/DGSelector.h
+++ b/.auto-resolution/PWGUD/Core/DGSelector.h
@@ -12,14 +12,16 @@
 #ifndef PWGUD_CORE_DGSELECTOR_H_
 #define PWGUD_CORE_DGSELECTOR_H_
 
-#include <vector>
+#include "PWGUD/Core/DGCutparHolder.h"
+#include "PWGUD/Core/UDHelpers.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/Logger.h"
 
 #include "TDatabasePDG.h"
 #include "TLorentzVector.h"
-#include "Framework/Logger.h"
-#include "Framework/AnalysisTask.h"
-#include "PWGUD/Core/UDHelpers.h"
-#include "PWGUD/Core/DGCutparHolder.h"
+
+#include <vector>
 
 // -----------------------------------------------------------------------------
 // add here Selectors for different types of diffractive events
diff --git a/.auto-resolution/PWGUD/Core/SGCutParHolder.h b/.auto-resolution/PWGUD/Core/SGCutParHolder.h
index 753e9f0c96f..fcee2d79703 100644
--- a/.auto-resolution/PWGUD/Core/SGCutParHolder.h
+++ b/.auto-resolution/PWGUD/Core/SGCutParHolder.h
@@ -13,6 +13,7 @@
 #define PWGUD_CORE_SGCUTPARHOLDER_H_
 
 #include <Rtypes.h>
+
 #include <vector>
 
 // object to hold customizable cut values
diff --git a/.auto-resolution/PWGUD/Core/SGTrackSelector.h b/.auto-resolution/PWGUD/Core/SGTrackSelector.h
index 4288ef89e80..11517771eac 100644
--- a/.auto-resolution/PWGUD/Core/SGTrackSelector.h
+++ b/.auto-resolution/PWGUD/Core/SGTrackSelector.h
@@ -16,16 +16,19 @@
 #ifndef PWGUD_CORE_SGTRACKSELECTOR_H_
 #define PWGUD_CORE_SGTRACKSELECTOR_H_
 
-#include <vector>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
+#include "PWGUD/Core/SGSelector.h"
+#include "PWGUD/DataModel/UDTables.h"
+
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include <iostream>
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/SGSelector.h"
-#include <TString.h>
+#include "Framework/runDataProcessing.h"
+
 #include "TVector3.h"
+#include <TString.h>
+
+#include <iostream>
+#include <vector>
 using namespace std;
 using namespace o2;
 using namespace o2::aod;
diff --git a/.auto-resolution/PWGUD/Core/UDFSParser.cxx b/.auto-resolution/PWGUD/Core/UDFSParser.cxx
index 8759e404f69..c7206806307 100644
--- a/.auto-resolution/PWGUD/Core/UDFSParser.cxx
+++ b/.auto-resolution/PWGUD/Core/UDFSParser.cxx
@@ -9,10 +9,11 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/Logger.h"
+#include "UDFSParser.h"
+
 #include "CommonConstants/LHCConstants.h"
 #include "CommonDataFormat/BunchFilling.h"
-#include "UDFSParser.h"
+#include "Framework/Logger.h"
 
 // -----------------------------------------------------------------------------
 UDFSParser::UDFSParser(const char* filename)
diff --git a/.auto-resolution/PWGUD/Core/UDGoodRunSelector.cxx b/.auto-resolution/PWGUD/Core/UDGoodRunSelector.cxx
index ec51580cccf..06940cd3728 100644
--- a/.auto-resolution/PWGUD/Core/UDGoodRunSelector.cxx
+++ b/.auto-resolution/PWGUD/Core/UDGoodRunSelector.cxx
@@ -9,11 +9,14 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <algorithm>
+#include "PWGUD/Core/UDGoodRunSelector.h"
+
 #include "Framework/Logger.h"
+
 #include "rapidjson/document.h"
 #include "rapidjson/filereadstream.h"
-#include "PWGUD/Core/UDGoodRunSelector.h"
+
+#include <algorithm>
 
 class TFile;
 
diff --git a/.auto-resolution/PWGUD/Core/UDGoodRunSelector.h b/.auto-resolution/PWGUD/Core/UDGoodRunSelector.h
index 4cf49330698..1b73f2c3ac4 100644
--- a/.auto-resolution/PWGUD/Core/UDGoodRunSelector.h
+++ b/.auto-resolution/PWGUD/Core/UDGoodRunSelector.h
@@ -12,8 +12,8 @@
 #ifndef PWGUD_CORE_UDGOODRUNSELECTOR_H_
 #define PWGUD_CORE_UDGOODRUNSELECTOR_H_
 
-#include <string>
 #include <map>
+#include <string>
 #include <vector>
 
 // A class to select good runs
diff --git a/.auto-resolution/PWGUD/Core/UDHelpers.h b/.auto-resolution/PWGUD/Core/UDHelpers.h
index 4b692f7c5c1..ba7dc979a18 100644
--- a/.auto-resolution/PWGUD/Core/UDHelpers.h
+++ b/.auto-resolution/PWGUD/Core/UDHelpers.h
@@ -16,19 +16,22 @@
 #ifndef PWGUD_CORE_UDHELPERS_H_
 #define PWGUD_CORE_UDHELPERS_H_
 
-#include <vector>
-#include <bitset>
+#include "PWGUD/Core/DGCutparHolder.h"
+#include "PWGUD/Core/UPCHelpers.h"
 
-#include "TLorentzVector.h"
-#include "Framework/Logger.h"
-#include "DataFormatsFT0/Digit.h"
-#include "DataFormatsFIT/Triggers.h"
-#include "CommonConstants/LHCConstants.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/Core/UPCHelpers.h"
-#include "PWGUD/Core/DGCutparHolder.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonConstants/LHCConstants.h"
+#include "DataFormatsFIT/Triggers.h"
+#include "DataFormatsFT0/Digit.h"
+#include "Framework/Logger.h"
+
+#include "TLorentzVector.h"
+
+#include <bitset>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGUD/Core/UPCHelpers.h b/.auto-resolution/PWGUD/Core/UPCHelpers.h
index 03ff2475c8c..b4d0dfa8899 100644
--- a/.auto-resolution/PWGUD/Core/UPCHelpers.h
+++ b/.auto-resolution/PWGUD/Core/UPCHelpers.h
@@ -12,13 +12,17 @@
 #ifndef PWGUD_CORE_UPCHELPERS_H_
 #define PWGUD_CORE_UPCHELPERS_H_
 
-#include "Framework/AnalysisDataModel.h"
-#include "Common/DataModel/EventSelection.h"
+#include "UPCCutparHolder.h"
+
+#include "PWGUD/DataModel/UDTables.h"
+
 #include "Common/CCDB/EventSelectionParams.h"
+#include "Common/DataModel/EventSelection.h"
+
 #include "CommonConstants/LHCConstants.h"
+#include "Framework/AnalysisDataModel.h"
+
 #include "TLorentzVector.h"
-#include "UPCCutparHolder.h"
-#include "PWGUD/DataModel/UDTables.h"
 
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.auto-resolution/PWGUD/Core/UPCJpsiCentralBarrelCorrHelper.h b/.auto-resolution/PWGUD/Core/UPCJpsiCentralBarrelCorrHelper.h
index 955601495e6..77d3781cbc0 100644
--- a/.auto-resolution/PWGUD/Core/UPCJpsiCentralBarrelCorrHelper.h
+++ b/.auto-resolution/PWGUD/Core/UPCJpsiCentralBarrelCorrHelper.h
@@ -16,10 +16,11 @@
 #ifndef PWGUD_CORE_UPCJPSICENTRALBARRELCORRHELPER_H_
 #define PWGUD_CORE_UPCJPSICENTRALBARRELCORRHELPER_H_
 
-#include <vector>
-#include <algorithm>
 #include "CommonConstants/MathConstants.h"
+
+#include <algorithm>
 #include <random>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGUD/Core/UPCPairCuts.h b/.auto-resolution/PWGUD/Core/UPCPairCuts.h
index 6b0e37adca0..f0cdf532561 100644
--- a/.auto-resolution/PWGUD/Core/UPCPairCuts.h
+++ b/.auto-resolution/PWGUD/Core/UPCPairCuts.h
@@ -16,14 +16,14 @@
 #ifndef PWGUD_CORE_UPCPAIRCUTS_H_
 #define PWGUD_CORE_UPCPAIRCUTS_H_
 
-#include <cmath>
+#include "PWGUD/Core/UPCTauCentralBarrelHelperRL.h"
 
-#include "Framework/Logger.h"
-#include "Framework/HistogramRegistry.h"
 #include "CommonConstants/MathConstants.h"
 #include "CommonConstants/PhysicsConstants.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/Logger.h"
 
-#include "PWGUD/Core/UPCTauCentralBarrelHelperRL.h"
+#include <cmath>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGUD/Core/decayTree.cxx b/.auto-resolution/PWGUD/Core/decayTree.cxx
index 026c77af706..f5691c42bcd 100644
--- a/.auto-resolution/PWGUD/Core/decayTree.cxx
+++ b/.auto-resolution/PWGUD/Core/decayTree.cxx
@@ -9,16 +9,17 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <utility>
+#include "decayTree.h"
+
+#include "rapidjson/document.h"
+#include "rapidjson/filereadstream.h"
+
 #include <cstdio>
 #include <map>
 #include <string>
+#include <utility>
 #include <vector>
 
-#include "rapidjson/document.h"
-#include "rapidjson/filereadstream.h"
-#include "decayTree.h"
-
 using namespace rapidjson;
 
 // -----------------------------------------------------------------------------
diff --git a/.auto-resolution/PWGUD/Core/decayTree.h b/.auto-resolution/PWGUD/Core/decayTree.h
index 3dd4f53578b..22680126420 100644
--- a/.auto-resolution/PWGUD/Core/decayTree.h
+++ b/.auto-resolution/PWGUD/Core/decayTree.h
@@ -12,17 +12,18 @@
 #ifndef PWGUD_CORE_DECAYTREE_H_
 #define PWGUD_CORE_DECAYTREE_H_
 
-#include <utility>
-#include <map>
-#include <vector>
-#include <string>
-
 #include "Framework/AnalysisTask.h"
-#include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/Logger.h"
-#include "TLorentzVector.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+
 #include "TDatabasePDG.h"
+#include "TLorentzVector.h"
+
+#include <map>
+#include <string>
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGUD/DataModel/SGTables.h b/.auto-resolution/PWGUD/DataModel/SGTables.h
index bf9ef68da96..672d8f1763f 100644
--- a/.auto-resolution/PWGUD/DataModel/SGTables.h
+++ b/.auto-resolution/PWGUD/DataModel/SGTables.h
@@ -12,14 +12,16 @@
 #ifndef PWGUD_DATAMODEL_SGTABLES_H_
 #define PWGUD_DATAMODEL_SGTABLES_H_
 
-#include <vector>
-#include <cmath>
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoA.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/DataTypes.h"
 #include "MathUtils/Utils.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+
+#include <cmath>
+#include <vector>
 
 namespace o2::aod
 {
diff --git a/.auto-resolution/PWGUD/TableProducer/Converters/UDCollisionSelExtrasConverter.cxx b/.auto-resolution/PWGUD/TableProducer/Converters/UDCollisionSelExtrasConverter.cxx
index 1fa1882e7d5..d8585bc3377 100644
--- a/.auto-resolution/PWGUD/TableProducer/Converters/UDCollisionSelExtrasConverter.cxx
+++ b/.auto-resolution/PWGUD/TableProducer/Converters/UDCollisionSelExtrasConverter.cxx
@@ -20,11 +20,12 @@
 
 /// \author Sasha Bylinkin <alexandr.bylinkin@cern.ch>
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "PWGUD/DataModel/UDTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.auto-resolution/PWGUD/TableProducer/Converters/UDCollisionSelExtrasV002Converter.cxx b/.auto-resolution/PWGUD/TableProducer/Converters/UDCollisionSelExtrasV002Converter.cxx
index b10b467ec4d..967c94a2b18 100644
--- a/.auto-resolution/PWGUD/TableProducer/Converters/UDCollisionSelExtrasV002Converter.cxx
+++ b/.auto-resolution/PWGUD/TableProducer/Converters/UDCollisionSelExtrasV002Converter.cxx
@@ -13,11 +13,12 @@
 /// \brief Converts UDCollisionSelExtras table from version 000 to 002 and 001 to 002
 /// \author Roman Lavicka <roman.lavicka@cern.ch>
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "PWGUD/DataModel/UDTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.auto-resolution/PWGUD/TableProducer/Converters/UDCollisionsConverter.cxx b/.auto-resolution/PWGUD/TableProducer/Converters/UDCollisionsConverter.cxx
index 8be7bce717b..27883d2592d 100644
--- a/.auto-resolution/PWGUD/TableProducer/Converters/UDCollisionsConverter.cxx
+++ b/.auto-resolution/PWGUD/TableProducer/Converters/UDCollisionsConverter.cxx
@@ -20,11 +20,12 @@
 
 /// \author Sasha Bylinkin <alexandr.bylinkin@cern.ch>
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "PWGUD/DataModel/UDTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.auto-resolution/PWGUD/TableProducer/Converters/UDFwdTracksExtraConverter.cxx b/.auto-resolution/PWGUD/TableProducer/Converters/UDFwdTracksExtraConverter.cxx
index f9b1f2d0d22..bf2fd2cb4da 100644
--- a/.auto-resolution/PWGUD/TableProducer/Converters/UDFwdTracksExtraConverter.cxx
+++ b/.auto-resolution/PWGUD/TableProducer/Converters/UDFwdTracksExtraConverter.cxx
@@ -21,11 +21,12 @@
 
 /// \author Andrea Giovanni Riffero <andrea.giovanni.riffero@cern.ch>
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "PWGUD/DataModel/UDTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.auto-resolution/PWGUD/TableProducer/DGBCCandProducer.cxx b/.auto-resolution/PWGUD/TableProducer/DGBCCandProducer.cxx
index 97b60c42c9e..d5a3b64214c 100644
--- a/.auto-resolution/PWGUD/TableProducer/DGBCCandProducer.cxx
+++ b/.auto-resolution/PWGUD/TableProducer/DGBCCandProducer.cxx
@@ -14,15 +14,18 @@
 /// \author Paul Buehler, paul.buehler@oeaw.ac.at
 /// \since  30.09.2022
 
-#include <algorithm>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "ReconstructionDataFormats/Vertex.h"
-#include "PWGUD/DataModel/UDTables.h"
+#include "DGBCCandProducer.h"
+
+#include "PWGUD/Core/DGSelector.h"
 #include "PWGUD/Core/UDHelpers.h"
 #include "PWGUD/Core/UPCHelpers.h"
-#include "PWGUD/Core/DGSelector.h"
-#include "DGBCCandProducer.h"
+#include "PWGUD/DataModel/UDTables.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Vertex.h"
+
+#include <algorithm>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGUD/TableProducer/DGBCCandProducer.h b/.auto-resolution/PWGUD/TableProducer/DGBCCandProducer.h
index 07717afbfde..66f67b32a50 100644
--- a/.auto-resolution/PWGUD/TableProducer/DGBCCandProducer.h
+++ b/.auto-resolution/PWGUD/TableProducer/DGBCCandProducer.h
@@ -16,12 +16,13 @@
 #ifndef PWGUD_TABLEPRODUCER_DGBCCANDPRODUCER_H_
 #define PWGUD_TABLEPRODUCER_DGBCCANDPRODUCER_H_
 
-#include <map>
-#include <vector>
 #include "Framework/ASoA.h"
 #include "Framework/AnalysisDataModel.h"
-#include "MathUtils/Utils.h"
 #include "Framework/DataTypes.h"
+#include "MathUtils/Utils.h"
+
+#include <map>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGUD/TableProducer/fwdTrackPropagation.cxx b/.auto-resolution/PWGUD/TableProducer/fwdTrackPropagation.cxx
index cc6ba621690..523035ad0f6 100644
--- a/.auto-resolution/PWGUD/TableProducer/fwdTrackPropagation.cxx
+++ b/.auto-resolution/PWGUD/TableProducer/fwdTrackPropagation.cxx
@@ -12,22 +12,22 @@
 /// \author Diana Krupova, diana.krupova@cern.ch
 /// \since 04.06.2024
 
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
+#include "PWGUD/DataModel/UDTables.h"
 
 #include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include "TGeoGlobalMagField.h"
-#include "Field/MagneticField.h"
 #include "DetectorsBase/Propagator.h"
+#include "Field/MagneticField.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 #include "GlobalTracking/MatchGlobalFwd.h"
 #include "MCHTracking/TrackExtrap.h"
 #include "MCHTracking/TrackParam.h"
-#include "Math/SMatrix.h"
 #include "ReconstructionDataFormats/TrackFwd.h"
 
-#include "PWGUD/DataModel/UDTables.h"
+#include "Math/SMatrix.h"
+#include "TGeoGlobalMagField.h"
 
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.auto-resolution/PWGUD/TableProducer/tauEventTableProducer.cxx b/.auto-resolution/PWGUD/TableProducer/tauEventTableProducer.cxx
index 548d8701689..158dabadec0 100644
--- a/.auto-resolution/PWGUD/TableProducer/tauEventTableProducer.cxx
+++ b/.auto-resolution/PWGUD/TableProducer/tauEventTableProducer.cxx
@@ -17,20 +17,25 @@
 //
 
 // C++ headers
+#include <algorithm>
+#include <random>
 #include <set>
 #include <utility>
-#include <algorithm>
 #include <vector>
-#include <random>
 
 // O2 headers
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/runDataProcessing.h"
 
 // O2Physics headers
+#include "PWGUD/Core/SGSelector.h"
+#include "PWGUD/Core/UPCTauCentralBarrelHelperRL.h"
+#include "PWGUD/DataModel/TauEventTables.h"
+#include "PWGUD/DataModel/UDTables.h"
+
 #include "Common/CCDB/EventSelectionParams.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
@@ -38,10 +43,6 @@
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "PWGUD/Core/UPCTauCentralBarrelHelperRL.h"
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/DataModel/TauEventTables.h"
-#include "PWGUD/Core/SGSelector.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGUD/TableProducer/udMcCollisions2udCollisions.cxx b/.auto-resolution/PWGUD/TableProducer/udMcCollisions2udCollisions.cxx
index cea35fb70ea..2522dd65896 100644
--- a/.auto-resolution/PWGUD/TableProducer/udMcCollisions2udCollisions.cxx
+++ b/.auto-resolution/PWGUD/TableProducer/udMcCollisions2udCollisions.cxx
@@ -16,13 +16,14 @@
 /// \brief  A task to create a reverse index from UDMcCollisions to UDCollisions
 ///
 
-#include <vector>
+#include "PWGUD/DataModel/UDIndex.h"
+#include "PWGUD/DataModel/UDTables.h"
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/DataModel/UDIndex.h"
+#include "Framework/runDataProcessing.h"
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGUD/TableProducer/udMcParticles2udTracks.cxx b/.auto-resolution/PWGUD/TableProducer/udMcParticles2udTracks.cxx
index 4a876a72fb3..df797f9ea3a 100644
--- a/.auto-resolution/PWGUD/TableProducer/udMcParticles2udTracks.cxx
+++ b/.auto-resolution/PWGUD/TableProducer/udMcParticles2udTracks.cxx
@@ -16,13 +16,14 @@
 /// \brief  A task to create a reverse index from UDMcParticles to UDTracks
 ///
 
-#include <vector>
+#include "PWGUD/DataModel/UDIndex.h"
+#include "PWGUD/DataModel/UDTables.h"
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/DataModel/UDIndex.h"
+#include "Framework/runDataProcessing.h"
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGUD/Tasks/FwdMuonsUPC.cxx b/.auto-resolution/PWGUD/Tasks/FwdMuonsUPC.cxx
index 0c4b3d81e3b..c821c4daa1d 100644
--- a/.auto-resolution/PWGUD/Tasks/FwdMuonsUPC.cxx
+++ b/.auto-resolution/PWGUD/Tasks/FwdMuonsUPC.cxx
@@ -16,22 +16,23 @@
 
 /// \author Andrea Giovanni Riffero <andrea.giovanni.riffero@cern.ch>
 
-#include <vector>
-#include <unordered_map>
+#include "PWGUD/DataModel/UDTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPLHCIFData.h"
 #include "DataFormatsParameters/GRPECSObject.h"
-#include "PWGUD/DataModel/UDTables.h"
+#include "DataFormatsParameters/GRPLHCIFData.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 
 #include "TLorentzVector.h"
-#include "TSystem.h"
 #include "TMath.h"
 #include "TRandom3.h"
+#include "TSystem.h"
+
+#include <unordered_map>
+#include <vector>
 
 // table for saving tree with info on data
 namespace dimu
diff --git a/.auto-resolution/PWGUD/Tasks/analysisMCDPMJetSGv3.cxx b/.auto-resolution/PWGUD/Tasks/analysisMCDPMJetSGv3.cxx
index 4347871377a..6c6bfdfb3ab 100644
--- a/.auto-resolution/PWGUD/Tasks/analysisMCDPMJetSGv3.cxx
+++ b/.auto-resolution/PWGUD/Tasks/analysisMCDPMJetSGv3.cxx
@@ -13,10 +13,11 @@
 ///
 /// \author Simone Ragoni
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 // #include "TDatabasePDG.h"
 #include "PWGUD/Core/UPCHelpers.h"
 #include "PWGUD/DataModel/UDTables.h"
diff --git a/.auto-resolution/PWGUD/Tasks/decayTreeAnalyzer.cxx b/.auto-resolution/PWGUD/Tasks/decayTreeAnalyzer.cxx
index c725a2ca72a..9a379877afa 100644
--- a/.auto-resolution/PWGUD/Tasks/decayTreeAnalyzer.cxx
+++ b/.auto-resolution/PWGUD/Tasks/decayTreeAnalyzer.cxx
@@ -13,18 +13,18 @@
 // \author Paul Buehler, paul.buehler@oeaw.ac.at
 // \since  01.03.2024
 
-#include <string>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
+#include "PWGUD/Core/UDGoodRunSelector.h"
+#include "PWGUD/Core/UDHelpers.h"
+#include "PWGUD/Core/decayTree.h"
+#include "PWGUD/DataModel/UDTables.h"
 
 #include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPLHCIFData.h"
 #include "CommonConstants/LHCConstants.h"
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/UDHelpers.h"
-#include "PWGUD/Core/UDGoodRunSelector.h"
-#include "PWGUD/Core/decayTree.h"
+#include "DataFormatsParameters/GRPLHCIFData.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include <string>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGUD/Tasks/dgCandAnalyzer.cxx b/.auto-resolution/PWGUD/Tasks/dgCandAnalyzer.cxx
index 93c62c567d5..7697610eb8d 100644
--- a/.auto-resolution/PWGUD/Tasks/dgCandAnalyzer.cxx
+++ b/.auto-resolution/PWGUD/Tasks/dgCandAnalyzer.cxx
@@ -13,20 +13,21 @@
 // \author Paul Buehler, paul.buehler@oeaw.ac.at
 // \since  06.06.2022
 
-#include <set>
-#include <string>
+#include "PWGUD/Core/DGPIDSelector.h"
+#include "PWGUD/Core/UDGoodRunSelector.h"
+#include "PWGUD/Core/UDHelpers.h"
+#include "PWGUD/DataModel/UDTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
+#include "Common/DataModel/PIDResponse.h"
 
 #include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPLHCIFData.h"
 #include "CommonConstants/LHCConstants.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/UDHelpers.h"
-#include "PWGUD/Core/DGPIDSelector.h"
-#include "PWGUD/Core/UDGoodRunSelector.h"
+#include "DataFormatsParameters/GRPLHCIFData.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include <set>
+#include <string>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGUD/Tasks/diffMCDataScanner.cxx b/.auto-resolution/PWGUD/Tasks/diffMCDataScanner.cxx
index 8ad8d7ae853..1ee06c28b61 100644
--- a/.auto-resolution/PWGUD/Tasks/diffMCDataScanner.cxx
+++ b/.auto-resolution/PWGUD/Tasks/diffMCDataScanner.cxx
@@ -13,9 +13,10 @@
 /// \author Paul Buehler, paul.buehler@oeaw.ac.at
 /// \since  01.10.2021
 
-#include "Framework/AnalysisTask.h"
-#include "PWGUD/DataModel/McPIDTable.h"
 #include "PWGUD/Core/UDHelpers.h"
+#include "PWGUD/DataModel/McPIDTable.h"
+
+#include "Framework/AnalysisTask.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGUD/Tasks/diffMCQA.cxx b/.auto-resolution/PWGUD/Tasks/diffMCQA.cxx
index 19bf3016a97..f7a3fa16500 100644
--- a/.auto-resolution/PWGUD/Tasks/diffMCQA.cxx
+++ b/.auto-resolution/PWGUD/Tasks/diffMCQA.cxx
@@ -13,12 +13,14 @@
 /// \author Paul Buehler, paul.buehler@oeaw.ac.at
 /// \since  01.10.2021
 
-#include "Framework/runDataProcessing.h"
+#include "PWGUD/Core/UDHelpers.h"
+
+#include "CommonConstants/PhysicsConstants.h"
 #include "Framework/AnalysisTask.h"
-#include "TLorentzVector.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/BCRange.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "PWGUD/Core/UDHelpers.h"
+
+#include "TLorentzVector.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGUD/Tasks/diffQA.cxx b/.auto-resolution/PWGUD/Tasks/diffQA.cxx
index a1e9ec34185..6c331ca7146 100644
--- a/.auto-resolution/PWGUD/Tasks/diffQA.cxx
+++ b/.auto-resolution/PWGUD/Tasks/diffQA.cxx
@@ -13,13 +13,15 @@
 /// \author Paul Buehler, paul.buehler@oeaw.ac.at
 /// \since  20.05.2022
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "TLorentzVector.h"
+#include "PWGUD/Core/UDHelpers.h"
+
 #include "CommonConstants/LHCConstants.h"
-#include "ReconstructionDataFormats/BCRange.h"
 #include "CommonConstants/PhysicsConstants.h"
-#include "PWGUD/Core/UDHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/BCRange.h"
+
+#include "TLorentzVector.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGUD/Tasks/eventByevent.cxx b/.auto-resolution/PWGUD/Tasks/eventByevent.cxx
index 072ae2d961c..ba7a512a26e 100644
--- a/.auto-resolution/PWGUD/Tasks/eventByevent.cxx
+++ b/.auto-resolution/PWGUD/Tasks/eventByevent.cxx
@@ -10,16 +10,19 @@
 // or submit itself to any jurisdiction.
 //
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include <iostream>
+#include "PWGUD/Core/SGSelector.h"
+#include "PWGUD/Core/SGTrackSelector.h"
 #include "PWGUD/DataModel/UDTables.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TLorentzVector.h"
 #include <TString.h>
 #include <TTree.h>
-#include "TLorentzVector.h"
-#include "PWGUD/Core/SGSelector.h"
-#include "PWGUD/Core/SGTrackSelector.h"
+
+#include <iostream>
 
 using namespace std;
 using namespace o2;
diff --git a/.auto-resolution/PWGUD/Tasks/exclusivePentaquark.cxx b/.auto-resolution/PWGUD/Tasks/exclusivePentaquark.cxx
index c63dc7fce68..24c7cd2b674 100644
--- a/.auto-resolution/PWGUD/Tasks/exclusivePentaquark.cxx
+++ b/.auto-resolution/PWGUD/Tasks/exclusivePentaquark.cxx
@@ -8,15 +8,19 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include <iostream>
+#include "PWGUD/Core/SGSelector.h"
 #include "PWGUD/DataModel/UDTables.h"
-#include <TString.h>
-#include "TLorentzVector.h"
+
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/Core/SGSelector.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TLorentzVector.h"
+#include <TString.h>
+
+#include <iostream>
 using std::array;
 using namespace std;
 using namespace o2;
diff --git a/.auto-resolution/PWGUD/Tasks/exclusivePhi.cxx b/.auto-resolution/PWGUD/Tasks/exclusivePhi.cxx
index 634d17a5d8e..ba639348852 100644
--- a/.auto-resolution/PWGUD/Tasks/exclusivePhi.cxx
+++ b/.auto-resolution/PWGUD/Tasks/exclusivePhi.cxx
@@ -9,16 +9,20 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 //
-#include <vector>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include <iostream>
 #include "PWGUD/DataModel/UDTables.h"
-#include <TString.h>
-#include "TLorentzVector.h"
+
 #include "Common/DataModel/PIDResponse.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TLorentzVector.h"
+#include <TString.h>
+
+#include <iostream>
+#include <vector>
+
 using std::array;
 using namespace std;
 using namespace o2;
@@ -648,7 +652,7 @@ struct ExclusivePhi {
         }
       }
     } // Kaon Band
-  }   // end of process
+  } // end of process
 
 }; // end of struct
 
diff --git a/.auto-resolution/PWGUD/Tasks/exclusivePhiLeptons.cxx b/.auto-resolution/PWGUD/Tasks/exclusivePhiLeptons.cxx
index b212dd21723..45cdeb2d450 100644
--- a/.auto-resolution/PWGUD/Tasks/exclusivePhiLeptons.cxx
+++ b/.auto-resolution/PWGUD/Tasks/exclusivePhiLeptons.cxx
@@ -8,16 +8,20 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include <vector>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include <iostream>
+#include "PWGUD/Core/SGSelector.h"
 #include "PWGUD/DataModel/UDTables.h"
-#include <TString.h>
-#include "TLorentzVector.h"
+
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/Core/SGSelector.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TLorentzVector.h"
+#include <TString.h>
+
+#include <iostream>
+#include <vector>
 using std::array;
 using namespace std;
 using namespace o2;
diff --git a/.auto-resolution/PWGUD/Tasks/exclusivePhiLeptonsTrees.cxx b/.auto-resolution/PWGUD/Tasks/exclusivePhiLeptonsTrees.cxx
index 00abada06d4..48f00ab2524 100644
--- a/.auto-resolution/PWGUD/Tasks/exclusivePhiLeptonsTrees.cxx
+++ b/.auto-resolution/PWGUD/Tasks/exclusivePhiLeptonsTrees.cxx
@@ -8,16 +8,20 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include <vector>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include <iostream>
+#include "PWGUD/Core/SGSelector.h"
 #include "PWGUD/DataModel/UDTables.h"
-#include <TString.h>
-#include "TLorentzVector.h"
+
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/Core/SGSelector.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TLorentzVector.h"
+#include <TString.h>
+
+#include <iostream>
+#include <vector>
 using std::array;
 using namespace std;
 using namespace o2;
diff --git a/.auto-resolution/PWGUD/Tasks/exclusiveTwoProtons.cxx b/.auto-resolution/PWGUD/Tasks/exclusiveTwoProtons.cxx
index b7cf9b84004..966bd2c923a 100644
--- a/.auto-resolution/PWGUD/Tasks/exclusiveTwoProtons.cxx
+++ b/.auto-resolution/PWGUD/Tasks/exclusiveTwoProtons.cxx
@@ -8,15 +8,19 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include <iostream>
+#include "PWGUD/Core/SGSelector.h"
 #include "PWGUD/DataModel/UDTables.h"
-#include <TString.h>
-#include "TLorentzVector.h"
+
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/Core/SGSelector.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TLorentzVector.h"
+#include <TString.h>
+
+#include <iostream>
 using std::array;
 using namespace std;
 using namespace o2;
diff --git a/.auto-resolution/PWGUD/Tasks/exclusiveTwoProtonsSG.cxx b/.auto-resolution/PWGUD/Tasks/exclusiveTwoProtonsSG.cxx
index 0ac54805c69..539ed887676 100644
--- a/.auto-resolution/PWGUD/Tasks/exclusiveTwoProtonsSG.cxx
+++ b/.auto-resolution/PWGUD/Tasks/exclusiveTwoProtonsSG.cxx
@@ -8,15 +8,19 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include <iostream>
+#include "PWGUD/Core/SGSelector.h"
 #include "PWGUD/DataModel/UDTables.h"
-#include <TString.h>
-#include "TLorentzVector.h"
+
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/Core/SGSelector.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TLorentzVector.h"
+#include <TString.h>
+
+#include <iostream>
 using std::array;
 using namespace std;
 using namespace o2;
diff --git a/.auto-resolution/PWGUD/Tasks/flowCumulantsUpc.cxx b/.auto-resolution/PWGUD/Tasks/flowCumulantsUpc.cxx
index 155a398cd44..9300fb8d2dd 100644
--- a/.auto-resolution/PWGUD/Tasks/flowCumulantsUpc.cxx
+++ b/.auto-resolution/PWGUD/Tasks/flowCumulantsUpc.cxx
@@ -14,42 +14,44 @@
 /// \since  Mar/2025
 /// \brief  jira: , task to measure flow observables with cumulant method
 
-#include <CCDB/BasicCCDBManager.h>
-#include <cmath>
-#include <vector>
-#include <array>
-#include <unordered_map>
-#include <string>
-#include <memory>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/HistogramRegistry.h"
+#include "FlowContainer.h"
+#include "GFW.h"
+#include "GFWCumulant.h"
+#include "GFWPowerArray.h"
+#include "GFWWeights.h"
 
-#include "Common/DataModel/EventSelection.h"
+#include "PWGUD/Core/SGSelector.h"
+#include "PWGUD/DataModel/UDTables.h"
+
+#include "Common/CCDB/ctpRateFetcher.h"
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/CCDB/ctpRateFetcher.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/SGSelector.h"
-#include "TVector3.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include <CCDB/BasicCCDBManager.h>
 
-#include "GFWPowerArray.h"
-#include "GFW.h"
-#include "GFWCumulant.h"
-#include "GFWWeights.h"
-#include "FlowContainer.h"
 #include "TList.h"
+#include "TVector3.h"
+#include <TF1.h>
+#include <TObjArray.h>
 #include <TProfile.h>
 #include <TRandom3.h>
-#include <TObjArray.h>
-#include <TF1.h>
+
+#include <array>
+#include <cmath>
+#include <memory>
+#include <string>
+#include <unordered_map>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGUD/Tasks/polarisationRho.cxx b/.auto-resolution/PWGUD/Tasks/polarisationRho.cxx
index c10e86baad6..3693acbfe2a 100644
--- a/.auto-resolution/PWGUD/Tasks/polarisationRho.cxx
+++ b/.auto-resolution/PWGUD/Tasks/polarisationRho.cxx
@@ -8,13 +8,16 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include <iostream>
 #include "PWGUD/DataModel/UDTables.h"
-#include <TString.h>
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TLorentzVector.h"
+#include <TString.h>
+
+#include <iostream>
 using namespace std;
 using namespace o2;
 using namespace o2::aod;
diff --git a/.auto-resolution/PWGUD/Tasks/sgD0Analyzer.cxx b/.auto-resolution/PWGUD/Tasks/sgD0Analyzer.cxx
index 58b01cbe281..229b6f09a4a 100644
--- a/.auto-resolution/PWGUD/Tasks/sgD0Analyzer.cxx
+++ b/.auto-resolution/PWGUD/Tasks/sgD0Analyzer.cxx
@@ -13,17 +13,21 @@
 // \author Sasha Bylinkin, alexander.bylinkin@gmail.com
 // \since  April 2023
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include <iostream>
-#include "PWGUD/DataModel/UDTables.h"
 #include "PWGUD/Core/SGSelector.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "PWGUD/Core/SGTrackSelector.h"
-#include <TString.h>
+#include "PWGUD/DataModel/UDTables.h"
+
+#include "Common/DataModel/PIDResponse.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TLorentzVector.h"
+#include <TString.h>
+
+#include <iostream>
 using namespace std;
 using namespace o2;
 using namespace o2::aod;
diff --git a/.auto-resolution/PWGUD/Tasks/sgExcUniverse.cxx b/.auto-resolution/PWGUD/Tasks/sgExcUniverse.cxx
index f7dd3691c25..47369db47cc 100644
--- a/.auto-resolution/PWGUD/Tasks/sgExcUniverse.cxx
+++ b/.auto-resolution/PWGUD/Tasks/sgExcUniverse.cxx
@@ -13,17 +13,19 @@
 // \author Sasha Bylinkin, alexander.bylinkin@gmail.com
 // \since  April 2023
 
-#include "Framework/runDataProcessing.h"
+#include "PWGUD/Core/SGSelector.h"
+#include "PWGUD/Core/SGTrackSelector.h"
+#include "PWGUD/Core/UDHelpers.h"
+#include "PWGUD/DataModel/UDTables.h"
+
+#include "Common/DataModel/PIDResponse.h"
+
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
-#include "TVector3.h"
-#include "TTree.h"
 #include "TFile.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/UDHelpers.h"
-#include "PWGUD/Core/SGSelector.h"
-#include "PWGUD/Core/SGTrackSelector.h"
+#include "TTree.h"
+#include "TVector3.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGUD/Tasks/sgExclOmega.cxx b/.auto-resolution/PWGUD/Tasks/sgExclOmega.cxx
index 0a816e1dc0e..4a3cf48490f 100644
--- a/.auto-resolution/PWGUD/Tasks/sgExclOmega.cxx
+++ b/.auto-resolution/PWGUD/Tasks/sgExclOmega.cxx
@@ -13,17 +13,21 @@
 // \author Sasha Bylinkin, alexander.bylinkin@gmail.com
 // \since  April 2023
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include <iostream>
-#include "PWGUD/DataModel/UDTables.h"
 #include "PWGUD/Core/SGSelector.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "PWGUD/Core/SGTrackSelector.h"
-#include <TString.h>
+#include "PWGUD/DataModel/UDTables.h"
+
+#include "Common/DataModel/PIDResponse.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TLorentzVector.h"
+#include <TString.h>
+
+#include <iostream>
 using namespace std;
 using namespace o2;
 using namespace o2::aod;
diff --git a/.auto-resolution/PWGUD/Tasks/sgExclusivePhi.cxx b/.auto-resolution/PWGUD/Tasks/sgExclusivePhi.cxx
index df10373e571..9bea84b6ae4 100644
--- a/.auto-resolution/PWGUD/Tasks/sgExclusivePhi.cxx
+++ b/.auto-resolution/PWGUD/Tasks/sgExclusivePhi.cxx
@@ -9,16 +9,20 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 //
-#include <vector>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include <iostream>
+#include "PWGUD/Core/SGSelector.h"
 #include "PWGUD/DataModel/UDTables.h"
-#include <TString.h>
-#include "TLorentzVector.h"
+
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/Core/SGSelector.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TLorentzVector.h"
+#include <TString.h>
+
+#include <iostream>
+#include <vector>
 
 using std::array;
 using namespace std;
@@ -655,7 +659,7 @@ struct sgExclusivePhi {
             }
           }
         } // end of two tracks only loop
-      }   // vertex cut
+      } // vertex cut
 
       if (allTracksAreKaonsBandPID.size() == 2) {
 
@@ -731,8 +735,8 @@ struct sgExclusivePhi {
           }
         }
       } // Kaon Band
-    }   // double gap
-  }     // end of process
+    } // double gap
+  } // end of process
 
 }; // end of struct
 
diff --git a/.auto-resolution/PWGUD/Tasks/sgExclusivePhiITSselections.cxx b/.auto-resolution/PWGUD/Tasks/sgExclusivePhiITSselections.cxx
index 2d8bc72c0f6..6a70d8f3a1d 100644
--- a/.auto-resolution/PWGUD/Tasks/sgExclusivePhiITSselections.cxx
+++ b/.auto-resolution/PWGUD/Tasks/sgExclusivePhiITSselections.cxx
@@ -9,16 +9,20 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 //
-#include <vector>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include <iostream>
+#include "PWGUD/Core/SGSelector.h"
 #include "PWGUD/DataModel/UDTables.h"
-#include <TString.h>
-#include "TLorentzVector.h"
+
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/Core/SGSelector.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TLorentzVector.h"
+#include <TString.h>
+
+#include <iostream>
+#include <vector>
 
 using std::array;
 using namespace std;
@@ -298,7 +302,7 @@ struct sgExclusivePhiITSselections {
             }
           }
         } // Mass cut
-      }   // end of two tracks only loop
+      } // end of two tracks only loop
 
       if (allTracksAreKaonsBandPID.size() == 2) {
         registry.fill(HIST("hTracksKaons"), allTracksAreKaonsBandPID.size() + 10);
@@ -357,7 +361,7 @@ struct sgExclusivePhiITSselections {
       } // Kaon Band
 
     } // double gap
-  }   // end of process
+  } // end of process
 
   void processSG(UDCollisionsFull::iterator const& collision, udtracksfull const& tracks)
   // process function subscribing to SG data
diff --git a/.auto-resolution/PWGUD/Tasks/sgFITAnalyzer.cxx b/.auto-resolution/PWGUD/Tasks/sgFITAnalyzer.cxx
index 73d42421b87..58889965136 100644
--- a/.auto-resolution/PWGUD/Tasks/sgFITAnalyzer.cxx
+++ b/.auto-resolution/PWGUD/Tasks/sgFITAnalyzer.cxx
@@ -13,18 +13,20 @@
 // \author Sasha Bylinkin, alexander.bylinkin@gmail.com
 // \since  April 2023
 
-#include "Framework/runDataProcessing.h"
+#include "PWGUD/Core/SGSelector.h"
+#include "PWGUD/Core/SGTrackSelector.h"
+#include "PWGUD/Core/UDHelpers.h"
+#include "PWGUD/DataModel/UDTables.h"
+
+#include "Common/DataModel/PIDResponse.h"
+
 #include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 
-#include "TVector3.h"
-#include "TTree.h"
 #include "TFile.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/UDHelpers.h"
-#include "PWGUD/Core/SGSelector.h"
-#include "PWGUD/Core/SGTrackSelector.h"
+#include "TTree.h"
+#include "TVector3.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGUD/Tasks/sgFourPiAnalyzer.cxx b/.auto-resolution/PWGUD/Tasks/sgFourPiAnalyzer.cxx
index 6a6abfc4628..49f9fd42c38 100644
--- a/.auto-resolution/PWGUD/Tasks/sgFourPiAnalyzer.cxx
+++ b/.auto-resolution/PWGUD/Tasks/sgFourPiAnalyzer.cxx
@@ -13,21 +13,25 @@
 // \author Sasha Bylinkin, alexander.bylinkin@gmail.com
 // \since  April 2023
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include <iostream>
-#include "PWGUD/DataModel/UDTables.h"
 #include "PWGUD/Core/SGSelector.h"
 #include "PWGUD/Core/SGTrackSelector.h"
+#include "PWGUD/DataModel/UDTables.h"
+
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/DataTypes.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 #include "MathUtils/Utils.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include <TString.h>
+
 #include "TLorentzVector.h"
+#include <TString.h>
+
+#include <iostream>
 using namespace std;
 using namespace o2;
 using namespace o2::aod;
diff --git a/.auto-resolution/PWGUD/Tasks/sgInclJpsi.cxx b/.auto-resolution/PWGUD/Tasks/sgInclJpsi.cxx
index f5001af7c10..013a97cc20f 100644
--- a/.auto-resolution/PWGUD/Tasks/sgInclJpsi.cxx
+++ b/.auto-resolution/PWGUD/Tasks/sgInclJpsi.cxx
@@ -13,17 +13,21 @@
 // \author Sasha Bylinkin, alexander.bylinkin@gmail.com
 // \since  April 2023
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include <iostream>
-#include "PWGUD/DataModel/UDTables.h"
 #include "PWGUD/Core/SGSelector.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "PWGUD/Core/SGTrackSelector.h"
-#include <TString.h>
+#include "PWGUD/DataModel/UDTables.h"
+
+#include "Common/DataModel/PIDResponse.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TLorentzVector.h"
+#include <TString.h>
+
+#include <iostream>
 using namespace std;
 using namespace o2;
 using namespace o2::aod;
@@ -297,7 +301,7 @@ struct SGInclJpsi {
             registry.fill(HIST("sss_Ntr_mm_invm_3"), tracks.size(), v01.M(), -1);
             registry.fill(HIST("sss_mm_pt_invm_3"), v01.Pt(), v01.M(), -1);
           }
-      }
+        }
       }
       if (selectionPIDElec(t0, use_tof, nsigmatpc_cut, nsigmatof_cut) && selectionPIDElec(t1, use_tof, nsigmatpc_cut, nsigmatof_cut)) {
         // Apply pion hypothesis and create pairs
diff --git a/.auto-resolution/PWGUD/Tasks/sgPIDAnalyzer.cxx b/.auto-resolution/PWGUD/Tasks/sgPIDAnalyzer.cxx
index e4015417971..5edef2f187d 100644
--- a/.auto-resolution/PWGUD/Tasks/sgPIDAnalyzer.cxx
+++ b/.auto-resolution/PWGUD/Tasks/sgPIDAnalyzer.cxx
@@ -13,19 +13,21 @@
 // \author Sasha Bylinkin, alexander.bylinkin@gmail.com
 // \since  April 2023
 
-#include "Framework/runDataProcessing.h"
+#include "PWGUD/Core/SGSelector.h"
+#include "PWGUD/Core/SGTrackSelector.h"
+#include "PWGUD/Core/UDHelpers.h"
+#include "PWGUD/DataModel/SGTables.h"
+
+#include "Common/DataModel/PIDResponse.h"
+
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
-#include "TVector3.h"
-#include "TTree.h"
 #include "TFile.h"
+#include "TTree.h"
+#include "TVector3.h"
 #include <TH1F.h>
 #include <TH2F.h>
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/DataModel/SGTables.h"
-#include "PWGUD/Core/UDHelpers.h"
-#include "PWGUD/Core/SGSelector.h"
-#include "PWGUD/Core/SGTrackSelector.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGUD/Tasks/sgPIDSpectra.cxx b/.auto-resolution/PWGUD/Tasks/sgPIDSpectra.cxx
index 7ecea94c66d..b873d37198d 100644
--- a/.auto-resolution/PWGUD/Tasks/sgPIDSpectra.cxx
+++ b/.auto-resolution/PWGUD/Tasks/sgPIDSpectra.cxx
@@ -13,17 +13,19 @@
 // \author Sasha Bylinkin, alexander.bylinkin@gmail.com
 // \since  April 2023
 
-#include "Framework/runDataProcessing.h"
+#include "PWGUD/Core/SGSelector.h"
+#include "PWGUD/Core/SGTrackSelector.h"
+#include "PWGUD/Core/UDHelpers.h"
+#include "PWGUD/DataModel/UDTables.h"
+
+#include "Common/DataModel/PIDResponse.h"
+
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
-#include "TVector3.h"
-#include "TTree.h"
 #include "TFile.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/UDHelpers.h"
-#include "PWGUD/Core/SGSelector.h"
-#include "PWGUD/Core/SGTrackSelector.h"
+#include "TTree.h"
+#include "TVector3.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGUD/Tasks/sgPIDSpectraTable.cxx b/.auto-resolution/PWGUD/Tasks/sgPIDSpectraTable.cxx
index 9a370403a6b..f6c608a1881 100644
--- a/.auto-resolution/PWGUD/Tasks/sgPIDSpectraTable.cxx
+++ b/.auto-resolution/PWGUD/Tasks/sgPIDSpectraTable.cxx
@@ -12,19 +12,22 @@
 // \Single Gap Event Analyzer
 // \author Sasha Bylinkin, alexander.bylinkin@gmail.com
 // \since  April 2023
-#include <vector>
-#include "Framework/runDataProcessing.h"
+#include "PWGUD/Core/SGSelector.h"
+#include "PWGUD/Core/SGTrackSelector.h"
+#include "PWGUD/Core/UDHelpers.h"
+#include "PWGUD/DataModel/SGTables.h"
+#include "PWGUD/DataModel/UDTables.h"
+
+#include "Common/DataModel/PIDResponse.h"
+
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
-#include "TVector3.h"
-#include "TTree.h"
 #include "TFile.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/DataModel/SGTables.h"
-#include "PWGUD/Core/UDHelpers.h"
-#include "PWGUD/Core/SGSelector.h"
-#include "PWGUD/Core/SGTrackSelector.h"
+#include "TTree.h"
+#include "TVector3.h"
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGUD/Tasks/sgSixPiAnalyzer.cxx b/.auto-resolution/PWGUD/Tasks/sgSixPiAnalyzer.cxx
index c3561ad7026..888b4325a61 100644
--- a/.auto-resolution/PWGUD/Tasks/sgSixPiAnalyzer.cxx
+++ b/.auto-resolution/PWGUD/Tasks/sgSixPiAnalyzer.cxx
@@ -13,22 +13,25 @@
 // \author Sasha Bylinkin, alexander.bylinkin@gmail.com
 // \since  April 2023
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include <iostream>
-#include "PWGUD/DataModel/UDTables.h"
 #include "PWGUD/Core/SGSelector.h"
 #include "PWGUD/Core/SGTrackSelector.h"
+#include "PWGUD/DataModel/UDTables.h"
+
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/DataTypes.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 #include "MathUtils/Utils.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 
-#include <TString.h>
 #include "TLorentzVector.h"
+#include <TString.h>
+
+#include <iostream>
 using namespace std;
 using namespace o2;
 using namespace o2::aod;
diff --git a/.auto-resolution/PWGUD/Tasks/sgSpectraAnalyzer.cxx b/.auto-resolution/PWGUD/Tasks/sgSpectraAnalyzer.cxx
index afd766e0992..17bd0d6db03 100644
--- a/.auto-resolution/PWGUD/Tasks/sgSpectraAnalyzer.cxx
+++ b/.auto-resolution/PWGUD/Tasks/sgSpectraAnalyzer.cxx
@@ -13,18 +13,20 @@
 // \author Sasha Bylinkin, alexander.bylinkin@gmail.com
 // \since  April 2023
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
+#include "PWGUD/Core/SGSelector.h"
+#include "PWGUD/Core/SGTrackSelector.h"
+#include "PWGUD/DataModel/UDTables.h"
+
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
 #include <iostream>
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/SGSelector.h"
-#include "PWGUD/Core/SGTrackSelector.h"
-//#include "Common/DataModel/PIDResponse.h"
-//#include "PWGUD/Core/RLhelper.h"
-#include <TString.h>
+// #include "Common/DataModel/PIDResponse.h"
+// #include "PWGUD/Core/RLhelper.h"
 #include "TLorentzVector.h"
+#include <TString.h>
 using namespace std;
 using namespace o2;
 using namespace o2::aod;
diff --git a/.auto-resolution/PWGUD/Tasks/sgTwoPiAnalyzer.cxx b/.auto-resolution/PWGUD/Tasks/sgTwoPiAnalyzer.cxx
index e1568bb1838..a7763f614cc 100644
--- a/.auto-resolution/PWGUD/Tasks/sgTwoPiAnalyzer.cxx
+++ b/.auto-resolution/PWGUD/Tasks/sgTwoPiAnalyzer.cxx
@@ -13,22 +13,25 @@
 // \author Sasha Bylinkin, alexander.bylinkin@gmail.com
 // \since  April 2023
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include <iostream>
-#include "PWGUD/DataModel/UDTables.h"
 #include "PWGUD/Core/SGSelector.h"
 #include "PWGUD/Core/SGTrackSelector.h"
+#include "PWGUD/DataModel/UDTables.h"
+
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/DataTypes.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 #include "MathUtils/Utils.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 
-#include <TString.h>
 #include "TLorentzVector.h"
+#include <TString.h>
+
+#include <iostream>
 using namespace std;
 using namespace o2;
 using namespace o2::aod;
diff --git a/.auto-resolution/PWGUD/Tasks/sginclusivePhiKstarSD.cxx b/.auto-resolution/PWGUD/Tasks/sginclusivePhiKstarSD.cxx
index 628818bd553..c92293b2275 100644
--- a/.auto-resolution/PWGUD/Tasks/sginclusivePhiKstarSD.cxx
+++ b/.auto-resolution/PWGUD/Tasks/sginclusivePhiKstarSD.cxx
@@ -14,29 +14,30 @@
 /// \author Sandeep Dudi, sandeep.dudi3@gmail.com
 /// \since  May 2024
 
-#include <cstdlib>
-#include <vector>
-#include <TString.h>
-#include <TMath.h>
-#include "Math/Vector4D.h"
-#include "Math/Vector3D.h"
-#include "Math/GenVector/Boost.h"
-#include "TPDGCode.h"
+#include "PWGUD/Core/SGSelector.h"
+#include "PWGUD/Core/SGTrackSelector.h"
+#include "PWGUD/Core/UPCHelpers.h"
+#include "PWGUD/DataModel/UDTables.h"
+
+#include "Common/DataModel/PIDResponse.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoA.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Vertex.h"
 
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/SGSelector.h"
-#include "PWGUD/Core/SGTrackSelector.h"
-#include "PWGUD/Core/UPCHelpers.h"
+#include "Math/GenVector/Boost.h"
+#include "Math/Vector3D.h"
+#include "Math/Vector4D.h"
+#include "TPDGCode.h"
+#include <TMath.h>
+#include <TString.h>
 
-#include "Common/DataModel/PIDResponse.h"
+#include <cstdlib>
+#include <vector>
 
 using namespace std;
 using namespace o2;
diff --git a/.auto-resolution/PWGUD/Tasks/upcAnalysis.cxx b/.auto-resolution/PWGUD/Tasks/upcAnalysis.cxx
index 74a007314e0..533e9bbeb32 100644
--- a/.auto-resolution/PWGUD/Tasks/upcAnalysis.cxx
+++ b/.auto-resolution/PWGUD/Tasks/upcAnalysis.cxx
@@ -9,16 +9,16 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TLorentzVector.h"
 #include <TH1D.h>
 #include <TH2D.h>
-#include "TLorentzVector.h"
 
 using namespace o2;
 using namespace o2::aod::evsel;
diff --git a/.auto-resolution/PWGUD/Tasks/upcCandidateAnalyzer.cxx b/.auto-resolution/PWGUD/Tasks/upcCandidateAnalyzer.cxx
index 568ecacb872..d07f76c22ee 100644
--- a/.auto-resolution/PWGUD/Tasks/upcCandidateAnalyzer.cxx
+++ b/.auto-resolution/PWGUD/Tasks/upcCandidateAnalyzer.cxx
@@ -9,11 +9,12 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "PWGUD/DataModel/UDTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TLorentzVector.h"
 
 using namespace o2;
diff --git a/.auto-resolution/PWGUD/Tasks/upcCandidateProducerQa.cpp b/.auto-resolution/PWGUD/Tasks/upcCandidateProducerQa.cpp
index 29accce2fe4..e697941c115 100644
--- a/.auto-resolution/PWGUD/Tasks/upcCandidateProducerQa.cpp
+++ b/.auto-resolution/PWGUD/Tasks/upcCandidateProducerQa.cpp
@@ -9,16 +9,18 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Common/CCDB/EventSelectionParams.h"
-#include "Common/DataModel/EventSelection.h"
-#include "CommonConstants/LHCConstants.h"
 #include "PWGUD/Core/UPCCutparHolder.h"
 #include "PWGUD/Core/UPCHelpers.h"
 #include "PWGUD/DataModel/UDTables.h"
 
+#include "Common/CCDB/EventSelectionParams.h"
+#include "Common/DataModel/EventSelection.h"
+
+#include "CommonConstants/LHCConstants.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2::framework;
 using namespace o2::framework::expressions;
 
diff --git a/.auto-resolution/PWGUD/Tasks/upcEventITSROFcounter.cxx b/.auto-resolution/PWGUD/Tasks/upcEventITSROFcounter.cxx
index 51241be5d69..7156c8038e0 100644
--- a/.auto-resolution/PWGUD/Tasks/upcEventITSROFcounter.cxx
+++ b/.auto-resolution/PWGUD/Tasks/upcEventITSROFcounter.cxx
@@ -15,24 +15,24 @@
 /// \author Roman Lavicka <roman.lavicka@cern.ch>, Austrian Academy of Sciences & SMI
 /// \since  09.08.2024
 
-#include <utility>
-#include <vector>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "ITSMFTBase/DPLAlpideParam.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "ReconstructionDataFormats/Vertex.h"
+#include "PWGUD/Core/SGSelector.h"
+#include "PWGUD/DataModel/UDTables.h"
 
 #include "Common/CCDB/EventSelectionParams.h"
 #include "Common/DataModel/EventSelection.h"
 
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/SGSelector.h"
+#include "CCDB/BasicCCDBManager.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ITSMFTBase/DPLAlpideParam.h"
+#include "ReconstructionDataFormats/Vertex.h"
 
 #include <TH1D.h>
 
+#include <utility>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.auto-resolution/PWGUD/Tasks/upcForward.cxx b/.auto-resolution/PWGUD/Tasks/upcForward.cxx
index bebcf0b2be2..16571bc28ac 100644
--- a/.auto-resolution/PWGUD/Tasks/upcForward.cxx
+++ b/.auto-resolution/PWGUD/Tasks/upcForward.cxx
@@ -14,16 +14,19 @@ o2-analysis-timestamp| o2-analysis-upc-forward | o2-analysis-event-selection  --
 for now AO2D.root I am using is
 alien:///alice/data/2015/LHC15o/000246392/pass5_lowIR/PWGZZ/Run3_Conversion/148_20210304-0829_child_1/AOD/001/AO2D.root
 */
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "Common/CCDB/TriggerAliases.h"
 #include "Common/DataModel/EventSelection.h"
-#include <iostream>
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TLorentzVector.h"
 #include <TH1D.h>
 #include <TH2D.h>
 #include <TString.h>
-#include "TLorentzVector.h"
-#include "Common/CCDB/TriggerAliases.h"
+
+#include <iostream>
 
 using namespace std;
 using namespace o2;
diff --git a/.auto-resolution/PWGUD/Tasks/upcJpsiCorr.cxx b/.auto-resolution/PWGUD/Tasks/upcJpsiCorr.cxx
index 8db8746b99d..9ec14bdf12a 100644
--- a/.auto-resolution/PWGUD/Tasks/upcJpsiCorr.cxx
+++ b/.auto-resolution/PWGUD/Tasks/upcJpsiCorr.cxx
@@ -15,22 +15,23 @@
 /// \author Sara Haidlova, sara.haidlova@cern.ch
 /// \since March 2024
 
-#include <vector>
 #include <utility>
+#include <vector>
 
 // O2 headers
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "CommonConstants/MathConstants.h"
 #include "CommonConstants/PhysicsConstants.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 // O2Physics headers
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/RecoDecay.h"
-#include "PWGUD/DataModel/UDTables.h"
+#include "PWGUD/Core/SGSelector.h"
 #include "PWGUD/Core/UDHelpers.h"
 #include "PWGUD/Core/UPCJpsiCentralBarrelCorrHelper.h"
-#include "PWGUD/Core/SGSelector.h"
+#include "PWGUD/DataModel/UDTables.h"
+
+#include "Common/Core/RecoDecay.h"
+#include "Common/DataModel/PIDResponse.h"
 
 // ROOT headers
 #include "TLorentzVector.h"
diff --git a/.auto-resolution/PWGUD/Tasks/upcMft.cxx b/.auto-resolution/PWGUD/Tasks/upcMft.cxx
index a3ae2b03287..168f9c47f96 100644
--- a/.auto-resolution/PWGUD/Tasks/upcMft.cxx
+++ b/.auto-resolution/PWGUD/Tasks/upcMft.cxx
@@ -13,27 +13,28 @@
 #include <iostream>
 
 // root headers
+#include "TLorentzVector.h"
+#include "TMath.h"
 #include <TH1F.h>
 #include <TH2F.h>
-#include "TMath.h"
-#include "TLorentzVector.h"
 
 // framework headers
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 // for track propagation
-#include "ReconstructionDataFormats/TrackFwd.h"
-#include "Math/MatrixFunctions.h"
-#include "Math/SMatrix.h"
-#include "MathUtils/Utils.h"
 #include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsMFT/TrackMFT.h"
 #include "DataFormatsParameters/GRPMagField.h"
 #include "DetectorsBase/Propagator.h"
-#include "TGeoGlobalMagField.h"
 #include "Field/MagneticField.h"
-#include "DataFormatsMFT/TrackMFT.h"
+#include "MathUtils/Utils.h"
+#include "ReconstructionDataFormats/TrackFwd.h"
+
+#include "Math/MatrixFunctions.h"
+#include "Math/SMatrix.h"
+#include "TGeoGlobalMagField.h"
 
 // define namespaces
 using namespace o2;
diff --git a/.auto-resolution/PWGUD/Tasks/upcPhotonuclearAnalysisJMG.cxx b/.auto-resolution/PWGUD/Tasks/upcPhotonuclearAnalysisJMG.cxx
index d20a78429dd..7d474f26513 100644
--- a/.auto-resolution/PWGUD/Tasks/upcPhotonuclearAnalysisJMG.cxx
+++ b/.auto-resolution/PWGUD/Tasks/upcPhotonuclearAnalysisJMG.cxx
@@ -13,15 +13,10 @@
 /// \author Josué Martínez García, josuem@cern.ch
 /// \file   upcPhotonuclearAnalysisJMG.cxx
 
-#include <vector>
-
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "Framework/StepTHn.h"
-#include "CommonConstants/MathConstants.h"
-#include <TTree.h>
+#include "PWGCF/Core/CorrelationContainer.h"
+#include "PWGUD/Core/UPCPairCuts.h"
+#include "PWGUD/Core/UPCTauCentralBarrelHelperRL.h"
+#include "PWGUD/DataModel/UDTables.h"
 
 #include "Common/CCDB/EventSelectionParams.h"
 #include "Common/Core/TrackSelection.h"
@@ -29,12 +24,18 @@
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "PWGCF/Core/CorrelationContainer.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonConstants/MathConstants.h"
 #include "DataFormatsParameters/GRPObject.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
 
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/UPCPairCuts.h"
-#include "PWGUD/Core/UPCTauCentralBarrelHelperRL.h"
+#include <TTree.h>
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGUD/Tasks/upcPionAnalysis.cxx b/.auto-resolution/PWGUD/Tasks/upcPionAnalysis.cxx
index fc215ea1822..4d581d5548c 100644
--- a/.auto-resolution/PWGUD/Tasks/upcPionAnalysis.cxx
+++ b/.auto-resolution/PWGUD/Tasks/upcPionAnalysis.cxx
@@ -9,18 +9,22 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 //
-#include <vector>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include <iostream>
-#include "PWGUD/DataModel/UDTables.h"
-#include <TString.h>
-#include <TTree.h>
-#include "TLorentzVector.h"
 #include "PWGUD/Core/SGSelector.h"
 #include "PWGUD/Core/SGTrackSelector.h"
+#include "PWGUD/DataModel/UDTables.h"
+
 #include "Common/Core/RecoDecay.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TLorentzVector.h"
+#include <TString.h>
+#include <TTree.h>
+
+#include <iostream>
+#include <vector>
 using namespace std;
 using namespace o2;
 using namespace o2::aod;
diff --git a/.auto-resolution/PWGUD/Tasks/upcQuarkoniaCentralBarrel.cxx b/.auto-resolution/PWGUD/Tasks/upcQuarkoniaCentralBarrel.cxx
index f195a750fa4..d029f336604 100644
--- a/.auto-resolution/PWGUD/Tasks/upcQuarkoniaCentralBarrel.cxx
+++ b/.auto-resolution/PWGUD/Tasks/upcQuarkoniaCentralBarrel.cxx
@@ -30,40 +30,41 @@
 //    david.dobrigkeit.chinellato@cern.ch
 //
 
-#include <Math/Vector4D.h>
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <map>
-#include <string>
-#include <vector>
-
-#include <TFile.h>
-#include <TH2F.h>
-#include <TProfile.h>
-#include <TLorentzVector.h>
-#include <TPDGCode.h>
+#include "PWGUD/Core/SGSelector.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/trackUtilities.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/Core/SGSelector.h"
-
+#include "Common/DataModel/TrackSelectionTables.h"
 #include "EventFiltering/Zorro.h"
 #include "EventFiltering/ZorroSummary.h"
 
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <Math/Vector4D.h>
+#include <TFile.h>
+#include <TH2F.h>
+#include <TLorentzVector.h>
+#include <TPDGCode.h>
+#include <TProfile.h>
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <map>
+#include <string>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.auto-resolution/PWGUD/Tasks/upcRhoPrimeAnalysis.cxx b/.auto-resolution/PWGUD/Tasks/upcRhoPrimeAnalysis.cxx
index d4048806854..6cb00abe79a 100644
--- a/.auto-resolution/PWGUD/Tasks/upcRhoPrimeAnalysis.cxx
+++ b/.auto-resolution/PWGUD/Tasks/upcRhoPrimeAnalysis.cxx
@@ -12,20 +12,20 @@
 /// \brief  Task for analysis of rho' in UPCs using UD tables (from SG producer).
 /// \author Cesar Ramirez, cesar.ramirez@cern.ch
 
-#include <string> // Para std::string
-#include <vector> // Para std::vector
+#include "PWGUD/Core/UPCTauCentralBarrelHelperRL.h"
+#include "PWGUD/DataModel/UDTables.h"
+
+#include "Common/DataModel/PIDResponse.h"
 
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
 
 #include "Math/Vector4D.h" // similiar to TLorentzVector (which is now legacy apparently)
-#include <random>
-
-#include "Common/DataModel/PIDResponse.h"
 
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/UPCTauCentralBarrelHelperRL.h"
+#include <random>
+#include <string> // Para std::string
+#include <vector> // Para std::vector
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/PWGUD/Tasks/upcTauRl.cxx b/.auto-resolution/PWGUD/Tasks/upcTauRl.cxx
index c0684cec14b..8f723ac30e8 100644
--- a/.auto-resolution/PWGUD/Tasks/upcTauRl.cxx
+++ b/.auto-resolution/PWGUD/Tasks/upcTauRl.cxx
@@ -17,20 +17,24 @@
 //
 
 // C++ headers
+#include <algorithm>
+#include <random>
 #include <set>
 #include <utility>
-#include <algorithm>
 #include <vector>
-#include <random>
 
 // O2 headers
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/runDataProcessing.h"
 
 // O2Physics headers
+#include "PWGUD/Core/SGSelector.h"
+#include "PWGUD/Core/UPCTauCentralBarrelHelperRL.h"
+#include "PWGUD/DataModel/UDTables.h"
+
 #include "Common/CCDB/EventSelectionParams.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
@@ -38,9 +42,6 @@
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "PWGUD/Core/UPCTauCentralBarrelHelperRL.h"
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/SGSelector.h"
 
 // ROOT headers
 #include "Math/Vector4D.h"
diff --git a/.auto-resolution/PWGUD/Tasks/upcTauTau13topo.cxx b/.auto-resolution/PWGUD/Tasks/upcTauTau13topo.cxx
index 0d18b316b8b..e4e433ec883 100644
--- a/.auto-resolution/PWGUD/Tasks/upcTauTau13topo.cxx
+++ b/.auto-resolution/PWGUD/Tasks/upcTauTau13topo.cxx
@@ -17,9 +17,9 @@
 // copts="--configuration json://tautauConfig.json -b"
 // o2-analysis-ud-tautau13topo $copts > output.log
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 // #include "TDatabasePDG.h" // not recommended in o2
 #include "Framework/O2DatabasePDGPlugin.h"
@@ -28,13 +28,13 @@
 // #include "Common/DataModel/EventSelection.h"
 // #include "Common/DataModel/TrackSelectionTables.h"
 
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/UDHelpers.h"
 #include "PWGUD/Core/DGPIDSelector.h"
 #include "PWGUD/Core/SGSelector.h"
+#include "PWGUD/Core/UDHelpers.h"
+#include "PWGUD/DataModel/UDTables.h"
 
 #include "Common/Core/RecoDecay.h"
+#include "Common/DataModel/PIDResponse.h"
 // #include <CommonUtils/EnumFlags.h>
 #include "TPDGCode.h"
 
diff --git a/.auto-resolution/PWGUD/Tasks/upcVetoAnalysis.cxx b/.auto-resolution/PWGUD/Tasks/upcVetoAnalysis.cxx
index 45b3844ed51..84d73774439 100644
--- a/.auto-resolution/PWGUD/Tasks/upcVetoAnalysis.cxx
+++ b/.auto-resolution/PWGUD/Tasks/upcVetoAnalysis.cxx
@@ -8,21 +8,21 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include <map>
-#include <string>
-#include <unordered_set>
-#include <vector>
-#include <unordered_map>
-#include <memory>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-
 #include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/LHCConstants.h"
 #include "DataFormatsFIT/Triggers.h"
-#include "DataFormatsParameters/GRPLHCIFData.h"
 #include "DataFormatsParameters/GRPECSObject.h"
+#include "DataFormatsParameters/GRPLHCIFData.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include <map>
+#include <memory>
+#include <string>
+#include <unordered_map>
+#include <unordered_set>
+#include <vector>
 
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.auto-resolution/Tools/KFparticle/qaKFEventTrack.cxx b/.auto-resolution/Tools/KFparticle/qaKFEventTrack.cxx
index f3f026a8da7..ccadf3f60af 100644
--- a/.auto-resolution/Tools/KFparticle/qaKFEventTrack.cxx
+++ b/.auto-resolution/Tools/KFparticle/qaKFEventTrack.cxx
@@ -16,37 +16,40 @@
 ///
 
 #include "Tools/KFparticle/qaKFEventTrack.h"
-#include <CCDB/BasicCCDBManager.h>
-#include <string>
+
 #include "TableHelper.h"
+
+#include <CCDB/BasicCCDBManager.h>
+
 #include <iostream>
+#include <string>
 using namespace std;
 
 /// includes O2
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/DCA.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DetectorsBase/Propagator.h"
 
 /// includes O2Physics
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/Core/trackUtilities.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 #include "Tools/KFparticle/KFUtilities.h"
 
 /// includes KFParticle
-#include "KFParticle.h"
 #include "KFPTrack.h"
 #include "KFPVertex.h"
+#include "KFParticle.h"
 #include "KFParticleBase.h"
 #include "KFVertex.h"
 
diff --git a/.auto-resolution/Tools/KFparticle/qaKFEventTrack.h b/.auto-resolution/Tools/KFparticle/qaKFEventTrack.h
index 399a3139a91..3ded6f627ea 100644
--- a/.auto-resolution/Tools/KFparticle/qaKFEventTrack.h
+++ b/.auto-resolution/Tools/KFparticle/qaKFEventTrack.h
@@ -15,10 +15,11 @@
 #ifndef TOOLS_KFPARTICLE_QAKFEVENTTRACK_H_
 #define TOOLS_KFPARTICLE_QAKFEVENTTRACK_H_
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Common/Core/trackUtilities.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+
 enum FlagsTracks {
   kITS = BIT(0),
   kTPC = BIT(1),
diff --git a/.auto-resolution/Tools/KFparticle/qaKFParticle.cxx b/.auto-resolution/Tools/KFparticle/qaKFParticle.cxx
index f4ffdf58a85..a0886d647d9 100644
--- a/.auto-resolution/Tools/KFparticle/qaKFParticle.cxx
+++ b/.auto-resolution/Tools/KFparticle/qaKFParticle.cxx
@@ -16,38 +16,42 @@
 ///
 
 #include "Tools/KFparticle/qaKFParticle.h"
+
+#include "TableHelper.h"
+
 #include <CCDB/BasicCCDBManager.h>
-#include <string>
+
 #include <TDatabasePDG.h>
 #include <TPDGCode.h>
-#include "TableHelper.h"
+
+#include <string>
 
 /// includes O2
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/DCA.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DetectorsBase/Propagator.h"
 
 /// includes O2Physics
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/trackUtilities.h"
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/Core/RecoDecay.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 #include "Tools/KFparticle/KFUtilities.h"
 
 /// includes KFParticle
-#include "KFParticle.h"
 #include "KFPTrack.h"
 #include "KFPVertex.h"
+#include "KFParticle.h"
 #include "KFParticleBase.h"
 #include "KFVertex.h"
 
diff --git a/.auto-resolution/Tools/KFparticle/qaKFParticle.h b/.auto-resolution/Tools/KFparticle/qaKFParticle.h
index afb23851cb5..ddde56d6931 100644
--- a/.auto-resolution/Tools/KFparticle/qaKFParticle.h
+++ b/.auto-resolution/Tools/KFparticle/qaKFParticle.h
@@ -15,10 +15,11 @@
 #ifndef TOOLS_KFPARTICLE_QAKFPARTICLE_H_
 #define TOOLS_KFPARTICLE_QAKFPARTICLE_H_
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Common/Core/trackUtilities.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+
 enum Source {
   kPrompt = BIT(0),
   kNonPrompt = BIT(1),
diff --git a/.auto-resolution/Tools/KFparticle/qaKFParticleLc.cxx b/.auto-resolution/Tools/KFparticle/qaKFParticleLc.cxx
index 20da1eb6128..c8f0c6fe6b2 100644
--- a/.auto-resolution/Tools/KFparticle/qaKFParticleLc.cxx
+++ b/.auto-resolution/Tools/KFparticle/qaKFParticleLc.cxx
@@ -16,38 +16,42 @@
 ///
 
 #include "Tools/KFparticle/qaKFParticleLc.h"
+
+#include "TableHelper.h"
+
 #include <CCDB/BasicCCDBManager.h>
-#include <string>
+
 #include <TDatabasePDG.h>
 #include <TPDGCode.h>
-#include "TableHelper.h"
+
+#include <string>
 
 /// includes O2
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/DCA.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DetectorsBase/Propagator.h"
 
 /// includes O2Physics
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/trackUtilities.h"
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/Core/RecoDecay.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 #include "Tools/KFparticle/KFUtilities.h"
 
 /// includes KFParticle
-#include "KFParticle.h"
 #include "KFPTrack.h"
 #include "KFPVertex.h"
+#include "KFParticle.h"
 #include "KFParticleBase.h"
 #include "KFVertex.h"
 
diff --git a/.auto-resolution/Tools/KFparticle/qaKFParticleLc.h b/.auto-resolution/Tools/KFparticle/qaKFParticleLc.h
index 8c57232f99a..444b45bb5eb 100644
--- a/.auto-resolution/Tools/KFparticle/qaKFParticleLc.h
+++ b/.auto-resolution/Tools/KFparticle/qaKFParticleLc.h
@@ -15,10 +15,11 @@
 #ifndef TOOLS_KFPARTICLE_QAKFPARTICLELC_H_
 #define TOOLS_KFPARTICLE_QAKFPARTICLELC_H_
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Common/Core/trackUtilities.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+
 enum Source {
   kPrompt = BIT(0),
   kNonPrompt = BIT(1),
diff --git a/.auto-resolution/Tutorials/ML/applyMlSelection.cxx b/.auto-resolution/Tutorials/ML/applyMlSelection.cxx
index 4ca579acc44..0212c53d913 100644
--- a/.auto-resolution/Tutorials/ML/applyMlSelection.cxx
+++ b/.auto-resolution/Tutorials/ML/applyMlSelection.cxx
@@ -15,14 +15,15 @@
 ///
 /// \author Fabio Catalano <fabio.catalano@cern.ch>, CERN
 
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+
+#include "Tools/ML/MlResponse.h"
+
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
 
-#include "Tools/ML/MlResponse.h"
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-
 using namespace o2;
 using namespace o2::analysis;
 using namespace o2::framework;
diff --git a/.auto-resolution/Tutorials/ML/applyOnnxModel.cxx b/.auto-resolution/Tutorials/ML/applyOnnxModel.cxx
index 6bf5d6ecb59..f49a315494f 100644
--- a/.auto-resolution/Tutorials/ML/applyOnnxModel.cxx
+++ b/.auto-resolution/Tutorials/ML/applyOnnxModel.cxx
@@ -14,10 +14,11 @@
 ///
 /// \author Christian Sonnabend <christian.sonnabend@cern.ch>, GSI
 
-#include "Framework/runDataProcessing.h"
+#include "Tools/ML/model.h"
+
 #include "Framework/AnalysisTask.h"
 #include "Framework/Logger.h"
-#include "Tools/ML/model.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Tutorials/OpenData/flowAnalysis.cxx b/.auto-resolution/Tutorials/OpenData/flowAnalysis.cxx
index dc5e180b300..75fe73001f4 100644
--- a/.auto-resolution/Tutorials/OpenData/flowAnalysis.cxx
+++ b/.auto-resolution/Tutorials/OpenData/flowAnalysis.cxx
@@ -15,20 +15,22 @@
 /// \author
 /// \since
 
-#include <TF1.h>
-#include <TH3.h>
-#include <Framework/runDataProcessing.h>
-#include <Framework/AnalysisTask.h>
-#include <Framework/HistogramRegistry.h>
-#include <Framework/AnalysisDataModel.h>
-#include <Common/DataModel/EventSelection.h>
 #include <Common/CCDB/TriggerAliases.h>
 #include <Common/DataModel/Centrality.h>
+#include <Common/DataModel/EventSelection.h>
 #include <Common/DataModel/Multiplicity.h>
-#include <Common/DataModel/TrackSelectionTables.h>
 #include <Common/DataModel/PIDResponse.h>
+#include <Common/DataModel/TrackSelectionTables.h>
+
 #include <CCDB/BasicCCDBManager.h>
 #include <DataFormatsParameters/GRPObject.h>
+#include <Framework/AnalysisDataModel.h>
+#include <Framework/AnalysisTask.h>
+#include <Framework/HistogramRegistry.h>
+#include <Framework/runDataProcessing.h>
+
+#include <TF1.h>
+#include <TH3.h>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Tutorials/PWGCF/EventPlane/src/qVectorstutorial.cxx b/.auto-resolution/Tutorials/PWGCF/EventPlane/src/qVectorstutorial.cxx
index b5b01185a49..eb02ea865ec 100644
--- a/.auto-resolution/Tutorials/PWGCF/EventPlane/src/qVectorstutorial.cxx
+++ b/.auto-resolution/Tutorials/PWGCF/EventPlane/src/qVectorstutorial.cxx
@@ -10,32 +10,32 @@
 // or submit itself to any jurisdiction.
 
 // C++/ROOT includes.
-#include <chrono>
-#include <string>
-#include <vector>
 #include <TComplex.h>
 #include <TH1F.h>
 #include <TH2D.h>
 #include <TMath.h>
 #include <TVector2.h>
 
+#include <chrono>
+#include <string>
+#include <vector>
+
 // o2Physics includes.
+#include "Common/Core/EventPlaneHelper.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Qvectors.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StaticFor.h"
-
-#include "Common/DataModel/Qvectors.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/Core/EventPlaneHelper.h"
-#include "Common/Core/TrackSelection.h"
-
-#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/runDataProcessing.h"
 
 // o2 includes.
 
diff --git a/.auto-resolution/Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask1.cxx b/.auto-resolution/Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask1.cxx
index 369e63cbdf6..246fba0e183 100644
--- a/.auto-resolution/Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask1.cxx
+++ b/.auto-resolution/Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask1.cxx
@@ -16,9 +16,9 @@
 #include "Framework/runDataProcessing.h"
 
 /// FemtoDream includes
+#include "PWGCF/DataModel/FemtoDerived.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamMath.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
-#include "PWGCF/DataModel/FemtoDerived.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask2.cxx b/.auto-resolution/Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask2.cxx
index ff5fa93aa5b..303d3d8e3ef 100644
--- a/.auto-resolution/Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask2.cxx
+++ b/.auto-resolution/Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask2.cxx
@@ -16,9 +16,9 @@
 #include "Framework/runDataProcessing.h"
 
 /// FemtoDream includes
+#include "PWGCF/DataModel/FemtoDerived.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamMath.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
-#include "PWGCF/DataModel/FemtoDerived.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask3.cxx b/.auto-resolution/Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask3.cxx
index ca200fd3937..69aa8baf37c 100644
--- a/.auto-resolution/Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask3.cxx
+++ b/.auto-resolution/Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask3.cxx
@@ -16,9 +16,9 @@
 #include "Framework/runDataProcessing.h"
 
 /// FemtoDream includes
+#include "PWGCF/DataModel/FemtoDerived.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamMath.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
-#include "PWGCF/DataModel/FemtoDerived.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask4.cxx b/.auto-resolution/Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask4.cxx
index 90ae5168a78..a6b61304a53 100644
--- a/.auto-resolution/Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask4.cxx
+++ b/.auto-resolution/Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask4.cxx
@@ -16,9 +16,9 @@
 #include "Framework/runDataProcessing.h"
 
 /// FemtoDream includes
+#include "PWGCF/DataModel/FemtoDerived.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamMath.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
-#include "PWGCF/DataModel/FemtoDerived.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask5.cxx b/.auto-resolution/Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask5.cxx
index d9159c2e3cc..3332d4ce43d 100644
--- a/.auto-resolution/Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask5.cxx
+++ b/.auto-resolution/Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask5.cxx
@@ -14,12 +14,13 @@
 /// O2 includes
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
+
 #include "TDatabasePDG.h"
 
 /// FemtoDream includes
+#include "PWGCF/DataModel/FemtoDerived.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamMath.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
-#include "PWGCF/DataModel/FemtoDerived.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Tutorials/PWGCF/FlowGenericFramework/src/flowGFWTutorial.cxx b/.auto-resolution/Tutorials/PWGCF/FlowGenericFramework/src/flowGFWTutorial.cxx
index cfd0eca696b..8e5f096c8ac 100644
--- a/.auto-resolution/Tutorials/PWGCF/FlowGenericFramework/src/flowGFWTutorial.cxx
+++ b/.auto-resolution/Tutorials/PWGCF/FlowGenericFramework/src/flowGFWTutorial.cxx
@@ -9,26 +9,28 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <CCDB/BasicCCDBManager.h>
-#include <cmath>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/HistogramRegistry.h"
+#include "GFW.h"
+#include "GFWCumulant.h"
+#include "GFWPowerArray.h"
 
-#include "Common/DataModel/EventSelection.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include <CCDB/BasicCCDBManager.h>
 
-#include "GFWPowerArray.h"
-#include "GFW.h"
-#include "GFWCumulant.h"
 #include "TList.h"
 #include <TProfile.h>
 #include <TRandom3.h>
 
+#include <cmath>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.auto-resolution/Tutorials/PWGCF/TwoParticleCorrelations/src/firstcfcorrelations.cxx b/.auto-resolution/Tutorials/PWGCF/TwoParticleCorrelations/src/firstcfcorrelations.cxx
index cdec4f3ca95..ef8f6f78b32 100644
--- a/.auto-resolution/Tutorials/PWGCF/TwoParticleCorrelations/src/firstcfcorrelations.cxx
+++ b/.auto-resolution/Tutorials/PWGCF/TwoParticleCorrelations/src/firstcfcorrelations.cxx
@@ -13,18 +13,20 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "PWGCF/Core/CorrelationContainer.h"
+#include "PWGCF/Core/PairCuts.h"
+
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonConstants/MathConstants.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/RunningWorkflowInfo.h"
-#include "CommonConstants/MathConstants.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Centrality.h"
-#include "PWGCF/Core/CorrelationContainer.h"
-#include "PWGCF/Core/PairCuts.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Tutorials/PWGCF/TwoParticleCorrelations/src/firstcfo2physics.cxx b/.auto-resolution/Tutorials/PWGCF/TwoParticleCorrelations/src/firstcfo2physics.cxx
index d5d1a6777d3..d6b459e43b3 100644
--- a/.auto-resolution/Tutorials/PWGCF/TwoParticleCorrelations/src/firstcfo2physics.cxx
+++ b/.auto-resolution/Tutorials/PWGCF/TwoParticleCorrelations/src/firstcfo2physics.cxx
@@ -13,11 +13,11 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-
 #include "Common/DataModel/Centrality.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.auto-resolution/Tutorials/PWGEM/Cocktail/configs/ana_config.json b/.auto-resolution/Tutorials/PWGEM/Cocktail/configs/ana_config.json
index 1b61ab3c3a8..dda7d3d0127 100644
--- a/.auto-resolution/Tutorials/PWGEM/Cocktail/configs/ana_config.json
+++ b/.auto-resolution/Tutorials/PWGEM/Cocktail/configs/ana_config.json
@@ -15,4 +15,4 @@
         "cfgPhotonPtFileName": "",
         "cfgPhotonPtDirName": ""
     }
-}
\ No newline at end of file
+}
diff --git a/.auto-resolution/Tutorials/PWGEM/Cocktail/files/parametrizations/PbPb_5TeV.json b/.auto-resolution/Tutorials/PWGEM/Cocktail/files/parametrizations/PbPb_5TeV.json
index 85e0fec1703..dee9dacae8d 100644
--- a/.auto-resolution/Tutorials/PWGEM/Cocktail/files/parametrizations/PbPb_5TeV.json
+++ b/.auto-resolution/Tutorials/PWGEM/Cocktail/files/parametrizations/PbPb_5TeV.json
@@ -399,4 +399,4 @@
         "221_pt": "(TMath::TwoPi()*x*(219.382*exp(-(sqrt(x*x+0.139571*0.139571)-0.139571)/0.384303)+2471.6*pow(exp(-1.12373*x-0.752507*x*x)+x/0.438343,-5.45943)))*((((x<9.445400)*(TMath::Max(TMath::Max(1.68883e-09*TMath::Power((exp(- -1.16032*sqrt(x*x+0.547*0.547-0.139*0.139)-0.435153*(x*x+0.547*0.547-0.139*0.139))+TMath::Power(0.480215/1.68883e-09,-1./16.7077)*sqrt(x*x+0.547*0.547-0.139*0.139)/0.0356546),-16.7077)/TMath::Power((exp(- -1.16032*x-0.435153*x*x)+x/0.0356546),-16.7077)+1.75797*TMath::Landau(x,2.41484,1.01421),0.00469052*TMath::Power((exp(- -0.124633*sqrt(x*x+0.547*0.547-0.139*0.139)-0.310906*(x*x+0.547*0.547-0.139*0.139))+TMath::Power(0.479677/0.00469052,-1./0.657178)*sqrt(x*x+0.547*0.547-0.139*0.139)/0.0210313),-0.657178)/TMath::Power((exp(- -0.124633*x-0.310906*x*x)+x/0.0210313),-0.657178)+1.42452*TMath::Landau(x,2.46537,0.969902)),TMath::Max(4.88363e-10*TMath::Power((exp(- -2.82354*sqrt(x*x+0.547*0.547-0.139*0.139)-0.728315*(x*x+0.547*0.547-0.139*0.139))+TMath::Power(0.483053/4.88363e-10,-1./16.2073)*sqrt(x*x+0.547*0.547-0.139*0.139)/0.0021492),-16.2073)/TMath::Power((exp(- -2.82354*x-0.728315*x*x)+x/0.0021492),-16.2073)+1.57731*TMath::Landau(x,2.40466,1.00957),0.00469052*TMath::Power((exp(- -0.124633*sqrt(x*x+0.547*0.547-0.139*0.139)-0.310906*(x*x+0.547*0.547-0.139*0.139))+TMath::Power(0.479677/0.00469052,-1./0.657178)*sqrt(x*x+0.547*0.547-0.139*0.139)/0.0210313),-0.657178)/TMath::Power((exp(- -0.124633*x-0.310906*x*x)+x/0.0210313),-0.657178)+1.42452*TMath::Landau(x,2.46537,0.969902))))+(x>=9.445400)*1.06*(((0.52091*1.)+(159.301*(-0.00307058*TMath::Power(1.+((x/1.03888)*(x/1.03888)),-(0.567478)))))/(1.+(-0.00307058*TMath::Power(1.+((x/1.03888)*(x/1.03888)),-(0.567478))))))))",
         "333_pt": "(TMath::TwoPi()*x*(219.382*exp(-(sqrt(x*x+0.139571*0.139571)-0.139571)/0.384303)+2471.6*pow(exp(-1.12373*x-0.752507*x*x)+x/0.438343,-5.45943)))*(0.1191/(1+exp(-(x- -0.316437)/0.554431))+-0.507618*TMath::Gaus(x,1.69654,1.62649)+0.494136*TMath::Gaus(x,2.56805,1.6193)+0.0789659)"
     }
-}
\ No newline at end of file
+}
diff --git a/.auto-resolution/Tutorials/PWGEM/Cocktail/files/parametrizations/pp_13TeV.json b/.auto-resolution/Tutorials/PWGEM/Cocktail/files/parametrizations/pp_13TeV.json
index 1f999879643..d4d5a77bf8f 100644
--- a/.auto-resolution/Tutorials/PWGEM/Cocktail/files/parametrizations/pp_13TeV.json
+++ b/.auto-resolution/Tutorials/PWGEM/Cocktail/files/parametrizations/pp_13TeV.json
@@ -43,4 +43,4 @@
         "113_pt": "(x*(123.313*(pow((exp((0.171351*x)-(abs(0.00418378)*(x*x)))+(x/0.919801)),-(6.29677)))))*((((0.37788/(1+exp(-((x-0.265203)/0.274547))))+(-(0.393597*TMath::Gaus(x,0.324349,0.819888))))+(-(0.230459*TMath::Gaus(x,1.23251,1.24114))))+0.412584)",
         "223_pt": "(x*(123.313*(pow((exp((0.171351*x)-(abs(0.00418378)*(x*x)))+(x/0.919801)),-(6.29677)))))*((((0.435069/(1+exp(-((x-0.302485)/0.27614))))+(-(0.258853*TMath::Gaus(x,0.42493,0.693856))))+(-(0.202117*TMath::Gaus(x,1.07795,1.09857))))+0.242026)"
     }
-}
\ No newline at end of file
+}
diff --git a/.auto-resolution/Tutorials/PWGEM/Cocktail/plotLFCocktail.C b/.auto-resolution/Tutorials/PWGEM/Cocktail/plotLFCocktail.C
index 8740544d66f..db095ad62f7 100644
--- a/.auto-resolution/Tutorials/PWGEM/Cocktail/plotLFCocktail.C
+++ b/.auto-resolution/Tutorials/PWGEM/Cocktail/plotLFCocktail.C
@@ -72,4 +72,5 @@ void plotLFCocktail(TString filename = "AnalysisResults.root", int rebin = 1)
   }
   gPad->BuildLegend(0.62, 0.9, 0.9, 0.6);
   mee[0]->SetTitle("after resolution and acceptance");
-}
\ No newline at end of file
+}
+ 
\ No newline at end of file
diff --git a/.auto-resolution/Tutorials/PWGEM/emcclustertutorial.cxx b/.auto-resolution/Tutorials/PWGEM/emcclustertutorial.cxx
index a047206e70d..222346a9114 100644
--- a/.auto-resolution/Tutorials/PWGEM/emcclustertutorial.cxx
+++ b/.auto-resolution/Tutorials/PWGEM/emcclustertutorial.cxx
@@ -9,32 +9,31 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <climits>
-#include <cstdlib>
-#include <map>
-#include <memory>
-#include <sstream>
-#include <string>
-#include <vector>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoA.h"
-#include "Framework/HistogramRegistry.h"
+#include "PWGJE/DataModel/EMCALClusters.h"
 
-#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
 
-#include "EMCALBase/Geometry.h"
-#include "EMCALCalib/BadChannelMap.h"
-#include "PWGJE/DataModel/EMCALClusters.h"
+#include "CommonDataFormat/InteractionRecord.h"
+#include "DataFormatsEMCAL/AnalysisCluster.h"
 #include "DataFormatsEMCAL/Cell.h"
 #include "DataFormatsEMCAL/Constants.h"
-#include "DataFormatsEMCAL/AnalysisCluster.h"
+#include "EMCALBase/Geometry.h"
+#include "EMCALCalib/BadChannelMap.h"
+#include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 
-#include "CommonDataFormat/InteractionRecord.h"
+#include <climits>
+#include <cstdlib>
+#include <map>
+#include <memory>
+#include <sstream>
+#include <string>
+#include <vector>
 
 // \struct ClusterTutorial
 /// \brief Skeleton task for EMCal cluster tutorial
diff --git a/.auto-resolution/Tutorials/PWGEM/pcm/pcmtutorial.cxx b/.auto-resolution/Tutorials/PWGEM/pcm/pcmtutorial.cxx
index c10b4251991..d31ffa85177 100644
--- a/.auto-resolution/Tutorials/PWGEM/pcm/pcmtutorial.cxx
+++ b/.auto-resolution/Tutorials/PWGEM/pcm/pcmtutorial.cxx
@@ -12,16 +12,18 @@
 /// \brief tutorial for pcm analysis.
 /// \author daiki.sekihata@cern.ch
 
-#include <TMath.h>
-#include <Math/Vector4D.h>
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+#include "PWGEM/PhotonMeson/Utils/PCMUtilities.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Common/Core/trackUtilities.h"
+
 #include "CommonConstants/PhysicsConstants.h"
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/PhotonMeson/Utils/PCMUtilities.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include <Math/Vector4D.h>
+#include <TMath.h>
 
 using namespace o2;
 using namespace o2::soa;
diff --git a/.auto-resolution/Tutorials/PWGLF/Resonance/resonancesCombine.cxx b/.auto-resolution/Tutorials/PWGLF/Resonance/resonancesCombine.cxx
index 26a28661c6c..8ff1a07b1e0 100644
--- a/.auto-resolution/Tutorials/PWGLF/Resonance/resonancesCombine.cxx
+++ b/.auto-resolution/Tutorials/PWGLF/Resonance/resonancesCombine.cxx
@@ -14,16 +14,18 @@
 /// \author Bong-Hwi Lim <bong-hwi.lim@cern.ch>
 /// \since 13/12/2024
 
-#include <TLorentzVector.h>
-#include <TPDGCode.h>
+#include "PWGLF/DataModel/LFResonanceTables.h"
 
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/DataModel/Qvectors.h"
 #include "Common/Core/EventPlaneHelper.h"
-#include "Framework/AnalysisTask.h"
+#include "Common/DataModel/Qvectors.h"
+
+#include "CommonConstants/PhysicsConstants.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
+
+#include <TLorentzVector.h>
+#include <TPDGCode.h>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Tutorials/PWGLF/Resonance/resonancesMicrotrack.cxx b/.auto-resolution/Tutorials/PWGLF/Resonance/resonancesMicrotrack.cxx
index 5022d4b602d..0e0073f6e3e 100644
--- a/.auto-resolution/Tutorials/PWGLF/Resonance/resonancesMicrotrack.cxx
+++ b/.auto-resolution/Tutorials/PWGLF/Resonance/resonancesMicrotrack.cxx
@@ -14,15 +14,16 @@
 /// \author Bong-Hwi Lim <bong-hwi.lim@cern.ch>
 /// \since 07/03/2025
 
-#include <TLorentzVector.h>
-#include <TPDGCode.h>
+#include "PWGLF/DataModel/LFResonanceTables.h"
 
 #include "CommonConstants/MathConstants.h"
 #include "CommonConstants/PhysicsConstants.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
+
+#include <TLorentzVector.h>
+#include <TPDGCode.h>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Tutorials/PWGLF/Resonance/resonances_step0.cxx b/.auto-resolution/Tutorials/PWGLF/Resonance/resonances_step0.cxx
index 706abc72cd2..33d64cbc34b 100644
--- a/.auto-resolution/Tutorials/PWGLF/Resonance/resonances_step0.cxx
+++ b/.auto-resolution/Tutorials/PWGLF/Resonance/resonances_step0.cxx
@@ -13,12 +13,13 @@
 /// \author
 /// \since 08/11/2023
 
-#include <TLorentzVector.h>
+#include "PWGLF/DataModel/LFResonanceTables.h"
 
-#include "Framework/AnalysisTask.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
+
+#include <TLorentzVector.h>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Tutorials/PWGLF/Resonance/resonances_step1.cxx b/.auto-resolution/Tutorials/PWGLF/Resonance/resonances_step1.cxx
index 2f566ace97c..7db2098ae2f 100644
--- a/.auto-resolution/Tutorials/PWGLF/Resonance/resonances_step1.cxx
+++ b/.auto-resolution/Tutorials/PWGLF/Resonance/resonances_step1.cxx
@@ -13,14 +13,15 @@
 /// \author
 /// \since 08/11/2023
 
-#include <TLorentzVector.h>
-#include <TPDGCode.h>
+#include "PWGLF/DataModel/LFResonanceTables.h"
 
 #include "CommonConstants/PhysicsConstants.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
+
+#include <TLorentzVector.h>
+#include <TPDGCode.h>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Tutorials/PWGLF/Resonance/resonances_step2.cxx b/.auto-resolution/Tutorials/PWGLF/Resonance/resonances_step2.cxx
index 000bbf1e501..ff905f82582 100644
--- a/.auto-resolution/Tutorials/PWGLF/Resonance/resonances_step2.cxx
+++ b/.auto-resolution/Tutorials/PWGLF/Resonance/resonances_step2.cxx
@@ -13,13 +13,14 @@
 /// \author
 /// \since 08/11/2023
 
-#include <TLorentzVector.h>
+#include "PWGLF/DataModel/LFResonanceTables.h"
 
 #include "CommonConstants/PhysicsConstants.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
+
+#include <TLorentzVector.h>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Tutorials/PWGLF/Resonance/resonances_step3.cxx b/.auto-resolution/Tutorials/PWGLF/Resonance/resonances_step3.cxx
index f2ef8dbbe67..80d24b43b17 100644
--- a/.auto-resolution/Tutorials/PWGLF/Resonance/resonances_step3.cxx
+++ b/.auto-resolution/Tutorials/PWGLF/Resonance/resonances_step3.cxx
@@ -13,11 +13,12 @@
 /// \author Hirak Kumar Koley <hirak.koley@cern.ch>
 /// \since 11/10/2024
 
+#include "PWGLF/DataModel/LFResonanceTables.h"
+
 #include "CommonConstants/PhysicsConstants.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Tutorials/PWGLF/Resonance/resonances_step4.cxx b/.auto-resolution/Tutorials/PWGLF/Resonance/resonances_step4.cxx
index 05f7b35f7cf..6c54f87a713 100644
--- a/.auto-resolution/Tutorials/PWGLF/Resonance/resonances_step4.cxx
+++ b/.auto-resolution/Tutorials/PWGLF/Resonance/resonances_step4.cxx
@@ -13,11 +13,12 @@
 /// \author Hirak Kumar Koley <hirak.koley@cern.ch>
 /// \since 11/10/2024
 
+#include "PWGLF/DataModel/LFResonanceTables.h"
+
 #include "CommonConstants/PhysicsConstants.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Tutorials/PWGLF/Resonance/resonances_step5.cxx b/.auto-resolution/Tutorials/PWGLF/Resonance/resonances_step5.cxx
index 7d8463b9236..3fc33f45f81 100644
--- a/.auto-resolution/Tutorials/PWGLF/Resonance/resonances_step5.cxx
+++ b/.auto-resolution/Tutorials/PWGLF/Resonance/resonances_step5.cxx
@@ -13,11 +13,12 @@
 /// \author Hirak Kumar Koley
 /// \since 11/10/2024
 
+#include "PWGLF/DataModel/LFResonanceTables.h"
+
 #include "CommonConstants/PhysicsConstants.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Tutorials/PWGLF/Resonance/resonances_step6.cxx b/.auto-resolution/Tutorials/PWGLF/Resonance/resonances_step6.cxx
index 23ccac6dfd2..723d5a64712 100644
--- a/.auto-resolution/Tutorials/PWGLF/Resonance/resonances_step6.cxx
+++ b/.auto-resolution/Tutorials/PWGLF/Resonance/resonances_step6.cxx
@@ -13,13 +13,14 @@
 /// \author Hirak Kumar Koley
 /// \since 11/10/2024
 
-#include <TLorentzVector.h>
+#include "PWGLF/DataModel/LFResonanceTables.h"
 
 #include "CommonConstants/PhysicsConstants.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
+
+#include <TLorentzVector.h>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_skeleton.cxx b/.auto-resolution/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_skeleton.cxx
index 788aaead7ae..9c7265a5051 100644
--- a/.auto-resolution/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_skeleton.cxx
+++ b/.auto-resolution/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_skeleton.cxx
@@ -15,11 +15,13 @@
 /// \author Nepeivoda Roman (roman.nepeivoda@cern.ch)
 /// \author Chiara De Martin (chiara.de.martin@cern.ch)
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/EventSelection.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/DataModel/EventSelection.h"
+
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_step0.cxx b/.auto-resolution/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_step0.cxx
index b0e595246d7..96c7877e130 100644
--- a/.auto-resolution/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_step0.cxx
+++ b/.auto-resolution/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_step0.cxx
@@ -15,11 +15,13 @@
 /// \author Nepeivoda Roman (roman.nepeivoda@cern.ch)
 /// \author Chiara De Martin (chiara.de.martin@cern.ch)
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/EventSelection.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/DataModel/EventSelection.h"
+
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_step1.cxx b/.auto-resolution/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_step1.cxx
index 836be98b240..92da4bfb428 100644
--- a/.auto-resolution/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_step1.cxx
+++ b/.auto-resolution/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_step1.cxx
@@ -15,11 +15,13 @@
 /// \author Nepeivoda Roman (roman.nepeivoda@cern.ch)
 /// \author Chiara De Martin (chiara.de.martin@cern.ch)
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/EventSelection.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/DataModel/EventSelection.h"
+
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_step2.cxx b/.auto-resolution/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_step2.cxx
index 1558bb78052..c182142fd0a 100644
--- a/.auto-resolution/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_step2.cxx
+++ b/.auto-resolution/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_step2.cxx
@@ -15,12 +15,14 @@
 /// \author Nepeivoda Roman (roman.nepeivoda@cern.ch)
 /// \author Chiara De Martin (chiara.de.martin@cern.ch)
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/EventSelection.h"
 #include "PWGLF/DataModel/LFStrangenessPIDTables.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/DataModel/EventSelection.h"
+
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_step3.cxx b/.auto-resolution/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_step3.cxx
index f12a4f02560..f6491959c37 100644
--- a/.auto-resolution/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_step3.cxx
+++ b/.auto-resolution/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_step3.cxx
@@ -15,12 +15,14 @@
 /// \author Nepeivoda Roman (roman.nepeivoda@cern.ch)
 /// \author Chiara De Martin (chiara.de.martin@cern.ch)
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/EventSelection.h"
 #include "PWGLF/DataModel/LFStrangenessPIDTables.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/DataModel/EventSelection.h"
+
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_step4.cxx b/.auto-resolution/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_step4.cxx
index d45ef3c26a1..706e580bcb2 100644
--- a/.auto-resolution/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_step4.cxx
+++ b/.auto-resolution/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_step4.cxx
@@ -15,12 +15,14 @@
 /// \author Nepeivoda Roman (roman.nepeivoda@cern.ch)
 /// \author Chiara De Martin (chiara.de.martin@cern.ch)
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/EventSelection.h"
 #include "PWGLF/DataModel/LFStrangenessPIDTables.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/DataModel/EventSelection.h"
+
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Tutorials/PWGLF/Strangeness/pp/strangeness_step0.cxx b/.auto-resolution/Tutorials/PWGLF/Strangeness/pp/strangeness_step0.cxx
index a14b0a5aa3f..4c2b6569e09 100644
--- a/.auto-resolution/Tutorials/PWGLF/Strangeness/pp/strangeness_step0.cxx
+++ b/.auto-resolution/Tutorials/PWGLF/Strangeness/pp/strangeness_step0.cxx
@@ -13,11 +13,13 @@
 /// \author Nepeivoda Roman (roman.nepeivoda@cern.ch)
 /// \author Chiara De Martin (chiara.de.martin@cern.ch)
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/EventSelection.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Common/DataModel/EventSelection.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.auto-resolution/Tutorials/PWGLF/Strangeness/pp/strangeness_step1.cxx b/.auto-resolution/Tutorials/PWGLF/Strangeness/pp/strangeness_step1.cxx
index 70748658778..ca57646dc97 100644
--- a/.auto-resolution/Tutorials/PWGLF/Strangeness/pp/strangeness_step1.cxx
+++ b/.auto-resolution/Tutorials/PWGLF/Strangeness/pp/strangeness_step1.cxx
@@ -13,11 +13,13 @@
 /// \author Nepeivoda Roman (roman.nepeivoda@cern.ch)
 /// \author Chiara De Martin (chiara.de.martin@cern.ch)
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/EventSelection.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Common/DataModel/EventSelection.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.auto-resolution/Tutorials/PWGLF/Strangeness/pp/strangeness_step2.cxx b/.auto-resolution/Tutorials/PWGLF/Strangeness/pp/strangeness_step2.cxx
index 9701410db1b..fd863f5090a 100644
--- a/.auto-resolution/Tutorials/PWGLF/Strangeness/pp/strangeness_step2.cxx
+++ b/.auto-resolution/Tutorials/PWGLF/Strangeness/pp/strangeness_step2.cxx
@@ -13,12 +13,14 @@
 /// \author Nepeivoda Roman (roman.nepeivoda@cern.ch)
 /// \author Chiara De Martin (chiara.de.martin@cern.ch)
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/EventSelection.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.auto-resolution/Tutorials/PWGLF/Strangeness/pp/strangeness_step3.cxx b/.auto-resolution/Tutorials/PWGLF/Strangeness/pp/strangeness_step3.cxx
index 6121831fadb..ef06ffaded7 100644
--- a/.auto-resolution/Tutorials/PWGLF/Strangeness/pp/strangeness_step3.cxx
+++ b/.auto-resolution/Tutorials/PWGLF/Strangeness/pp/strangeness_step3.cxx
@@ -13,12 +13,14 @@
 /// \author Nepeivoda Roman (roman.nepeivoda@cern.ch)
 /// \author Chiara De Martin (chiara.de.martin@cern.ch)
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/EventSelection.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.auto-resolution/Tutorials/PWGLF/Strangeness/pp/strangeness_step4.cxx b/.auto-resolution/Tutorials/PWGLF/Strangeness/pp/strangeness_step4.cxx
index 544d4283932..b96601c16f8 100644
--- a/.auto-resolution/Tutorials/PWGLF/Strangeness/pp/strangeness_step4.cxx
+++ b/.auto-resolution/Tutorials/PWGLF/Strangeness/pp/strangeness_step4.cxx
@@ -13,12 +13,14 @@
 /// \author Nepeivoda Roman (roman.nepeivoda@cern.ch)
 /// \author Chiara De Martin (chiara.de.martin@cern.ch)
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/EventSelection.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Tutorials/PWGMM/myExampleTask.cxx b/.auto-resolution/Tutorials/PWGMM/myExampleTask.cxx
index f7035781b6e..2de9b8c1114 100644
--- a/.auto-resolution/Tutorials/PWGMM/myExampleTask.cxx
+++ b/.auto-resolution/Tutorials/PWGMM/myExampleTask.cxx
@@ -13,8 +13,8 @@
 ///        it is meant to be a blank page for further developments.
 /// \author everyone
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Tutorials/PWGUD/UDTutorial_01.cxx b/.auto-resolution/Tutorials/PWGUD/UDTutorial_01.cxx
index c2cbf7b4f13..70161203257 100644
--- a/.auto-resolution/Tutorials/PWGUD/UDTutorial_01.cxx
+++ b/.auto-resolution/Tutorials/PWGUD/UDTutorial_01.cxx
@@ -13,13 +13,15 @@
 // \author Paul Buehler, paul.buehler@oeaw.ac.at
 // \since  April 2023
 
-#include "Framework/runDataProcessing.h"
+#include "PWGUD/Core/UDHelpers.h"
+#include "PWGUD/DataModel/UDTables.h"
+
+#include "Common/DataModel/PIDResponse.h"
+
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 #include "TVector3.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/UDHelpers.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Tutorials/PWGUD/UDTutorial_02a.cxx b/.auto-resolution/Tutorials/PWGUD/UDTutorial_02a.cxx
index 75aa83c87a7..f10174d8d5b 100644
--- a/.auto-resolution/Tutorials/PWGUD/UDTutorial_02a.cxx
+++ b/.auto-resolution/Tutorials/PWGUD/UDTutorial_02a.cxx
@@ -13,14 +13,16 @@
 // \author Paul Buehler, paul.buehler@oeaw.ac.at
 // \since  April 2023
 
-#include "Framework/runDataProcessing.h"
+#include "PWGUD/Core/UDHelpers.h"
+#include "PWGUD/DataModel/UDTables.h"
+
+#include "Common/DataModel/PIDResponse.h"
+
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 #include "TDatabasePDG.h"
 #include "TLorentzVector.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/UDHelpers.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Tutorials/PWGUD/UDTutorial_02b.cxx b/.auto-resolution/Tutorials/PWGUD/UDTutorial_02b.cxx
index 26a76a98186..315ae0dd45a 100644
--- a/.auto-resolution/Tutorials/PWGUD/UDTutorial_02b.cxx
+++ b/.auto-resolution/Tutorials/PWGUD/UDTutorial_02b.cxx
@@ -13,13 +13,14 @@
 // \author Paul Buehler, paul.buehler@oeaw.ac.at
 // \since  April 2023
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
+#include "PWGUD/Core/DGPIDSelector.h"
+#include "PWGUD/Core/UDHelpers.h"
+#include "PWGUD/DataModel/UDTables.h"
 
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/UDHelpers.h"
-#include "PWGUD/Core/DGPIDSelector.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Tutorials/PWGUD/UDTutorial_03a.cxx b/.auto-resolution/Tutorials/PWGUD/UDTutorial_03a.cxx
index 9840123236b..a466ddfc1ff 100644
--- a/.auto-resolution/Tutorials/PWGUD/UDTutorial_03a.cxx
+++ b/.auto-resolution/Tutorials/PWGUD/UDTutorial_03a.cxx
@@ -13,15 +13,17 @@
 // \author Paul Buehler, paul.buehler@oeaw.ac.at
 // \since  October 2023
 
-#include "Framework/runDataProcessing.h"
+#include "PWGUD/Core/UDHelpers.h"
+
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 #include "TDatabasePDG.h"
 #include "TLorentzVector.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/Core/UDHelpers.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Tutorials/PWGUD/UDTutorial_03b.cxx b/.auto-resolution/Tutorials/PWGUD/UDTutorial_03b.cxx
index 71a144f1d1e..562836e0dce 100644
--- a/.auto-resolution/Tutorials/PWGUD/UDTutorial_03b.cxx
+++ b/.auto-resolution/Tutorials/PWGUD/UDTutorial_03b.cxx
@@ -13,15 +13,17 @@
 // \author Paul Buehler, paul.buehler@oeaw.ac.at
 // \since  October 2023
 
-#include "Framework/runDataProcessing.h"
+#include "PWGUD/Core/UDHelpers.h"
+
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 #include "TDatabasePDG.h"
 #include "TLorentzVector.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/Core/UDHelpers.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Tutorials/PWGUD/UDTutorial_04.cxx b/.auto-resolution/Tutorials/PWGUD/UDTutorial_04.cxx
index 94a93cb0ef4..8b16a7fde51 100644
--- a/.auto-resolution/Tutorials/PWGUD/UDTutorial_04.cxx
+++ b/.auto-resolution/Tutorials/PWGUD/UDTutorial_04.cxx
@@ -13,13 +13,14 @@
 // \author Paul Buehler, paul.buehler@oeaw.ac.at
 // \since  October 2023
 
-#include "Framework/runDataProcessing.h"
+#include "PWGUD/Core/UDHelpers.h"
+#include "PWGUD/DataModel/UDTables.h"
+
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 #include "TDatabasePDG.h"
 #include "TLorentzVector.h"
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/UDHelpers.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Tutorials/PWGUD/UDTutorial_05.cxx b/.auto-resolution/Tutorials/PWGUD/UDTutorial_05.cxx
index 40375c48614..9ca8ddf62d5 100644
--- a/.auto-resolution/Tutorials/PWGUD/UDTutorial_05.cxx
+++ b/.auto-resolution/Tutorials/PWGUD/UDTutorial_05.cxx
@@ -10,16 +10,18 @@
 // or submit itself to any jurisdiction.
 //
 
-#include <iostream>
-#include "TLorentzVector.h"
-#include "TDatabasePDG.h"
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "PWGUD/DataModel/UDTables.h"
 #include "PWGUD/Core/SGSelector.h"
 #include "PWGUD/Core/SGTrackSelector.h"
+#include "PWGUD/DataModel/UDTables.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TDatabasePDG.h"
+#include "TLorentzVector.h"
+
+#include <iostream>
 
 // using namespace std;
 using namespace o2;
diff --git a/.auto-resolution/Tutorials/PWGUD/UDTutorial_06.cxx b/.auto-resolution/Tutorials/PWGUD/UDTutorial_06.cxx
index 9b1d1f55895..d7ef0273e7f 100644
--- a/.auto-resolution/Tutorials/PWGUD/UDTutorial_06.cxx
+++ b/.auto-resolution/Tutorials/PWGUD/UDTutorial_06.cxx
@@ -14,23 +14,23 @@
 /// \date 10.10.2024
 
 // O2 headers
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 // O2Physics headers
-#include "PWGUD/DataModel/UDTables.h"
 #include "PWGUD/Core/UDHelpers.h"
+#include "PWGUD/DataModel/UDTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPLHCIFData.h"
 #include "DataFormatsParameters/GRPECSObject.h"
+#include "DataFormatsParameters/GRPLHCIFData.h"
 
 // ROOT headers
-#include "TSystem.h"
 #include "TDatabasePDG.h"
 #include "TLorentzVector.h"
-#include "TLorentzVector.h"
 #include "TMath.h"
+#include "TSystem.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Tutorials/PWGUD/UDTutorial_07.cxx b/.auto-resolution/Tutorials/PWGUD/UDTutorial_07.cxx
index 0060b68293e..cfa5dc6d27c 100644
--- a/.auto-resolution/Tutorials/PWGUD/UDTutorial_07.cxx
+++ b/.auto-resolution/Tutorials/PWGUD/UDTutorial_07.cxx
@@ -9,16 +9,19 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 //
-#include <iostream>
-#include <TString.h>
-#include <TTree.h>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "PWGUD/DataModel/UDTables.h"
-#include "TLorentzVector.h"
 #include "PWGUD/Core/SGSelector.h"
 #include "PWGUD/Core/SGTrackSelector.h"
+#include "PWGUD/DataModel/UDTables.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TLorentzVector.h"
+#include <TString.h>
+#include <TTree.h>
+
+#include <iostream>
 
 using namespace std;
 using namespace o2;
diff --git a/.auto-resolution/Tutorials/Skimming/DataModel/JEDerived.h b/.auto-resolution/Tutorials/Skimming/DataModel/JEDerived.h
index 20a8b3d076e..b0b79c2060a 100644
--- a/.auto-resolution/Tutorials/Skimming/DataModel/JEDerived.h
+++ b/.auto-resolution/Tutorials/Skimming/DataModel/JEDerived.h
@@ -29,7 +29,7 @@ DECLARE_SOA_COLUMN(Area, area, float);
 DECLARE_SOA_DYNAMIC_COLUMN(Px, px, [](float pt, float phi) { return pt * TMath::Cos(phi); });
 DECLARE_SOA_DYNAMIC_COLUMN(Py, py, [](float pt, float phi) { return pt * TMath::Sin(phi); });
 DECLARE_SOA_DYNAMIC_COLUMN(Pz, pz, [](float pt, float eta) { return pt * TMath::SinH(eta); });
-DECLARE_SOA_DYNAMIC_COLUMN(P, p, [](float pt, float eta) { return pt * TMath::CosH(eta); }); //absolute p
+DECLARE_SOA_DYNAMIC_COLUMN(P, p, [](float pt, float eta) { return pt * TMath::CosH(eta); }); // absolute p
 } // namespace jejet
 
 DECLARE_SOA_TABLE(JEJets, "AOD", "JEJET",
@@ -56,7 +56,7 @@ DECLARE_SOA_COLUMN(Phi, phi, float);
 DECLARE_SOA_DYNAMIC_COLUMN(Px, px, [](float pt, float phi) { return pt * TMath::Cos(phi); });
 DECLARE_SOA_DYNAMIC_COLUMN(Py, py, [](float pt, float phi) { return pt * TMath::Sin(phi); });
 DECLARE_SOA_DYNAMIC_COLUMN(Pz, pz, [](float pt, float eta) { return pt * TMath::SinH(eta); });
-DECLARE_SOA_DYNAMIC_COLUMN(P, p, [](float pt, float eta) { return pt * TMath::CosH(eta); }); //absolute p
+DECLARE_SOA_DYNAMIC_COLUMN(P, p, [](float pt, float eta) { return pt * TMath::CosH(eta); }); // absolute p
 } // namespace jeconstituent
 
 DECLARE_SOA_TABLE(JEConstituents, "AOD", "JECONSTITUENT", o2::soa::Index<>,
diff --git a/.auto-resolution/Tutorials/Skimming/derivedBasicConsumer.cxx b/.auto-resolution/Tutorials/Skimming/derivedBasicConsumer.cxx
index c96eeb156e7..21b06c2f9a6 100644
--- a/.auto-resolution/Tutorials/Skimming/derivedBasicConsumer.cxx
+++ b/.auto-resolution/Tutorials/Skimming/derivedBasicConsumer.cxx
@@ -11,13 +11,15 @@
 /// \author Nima Zardoshti <nima.zardoshti@cern.ch>, CERN
 
 // O2 includes
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "DataModel/DerivedExampleTable.h"
 
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "ReconstructionDataFormats/Track.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.auto-resolution/Tutorials/Skimming/derivedBasicProvider.cxx b/.auto-resolution/Tutorials/Skimming/derivedBasicProvider.cxx
index 93e567ecc9b..b0613b74cfd 100644
--- a/.auto-resolution/Tutorials/Skimming/derivedBasicProvider.cxx
+++ b/.auto-resolution/Tutorials/Skimming/derivedBasicProvider.cxx
@@ -10,13 +10,15 @@
 // or submit itself to any jurisdiction.
 
 // O2 includes
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "DataModel/DerivedExampleTable.h"
 
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "ReconstructionDataFormats/Track.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.auto-resolution/Tutorials/Skimming/jetProvider.cxx b/.auto-resolution/Tutorials/Skimming/jetProvider.cxx
index 36b985bc18d..ace25583de3 100644
--- a/.auto-resolution/Tutorials/Skimming/jetProvider.cxx
+++ b/.auto-resolution/Tutorials/Skimming/jetProvider.cxx
@@ -11,14 +11,17 @@
 /// \author Nima Zardoshti <nima.zardoshti@cern.ch>, CERN
 
 // O2 includes
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "DataModel/JEDerived.h"
-#include "PWGJE/DataModel/Jet.h"
+
 #include "PWGJE/Core/JetFinder.h"
+#include "PWGJE/DataModel/Jet.h"
+
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "ReconstructionDataFormats/Track.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Tutorials/Skimming/jetSpectraAnalyser.cxx b/.auto-resolution/Tutorials/Skimming/jetSpectraAnalyser.cxx
index 6e635cd659e..2257e40086a 100644
--- a/.auto-resolution/Tutorials/Skimming/jetSpectraAnalyser.cxx
+++ b/.auto-resolution/Tutorials/Skimming/jetSpectraAnalyser.cxx
@@ -14,18 +14,19 @@
 // Author: Nima Zardoshti
 //
 
-#include "TH1F.h"
-#include "TTree.h"
+#include "DataModel/JEDerived.h"
+
+#include "PWGJE/Core/JetFinder.h"
+#include "PWGJE/DataModel/Jet.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 
-#include "PWGJE/DataModel/Jet.h"
-#include "PWGJE/Core/JetFinder.h"
-#include "DataModel/JEDerived.h"
+#include "TH1F.h"
+#include "TTree.h"
 
 using namespace o2;
 using namespace o2::framework;
@@ -39,7 +40,7 @@ struct JetSpectraAnalyser {
      {"hNJetConstituents", "Number of constituents;N;entries", {HistType::kTH1F, {{100, -0.5, 99.5}}}},
      {"hConstituentPt", "Constituent pT; Constituent #it{p}_{T} (GeV/#it{c});entries", {HistType::kTH1F, {{100, 0., 100.}}}}}};
 
-  //Filter jetCuts = aod::jet::pt > f_jetPtMin;
+  // Filter jetCuts = aod::jet::pt > f_jetPtMin;
 
   void process(aod::JEJet const& jet,
                aod::JEConstituents const& constituents)
@@ -55,4 +56,5 @@ WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
   return WorkflowSpec{
     adaptAnalysisTask<JetSpectraAnalyser>(cfgc, TaskName{"jetspectra-task-skim-analyser"})};
-}
\ No newline at end of file
+}
+ 
\ No newline at end of file
diff --git a/.auto-resolution/Tutorials/Skimming/jetSpectraReference.cxx b/.auto-resolution/Tutorials/Skimming/jetSpectraReference.cxx
index 74fb82dfc83..e73f5526dc4 100644
--- a/.auto-resolution/Tutorials/Skimming/jetSpectraReference.cxx
+++ b/.auto-resolution/Tutorials/Skimming/jetSpectraReference.cxx
@@ -14,17 +14,17 @@
 // Author: Nima Zardoshti
 //
 
-#include "TH1F.h"
-#include "TTree.h"
+#include "PWGJE/Core/JetFinder.h"
+#include "PWGJE/DataModel/Jet.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 
-#include "PWGJE/DataModel/Jet.h"
-#include "PWGJE/Core/JetFinder.h"
+#include "TH1F.h"
+#include "TTree.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Tutorials/Skimming/spectraNucleiAnalyser.cxx b/.auto-resolution/Tutorials/Skimming/spectraNucleiAnalyser.cxx
index f0647db20a9..cdad3b82434 100644
--- a/.auto-resolution/Tutorials/Skimming/spectraNucleiAnalyser.cxx
+++ b/.auto-resolution/Tutorials/Skimming/spectraNucleiAnalyser.cxx
@@ -10,16 +10,17 @@
 // or submit itself to any jurisdiction.
 // O2 includes
 
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
+#include "DataModel/LFDerived.h"
+
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "DataModel/LFDerived.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
 #include <TLorentzVector.h>
 
diff --git a/.auto-resolution/Tutorials/Skimming/spectraNucleiProvider.cxx b/.auto-resolution/Tutorials/Skimming/spectraNucleiProvider.cxx
index 7a76882fd7a..66fe7b5de4d 100644
--- a/.auto-resolution/Tutorials/Skimming/spectraNucleiProvider.cxx
+++ b/.auto-resolution/Tutorials/Skimming/spectraNucleiProvider.cxx
@@ -11,16 +11,17 @@
 /// \author Nima Zardoshti <nima.zardoshti@cern.ch>, CERN
 
 // O2 includes
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "MathUtils/Utils.h"
 #include "DataModel/LFDerived.h"
 
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "MathUtils/Utils.h"
+#include "ReconstructionDataFormats/Track.h"
 
 #include <TLorentzVector.h>
 
diff --git a/.auto-resolution/Tutorials/Skimming/spectraNucleiReference.cxx b/.auto-resolution/Tutorials/Skimming/spectraNucleiReference.cxx
index 40535297fef..2af935c4339 100644
--- a/.auto-resolution/Tutorials/Skimming/spectraNucleiReference.cxx
+++ b/.auto-resolution/Tutorials/Skimming/spectraNucleiReference.cxx
@@ -10,18 +10,16 @@
 // or submit itself to any jurisdiction.
 // O2 includes
 
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
 #include <TLorentzVector.h>
 
diff --git a/.auto-resolution/Tutorials/Skimming/spectraTPCAnalyser.cxx b/.auto-resolution/Tutorials/Skimming/spectraTPCAnalyser.cxx
index 769ad0b885a..b5e42893f15 100644
--- a/.auto-resolution/Tutorials/Skimming/spectraTPCAnalyser.cxx
+++ b/.auto-resolution/Tutorials/Skimming/spectraTPCAnalyser.cxx
@@ -10,13 +10,15 @@
 // or submit itself to any jurisdiction.
 
 // O2 includes
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
+#include "DataModel/LFDerived.h"
+
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "DataModel/LFDerived.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "ReconstructionDataFormats/Track.h"
 
 using namespace o2;
 using namespace o2::framework;
@@ -63,7 +65,7 @@ struct TPCSpectraAnalyserTask {
     histos.fill(HIST(hpt[i]), track.pt());
   }
 
-  Filter collisionFilter = nabs(aod::collision::posZ) < cfgCutVertex; //collision filters not doing anything now?
+  Filter collisionFilter = nabs(aod::collision::posZ) < cfgCutVertex; // collision filters not doing anything now?
   Filter trackFilter = nabs(aod::lftrack::eta) < cfgCutEta;
 
   void process(soa::Filtered<aod::LFTracks>::iterator const& track)
diff --git a/.auto-resolution/Tutorials/Skimming/spectraTPCProvider.cxx b/.auto-resolution/Tutorials/Skimming/spectraTPCProvider.cxx
index c0bbf087fd3..12ca5c9a1ba 100644
--- a/.auto-resolution/Tutorials/Skimming/spectraTPCProvider.cxx
+++ b/.auto-resolution/Tutorials/Skimming/spectraTPCProvider.cxx
@@ -11,15 +11,17 @@
 /// \author Nima Zardoshti <nima.zardoshti@cern.ch>, CERN
 
 // O2 includes
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
+#include "DataModel/LFDerived.h"
+
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "MathUtils/Utils.h"
-#include "DataModel/LFDerived.h"
+#include "ReconstructionDataFormats/Track.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Tutorials/Skimming/spectraTPCReference.cxx b/.auto-resolution/Tutorials/Skimming/spectraTPCReference.cxx
index 5d23fd202dc..7fbca871870 100644
--- a/.auto-resolution/Tutorials/Skimming/spectraTPCReference.cxx
+++ b/.auto-resolution/Tutorials/Skimming/spectraTPCReference.cxx
@@ -10,13 +10,14 @@
 // or submit itself to any jurisdiction.
 
 // O2 includes
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "ReconstructionDataFormats/Track.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
@@ -47,7 +48,7 @@ struct TPCSpectraReferenceTask {
     }
   }
 
-  //Defining filters and input
+  // Defining filters and input
   Configurable<float> cfgCutVertex{"cfgCutVertex", 10.0f, "Accepted z-vertex range"};
   Configurable<float> cfgCutEta{"cfgCutEta", 0.8f, "Eta range for tracks"};
   Configurable<float> cfgCutPt{"cfgCutPt", 0.0f, "Pt range for tracks"};
diff --git a/.auto-resolution/Tutorials/Skimming/spectraUPCAnalyser.cxx b/.auto-resolution/Tutorials/Skimming/spectraUPCAnalyser.cxx
index cdc6c9a0c4b..2c831ddc591 100644
--- a/.auto-resolution/Tutorials/Skimming/spectraUPCAnalyser.cxx
+++ b/.auto-resolution/Tutorials/Skimming/spectraUPCAnalyser.cxx
@@ -10,16 +10,18 @@
 // or submit itself to any jurisdiction.
 
 // O2 includes
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
+#include "DataModel/UDDerived.h"
+
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "DataModel/UDDerived.h"
-#include "TLorentzVector.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include "TLorentzVector.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Tutorials/Skimming/spectraUPCProvider.cxx b/.auto-resolution/Tutorials/Skimming/spectraUPCProvider.cxx
index 053b7437080..3d6909f88d0 100644
--- a/.auto-resolution/Tutorials/Skimming/spectraUPCProvider.cxx
+++ b/.auto-resolution/Tutorials/Skimming/spectraUPCProvider.cxx
@@ -10,18 +10,19 @@
 // or submit itself to any jurisdiction.
 /// \author Nima Zardoshti <nima.zardoshti@cern.ch>, CERN
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "ReconstructionDataFormats/Track.h"
+#include "DataModel/UDDerived.h"
 
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
 #include <TH1D.h>
-#include "DataModel/UDDerived.h"
 
 using namespace o2;
 using namespace o2::aod::evsel;
diff --git a/.auto-resolution/Tutorials/Skimming/spectraUPCReference.cxx b/.auto-resolution/Tutorials/Skimming/spectraUPCReference.cxx
index f0a26f248f8..59ba6c24ab1 100644
--- a/.auto-resolution/Tutorials/Skimming/spectraUPCReference.cxx
+++ b/.auto-resolution/Tutorials/Skimming/spectraUPCReference.cxx
@@ -9,17 +9,16 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 
-#include <TH1D.h>
 #include "TLorentzVector.h"
+#include <TH1D.h>
 
 using namespace o2;
 using namespace o2::aod::evsel;
diff --git a/.auto-resolution/Tutorials/include/configurableCut.h b/.auto-resolution/Tutorials/include/configurableCut.h
index b690058abf1..2bbb47486fc 100644
--- a/.auto-resolution/Tutorials/include/configurableCut.h
+++ b/.auto-resolution/Tutorials/include/configurableCut.h
@@ -13,10 +13,13 @@
 #define CONFIGURABLECUT_H
 
 #include "Framework/Array2D.h"
-#include <iosfwd>
-#include <Rtypes.h>
+
 #include <TMath.h>
 
+#include <Rtypes.h>
+
+#include <iosfwd>
+
 static constexpr double default_matrix[3][3] = {{1.1, 1.2, 1.3}, {2.1, 2.2, 2.3}, {3.1, 3.2, 3.3}};
 
 class configurableCut
diff --git a/.auto-resolution/Tutorials/src/ZDCVZeroIteration.cxx b/.auto-resolution/Tutorials/src/ZDCVZeroIteration.cxx
index 10b45687213..1804fe5690f 100644
--- a/.auto-resolution/Tutorials/src/ZDCVZeroIteration.cxx
+++ b/.auto-resolution/Tutorials/src/ZDCVZeroIteration.cxx
@@ -17,8 +17,8 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Tutorials/src/associatedExample.cxx b/.auto-resolution/Tutorials/src/associatedExample.cxx
index 6538104d3f5..f7abeeb604e 100644
--- a/.auto-resolution/Tutorials/src/associatedExample.cxx
+++ b/.auto-resolution/Tutorials/src/associatedExample.cxx
@@ -13,8 +13,8 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 namespace o2::aod
 {
@@ -140,7 +140,7 @@ struct PartitionColExtra {
 struct BuildHmpidIndex {
   // build the index table HMPIDTracksIndex
   Builds<aod::HMPIDTracksIndex> idx;
-  void init(InitContext const&){};
+  void init(InitContext const&) {};
 };
 
 struct ConsumeHmpidIndex {
diff --git a/.auto-resolution/Tutorials/src/ccdbaccess.cxx b/.auto-resolution/Tutorials/src/ccdbaccess.cxx
index afa5c9d4d52..69f804195d1 100644
--- a/.auto-resolution/Tutorials/src/ccdbaccess.cxx
+++ b/.auto-resolution/Tutorials/src/ccdbaccess.cxx
@@ -18,10 +18,10 @@
 /// \author Nicolo' Jacazio
 /// \since 2020-06-22
 
-#include "Framework/runDataProcessing.h"
+#include "CommonDataFormat/InteractionRecord.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 #include <CCDB/BasicCCDBManager.h>
-#include "CommonDataFormat/InteractionRecord.h"
 
 #include <chrono>
 
diff --git a/.auto-resolution/Tutorials/src/collisionTracksIteration.cxx b/.auto-resolution/Tutorials/src/collisionTracksIteration.cxx
index a2261504d3b..e7999a01455 100644
--- a/.auto-resolution/Tutorials/src/collisionTracksIteration.cxx
+++ b/.auto-resolution/Tutorials/src/collisionTracksIteration.cxx
@@ -15,8 +15,8 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Tutorials/src/compatibleBCs.cxx b/.auto-resolution/Tutorials/src/compatibleBCs.cxx
index 20d38d032db..22c8b2c49be 100644
--- a/.auto-resolution/Tutorials/src/compatibleBCs.cxx
+++ b/.auto-resolution/Tutorials/src/compatibleBCs.cxx
@@ -15,9 +15,9 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "CommonConstants/LHCConstants.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Tutorials/src/conditionalExpressions.cxx b/.auto-resolution/Tutorials/src/conditionalExpressions.cxx
index 07b9dbac403..5843f2b5a33 100644
--- a/.auto-resolution/Tutorials/src/conditionalExpressions.cxx
+++ b/.auto-resolution/Tutorials/src/conditionalExpressions.cxx
@@ -11,8 +11,8 @@
 ///
 /// \brief Demonstration of conditions in filter expressions
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Tutorials/src/configurableCut.cxx b/.auto-resolution/Tutorials/src/configurableCut.cxx
index 62b1d1adc66..22ef7341b84 100644
--- a/.auto-resolution/Tutorials/src/configurableCut.cxx
+++ b/.auto-resolution/Tutorials/src/configurableCut.cxx
@@ -10,6 +10,7 @@
 // or submit itself to any jurisdiction.
 
 #include "configurableCut.h"
+
 #include <iostream>
 
 std::ostream& operator<<(std::ostream& os, configurableCut const& c)
diff --git a/.auto-resolution/Tutorials/src/configurableCut.json b/.auto-resolution/Tutorials/src/configurableCut.json
index 33d4294b132..be9ab281ad8 100644
--- a/.auto-resolution/Tutorials/src/configurableCut.json
+++ b/.auto-resolution/Tutorials/src/configurableCut.json
@@ -10,12 +10,12 @@
     "internal-dpl-aod-spawner": "",
     "configurable-demo": {
         "cut": {
-		"cut": "0.1",
-		"state": "1"
-	},
+            "cut": "0.1",
+            "state": "1"
+        },
         "mutable_cut": {
-		"cut": "0.2",
-		"state": "-1"
-	}
+            "cut": "0.2",
+            "state": "-1"
+        }
     }
 }
diff --git a/.auto-resolution/Tutorials/src/configurableObjects.cxx b/.auto-resolution/Tutorials/src/configurableObjects.cxx
index 210d93c0dac..0d34f8f1913 100644
--- a/.auto-resolution/Tutorials/src/configurableObjects.cxx
+++ b/.auto-resolution/Tutorials/src/configurableObjects.cxx
@@ -14,11 +14,12 @@
 /// \author
 /// \since
 
-#include <sstream>
-
 #include "configurableCut.h"
-#include "Framework/runDataProcessing.h"
+
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include <sstream>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Tutorials/src/consume.cxx b/.auto-resolution/Tutorials/src/consume.cxx
index f97e65bda87..95e8a8e9a4b 100644
--- a/.auto-resolution/Tutorials/src/consume.cxx
+++ b/.auto-resolution/Tutorials/src/consume.cxx
@@ -14,8 +14,9 @@
 /// \since
 
 #include "IntermediateTables.h"
-#include "Framework/runDataProcessing.h"
+
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Tutorials/src/dynamicColumns.cxx b/.auto-resolution/Tutorials/src/dynamicColumns.cxx
index 48de150b042..2e6dbcc0a15 100644
--- a/.auto-resolution/Tutorials/src/dynamicColumns.cxx
+++ b/.auto-resolution/Tutorials/src/dynamicColumns.cxx
@@ -13,8 +13,8 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 namespace o2::aod
 {
diff --git a/.auto-resolution/Tutorials/src/efficiencyGlobal.cxx b/.auto-resolution/Tutorials/src/efficiencyGlobal.cxx
index ef509cb0bac..e405c479697 100644
--- a/.auto-resolution/Tutorials/src/efficiencyGlobal.cxx
+++ b/.auto-resolution/Tutorials/src/efficiencyGlobal.cxx
@@ -17,9 +17,10 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 #include <CCDB/BasicCCDBManager.h>
+
 #include <chrono>
 
 using namespace o2::framework;
@@ -56,7 +57,7 @@ struct EfficiencyGlobal {
   {
     for (auto& track : tracks) {
       pt->Fill(track.pt(), efficiency->GetBinContent(efficiency->FindBin(track.pt())));
-      //LOGF(info, "Efficiency %f for pt %f", efficiency->GetBinContent(efficiency->FindBin(track.pt())), track.pt());
+      // LOGF(info, "Efficiency %f for pt %f", efficiency->GetBinContent(efficiency->FindBin(track.pt())), track.pt());
     }
   }
 };
diff --git a/.auto-resolution/Tutorials/src/efficiencyPerRun.cxx b/.auto-resolution/Tutorials/src/efficiencyPerRun.cxx
index c2fa7a887ca..57f28054d37 100644
--- a/.auto-resolution/Tutorials/src/efficiencyPerRun.cxx
+++ b/.auto-resolution/Tutorials/src/efficiencyPerRun.cxx
@@ -20,9 +20,10 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 #include <CCDB/BasicCCDBManager.h>
+
 #include <chrono>
 
 using namespace o2::framework;
@@ -58,7 +59,7 @@ struct EfficiencyPerRun {
 
     for (auto& track : tracks) {
       pt->Fill(track.pt(), efficiency->GetBinContent(efficiency->FindBin(track.pt())));
-      //LOGF(info, "Efficiency %f for pt %f", efficiency->GetBinContent(efficiency->FindBin(track.pt())), track.pt());
+      // LOGF(info, "Efficiency %f for pt %f", efficiency->GetBinContent(efficiency->FindBin(track.pt())), track.pt());
     }
   }
 };
diff --git a/.auto-resolution/Tutorials/src/eventMixing.cxx b/.auto-resolution/Tutorials/src/eventMixing.cxx
index a1526740886..759dfeb2ff2 100644
--- a/.auto-resolution/Tutorials/src/eventMixing.cxx
+++ b/.auto-resolution/Tutorials/src/eventMixing.cxx
@@ -14,15 +14,17 @@
 /// \author Karwowska Maja
 /// \since
 
-#include <vector>
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.auto-resolution/Tutorials/src/eventMixingValidation.cxx b/.auto-resolution/Tutorials/src/eventMixingValidation.cxx
index cc1933b0a25..1bfc9891ac5 100644
--- a/.auto-resolution/Tutorials/src/eventMixingValidation.cxx
+++ b/.auto-resolution/Tutorials/src/eventMixingValidation.cxx
@@ -14,15 +14,17 @@
 /// \author Karwowska Maja
 /// \since
 
-#include <vector>
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/SliceCache.h"
 #include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Multiplicity.h"
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
@@ -39,7 +41,7 @@ struct MixedEventsEmptyTables {
   std::vector<double> xBins{VARIABLE_WIDTH, -0.064, -0.062, -0.060, 0.066, 0.068, 0.070, 0.072};
   std::vector<double> yBins{VARIABLE_WIDTH, -0.320, -0.301, -0.300, 0.330, 0.340, 0.350, 0.360};
   using BinningType = ColumnBinningPolicy<aod::collision::PosX, aod::collision::PosY>;
-  BinningType binningOnPositions{{xBins, yBins}, true};                                 // true is for 'ignore overflows' (true by default)
+  BinningType binningOnPositions{{xBins, yBins}, true};                                         // true is for 'ignore overflows' (true by default)
   SameKindPair<aod::Collisions, MyTracks, BinningType> pair{binningOnPositions, 5, -1, &cache}; // indicates that 5 events should be mixed and under/overflow (-1) to be ignored
 
   void process(aod::Collisions const& collisions, MyTracks const& tracks)
@@ -71,7 +73,7 @@ struct MixedEventsJoinedTracks {
   std::vector<double> xBins{VARIABLE_WIDTH, -0.064, -0.062, -0.060, 0.066, 0.068, 0.070, 0.072};
   std::vector<double> yBins{VARIABLE_WIDTH, -0.320, -0.301, -0.300, 0.330, 0.340, 0.350, 0.360};
   using BinningType = ColumnBinningPolicy<aod::collision::PosX, aod::collision::PosY>;
-  BinningType binningOnPositions{{xBins, yBins}, true};                                        // true is for 'ignore overflows' (true by default)
+  BinningType binningOnPositions{{xBins, yBins}, true};                                                // true is for 'ignore overflows' (true by default)
   SameKindPair<aod::Collisions, aod::FullTracks, BinningType> pair{binningOnPositions, 5, -1, &cache}; // indicates that 5 events should be mixed and under/overflow (-1) to be ignored
 
   void process(aod::Collisions const& collisions, aod::FullTracks const& tracks)
diff --git a/.auto-resolution/Tutorials/src/extendedColumns.cxx b/.auto-resolution/Tutorials/src/extendedColumns.cxx
index 72bb2bb55b4..43ec8f77a7d 100644
--- a/.auto-resolution/Tutorials/src/extendedColumns.cxx
+++ b/.auto-resolution/Tutorials/src/extendedColumns.cxx
@@ -13,8 +13,8 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 namespace o2::aod
 {
diff --git a/.auto-resolution/Tutorials/src/extendedTables.cxx b/.auto-resolution/Tutorials/src/extendedTables.cxx
index 643a81e1504..4b50c4d85b0 100644
--- a/.auto-resolution/Tutorials/src/extendedTables.cxx
+++ b/.auto-resolution/Tutorials/src/extendedTables.cxx
@@ -13,8 +13,8 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 namespace o2::aod
 {
diff --git a/.auto-resolution/Tutorials/src/filters.cxx b/.auto-resolution/Tutorials/src/filters.cxx
index a3c590b8bfd..6b2d4a1aba4 100644
--- a/.auto-resolution/Tutorials/src/filters.cxx
+++ b/.auto-resolution/Tutorials/src/filters.cxx
@@ -13,8 +13,8 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 namespace o2::aod
 {
diff --git a/.auto-resolution/Tutorials/src/fullTrackIteration.cxx b/.auto-resolution/Tutorials/src/fullTrackIteration.cxx
index c88ba5b1a78..0bfa4532d55 100644
--- a/.auto-resolution/Tutorials/src/fullTrackIteration.cxx
+++ b/.auto-resolution/Tutorials/src/fullTrackIteration.cxx
@@ -13,8 +13,8 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Tutorials/src/hepMC.cxx b/.auto-resolution/Tutorials/src/hepMC.cxx
index d05941eff06..10d73141b78 100644
--- a/.auto-resolution/Tutorials/src/hepMC.cxx
+++ b/.auto-resolution/Tutorials/src/hepMC.cxx
@@ -13,8 +13,8 @@
 /// \author jgrosseo
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Tutorials/src/histogramRegistry.cxx b/.auto-resolution/Tutorials/src/histogramRegistry.cxx
index ddbcdd18c56..24d5899361c 100644
--- a/.auto-resolution/Tutorials/src/histogramRegistry.cxx
+++ b/.auto-resolution/Tutorials/src/histogramRegistry.cxx
@@ -13,12 +13,13 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include <TParameter.h>
 
+#include "Framework/AnalysisTask.h"
 #include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
+
+#include <TParameter.h>
 
 using namespace o2;
 using namespace o2::framework;
@@ -30,7 +31,7 @@ struct EtaPhiHistograms {
     {
       {"eta", "#eta", {HistType::kTH1F, {{102, -2.01, 2.01}}}},     //
       {"phi", "#varphi", {HistType::kTH1F, {{100, 0., 2. * M_PI}}}} //
-    }                                                               //
+    } //
   };
 
   void process(aod::Tracks const& tracks)
@@ -49,7 +50,7 @@ struct FilteredHistograms {
     {
       {"eta", "#eta", {HistType::kTH1F, {{102, -2.01, 2.01}}}},                            //
       {"ptToPt", "#ptToPt", {HistType::kTH2F, {{100, -0.01, 10.01}, {100, -0.01, 10.01}}}} //
-    }                                                                                      //
+    } //
   };
 
   void process(aod::Tracks const& tracks)
@@ -259,7 +260,7 @@ struct TListTest {
     {
       {"eta", "#eta", {HistType::kTH1F, {{102, -2.01, 2.01}}}},     //
       {"phi", "#varphi", {HistType::kTH1F, {{100, 0., 2. * M_PI}}}} //
-    }                                                               //
+    } //
   };
 
   void init(InitContext const&)
diff --git a/.auto-resolution/Tutorials/src/histogramTrackSelection.cxx b/.auto-resolution/Tutorials/src/histogramTrackSelection.cxx
index df164396b66..599aa0e0ee9 100644
--- a/.auto-resolution/Tutorials/src/histogramTrackSelection.cxx
+++ b/.auto-resolution/Tutorials/src/histogramTrackSelection.cxx
@@ -17,12 +17,12 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-
 #include "Common/Core/TrackSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.auto-resolution/Tutorials/src/histograms.cxx b/.auto-resolution/Tutorials/src/histograms.cxx
index 613b27d05d6..13c44fbc713 100644
--- a/.auto-resolution/Tutorials/src/histograms.cxx
+++ b/.auto-resolution/Tutorials/src/histograms.cxx
@@ -19,8 +19,8 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Tutorials/src/histogramsFullTracks.cxx b/.auto-resolution/Tutorials/src/histogramsFullTracks.cxx
index 8c45e5a3927..a68e3e5a873 100644
--- a/.auto-resolution/Tutorials/src/histogramsFullTracks.cxx
+++ b/.auto-resolution/Tutorials/src/histogramsFullTracks.cxx
@@ -13,9 +13,11 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 #include <TH2F.h>
+
 #include <cmath>
 
 using namespace o2;
diff --git a/.auto-resolution/Tutorials/src/jetAnalysis.cxx b/.auto-resolution/Tutorials/src/jetAnalysis.cxx
index 8313e69f2bb..e684f645b90 100644
--- a/.auto-resolution/Tutorials/src/jetAnalysis.cxx
+++ b/.auto-resolution/Tutorials/src/jetAnalysis.cxx
@@ -14,10 +14,11 @@
 /// \author Jochen Klein
 /// \since
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "PWGJE/DataModel/Jet.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.auto-resolution/Tutorials/src/mcHistograms.cxx b/.auto-resolution/Tutorials/src/mcHistograms.cxx
index 75c28c6c3c4..08bcb24119d 100644
--- a/.auto-resolution/Tutorials/src/mcHistograms.cxx
+++ b/.auto-resolution/Tutorials/src/mcHistograms.cxx
@@ -13,10 +13,11 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "CommonConstants/MathConstants.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TDatabasePDG.h"
 
 using namespace o2;
diff --git a/.auto-resolution/Tutorials/src/mcOnly.cxx b/.auto-resolution/Tutorials/src/mcOnly.cxx
index e72295ecb3a..293bd0a1904 100644
--- a/.auto-resolution/Tutorials/src/mcOnly.cxx
+++ b/.auto-resolution/Tutorials/src/mcOnly.cxx
@@ -13,10 +13,11 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "CommonConstants/MathConstants.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TDatabasePDG.h"
 
 using namespace o2;
diff --git a/.auto-resolution/Tutorials/src/multiplicityEventTrackSelection.cxx b/.auto-resolution/Tutorials/src/multiplicityEventTrackSelection.cxx
index c1e3714f2f3..2c0b4cce38a 100644
--- a/.auto-resolution/Tutorials/src/multiplicityEventTrackSelection.cxx
+++ b/.auto-resolution/Tutorials/src/multiplicityEventTrackSelection.cxx
@@ -17,12 +17,12 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.auto-resolution/Tutorials/src/muonIteration.cxx b/.auto-resolution/Tutorials/src/muonIteration.cxx
index 4b94fe77ae3..497a07cd881 100644
--- a/.auto-resolution/Tutorials/src/muonIteration.cxx
+++ b/.auto-resolution/Tutorials/src/muonIteration.cxx
@@ -16,8 +16,8 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
@@ -65,7 +65,7 @@ struct IterateMuonsSparse {
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
   return WorkflowSpec{
-    //adaptAnalysisTask<IterateMuonsExclusives>(cfgc), // currently does not work
+    // adaptAnalysisTask<IterateMuonsExclusives>(cfgc), // currently does not work
     adaptAnalysisTask<IterateMuons>(cfgc),
     adaptAnalysisTask<IterateMuonsSparse>(cfgc),
   };
diff --git a/.auto-resolution/Tutorials/src/newCollections.cxx b/.auto-resolution/Tutorials/src/newCollections.cxx
index 490782347f3..689d442314f 100644
--- a/.auto-resolution/Tutorials/src/newCollections.cxx
+++ b/.auto-resolution/Tutorials/src/newCollections.cxx
@@ -13,8 +13,8 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 // define columns in a sub-namespace of o2::aod
 // and tables in namespace o2::aod
diff --git a/.auto-resolution/Tutorials/src/partitions.cxx b/.auto-resolution/Tutorials/src/partitions.cxx
index f5b58529a80..aee5605da20 100644
--- a/.auto-resolution/Tutorials/src/partitions.cxx
+++ b/.auto-resolution/Tutorials/src/partitions.cxx
@@ -13,8 +13,8 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Tutorials/src/pidTpcTof.cxx b/.auto-resolution/Tutorials/src/pidTpcTof.cxx
index 777c09c1920..b5d755cf1c0 100644
--- a/.auto-resolution/Tutorials/src/pidTpcTof.cxx
+++ b/.auto-resolution/Tutorials/src/pidTpcTof.cxx
@@ -17,8 +17,8 @@
 
 // O2 includes
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
 
 // O2Physics includes
 #include "Common/DataModel/PIDResponse.h"
diff --git a/.auto-resolution/Tutorials/src/preprocess.cxx b/.auto-resolution/Tutorials/src/preprocess.cxx
index 417bafbf744..290c040db39 100644
--- a/.auto-resolution/Tutorials/src/preprocess.cxx
+++ b/.auto-resolution/Tutorials/src/preprocess.cxx
@@ -16,10 +16,11 @@
 /// \since
 
 #include "IntermediateTables.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
+
 #include "Framework/AnalysisTask.h"
 #include "Framework/ConfigParamSpec.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Tutorials/src/propagatedTracks.cxx b/.auto-resolution/Tutorials/src/propagatedTracks.cxx
index 651738de71e..097adc3ecf3 100644
--- a/.auto-resolution/Tutorials/src/propagatedTracks.cxx
+++ b/.auto-resolution/Tutorials/src/propagatedTracks.cxx
@@ -14,18 +14,18 @@
 // Needs o2-analysis-track-propagation
 //
 
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/Core/trackUtilities.h"
-#include "ReconstructionDataFormats/DCA.h"
-#include "DetectorsBase/Propagator.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CommonUtils/NameConf.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
 #include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/DCA.h"
 
 using namespace o2;
 using namespace o2::constants::math;
@@ -105,4 +105,5 @@ WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
     adaptAnalysisTask<PropagatedTracksQa>(cfgc),
     adaptAnalysisTask<PropagatedTracksExtra>(cfgc),
   };
-}
\ No newline at end of file
+}
+ 
\ No newline at end of file
diff --git a/.auto-resolution/Tutorials/src/reweighting.cxx b/.auto-resolution/Tutorials/src/reweighting.cxx
index 17a4ad4bf33..b1f0c43a22f 100644
--- a/.auto-resolution/Tutorials/src/reweighting.cxx
+++ b/.auto-resolution/Tutorials/src/reweighting.cxx
@@ -28,11 +28,15 @@
 // This workflow is used to create a flat tree for model training
 // Use o2-aod-merger to combine dataframes in output AnalysisResults_trees.root
 
-#include <onnxruntime_cxx_api.h>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/Multiplicity.h"
 #include "TrainingTree.h"
+
+#include "Common/DataModel/Multiplicity.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include <onnxruntime_cxx_api.h>
+
 #include <cmath>
 
 using namespace o2;
diff --git a/.auto-resolution/Tutorials/src/schemaEvolution.cxx b/.auto-resolution/Tutorials/src/schemaEvolution.cxx
index a15fcba6dda..04033257753 100644
--- a/.auto-resolution/Tutorials/src/schemaEvolution.cxx
+++ b/.auto-resolution/Tutorials/src/schemaEvolution.cxx
@@ -16,8 +16,8 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 namespace o2::aod
 {
diff --git a/.auto-resolution/Tutorials/src/tableIOout.cxx b/.auto-resolution/Tutorials/src/tableIOout.cxx
index 403740755d9..75678bca3b6 100644
--- a/.auto-resolution/Tutorials/src/tableIOout.cxx
+++ b/.auto-resolution/Tutorials/src/tableIOout.cxx
@@ -14,8 +14,8 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 namespace o2::aod
 {
diff --git a/.auto-resolution/Tutorials/src/trackIteration.cxx b/.auto-resolution/Tutorials/src/trackIteration.cxx
index ff3271d90c0..53b85c39ec9 100644
--- a/.auto-resolution/Tutorials/src/trackIteration.cxx
+++ b/.auto-resolution/Tutorials/src/trackIteration.cxx
@@ -13,8 +13,8 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.auto-resolution/Tutorials/src/tracksCombinations.cxx b/.auto-resolution/Tutorials/src/tracksCombinations.cxx
index 413e8399e9b..ca5db69f0f4 100644
--- a/.auto-resolution/Tutorials/src/tracksCombinations.cxx
+++ b/.auto-resolution/Tutorials/src/tracksCombinations.cxx
@@ -15,11 +15,12 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
 #include "Common/DataModel/Multiplicity.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::soa;
diff --git a/.auto-resolution/Tutorials/src/treeCreator.cxx b/.auto-resolution/Tutorials/src/treeCreator.cxx
index 27d1f1eda21..70879497ecd 100644
--- a/.auto-resolution/Tutorials/src/treeCreator.cxx
+++ b/.auto-resolution/Tutorials/src/treeCreator.cxx
@@ -30,11 +30,13 @@
 // This workflow is used to create a flat tree for model training
 // Use o2-aod-merger to combine dataframes in output AnalysisResults_trees.root
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/Multiplicity.h"
 #include "TrainingTree.h"
 
+#include "Common/DataModel/Multiplicity.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.auto-resolution/Tutorials/src/weakDecayIteration.cxx b/.auto-resolution/Tutorials/src/weakDecayIteration.cxx
index 0c4bc01f877..0735f5537e0 100644
--- a/.auto-resolution/Tutorials/src/weakDecayIteration.cxx
+++ b/.auto-resolution/Tutorials/src/weakDecayIteration.cxx
@@ -17,8 +17,8 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/ALICE3/Core/DelphesO2TrackSmearer.h b/.conflict-base-0/ALICE3/Core/DelphesO2TrackSmearer.h
index 1e0fd873e2c..7714e53f65f 100644
--- a/.conflict-base-0/ALICE3/Core/DelphesO2TrackSmearer.h
+++ b/.conflict-base-0/ALICE3/Core/DelphesO2TrackSmearer.h
@@ -24,12 +24,13 @@
 #ifndef ALICE3_CORE_DELPHESO2TRACKSMEARER_H_
 #define ALICE3_CORE_DELPHESO2TRACKSMEARER_H_
 
-#include <map>
-#include <iostream>
-#include <fstream>
+#include "ReconstructionDataFormats/Track.h"
 
 #include "TRandom.h"
-#include "ReconstructionDataFormats/Track.h"
+
+#include <fstream>
+#include <iostream>
+#include <map>
 
 ///////////////////////////////
 /// DelphesO2/src/lutCovm.hh //
@@ -85,7 +86,7 @@ struct map_t {
     if (bin > nbins - 1)
       return nbins - 1;
     return bin;
-  }                                                                                                            //;
+  } //;
   void print() { printf("nbins = %d, min = %f, max = %f, log = %s \n", nbins, min, max, log ? "on" : "off"); } //;
 };
 
@@ -214,8 +215,8 @@ class TrackSmearer
         return 7; // Helium3
       default:
         return 2; // Default: pion
-    }             //;
-  }               //;
+    } //;
+  } //;
 
   void setdNdEta(float val) { mdNdEta = val; } //;
 
diff --git a/.conflict-base-0/ALICE3/Core/DetLayer.cxx b/.conflict-base-0/ALICE3/Core/DetLayer.cxx
index 25e61e6e6d5..fa49e4d811e 100644
--- a/.conflict-base-0/ALICE3/Core/DetLayer.cxx
+++ b/.conflict-base-0/ALICE3/Core/DetLayer.cxx
@@ -16,11 +16,11 @@
 /// \brief  Basic struct to hold information regarding a detector layer to be used in fast simulation
 ///
 
-#include <vector>
-#include <string>
-
 #include "DetLayer.h"
 
+#include <string>
+#include <vector>
+
 namespace o2::fastsim
 {
 
diff --git a/.conflict-base-0/ALICE3/Core/DetLayer.h b/.conflict-base-0/ALICE3/Core/DetLayer.h
index 2577c73e42d..e70d719a6e4 100644
--- a/.conflict-base-0/ALICE3/Core/DetLayer.h
+++ b/.conflict-base-0/ALICE3/Core/DetLayer.h
@@ -19,10 +19,10 @@
 #ifndef ALICE3_CORE_DETLAYER_H_
 #define ALICE3_CORE_DETLAYER_H_
 
-#include <string>
-
 #include "TString.h"
 
+#include <string>
+
 namespace o2::fastsim
 {
 
diff --git a/.conflict-base-0/ALICE3/Core/TOFResoALICE3.h b/.conflict-base-0/ALICE3/Core/TOFResoALICE3.h
index b102091f756..9179c550e8e 100644
--- a/.conflict-base-0/ALICE3/Core/TOFResoALICE3.h
+++ b/.conflict-base-0/ALICE3/Core/TOFResoALICE3.h
@@ -20,9 +20,9 @@
 #define O2_ANALYSIS_PID_TOFRESOALICE3_H_
 
 // O2 includes
-#include "PID/ParamBase.h"
 #include "PID/DetectorResponse.h"
 #include "PID/PIDTOF.h"
+#include "PID/ParamBase.h"
 #include "ReconstructionDataFormats/PID.h"
 
 namespace o2::pid::tof
diff --git a/.conflict-base-0/ALICE3/DataModel/A3DecayFinderTables.h b/.conflict-base-0/ALICE3/DataModel/A3DecayFinderTables.h
index 55229bbb5d4..ed5bccfbb56 100644
--- a/.conflict-base-0/ALICE3/DataModel/A3DecayFinderTables.h
+++ b/.conflict-base-0/ALICE3/DataModel/A3DecayFinderTables.h
@@ -19,9 +19,10 @@
 #define ALICE3_DATAMODEL_A3DECAYFINDERTABLES_H_
 
 // O2 includes
-#include "Framework/AnalysisDataModel.h"
 #include "Common/Core/RecoDecay.h"
 
+#include "Framework/AnalysisDataModel.h"
+
 enum a3selectionBit : uint32_t { kDCAxy = 0,
                                  kInnerTOFPion,
                                  kInnerTOFKaon,
diff --git a/.conflict-base-0/ALICE3/TableProducer/OTF/onTheFlyTrackerPid.cxx b/.conflict-base-0/ALICE3/TableProducer/OTF/onTheFlyTrackerPid.cxx
index 42d2bcc5252..54de20c87b7 100644
--- a/.conflict-base-0/ALICE3/TableProducer/OTF/onTheFlyTrackerPid.cxx
+++ b/.conflict-base-0/ALICE3/TableProducer/OTF/onTheFlyTrackerPid.cxx
@@ -20,42 +20,45 @@
 /// \since  May 22, 2025
 ///
 
-#include <utility>
-#include <map>
-#include <string>
-#include <algorithm>
-#include <vector>
+#include "TableHelper.h"
 
+#include "ALICE3/Core/DelphesO2TrackSmearer.h"
+#include "ALICE3/Core/TrackUtilities.h"
+#include "ALICE3/DataModel/OTFPIDTrk.h"
+#include "ALICE3/DataModel/OTFRICH.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
+#include "CommonConstants/GeomConstants.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "CommonUtils/NameConf.h"
+#include "DataFormatsCalibration/MeanVertexObject.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "DetectorsVertexing/HelixHelper.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/Core/trackUtilities.h"
-#include "ALICE3/Core/TrackUtilities.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/DCA.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "CommonUtils/NameConf.h"
-#include "CCDB/CcdbApi.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "DataFormatsCalibration/MeanVertexObject.h"
-#include "CommonConstants/GeomConstants.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "TRandom3.h"
+
 #include "TF1.h"
 #include "TH2F.h"
-#include "TVector3.h"
+#include "TRandom3.h"
 #include "TString.h"
-#include "ALICE3/DataModel/OTFRICH.h"
-#include "DetectorsVertexing/HelixHelper.h"
-#include "TableHelper.h"
-#include "ALICE3/Core/DelphesO2TrackSmearer.h"
-#include "ALICE3/DataModel/OTFPIDTrk.h"
+#include "TVector3.h"
+
+#include <algorithm>
+#include <map>
+#include <string>
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/ALICE3/TableProducer/alice3-centrality.cxx b/.conflict-base-0/ALICE3/TableProducer/alice3-centrality.cxx
index 48c7ae617bf..bd6b8ac09d1 100644
--- a/.conflict-base-0/ALICE3/TableProducer/alice3-centrality.cxx
+++ b/.conflict-base-0/ALICE3/TableProducer/alice3-centrality.cxx
@@ -12,12 +12,13 @@
 /// \author David Dobrigkeit Chinellato <david.dobrigkeit.chinellato@cern.ch>, UNICAMP/CERN
 
 // O2 includes
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 #include <CCDB/BasicCCDBManager.h>
-#include "Common/DataModel/Centrality.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/ALICE3/TableProducer/alice3-correlatorDDbar.cxx b/.conflict-base-0/ALICE3/TableProducer/alice3-correlatorDDbar.cxx
index 6c270dc1cd5..63679b81b76 100644
--- a/.conflict-base-0/ALICE3/TableProducer/alice3-correlatorDDbar.cxx
+++ b/.conflict-base-0/ALICE3/TableProducer/alice3-correlatorDDbar.cxx
@@ -14,21 +14,20 @@
 ///
 /// \author Fabio Colamaria <fabio.colamaria@ba.infn.it>, INFN Bari
 
-#include <vector>
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/Core/SelectorCuts.h"
+#include "PWGHF/HFC/DataModel/CorrelationTables.h"
+
+#include "ALICE3/DataModel/A3DecayFinderTables.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
 #include "CommonConstants/PhysicsConstants.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
 
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-
-#include "ALICE3/DataModel/A3DecayFinderTables.h"
-
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/Core/SelectorCuts.h"
-#include "PWGHF/HFC/DataModel/CorrelationTables.h"
+#include <vector>
 // #include "PWGHF/DataModel/CandidateReconstructionTables.h"
 // #include "PWGHF/DataModel/CandidateSelectionTables.h"
 
diff --git a/.conflict-base-0/ALICE3/TableProducer/alice3-decayfinder.cxx b/.conflict-base-0/ALICE3/TableProducer/alice3-decayfinder.cxx
index 2d12ea9ed14..76ee4cc5027 100644
--- a/.conflict-base-0/ALICE3/TableProducer/alice3-decayfinder.cxx
+++ b/.conflict-base-0/ALICE3/TableProducer/alice3-decayfinder.cxx
@@ -17,35 +17,37 @@
 //    HF decays. Work in progress: use at your own risk!
 //
 
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <map>
-#include <iterator>
-#include <utility>
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "ReconstructionDataFormats/Track.h"
+#include "ALICE3/DataModel/A3DecayFinderTables.h"
+#include "ALICE3/DataModel/OTFTOF.h"
+#include "ALICE3/DataModel/RICH.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
 #include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "DCAFitter/DCAFitterN.h"
 #include "DataFormatsCalibration/MeanVertexObject.h"
-#include "ALICE3/DataModel/OTFTOF.h"
-#include "ALICE3/DataModel/RICH.h"
-#include "ALICE3/DataModel/A3DecayFinderTables.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <iterator>
+#include <map>
+#include <utility>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/ALICE3/TableProducer/alice3-decaypreselector.cxx b/.conflict-base-0/ALICE3/TableProducer/alice3-decaypreselector.cxx
index 527d1c1d197..b613d893292 100644
--- a/.conflict-base-0/ALICE3/TableProducer/alice3-decaypreselector.cxx
+++ b/.conflict-base-0/ALICE3/TableProducer/alice3-decaypreselector.cxx
@@ -17,36 +17,38 @@
 //    HF decays. Work in progress: use at your own risk!
 //
 
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <map>
-#include <iterator>
-#include <vector>
-#include <utility>
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "ReconstructionDataFormats/Track.h"
+#include "ALICE3/DataModel/A3DecayFinderTables.h"
+#include "ALICE3/DataModel/OTFRICH.h"
+#include "ALICE3/DataModel/OTFTOF.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
 #include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "DCAFitter/DCAFitterN.h"
 #include "DataFormatsCalibration/MeanVertexObject.h"
-#include "ALICE3/DataModel/OTFTOF.h"
-#include "ALICE3/DataModel/OTFRICH.h"
-#include "ALICE3/DataModel/A3DecayFinderTables.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <iterator>
+#include <map>
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/ALICE3/TableProducer/alice3-multicharmTable.cxx b/.conflict-base-0/ALICE3/TableProducer/alice3-multicharmTable.cxx
index 16b16c666d8..62713161343 100644
--- a/.conflict-base-0/ALICE3/TableProducer/alice3-multicharmTable.cxx
+++ b/.conflict-base-0/ALICE3/TableProducer/alice3-multicharmTable.cxx
@@ -17,41 +17,43 @@
 //    HF decays. Work in progress: use at your own risk!
 //
 
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <map>
-#include <iterator>
-#include <utility>
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "ReconstructionDataFormats/Track.h"
+#include "ALICE3/DataModel/A3DecayFinderTables.h"
+#include "ALICE3/DataModel/OTFMulticharm.h"
+#include "ALICE3/DataModel/OTFStrangeness.h"
+#include "ALICE3/DataModel/OTFTOF.h"
+#include "ALICE3/DataModel/RICH.h"
+#include "ALICE3/DataModel/tracksAlice3.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
 #include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "DCAFitter/DCAFitterN.h"
 #include "DataFormatsCalibration/MeanVertexObject.h"
-#include "ALICE3/DataModel/OTFTOF.h"
-#include "ALICE3/DataModel/RICH.h"
-#include "ALICE3/DataModel/A3DecayFinderTables.h"
-#include "ALICE3/DataModel/OTFStrangeness.h"
-#include "ALICE3/DataModel/OTFMulticharm.h"
-#include "ALICE3/DataModel/tracksAlice3.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
 #include "DetectorsVertexing/PVertexer.h"
 #include "DetectorsVertexing/PVertexerHelpers.h"
-#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <iterator>
+#include <map>
+#include <utility>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/ALICE3/TableProducer/alice3-pidTOF.cxx b/.conflict-base-0/ALICE3/TableProducer/alice3-pidTOF.cxx
index 3e54b1f46dc..cd5fe0dfff0 100644
--- a/.conflict-base-0/ALICE3/TableProducer/alice3-pidTOF.cxx
+++ b/.conflict-base-0/ALICE3/TableProducer/alice3-pidTOF.cxx
@@ -17,15 +17,16 @@
 ///
 
 // O2 includes
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "ALICE3/Core/TOFResoALICE3.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StaticFor.h"
+#include "ReconstructionDataFormats/Track.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/ALICE3/TableProducer/alice3-trackextension.cxx b/.conflict-base-0/ALICE3/TableProducer/alice3-trackextension.cxx
index 578d1979310..8709b5e7b7e 100644
--- a/.conflict-base-0/ALICE3/TableProducer/alice3-trackextension.cxx
+++ b/.conflict-base-0/ALICE3/TableProducer/alice3-trackextension.cxx
@@ -13,11 +13,12 @@
 // Task performing basic track selection for the ALICE3.
 //
 
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/Core/trackUtilities.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/ALICE3/TableProducer/alice3-trackselection.cxx b/.conflict-base-0/ALICE3/TableProducer/alice3-trackselection.cxx
index 58f3a4f33ce..b45910da01d 100644
--- a/.conflict-base-0/ALICE3/TableProducer/alice3-trackselection.cxx
+++ b/.conflict-base-0/ALICE3/TableProducer/alice3-trackselection.cxx
@@ -14,11 +14,12 @@
 /// \brief  Track selection for the ALICE3 studies
 ///
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/ALICE3/Tasks/ECALqa.cxx b/.conflict-base-0/ALICE3/Tasks/ECALqa.cxx
index b3d1b200f71..8903a101b56 100644
--- a/.conflict-base-0/ALICE3/Tasks/ECALqa.cxx
+++ b/.conflict-base-0/ALICE3/Tasks/ECALqa.cxx
@@ -17,12 +17,13 @@
 ///
 
 // O2 includes
-#include "Framework/AnalysisTask.h"
 #include "ALICE3/DataModel/ECAL.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "ReconstructionDataFormats/PID.h"
+
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/PID.h"
 
 using namespace o2;
 using namespace o2::track;
diff --git a/.conflict-base-0/ALICE3/Tasks/alice3-cdeuteron.cxx b/.conflict-base-0/ALICE3/Tasks/alice3-cdeuteron.cxx
index de6b6738d02..c8357dc9a30 100644
--- a/.conflict-base-0/ALICE3/Tasks/alice3-cdeuteron.cxx
+++ b/.conflict-base-0/ALICE3/Tasks/alice3-cdeuteron.cxx
@@ -13,15 +13,17 @@
 /// \author Alexander Kalweit <alexander.kalweit@cern.ch>, CERN
 
 // O2 includes
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/PIDResponse.h"
+
+#include "DCAFitter/DCAFitterN.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "TLorentzVector.h"
 #include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/PID.h"
-#include "Common/Core/RecoDecay.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/trackUtilities.h"
+
+#include "TLorentzVector.h"
 
 using namespace o2;
 using namespace o2::framework;
@@ -468,7 +470,7 @@ struct Alice3CDeuteron {
 
           // fitterCasc.getTrack(1).getPxPyPzGlo(pvecbach);
         } // End loop on pions
-      }   // End loop on kaons
+      } // End loop on kaons
       histos.fill(HIST("event/candperdeuteron"), ncand);
     } // End loop on deuterons
   }
diff --git a/.conflict-base-0/ALICE3/Tasks/alice3-dilepton.cxx b/.conflict-base-0/ALICE3/Tasks/alice3-dilepton.cxx
index e3632fc5a02..6f20f518d27 100644
--- a/.conflict-base-0/ALICE3/Tasks/alice3-dilepton.cxx
+++ b/.conflict-base-0/ALICE3/Tasks/alice3-dilepton.cxx
@@ -16,16 +16,17 @@
 
 #include "Math/Vector4D.h"
 // O2 includes
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/HistogramRegistry.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Framework/AnalysisDataModel.h"
-#include "ALICE3/DataModel/OTFTOF.h"
 #include "ALICE3/DataModel/OTFRICH.h"
+#include "ALICE3/DataModel/OTFTOF.h"
 #include "ALICE3/DataModel/tracksAlice3.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-base-0/ALICE3/Tasks/alice3-multicharm.cxx b/.conflict-base-0/ALICE3/Tasks/alice3-multicharm.cxx
index 2b6ad804ddf..16332ead7e0 100644
--- a/.conflict-base-0/ALICE3/Tasks/alice3-multicharm.cxx
+++ b/.conflict-base-0/ALICE3/Tasks/alice3-multicharm.cxx
@@ -17,41 +17,43 @@
 //    HF decays. Work in progress: use at your own risk!
 //
 
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <map>
-#include <iterator>
-#include <utility>
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "ReconstructionDataFormats/Track.h"
+#include "ALICE3/DataModel/A3DecayFinderTables.h"
+#include "ALICE3/DataModel/OTFMulticharm.h"
+#include "ALICE3/DataModel/OTFStrangeness.h"
+#include "ALICE3/DataModel/OTFTOF.h"
+#include "ALICE3/DataModel/RICH.h"
+#include "ALICE3/DataModel/tracksAlice3.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
 #include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "DCAFitter/DCAFitterN.h"
 #include "DataFormatsCalibration/MeanVertexObject.h"
-#include "ALICE3/DataModel/OTFTOF.h"
-#include "ALICE3/DataModel/RICH.h"
-#include "ALICE3/DataModel/A3DecayFinderTables.h"
-#include "ALICE3/DataModel/OTFStrangeness.h"
-#include "ALICE3/DataModel/OTFMulticharm.h"
-#include "ALICE3/DataModel/tracksAlice3.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
 #include "DetectorsVertexing/PVertexer.h"
 #include "DetectorsVertexing/PVertexerHelpers.h"
-#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <iterator>
+#include <map>
+#include <utility>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/ALICE3/Tasks/alice3-qa-multiplicity.cxx b/.conflict-base-0/ALICE3/Tasks/alice3-qa-multiplicity.cxx
index b798209dfde..8d15316eb05 100644
--- a/.conflict-base-0/ALICE3/Tasks/alice3-qa-multiplicity.cxx
+++ b/.conflict-base-0/ALICE3/Tasks/alice3-qa-multiplicity.cxx
@@ -11,11 +11,12 @@
 /// \author Nicolo' Jacazio <nicolo.jacazio@cern.ch>, CERN
 
 // O2 includes
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-base-0/ALICE3/Tasks/alice3-qa-singleparticle.cxx b/.conflict-base-0/ALICE3/Tasks/alice3-qa-singleparticle.cxx
index 1c8f0f19330..32925a2708b 100644
--- a/.conflict-base-0/ALICE3/Tasks/alice3-qa-singleparticle.cxx
+++ b/.conflict-base-0/ALICE3/Tasks/alice3-qa-singleparticle.cxx
@@ -17,9 +17,10 @@
 
 // O2 includes
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TDatabasePDG.h"
 #include "TMCProcess.h"
 
diff --git a/.conflict-base-0/ALICE3/Tasks/alice3-taskcorrelationDDbar.cxx b/.conflict-base-0/ALICE3/Tasks/alice3-taskcorrelationDDbar.cxx
index b6c8058f747..914cc3ba95c 100644
--- a/.conflict-base-0/ALICE3/Tasks/alice3-taskcorrelationDDbar.cxx
+++ b/.conflict-base-0/ALICE3/Tasks/alice3-taskcorrelationDDbar.cxx
@@ -14,15 +14,15 @@
 ///
 /// \author Fabio Colamaria <fabio.colamaria@ba.infn.it>, INFN Bari
 
-#include <vector>
+#include "PWGHF/Core/SelectorCuts.h"
+#include "PWGHF/HFC/DataModel/CorrelationTables.h"
+#include "PWGHF/Utils/utilsAnalysis.h"
 
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
 
-#include "PWGHF/Core/SelectorCuts.h"
-#include "PWGHF/Utils/utilsAnalysis.h"
-#include "PWGHF/HFC/DataModel/CorrelationTables.h"
+#include <vector>
 // #include "PWGHF/DataModel/CandidateReconstructionTables.h"
 // #include "PWGHF/DataModel/CandidateSelectionTables.h"
 
diff --git a/.conflict-base-0/ALICE3/Tasks/alice3Efficiency.cxx b/.conflict-base-0/ALICE3/Tasks/alice3Efficiency.cxx
index 7741ea24696..0f247305d00 100644
--- a/.conflict-base-0/ALICE3/Tasks/alice3Efficiency.cxx
+++ b/.conflict-base-0/ALICE3/Tasks/alice3Efficiency.cxx
@@ -17,16 +17,17 @@
 /// \since  May 27, 2025
 ///
 
-#include <map>
-#include <vector>
-
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/HistogramRegistry.h"
 #include "Framework/ConfigParamRegistry.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TEfficiency.h"
 #include "THashList.h"
 
+#include <map>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 std::map<int, TEfficiency*> effVsPt;
diff --git a/.conflict-base-0/ALICE3/Tasks/alice3SeparationPower.cxx b/.conflict-base-0/ALICE3/Tasks/alice3SeparationPower.cxx
index ae5b52d0692..c01cbdaf767 100644
--- a/.conflict-base-0/ALICE3/Tasks/alice3SeparationPower.cxx
+++ b/.conflict-base-0/ALICE3/Tasks/alice3SeparationPower.cxx
@@ -17,20 +17,22 @@
 /// \since  May 13, 2025
 ///
 
-#include <utility>
-#include <map>
-#include <string>
-#include <vector>
+#include "ALICE3/DataModel/OTFRICH.h"
+#include "ALICE3/DataModel/OTFTOF.h"
 
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
 #include "Framework/HistogramRegistry.h"
-#include "TProfile2D.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+
 #include "THashList.h"
-#include "ALICE3/DataModel/OTFTOF.h"
-#include "ALICE3/DataModel/OTFRICH.h"
+#include "TProfile2D.h"
+
+#include <map>
+#include <string>
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/ALICE3/Tasks/pidFTOFqa.cxx b/.conflict-base-0/ALICE3/Tasks/pidFTOFqa.cxx
index 52dbaf8dcfa..03fa51e58cc 100644
--- a/.conflict-base-0/ALICE3/Tasks/pidFTOFqa.cxx
+++ b/.conflict-base-0/ALICE3/Tasks/pidFTOFqa.cxx
@@ -10,14 +10,15 @@
 // or submit itself to any jurisdiction.
 
 // O2 includes
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
 #include "ALICE3/DataModel/FTOF.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-base-0/ALICE3/Tasks/pidRICHqa.cxx b/.conflict-base-0/ALICE3/Tasks/pidRICHqa.cxx
index ab2a71e3ad9..392d4d99b8d 100644
--- a/.conflict-base-0/ALICE3/Tasks/pidRICHqa.cxx
+++ b/.conflict-base-0/ALICE3/Tasks/pidRICHqa.cxx
@@ -16,9 +16,10 @@
 ///
 
 // O2 includes
-#include "Framework/AnalysisTask.h"
 #include "ALICE3/DataModel/RICH.h"
 #include "Common/DataModel/PIDResponse.h"
+
+#include "Framework/AnalysisTask.h"
 #include "ReconstructionDataFormats/PID.h"
 
 using namespace o2;
diff --git a/.conflict-base-0/Common/CCDB/EventSelectionParams.h b/.conflict-base-0/Common/CCDB/EventSelectionParams.h
index 4633ff7aa73..cc4c397dd1b 100644
--- a/.conflict-base-0/Common/CCDB/EventSelectionParams.h
+++ b/.conflict-base-0/Common/CCDB/EventSelectionParams.h
@@ -17,9 +17,10 @@
 #ifndef COMMON_CCDB_EVENTSELECTIONPARAMS_H_
 #define COMMON_CCDB_EVENTSELECTIONPARAMS_H_
 
-#include <Rtypes.h>
 #include <TMath.h>
 
+#include <Rtypes.h>
+
 namespace o2::aod::evsel
 {
 // Event selection criteria
diff --git a/.conflict-base-0/Common/CCDB/RCTSelectionFlags.h b/.conflict-base-0/Common/CCDB/RCTSelectionFlags.h
index 1f396751c25..f80a1a7aa1b 100644
--- a/.conflict-base-0/Common/CCDB/RCTSelectionFlags.h
+++ b/.conflict-base-0/Common/CCDB/RCTSelectionFlags.h
@@ -18,11 +18,13 @@
 #define COMMON_CCDB_RCTSELECTIONFLAGS_H_
 
 #include <CommonUtils/EnumFlags.h>
-#include <Rtypes.h>
+
 #include <TMath.h>
 
-#include <stdexcept>
+#include <Rtypes.h>
+
 #include <algorithm>
+#include <stdexcept>
 #include <string>
 #include <vector>
 
diff --git a/.conflict-base-0/Common/CCDB/TriggerAliases.cxx b/.conflict-base-0/Common/CCDB/TriggerAliases.cxx
index 789d293c1d0..1c013e58ad3 100644
--- a/.conflict-base-0/Common/CCDB/TriggerAliases.cxx
+++ b/.conflict-base-0/Common/CCDB/TriggerAliases.cxx
@@ -10,6 +10,7 @@
 // or submit itself to any jurisdiction.
 
 #include "Common/CCDB/TriggerAliases.h"
+
 #include "Framework/Logger.h"
 
 std::string aliasLabels[kNaliases] = {
diff --git a/.conflict-base-0/Common/CCDB/TriggerAliases.h b/.conflict-base-0/Common/CCDB/TriggerAliases.h
index f1baf04fdcc..fff86e67e1f 100644
--- a/.conflict-base-0/Common/CCDB/TriggerAliases.h
+++ b/.conflict-base-0/Common/CCDB/TriggerAliases.h
@@ -12,10 +12,11 @@
 #ifndef COMMON_CCDB_TRIGGERALIASES_H_
 #define COMMON_CCDB_TRIGGERALIASES_H_
 
+#include <Rtypes.h>
+
 #include <cstdint>
 #include <map>
 #include <string>
-#include <Rtypes.h>
 
 enum triggerAliases {
   kINT7 = 0,
diff --git a/.conflict-base-0/Common/CCDB/ctpRateFetcher.cxx b/.conflict-base-0/Common/CCDB/ctpRateFetcher.cxx
index e20fc41616c..5a3b1e48132 100644
--- a/.conflict-base-0/Common/CCDB/ctpRateFetcher.cxx
+++ b/.conflict-base-0/Common/CCDB/ctpRateFetcher.cxx
@@ -11,14 +11,14 @@
 
 #include "ctpRateFetcher.h"
 
-#include <map>
-#include <vector>
-
+#include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/LHCConstants.h"
 #include "DataFormatsCTP/Configuration.h"
 #include "DataFormatsCTP/Scalers.h"
 #include "DataFormatsParameters/GRPLHCIFData.h"
-#include "CCDB/BasicCCDBManager.h"
+
+#include <map>
+#include <vector>
 
 namespace o2
 {
diff --git a/.conflict-base-0/Common/CCDB/ctpRateFetcher.h b/.conflict-base-0/Common/CCDB/ctpRateFetcher.h
index 6aaf5e3ebaa..beb8cd28b8e 100644
--- a/.conflict-base-0/Common/CCDB/ctpRateFetcher.h
+++ b/.conflict-base-0/Common/CCDB/ctpRateFetcher.h
@@ -12,10 +12,10 @@
 #ifndef COMMON_CCDB_CTPRATEFETCHER_H_
 #define COMMON_CCDB_CTPRATEFETCHER_H_
 
-#include <string>
-
 #include "CCDB/BasicCCDBManager.h"
 
+#include <string>
+
 namespace o2
 {
 
diff --git a/.conflict-base-0/Common/CCDB/macros/ctpRateF.C b/.conflict-base-0/Common/CCDB/macros/ctpRateF.C
index 32b93e4aa6b..efce284c159 100644
--- a/.conflict-base-0/Common/CCDB/macros/ctpRateF.C
+++ b/.conflict-base-0/Common/CCDB/macros/ctpRateF.C
@@ -9,15 +9,16 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <map>
-#include <vector>
+#include "Common/CCDB/ctpRateFetcher.h"
 
+#include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/LHCConstants.h"
 #include "DataFormatsCTP/Configuration.h"
 #include "DataFormatsCTP/Scalers.h"
 #include "DataFormatsParameters/GRPLHCIFData.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "Common/CCDB/ctpRateFetcher.h"
+
+#include <map>
+#include <vector>
 
 struct ctpRateFetcher {
   ctpRateFetcher() = default;
diff --git a/.conflict-base-0/Common/CCDB/macros/upload_event_selection_params.C b/.conflict-base-0/Common/CCDB/macros/upload_event_selection_params.C
index cafc863ab03..8296dc0f78a 100644
--- a/.conflict-base-0/Common/CCDB/macros/upload_event_selection_params.C
+++ b/.conflict-base-0/Common/CCDB/macros/upload_event_selection_params.C
@@ -9,12 +9,15 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "CCDB/CcdbApi.h"
+#include "EventSelectionParams.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
+
 #include "TString.h"
+
 #include <map>
 #include <string>
-#include "EventSelectionParams.h"
 using std::map;
 using std::string;
 
diff --git a/.conflict-base-0/Common/CCDB/macros/upload_event_selection_params_run3.C b/.conflict-base-0/Common/CCDB/macros/upload_event_selection_params_run3.C
index f81491949c6..f7887aa1df5 100644
--- a/.conflict-base-0/Common/CCDB/macros/upload_event_selection_params_run3.C
+++ b/.conflict-base-0/Common/CCDB/macros/upload_event_selection_params_run3.C
@@ -9,11 +9,14 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
+#include "EventSelectionParams.h"
+
 #include "CCDB/CcdbApi.h"
+
 #include "TString.h"
+
 #include <map>
 #include <string>
-#include "EventSelectionParams.h"
 using std::map;
 using std::string;
 
@@ -140,4 +143,5 @@ void fillMapOfCustomOrbitShifts(std::map<int, int>& mapOrbitShift)
   mapOrbitShift[523797] = 41;
   mapOrbitShift[523821] = 36;
   mapOrbitShift[523897] = 38;
-}
\ No newline at end of file
+}
+ 
\ No newline at end of file
diff --git a/.conflict-base-0/Common/CCDB/macros/upload_trigger_aliases.C b/.conflict-base-0/Common/CCDB/macros/upload_trigger_aliases.C
index 9fa91cd9b13..a6bf004edb5 100644
--- a/.conflict-base-0/Common/CCDB/macros/upload_trigger_aliases.C
+++ b/.conflict-base-0/Common/CCDB/macros/upload_trigger_aliases.C
@@ -9,12 +9,15 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "CCDB/CcdbApi.h"
+#include "TriggerAliases.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
+
 #include "TObjArray.h"
-#include "TriggerAliases.h"
-#include "TTree.h"
 #include "TString.h"
+#include "TTree.h"
+
 #include <fstream>
 #include <map>
 #include <string>
diff --git a/.conflict-base-0/Common/CCDB/macros/upload_trigger_aliases_run3.C b/.conflict-base-0/Common/CCDB/macros/upload_trigger_aliases_run3.C
index e946d9117d4..75e813b6dd3 100644
--- a/.conflict-base-0/Common/CCDB/macros/upload_trigger_aliases_run3.C
+++ b/.conflict-base-0/Common/CCDB/macros/upload_trigger_aliases_run3.C
@@ -9,13 +9,16 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "DataFormatsCTP/Configuration.h"
-#include "CCDB/CcdbApi.h"
+#include "TriggerAliases.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
+#include "DataFormatsCTP/Configuration.h"
+
 #include "TObjArray.h"
-#include "TriggerAliases.h"
-#include "TTree.h"
 #include "TString.h"
+#include "TTree.h"
+
 #include <fstream>
 #include <map>
 #include <string>
diff --git a/.conflict-base-0/Common/Core/CollisionAssociation.h b/.conflict-base-0/Common/Core/CollisionAssociation.h
index 69ec38a24db..c505f0c6dbb 100644
--- a/.conflict-base-0/Common/Core/CollisionAssociation.h
+++ b/.conflict-base-0/Common/Core/CollisionAssociation.h
@@ -20,13 +20,13 @@
 #ifndef COMMON_CORE_COLLISIONASSOCIATION_H_
 #define COMMON_CORE_COLLISIONASSOCIATION_H_
 
-#include <vector>
-#include <memory>
-#include <utility>
-
 #include "CommonConstants/LHCConstants.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+
+#include <memory>
+#include <utility>
+#include <vector>
 
 namespace o2::aod
 {
diff --git a/.conflict-base-0/Common/Core/EventPlaneHelper.cxx b/.conflict-base-0/Common/Core/EventPlaneHelper.cxx
index 75424d900d9..b1e63af16fa 100644
--- a/.conflict-base-0/Common/Core/EventPlaneHelper.cxx
+++ b/.conflict-base-0/Common/Core/EventPlaneHelper.cxx
@@ -20,13 +20,13 @@
 
 #include "Common/Core/EventPlaneHelper.h"
 
+#include "TMath.h"
+#include "TVector3.h"
+
 #include <algorithm>
 #include <iterator>
-#include <vector>
 #include <memory>
-
-#include "TMath.h"
-#include "TVector3.h"
+#include <vector>
 
 double EventPlaneHelper::GetPhiFV0(int chno, o2::fv0::Geometry* fv0geom)
 {
diff --git a/.conflict-base-0/Common/Core/EventPlaneHelper.h b/.conflict-base-0/Common/Core/EventPlaneHelper.h
index d6a2f3cba11..c85c04fe092 100644
--- a/.conflict-base-0/Common/Core/EventPlaneHelper.h
+++ b/.conflict-base-0/Common/Core/EventPlaneHelper.h
@@ -21,17 +21,16 @@
 #ifndef COMMON_CORE_EVENTPLANEHELPER_H_
 #define COMMON_CORE_EVENTPLANEHELPER_H_
 
-#include <vector>
-#include <memory>
+#include "FT0Base/Geometry.h"
+#include "FV0Base/Geometry.h"
 
 #include "TNamed.h"
-
 #include <TComplex.h>
 #include <TH2D.h>
 #include <TProfile.h>
 
-#include "FV0Base/Geometry.h"
-#include "FT0Base/Geometry.h"
+#include <memory>
+#include <vector>
 
 class EventPlaneHelper
 {
diff --git a/.conflict-base-0/Common/Core/FFitWeights.cxx b/.conflict-base-0/Common/Core/FFitWeights.cxx
index 3a92114f48c..3cb9216ba85 100644
--- a/.conflict-base-0/Common/Core/FFitWeights.cxx
+++ b/.conflict-base-0/Common/Core/FFitWeights.cxx
@@ -16,12 +16,12 @@
 
 #include "FFitWeights.h"
 
-#include <string>
+#include <TSpline.h>
+
 #include <cstdio>
+#include <string>
 #include <vector>
 
-#include <TSpline.h>
-
 ClassImp(FFitWeights)
 
   FFitWeights::FFitWeights() : TNamed("", ""),
diff --git a/.conflict-base-0/Common/Core/FFitWeights.h b/.conflict-base-0/Common/Core/FFitWeights.h
index c80165730f7..5227eefa359 100644
--- a/.conflict-base-0/Common/Core/FFitWeights.h
+++ b/.conflict-base-0/Common/Core/FFitWeights.h
@@ -17,22 +17,22 @@
 #ifndef COMMON_CORE_FFITWEIGHTS_H_
 #define COMMON_CORE_FFITWEIGHTS_H_
 
-#include <vector>
-#include <string>
-#include <utility>
-#include <algorithm>
-#include <complex>
-#include <memory>
-
+#include "TCollection.h"
+#include "TFile.h"
+#include "TH1D.h"
+#include "TH2D.h"
+#include "TH3D.h"
+#include "TMath.h"
 #include "TNamed.h"
 #include "TObjArray.h"
-#include "TH3D.h"
-#include "TH2D.h"
-#include "TH1D.h"
-#include "TFile.h"
-#include "TCollection.h"
 #include "TString.h"
-#include "TMath.h"
+
+#include <algorithm>
+#include <complex>
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
 
 class FFitWeights : public TNamed
 {
diff --git a/.conflict-base-0/Common/Core/OrbitRange.cxx b/.conflict-base-0/Common/Core/OrbitRange.cxx
index 51a3ec5fe78..b57654079bc 100644
--- a/.conflict-base-0/Common/Core/OrbitRange.cxx
+++ b/.conflict-base-0/Common/Core/OrbitRange.cxx
@@ -14,6 +14,7 @@
 //
 
 #include "Common/Core/OrbitRange.h"
+
 #include "TCollection.h"
 #include "TMath.h"
 
diff --git a/.conflict-base-0/Common/Core/PID/DetectorResponse.h b/.conflict-base-0/Common/Core/PID/DetectorResponse.h
index 1f687a4605c..e78251935ee 100644
--- a/.conflict-base-0/Common/Core/PID/DetectorResponse.h
+++ b/.conflict-base-0/Common/Core/PID/DetectorResponse.h
@@ -20,18 +20,21 @@
 #ifndef O2_ANALYSIS_PID_DETECTORRESPONSE_H_
 #define O2_ANALYSIS_PID_DETECTORRESPONSE_H_
 
+#include "Framework/Logger.h"
+
 #include <array>
 #include <vector>
-#include "Framework/Logger.h"
 // ROOT includes
 #include "Rtypes.h"
-#include "TMath.h"
+
 #include "TFile.h"
+#include "TMath.h"
 
 // O2 includes
-#include "ReconstructionDataFormats/PID.h"
 #include "Common/Core/PID/ParamBase.h"
 
+#include "ReconstructionDataFormats/PID.h"
+
 namespace o2::pid
 {
 /// \brief Class to handle the general detector response
diff --git a/.conflict-base-0/Common/Core/PID/PIDTOF.cxx b/.conflict-base-0/Common/Core/PID/PIDTOF.cxx
index bec41fafc43..10a3588730c 100644
--- a/.conflict-base-0/Common/Core/PID/PIDTOF.cxx
+++ b/.conflict-base-0/Common/Core/PID/PIDTOF.cxx
@@ -17,6 +17,7 @@
 ///
 
 #include "PIDTOF.h"
+
 #include <string>
 
 namespace o2::pid::tof
diff --git a/.conflict-base-0/Common/Core/PID/PIDTOF.h b/.conflict-base-0/Common/Core/PID/PIDTOF.h
index ad16716916c..fb02804745a 100644
--- a/.conflict-base-0/Common/Core/PID/PIDTOF.h
+++ b/.conflict-base-0/Common/Core/PID/PIDTOF.h
@@ -25,17 +25,18 @@
 
 // ROOT includes
 #include "Rtypes.h"
-#include "TMath.h"
-#include "TGraph.h"
-#include "TFile.h"
+
 #include "TF2.h"
+#include "TFile.h"
+#include "TGraph.h"
+#include "TMath.h"
 
 // O2 includes
+#include "CommonConstants/PhysicsConstants.h"
 #include "DataFormatsTOF/ParameterContainers.h"
+#include "Framework/DataTypes.h"
 #include "Framework/Logger.h"
 #include "ReconstructionDataFormats/PID.h"
-#include "Framework/DataTypes.h"
-#include "CommonConstants/PhysicsConstants.h"
 
 namespace o2::pid::tof
 {
diff --git a/.conflict-base-0/Common/Core/PID/ParamBase.cxx b/.conflict-base-0/Common/Core/PID/ParamBase.cxx
index 74824781d07..ab5a0d0f4dd 100644
--- a/.conflict-base-0/Common/Core/PID/ParamBase.cxx
+++ b/.conflict-base-0/Common/Core/PID/ParamBase.cxx
@@ -18,7 +18,9 @@
 ///
 
 #include "PID/ParamBase.h"
+
 #include "Framework/Logger.h"
+
 #include "TFile.h"
 
 namespace o2::pid
diff --git a/.conflict-base-0/Common/Core/PID/ParamBase.h b/.conflict-base-0/Common/Core/PID/ParamBase.h
index ec4b17083f4..28bbc6b732b 100644
--- a/.conflict-base-0/Common/Core/PID/ParamBase.h
+++ b/.conflict-base-0/Common/Core/PID/ParamBase.h
@@ -26,11 +26,11 @@
 #include <vector>    // std::vector
 
 // ROOT includes
-#include "TNamed.h"
-#include "TFile.h"
-
 #include "Framework/Logger.h"
 
+#include "TFile.h"
+#include "TNamed.h"
+
 namespace o2::pid
 {
 /// Variable to use for the pid input/output i.e. float, double et cetera
diff --git a/.conflict-base-0/Common/Core/PID/TPCPIDResponse.h b/.conflict-base-0/Common/Core/PID/TPCPIDResponse.h
index f25e1acd69e..03ec6c2302f 100644
--- a/.conflict-base-0/Common/Core/PID/TPCPIDResponse.h
+++ b/.conflict-base-0/Common/Core/PID/TPCPIDResponse.h
@@ -17,14 +17,15 @@
 #ifndef COMMON_CORE_PID_TPCPIDRESPONSE_H_
 #define COMMON_CORE_PID_TPCPIDRESPONSE_H_
 
+#include "Framework/Logger.h"
+
 #include <array>
-#include <vector>
 #include <cmath>
-#include "Framework/Logger.h"
+#include <vector>
 // O2 includes
-#include "ReconstructionDataFormats/PID.h"
-#include "Framework/DataTypes.h"
 #include "DataFormatsTPC/BetheBlochAleph.h"
+#include "Framework/DataTypes.h"
+#include "ReconstructionDataFormats/PID.h"
 
 namespace o2::pid::tpc
 {
diff --git a/.conflict-base-0/Common/Core/TPCVDriftManager.h b/.conflict-base-0/Common/Core/TPCVDriftManager.h
index 5d35db5ea99..54f0f26a9f6 100644
--- a/.conflict-base-0/Common/Core/TPCVDriftManager.h
+++ b/.conflict-base-0/Common/Core/TPCVDriftManager.h
@@ -12,17 +12,17 @@
 #ifndef COMMON_CORE_TPCVDRIFTMANAGER_H_
 #define COMMON_CORE_TPCVDRIFTMANAGER_H_
 
-#include <string>
-
 #include "CCDB/BasicCCDBManager.h"
-#include "Framework/Logger.h"
-#include "Framework/DataTypes.h"
-#include "DataFormatsTPC/VDriftCorrFact.h"
 #include "CommonConstants/LHCConstants.h"
-#include "DataFormatsParameters/GRPLHCIFData.h"
 #include "DataFormatsParameters/GRPECSObject.h"
+#include "DataFormatsParameters/GRPLHCIFData.h"
+#include "DataFormatsTPC/VDriftCorrFact.h"
+#include "Framework/DataTypes.h"
+#include "Framework/Logger.h"
 #include "ReconstructionDataFormats/Track.h"
 
+#include <string>
+
 namespace o2::aod::common
 {
 
diff --git a/.conflict-base-0/Common/Core/TrackSelection.cxx b/.conflict-base-0/Common/Core/TrackSelection.cxx
index 717d7db77f5..1103b678024 100644
--- a/.conflict-base-0/Common/Core/TrackSelection.cxx
+++ b/.conflict-base-0/Common/Core/TrackSelection.cxx
@@ -13,9 +13,10 @@
 // Class for track selection
 //
 
-#include "Framework/Logger.h"
 #include "Common/Core/TrackSelection.h"
 
+#include "Framework/Logger.h"
+
 bool TrackSelection::FulfillsITSHitRequirements(uint8_t itsClusterMap) const
 {
   constexpr uint8_t bit = 1;
diff --git a/.conflict-base-0/Common/Core/TrackSelection.h b/.conflict-base-0/Common/Core/TrackSelection.h
index 19d77a198e1..94285fbdda8 100644
--- a/.conflict-base-0/Common/Core/TrackSelection.h
+++ b/.conflict-base-0/Common/Core/TrackSelection.h
@@ -16,13 +16,15 @@
 #ifndef COMMON_CORE_TRACKSELECTION_H_
 #define COMMON_CORE_TRACKSELECTION_H_
 
+#include "Rtypes.h"
+
+#include "Framework/DataTypes.h"
+#include "Framework/Logger.h"
+
 #include <set>
-#include <vector>
-#include <utility>
 #include <string>
-#include "Framework/Logger.h"
-#include "Framework/DataTypes.h"
-#include "Rtypes.h"
+#include <utility>
+#include <vector>
 
 class TrackSelection
 {
diff --git a/.conflict-base-0/Common/Core/TrackSelectionDefaults.cxx b/.conflict-base-0/Common/Core/TrackSelectionDefaults.cxx
index 2958718feba..3e659db0502 100644
--- a/.conflict-base-0/Common/Core/TrackSelectionDefaults.cxx
+++ b/.conflict-base-0/Common/Core/TrackSelectionDefaults.cxx
@@ -15,10 +15,12 @@
 /// \since 20-10-2020
 ///
 
-#include "Framework/DataTypes.h"
-#include "Common/Core/TrackSelection.h"
 #include "TrackSelectionDefaults.h"
 
+#include "Common/Core/TrackSelection.h"
+
+#include "Framework/DataTypes.h"
+
 // Default track selection requiring one hit in the SPD
 TrackSelection getGlobalTrackSelection()
 {
diff --git a/.conflict-base-0/Common/Core/TrackSelectionDefaults.h b/.conflict-base-0/Common/Core/TrackSelectionDefaults.h
index 72c666456ae..9dc2f1aa661 100644
--- a/.conflict-base-0/Common/Core/TrackSelectionDefaults.h
+++ b/.conflict-base-0/Common/Core/TrackSelectionDefaults.h
@@ -18,9 +18,10 @@
 #ifndef COMMON_CORE_TRACKSELECTIONDEFAULTS_H_
 #define COMMON_CORE_TRACKSELECTIONDEFAULTS_H_
 
-#include "Framework/DataTypes.h"
 #include "Common/Core/TrackSelection.h"
 
+#include "Framework/DataTypes.h"
+
 // Default track selection requiring one hit in the SPD
 TrackSelection getGlobalTrackSelection();
 
diff --git a/.conflict-base-0/Common/Core/TrackSelectorPID.h b/.conflict-base-0/Common/Core/TrackSelectorPID.h
index 214627a2d72..afda01c5a44 100644
--- a/.conflict-base-0/Common/Core/TrackSelectorPID.h
+++ b/.conflict-base-0/Common/Core/TrackSelectorPID.h
@@ -17,11 +17,11 @@
 #ifndef COMMON_CORE_TRACKSELECTORPID_H_
 #define COMMON_CORE_TRACKSELECTORPID_H_
 
-#include <TPDGCode.h>
-
 #include "Framework/Logger.h"
 #include "ReconstructionDataFormats/PID.h"
 
+#include <TPDGCode.h>
+
 /// Class for track selection using PID detectors
 
 struct TrackSelectorPID {
diff --git a/.conflict-base-0/Common/Core/trackUtilities.h b/.conflict-base-0/Common/Core/trackUtilities.h
index e67e0f82d6f..744647915f8 100644
--- a/.conflict-base-0/Common/Core/trackUtilities.h
+++ b/.conflict-base-0/Common/Core/trackUtilities.h
@@ -17,11 +17,13 @@
 #ifndef COMMON_CORE_TRACKUTILITIES_H_
 #define COMMON_CORE_TRACKUTILITIES_H_
 
-#include <utility> // std::move
+#include "Common/Core/RecoDecay.h"
+
 #include "CommonConstants/MathConstants.h"
 #include "ReconstructionDataFormats/Track.h"
 #include "ReconstructionDataFormats/Vertex.h"
-#include "Common/Core/RecoDecay.h"
+
+#include <utility> // std::move
 
 /// Extracts track parameters from a track.
 template <typename TrackPrecision = float, typename T>
diff --git a/.conflict-base-0/Common/DataModel/CaloClusters.h b/.conflict-base-0/Common/DataModel/CaloClusters.h
index 23a44371d80..9a83a92ccec 100644
--- a/.conflict-base-0/Common/DataModel/CaloClusters.h
+++ b/.conflict-base-0/Common/DataModel/CaloClusters.h
@@ -12,9 +12,10 @@
 #ifndef COMMON_DATAMODEL_CALOCLUSTERS_H_
 #define COMMON_DATAMODEL_CALOCLUSTERS_H_
 
-#include <vector>
 #include "Framework/AnalysisDataModel.h"
 
+#include <vector>
+
 namespace o2::aod
 {
 namespace calocluster
diff --git a/.conflict-base-0/Common/DataModel/EseTable.h b/.conflict-base-0/Common/DataModel/EseTable.h
index 68ffdff450a..defc3c750a5 100644
--- a/.conflict-base-0/Common/DataModel/EseTable.h
+++ b/.conflict-base-0/Common/DataModel/EseTable.h
@@ -17,10 +17,10 @@
 #ifndef COMMON_DATAMODEL_ESETABLE_H_
 #define COMMON_DATAMODEL_ESETABLE_H_
 
-#include <vector>
-
-#include "Framework/AnalysisTask.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+
+#include <vector>
 
 namespace o2::aod
 {
diff --git a/.conflict-base-0/Common/DataModel/EventSelection.h b/.conflict-base-0/Common/DataModel/EventSelection.h
index 77849d0d7cf..093ae4303c3 100644
--- a/.conflict-base-0/Common/DataModel/EventSelection.h
+++ b/.conflict-base-0/Common/DataModel/EventSelection.h
@@ -17,10 +17,11 @@
 #ifndef COMMON_DATAMODEL_EVENTSELECTION_H_
 #define COMMON_DATAMODEL_EVENTSELECTION_H_
 
-#include "Framework/AnalysisDataModel.h"
-#include "Common/CCDB/TriggerAliases.h"
 #include "Common/CCDB/EventSelectionParams.h"
 #include "Common/CCDB/RCTSelectionFlags.h"
+#include "Common/CCDB/TriggerAliases.h"
+
+#include "Framework/AnalysisDataModel.h"
 
 namespace o2::aod
 {
diff --git a/.conflict-base-0/Common/DataModel/McCollisionExtra.h b/.conflict-base-0/Common/DataModel/McCollisionExtra.h
index 14b11b9a4e8..4b0f20c92fa 100644
--- a/.conflict-base-0/Common/DataModel/McCollisionExtra.h
+++ b/.conflict-base-0/Common/DataModel/McCollisionExtra.h
@@ -14,15 +14,16 @@
 #ifndef COMMON_DATAMODEL_MCCOLLISIONEXTRA_H_
 #define COMMON_DATAMODEL_MCCOLLISIONEXTRA_H_
 
-#include <cmath>
 #include "Framework/AnalysisDataModel.h"
 
+#include <cmath>
+
 namespace o2::aod
 {
 namespace mccollisionprop
 {
-DECLARE_SOA_COLUMN(NumRecoCollision, numRecoCollision, int);     //! stores N times this PV was recoed
-DECLARE_SOA_COLUMN(BestCollisionIndex, bestCollisionIndex, int); //! stores N times this PV was recoed
+DECLARE_SOA_COLUMN(NumRecoCollision, numRecoCollision, int);             //! stores N times this PV was recoed
+DECLARE_SOA_COLUMN(BestCollisionIndex, bestCollisionIndex, int);         //! stores N times this PV was recoed
 DECLARE_SOA_COLUMN(BestCollisionCentFT0C, bestCollisionCentFT0C, float); //! stores best FT0C centrality
 
 // collision MC context (neighbours contain PoI?)
@@ -35,4 +36,4 @@ DECLARE_SOA_TABLE(McCollContexts, "AOD", "MCCOLLCONTEXT",
                   mccollisionprop::ForwardCollisionMap, mccollisionprop::BackwardCollisionMap);
 } // namespace o2::aod
 
-#endif // COMMON_DATAMODEL_MCCOLLISIONEXTRA_H_
\ No newline at end of file
+#endif // COMMON_DATAMODEL_MCCOLLISIONEXTRA_H_
diff --git a/.conflict-base-0/Common/DataModel/MftmchMatchingML.h b/.conflict-base-0/Common/DataModel/MftmchMatchingML.h
index f243411f3b7..56171cb052e 100644
--- a/.conflict-base-0/Common/DataModel/MftmchMatchingML.h
+++ b/.conflict-base-0/Common/DataModel/MftmchMatchingML.h
@@ -12,9 +12,10 @@
 #ifndef COMMON_DATAMODEL_MFTMCHMATCHINGML_H_
 #define COMMON_DATAMODEL_MFTMCHMATCHINGML_H_
 
-#include "Framework/AnalysisDataModel.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+
 namespace o2::aod
 {
 DECLARE_SOA_TABLE(FwdTracksML, "AOD", "FWDTRACKML",
diff --git a/.conflict-base-0/Common/DataModel/Multiplicity.h b/.conflict-base-0/Common/DataModel/Multiplicity.h
index 0ac2a0074c6..8b0bcc2f051 100644
--- a/.conflict-base-0/Common/DataModel/Multiplicity.h
+++ b/.conflict-base-0/Common/DataModel/Multiplicity.h
@@ -16,9 +16,10 @@
 #ifndef COMMON_DATAMODEL_MULTIPLICITY_H_
 #define COMMON_DATAMODEL_MULTIPLICITY_H_
 
-#include "Framework/AnalysisDataModel.h"
 #include "Common/DataModel/EventSelection.h"
 
+#include "Framework/AnalysisDataModel.h"
+
 namespace o2::aod
 {
 namespace mult
diff --git a/.conflict-base-0/Common/DataModel/OccupancyTables.h b/.conflict-base-0/Common/DataModel/OccupancyTables.h
index 9e14fd8f4f2..70db5b31793 100644
--- a/.conflict-base-0/Common/DataModel/OccupancyTables.h
+++ b/.conflict-base-0/Common/DataModel/OccupancyTables.h
@@ -14,11 +14,11 @@
 ///
 /// \author Rahul Verma (rahul.verma@iitb.ac.in) :: Marian I Ivanov (marian.ivanov@cern.ch)
 
-#include <vector>
-
 #include "Framework/ASoA.h"
 #include "Framework/AnalysisDataModel.h"
 
+#include <vector>
+
 #ifndef COMMON_DATAMODEL_OCCUPANCYTABLES_H_
 #define COMMON_DATAMODEL_OCCUPANCYTABLES_H_
 
diff --git a/.conflict-base-0/Common/DataModel/PIDResponse.h b/.conflict-base-0/Common/DataModel/PIDResponse.h
index eee2e4df2e3..f113f3a4c1f 100644
--- a/.conflict-base-0/Common/DataModel/PIDResponse.h
+++ b/.conflict-base-0/Common/DataModel/PIDResponse.h
@@ -19,9 +19,9 @@
 #ifndef COMMON_DATAMODEL_PIDRESPONSE_H_
 #define COMMON_DATAMODEL_PIDRESPONSE_H_
 
+#include "PIDResponseCombined.h"
 #include "PIDResponseTOF.h"
 #include "PIDResponseTPC.h"
-#include "PIDResponseCombined.h"
 
 namespace o2::aod
 {
diff --git a/.conflict-base-0/Common/DataModel/PIDResponseCombined.h b/.conflict-base-0/Common/DataModel/PIDResponseCombined.h
index 4b54d214838..e6f859ab692 100644
--- a/.conflict-base-0/Common/DataModel/PIDResponseCombined.h
+++ b/.conflict-base-0/Common/DataModel/PIDResponseCombined.h
@@ -24,8 +24,8 @@
 // O2 includes
 #include "Framework/ASoA.h"
 #include "Framework/AnalysisDataModel.h"
-#include "ReconstructionDataFormats/PID.h"
 #include "Framework/Logger.h"
+#include "ReconstructionDataFormats/PID.h"
 
 namespace o2::aod
 {
diff --git a/.conflict-base-0/Common/DataModel/PIDResponseTOF.h b/.conflict-base-0/Common/DataModel/PIDResponseTOF.h
index 5edfe931ad8..85beb113851 100644
--- a/.conflict-base-0/Common/DataModel/PIDResponseTOF.h
+++ b/.conflict-base-0/Common/DataModel/PIDResponseTOF.h
@@ -23,11 +23,12 @@
 #include <experimental/type_traits>
 
 // O2 includes
+#include "Common/Core/PID/PIDTOF.h"
+
 #include "Framework/ASoA.h"
 #include "Framework/AnalysisDataModel.h"
-#include "ReconstructionDataFormats/PID.h"
 #include "Framework/Logger.h"
-#include "Common/Core/PID/PIDTOF.h"
+#include "ReconstructionDataFormats/PID.h"
 
 namespace o2::aod
 {
diff --git a/.conflict-base-0/Common/DataModel/PIDResponseTPC.h b/.conflict-base-0/Common/DataModel/PIDResponseTPC.h
index a22d5c9c008..e5247b90432 100644
--- a/.conflict-base-0/Common/DataModel/PIDResponseTPC.h
+++ b/.conflict-base-0/Common/DataModel/PIDResponseTPC.h
@@ -25,8 +25,8 @@
 // O2 includes
 #include "Framework/ASoA.h"
 #include "Framework/AnalysisDataModel.h"
-#include "ReconstructionDataFormats/PID.h"
 #include "Framework/Logger.h"
+#include "ReconstructionDataFormats/PID.h"
 
 namespace o2::aod
 {
diff --git a/.conflict-base-0/Common/DataModel/Qvectors.h b/.conflict-base-0/Common/DataModel/Qvectors.h
index 423c2648e89..1ff0ceebabd 100644
--- a/.conflict-base-0/Common/DataModel/Qvectors.h
+++ b/.conflict-base-0/Common/DataModel/Qvectors.h
@@ -21,9 +21,10 @@
 #ifndef COMMON_DATAMODEL_QVECTORS_H_
 #define COMMON_DATAMODEL_QVECTORS_H_
 
-#include <vector>
 #include "Framework/AnalysisDataModel.h"
 
+#include <vector>
+
 namespace o2::aod
 {
 namespace qvec
diff --git a/.conflict-base-0/Common/LegacyDataQA/centqa.cxx b/.conflict-base-0/Common/LegacyDataQA/centqa.cxx
index 0d69be10754..00bb1fee419 100644
--- a/.conflict-base-0/Common/LegacyDataQA/centqa.cxx
+++ b/.conflict-base-0/Common/LegacyDataQA/centqa.cxx
@@ -22,13 +22,15 @@
 // - david.dobrigkeit.chinellato@cern.ch
 //
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Common/DataModel/McCollisionExtra.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/McCollisionExtra.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TH1F.h"
 #include "TH2F.h"
 
diff --git a/.conflict-base-0/Common/LegacyDataQA/otfv0qa.cxx b/.conflict-base-0/Common/LegacyDataQA/otfv0qa.cxx
index 8dc446d9a01..13ee2809bcd 100644
--- a/.conflict-base-0/Common/LegacyDataQA/otfv0qa.cxx
+++ b/.conflict-base-0/Common/LegacyDataQA/otfv0qa.cxx
@@ -9,13 +9,15 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/McCollisionExtra.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TH1F.h"
 #include "TH2F.h"
 
diff --git a/.conflict-base-0/Common/LegacyDataQA/pmdQa.cxx b/.conflict-base-0/Common/LegacyDataQA/pmdQa.cxx
index 9958fd26761..3d355f33f0b 100644
--- a/.conflict-base-0/Common/LegacyDataQA/pmdQa.cxx
+++ b/.conflict-base-0/Common/LegacyDataQA/pmdQa.cxx
@@ -15,21 +15,23 @@
 /// \author Abhi Modak (abhi.modak@cern.ch)
 /// \since May 17, 2025
 
-#include <cstdlib>
-#include <cmath>
-#include <vector>
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PmdTable.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
+#include "CCDB/BasicCCDBManager.h"
 #include "Framework/ASoA.h"
 #include "Framework/AnalysisDataModel.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/PmdTable.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "CCDB/BasicCCDBManager.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TH1F.h"
 #include "TH2F.h"
 
+#include <cmath>
+#include <cstdlib>
+#include <vector>
+
 using namespace o2;
 using namespace o2::aod::run2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Common/LegacyDataQA/tpcpidqa.cxx b/.conflict-base-0/Common/LegacyDataQA/tpcpidqa.cxx
index a67043fd342..fd9988f7251 100644
--- a/.conflict-base-0/Common/LegacyDataQA/tpcpidqa.cxx
+++ b/.conflict-base-0/Common/LegacyDataQA/tpcpidqa.cxx
@@ -18,12 +18,14 @@
 //
 // Warning: expected resolution is NOT provided.
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "TableHelper.h"
 
+#include "Common/DataModel/PIDResponse.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-base-0/Common/TableProducer/Converters/bcConverter.cxx b/.conflict-base-0/Common/TableProducer/Converters/bcConverter.cxx
index 54f9a90aa8b..a023c530236 100644
--- a/.conflict-base-0/Common/TableProducer/Converters/bcConverter.cxx
+++ b/.conflict-base-0/Common/TableProducer/Converters/bcConverter.cxx
@@ -8,9 +8,9 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Common/TableProducer/Converters/bcFlagsCreator.cxx b/.conflict-base-0/Common/TableProducer/Converters/bcFlagsCreator.cxx
index 972832716b5..6300998830c 100644
--- a/.conflict-base-0/Common/TableProducer/Converters/bcFlagsCreator.cxx
+++ b/.conflict-base-0/Common/TableProducer/Converters/bcFlagsCreator.cxx
@@ -8,9 +8,9 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Common/TableProducer/Converters/caloLabelConverter.cxx b/.conflict-base-0/Common/TableProducer/Converters/caloLabelConverter.cxx
index 0186e34f628..2200df1e1a6 100644
--- a/.conflict-base-0/Common/TableProducer/Converters/caloLabelConverter.cxx
+++ b/.conflict-base-0/Common/TableProducer/Converters/caloLabelConverter.cxx
@@ -8,9 +8,9 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Common/TableProducer/Converters/collisionConverter.cxx b/.conflict-base-0/Common/TableProducer/Converters/collisionConverter.cxx
index d3186ea462f..9f6da391425 100644
--- a/.conflict-base-0/Common/TableProducer/Converters/collisionConverter.cxx
+++ b/.conflict-base-0/Common/TableProducer/Converters/collisionConverter.cxx
@@ -8,9 +8,9 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Common/TableProducer/Converters/fddConverter.cxx b/.conflict-base-0/Common/TableProducer/Converters/fddConverter.cxx
index 50d47ade048..a5aaaffecf3 100644
--- a/.conflict-base-0/Common/TableProducer/Converters/fddConverter.cxx
+++ b/.conflict-base-0/Common/TableProducer/Converters/fddConverter.cxx
@@ -8,9 +8,9 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Common/TableProducer/Converters/hmpConverter.cxx b/.conflict-base-0/Common/TableProducer/Converters/hmpConverter.cxx
index da4eeeb7bca..2c8b5815868 100644
--- a/.conflict-base-0/Common/TableProducer/Converters/hmpConverter.cxx
+++ b/.conflict-base-0/Common/TableProducer/Converters/hmpConverter.cxx
@@ -12,9 +12,9 @@
 // HMPID converter to new format
 // to be used with Run 2 converted data and older AO2Ds
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Common/TableProducer/Converters/mcCollisionConverter.cxx b/.conflict-base-0/Common/TableProducer/Converters/mcCollisionConverter.cxx
index b965a092117..eb837e9cf22 100644
--- a/.conflict-base-0/Common/TableProducer/Converters/mcCollisionConverter.cxx
+++ b/.conflict-base-0/Common/TableProducer/Converters/mcCollisionConverter.cxx
@@ -8,9 +8,9 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Common/TableProducer/Converters/mcConverter.cxx b/.conflict-base-0/Common/TableProducer/Converters/mcConverter.cxx
index a78ac3158ea..8680bcb65dc 100644
--- a/.conflict-base-0/Common/TableProducer/Converters/mcConverter.cxx
+++ b/.conflict-base-0/Common/TableProducer/Converters/mcConverter.cxx
@@ -8,9 +8,9 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Common/TableProducer/Converters/mftTracksConverter.cxx b/.conflict-base-0/Common/TableProducer/Converters/mftTracksConverter.cxx
index 425bb0c6392..006e9bbe742 100644
--- a/.conflict-base-0/Common/TableProducer/Converters/mftTracksConverter.cxx
+++ b/.conflict-base-0/Common/TableProducer/Converters/mftTracksConverter.cxx
@@ -19,9 +19,9 @@
 
 /// \author L.Micheletti <luca.micheletti@cern.ch>
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Common/TableProducer/Converters/multMCExtrasConverter.cxx b/.conflict-base-0/Common/TableProducer/Converters/multMCExtrasConverter.cxx
index ac2c074ba1b..27eeaf78bcb 100644
--- a/.conflict-base-0/Common/TableProducer/Converters/multMCExtrasConverter.cxx
+++ b/.conflict-base-0/Common/TableProducer/Converters/multMCExtrasConverter.cxx
@@ -9,11 +9,12 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Common/DataModel/Multiplicity.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-base-0/Common/TableProducer/Converters/multsExtraConverter.cxx b/.conflict-base-0/Common/TableProducer/Converters/multsExtraConverter.cxx
index d62b34508b8..2e30ed2a266 100644
--- a/.conflict-base-0/Common/TableProducer/Converters/multsExtraConverter.cxx
+++ b/.conflict-base-0/Common/TableProducer/Converters/multsExtraConverter.cxx
@@ -9,11 +9,12 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Common/DataModel/Multiplicity.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-base-0/Common/TableProducer/Converters/run2TinyToFullPID.cxx b/.conflict-base-0/Common/TableProducer/Converters/run2TinyToFullPID.cxx
index 23b6c5a8cbf..098318e3c3a 100644
--- a/.conflict-base-0/Common/TableProducer/Converters/run2TinyToFullPID.cxx
+++ b/.conflict-base-0/Common/TableProducer/Converters/run2TinyToFullPID.cxx
@@ -18,12 +18,14 @@
 //
 // Warning: expected resolution is NOT provided.
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "TableHelper.h"
 
+#include "Common/DataModel/PIDResponse.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-base-0/Common/TableProducer/Converters/run2bcinfosConverter.cxx b/.conflict-base-0/Common/TableProducer/Converters/run2bcinfosConverter.cxx
index 6257d371824..06d5282a9ee 100644
--- a/.conflict-base-0/Common/TableProducer/Converters/run2bcinfosConverter.cxx
+++ b/.conflict-base-0/Common/TableProducer/Converters/run2bcinfosConverter.cxx
@@ -9,9 +9,9 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Common/TableProducer/Converters/run2tracksExtraConverter.cxx b/.conflict-base-0/Common/TableProducer/Converters/run2tracksExtraConverter.cxx
index 28ae54c4367..ffb9b9cf24e 100644
--- a/.conflict-base-0/Common/TableProducer/Converters/run2tracksExtraConverter.cxx
+++ b/.conflict-base-0/Common/TableProducer/Converters/run2tracksExtraConverter.cxx
@@ -9,9 +9,9 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Common/TableProducer/Converters/trackQA002Converter.cxx b/.conflict-base-0/Common/TableProducer/Converters/trackQA002Converter.cxx
index 566c998e1bc..2e74c50d8e9 100644
--- a/.conflict-base-0/Common/TableProducer/Converters/trackQA002Converter.cxx
+++ b/.conflict-base-0/Common/TableProducer/Converters/trackQA002Converter.cxx
@@ -8,11 +8,11 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include <limits>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include <limits>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Common/TableProducer/Converters/trackQA003Converter.cxx b/.conflict-base-0/Common/TableProducer/Converters/trackQA003Converter.cxx
index 56a6d3551e9..2447283f468 100644
--- a/.conflict-base-0/Common/TableProducer/Converters/trackQA003Converter.cxx
+++ b/.conflict-base-0/Common/TableProducer/Converters/trackQA003Converter.cxx
@@ -8,11 +8,11 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include <limits>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include <limits>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Common/TableProducer/Converters/trackQAConverter.cxx b/.conflict-base-0/Common/TableProducer/Converters/trackQAConverter.cxx
index bdfecbca8d0..fd8657ebcdd 100644
--- a/.conflict-base-0/Common/TableProducer/Converters/trackQAConverter.cxx
+++ b/.conflict-base-0/Common/TableProducer/Converters/trackQAConverter.cxx
@@ -8,11 +8,11 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include <limits>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include <limits>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Common/TableProducer/Converters/tracksExtraConverter.cxx b/.conflict-base-0/Common/TableProducer/Converters/tracksExtraConverter.cxx
index b097cb7c4a3..ed8b6c21db8 100644
--- a/.conflict-base-0/Common/TableProducer/Converters/tracksExtraConverter.cxx
+++ b/.conflict-base-0/Common/TableProducer/Converters/tracksExtraConverter.cxx
@@ -19,9 +19,9 @@
 
 /// \author F.Mazzaschi <fmazzasc@cern.ch>
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Common/TableProducer/Converters/tracksExtraV002Converter.cxx b/.conflict-base-0/Common/TableProducer/Converters/tracksExtraV002Converter.cxx
index a70ac8ea8a8..8c4c8a22d4a 100644
--- a/.conflict-base-0/Common/TableProducer/Converters/tracksExtraV002Converter.cxx
+++ b/.conflict-base-0/Common/TableProducer/Converters/tracksExtraV002Converter.cxx
@@ -9,9 +9,9 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Common/TableProducer/Converters/v0converter.cxx b/.conflict-base-0/Common/TableProducer/Converters/v0converter.cxx
index 849e35591e1..3131a4a5ad2 100644
--- a/.conflict-base-0/Common/TableProducer/Converters/v0converter.cxx
+++ b/.conflict-base-0/Common/TableProducer/Converters/v0converter.cxx
@@ -8,9 +8,9 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Common/TableProducer/Converters/zdcConverter.cxx b/.conflict-base-0/Common/TableProducer/Converters/zdcConverter.cxx
index 2c94d5ca46f..2b97f8ff102 100644
--- a/.conflict-base-0/Common/TableProducer/Converters/zdcConverter.cxx
+++ b/.conflict-base-0/Common/TableProducer/Converters/zdcConverter.cxx
@@ -12,9 +12,9 @@
 // ZDC converter to new format
 // to be used with Run 2 converted data and older AO2Ds
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 #include "ZDCBase/Constants.h"
 
 using namespace o2;
diff --git a/.conflict-base-0/Common/TableProducer/PID/pidBayes.cxx b/.conflict-base-0/Common/TableProducer/PID/pidBayes.cxx
index abedb281668..4654caf1580 100644
--- a/.conflict-base-0/Common/TableProducer/PID/pidBayes.cxx
+++ b/.conflict-base-0/Common/TableProducer/PID/pidBayes.cxx
@@ -16,29 +16,30 @@
 ///         Only the tables for the mass hypotheses requested are filled, the others are sent empty.
 ///
 
-#include <utility>
 #include <algorithm>
-#include <vector>
 #include <memory>
 #include <string>
+#include <utility>
+#include <vector>
 
 // O2 includes
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/Array2D.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "Common/Core/PID/TPCPIDResponse.h"
+#include "pidTOFBase.h"
+
 #include "Common/Core/PID/DetectorResponse.h"
-#include "Common/Core/PID/ParamBase.h"
 #include "Common/Core/PID/PIDTOF.h"
+#include "Common/Core/PID/ParamBase.h"
+#include "Common/Core/PID/TPCPIDResponse.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/PIDResponseCombined.h"
-#include "Common/DataModel/PIDResponseTPC.h"
 #include "Common/DataModel/PIDResponseTOF.h"
+#include "Common/DataModel/PIDResponseTPC.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "pidTOFBase.h"
+#include "CCDB/BasicCCDBManager.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/Array2D.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Common/TableProducer/PID/pidITS.cxx b/.conflict-base-0/Common/TableProducer/PID/pidITS.cxx
index 1a6cdbc5491..64c05ea41c9 100644
--- a/.conflict-base-0/Common/TableProducer/PID/pidITS.cxx
+++ b/.conflict-base-0/Common/TableProducer/PID/pidITS.cxx
@@ -19,22 +19,23 @@
 ///         Only the tables for the mass hypotheses requested are filled, the others are sent empty.
 ///
 
+#include <string>
 #include <utility>
 #include <vector>
-#include <string>
 
 // O2 includes
-#include "Framework/runDataProcessing.h"
+#include "CCDB/BasicCCDBManager.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "CCDB/BasicCCDBManager.h"
 #include "TOFBase/EventTimeMaker.h"
 
 // O2Physics includes
-#include "Common/DataModel/PIDResponseITS.h"
 #include "MetadataHelper.h"
 
+#include "Common/DataModel/PIDResponseITS.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-base-0/Common/TableProducer/PID/pidTOF.cxx b/.conflict-base-0/Common/TableProducer/PID/pidTOF.cxx
index 076cc0c26de..ab4b9c6ce02 100644
--- a/.conflict-base-0/Common/TableProducer/PID/pidTOF.cxx
+++ b/.conflict-base-0/Common/TableProducer/PID/pidTOF.cxx
@@ -17,10 +17,10 @@
 ///
 
 // O2 includes
-#include <CCDB/BasicCCDBManager.h>
-#include "TOFBase/EventTimeMaker.h"
 #include "Framework/AnalysisTask.h"
 #include "ReconstructionDataFormats/Track.h"
+#include "TOFBase/EventTimeMaker.h"
+#include <CCDB/BasicCCDBManager.h>
 
 // O2Physics includes
 #include "TableHelper.h"
diff --git a/.conflict-base-0/Common/TableProducer/PID/pidTOFBase.cxx b/.conflict-base-0/Common/TableProducer/PID/pidTOFBase.cxx
index f0f9722fc6b..2300535c274 100644
--- a/.conflict-base-0/Common/TableProducer/PID/pidTOFBase.cxx
+++ b/.conflict-base-0/Common/TableProducer/PID/pidTOFBase.cxx
@@ -15,25 +15,27 @@
 /// \brief  Base to build tasks for TOF PID tasks.
 ///
 
+#include <string>
 #include <utility>
 #include <vector>
-#include <string>
 
 // O2 includes
 #include "CCDB/BasicCCDBManager.h"
-#include "TOFBase/EventTimeMaker.h"
 #include "Framework/AnalysisTask.h"
 #include "ReconstructionDataFormats/Track.h"
+#include "TOFBase/EventTimeMaker.h"
 
 // O2Physics includes
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "TableHelper.h"
+#include "pidTOFBase.h"
+
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/FT0Corrected.h"
 #include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
-#include "TableHelper.h"
-#include "pidTOFBase.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Common/TableProducer/PID/pidTOFBase.h b/.conflict-base-0/Common/TableProducer/PID/pidTOFBase.h
index 44367eacb75..98189aa03b1 100644
--- a/.conflict-base-0/Common/TableProducer/PID/pidTOFBase.h
+++ b/.conflict-base-0/Common/TableProducer/PID/pidTOFBase.h
@@ -22,10 +22,11 @@
 #include <vector>
 
 // O2Physics
-#include "PID/ParamBase.h"
-#include "PID/PIDTOF.h"
-#include "Common/DataModel/PIDResponseTOF.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/PIDResponseTOF.h"
+
+#include "PID/PIDTOF.h"
+#include "PID/ParamBase.h"
 
 static constexpr int nSpecies = 9;
 static constexpr int nParameters = 1;
diff --git a/.conflict-base-0/Common/TableProducer/PID/pidTOFFull.cxx b/.conflict-base-0/Common/TableProducer/PID/pidTOFFull.cxx
index 6fec03a10ff..98bd612a166 100644
--- a/.conflict-base-0/Common/TableProducer/PID/pidTOFFull.cxx
+++ b/.conflict-base-0/Common/TableProducer/PID/pidTOFFull.cxx
@@ -17,10 +17,10 @@
 ///
 
 // O2 includes
-#include <CCDB/BasicCCDBManager.h>
-#include "TOFBase/EventTimeMaker.h"
 #include "Framework/AnalysisTask.h"
 #include "ReconstructionDataFormats/Track.h"
+#include "TOFBase/EventTimeMaker.h"
+#include <CCDB/BasicCCDBManager.h>
 
 // O2Physics includes
 #include "TableHelper.h"
diff --git a/.conflict-base-0/Common/TableProducer/PID/pidTOFbeta.cxx b/.conflict-base-0/Common/TableProducer/PID/pidTOFbeta.cxx
index d76d631bc4d..c8c6a65c22c 100644
--- a/.conflict-base-0/Common/TableProducer/PID/pidTOFbeta.cxx
+++ b/.conflict-base-0/Common/TableProducer/PID/pidTOFbeta.cxx
@@ -16,11 +16,13 @@
 ///
 
 // O2 includes
+#include "TableHelper.h"
+#include "pidTOFBase.h"
+
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
 #include "Framework/AnalysisTask.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "pidTOFBase.h"
-#include "TableHelper.h"
 
 // O2Physics includes
 #include "PID/PIDTOF.h"
diff --git a/.conflict-base-0/Common/TableProducer/caloClusterProducer.cxx b/.conflict-base-0/Common/TableProducer/caloClusterProducer.cxx
index 086885beb4c..d0336adcef4 100644
--- a/.conflict-base-0/Common/TableProducer/caloClusterProducer.cxx
+++ b/.conflict-base-0/Common/TableProducer/caloClusterProducer.cxx
@@ -14,35 +14,34 @@
 ///
 /// \author Dmitri Peresunko <Dmitri.Peresunko@cern.ch>
 
-#include <algorithm>
-#include <map>
-#include <memory>
-#include <string>
-#include <vector>
-
-#include "Framework/ConfigParamSpec.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/CaloClusters.h"
 #include "Common/Core/trackUtilities.h"
-#include "ReconstructionDataFormats/TrackParametrization.h"
-#include "DetectorsBase/Propagator.h"
+#include "Common/DataModel/CaloClusters.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "CommonUtils/NameConf.h"
 #include "CCDB/BasicCCDBManager.h"
-#include "SimulationDataFormat/MCTruthContainer.h"
-
-#include "DataFormatsParameters/GRPMagField.h"
+#include "CommonUtils/NameConf.h"
+#include "DataFormatsPHOS/BadChannelsMap.h"
+#include "DataFormatsPHOS/CalibParams.h"
 #include "DataFormatsPHOS/Cell.h"
 #include "DataFormatsPHOS/Cluster.h"
-#include "DataFormatsPHOS/TriggerRecord.h"
 #include "DataFormatsPHOS/MCLabel.h"
-#include "DataFormatsPHOS/BadChannelsMap.h"
-#include "DataFormatsPHOS/CalibParams.h"
+#include "DataFormatsPHOS/TriggerRecord.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/ConfigParamSpec.h"
+#include "Framework/runDataProcessing.h"
 #include "PHOSBase/Geometry.h"
 #include "PHOSReconstruction/Clusterer.h"
+#include "ReconstructionDataFormats/TrackParametrization.h"
+#include "SimulationDataFormat/MCTruthContainer.h"
+
+#include <algorithm>
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
 
 using namespace o2::framework;
 using namespace o2;
diff --git a/.conflict-base-0/Common/TableProducer/centralityTable.cxx b/.conflict-base-0/Common/TableProducer/centralityTable.cxx
index 9198f79499e..701d26f9ebb 100644
--- a/.conflict-base-0/Common/TableProducer/centralityTable.cxx
+++ b/.conflict-base-0/Common/TableProducer/centralityTable.cxx
@@ -15,25 +15,28 @@
 /// \author ALICE
 //
 
-#include <string>
-#include <vector>
-#include <algorithm>
-#include <map>
+#include "MetadataHelper.h"
+#include "TableHelper.h"
 
-#include <CCDB/BasicCCDBManager.h>
-#include <TH1F.h>
-#include <TFormula.h>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/HistogramRegistry.h"
-#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "MetadataHelper.h"
-#include "TableHelper.h"
+#include "Common/DataModel/Multiplicity.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include <CCDB/BasicCCDBManager.h>
+
 #include "TList.h"
+#include <TFormula.h>
+#include <TH1F.h>
+
+#include <algorithm>
+#include <map>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Common/TableProducer/eseTableProducer.cxx b/.conflict-base-0/Common/TableProducer/eseTableProducer.cxx
index 098bfbe400f..9f6619060fe 100644
--- a/.conflict-base-0/Common/TableProducer/eseTableProducer.cxx
+++ b/.conflict-base-0/Common/TableProducer/eseTableProducer.cxx
@@ -14,30 +14,29 @@
 ///
 /// \author Joachim C. K. B. Hansen
 
-#include <CCDB/BasicCCDBManager.h>
+#include "FFitWeights.h"
 
-#include <chrono>
-#include <string>
-#include <algorithm>
-#include <numeric>
-#include <vector>
-#include <tuple>
-#include <unordered_map>
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EseTable.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/Qvectors.h"
 
 #include "Framework/ASoA.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
 #include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include <CCDB/BasicCCDBManager.h>
 
-#include "Common/DataModel/EventSelection.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-
-#include "Common/DataModel/EseTable.h"
-#include "Common/DataModel/Qvectors.h"
-#include "FFitWeights.h"
+#include <algorithm>
+#include <chrono>
+#include <numeric>
+#include <string>
+#include <tuple>
+#include <unordered_map>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Common/TableProducer/eventSelection.cxx b/.conflict-base-0/Common/TableProducer/eventSelection.cxx
index 5ead8e80493..52bf23cda7b 100644
--- a/.conflict-base-0/Common/TableProducer/eventSelection.cxx
+++ b/.conflict-base-0/Common/TableProducer/eventSelection.cxx
@@ -14,35 +14,38 @@
 ///
 /// \author Evgeny Kryshen <evgeny.kryshen@cern.ch> and Igor Altsybeev <Igor.Altsybeev@cern.ch>
 
-#include <vector>
-#include <map>
-#include <string>
-#include <limits>
-
-#include "Framework/ConfigParamSpec.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Common/DataModel/EventSelection.h"
+
+#include "MetadataHelper.h"
+
 #include "Common/CCDB/EventSelectionParams.h"
 #include "Common/CCDB/TriggerAliases.h"
+
 #include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/LHCConstants.h"
-#include "Framework/HistogramRegistry.h"
+#include "DataFormatsCTP/Configuration.h"
+#include "DataFormatsCTP/Scalers.h"
 #include "DataFormatsFT0/Digit.h"
-#include "DataFormatsParameters/GRPLHCIFData.h"
-#include "DataFormatsParameters/GRPECSObject.h"
-#include "ITSMFTBase/DPLAlpideParam.h"
-#include "MetadataHelper.h"
-#include "DataFormatsParameters/AggregatedRunInfo.h"
 #include "DataFormatsITSMFT/NoiseMap.h" // missing include in TimeDeadMap.h
 #include "DataFormatsITSMFT/TimeDeadMap.h"
+#include "DataFormatsParameters/AggregatedRunInfo.h"
+#include "DataFormatsParameters/GRPECSObject.h"
+#include "DataFormatsParameters/GRPLHCIFData.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/ConfigParamSpec.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include "ITSMFTBase/DPLAlpideParam.h"
 #include "ITSMFTReconstruction/ChipMappingITS.h"
-#include "DataFormatsCTP/Configuration.h"
-#include "DataFormatsCTP/Scalers.h"
 
 #include "TH1D.h"
 
+#include <limits>
+#include <map>
+#include <string>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::aod::evsel;
diff --git a/.conflict-base-0/Common/TableProducer/ft0CorrectedTable.cxx b/.conflict-base-0/Common/TableProducer/ft0CorrectedTable.cxx
index a8a2787aa5a..694fed73c4c 100644
--- a/.conflict-base-0/Common/TableProducer/ft0CorrectedTable.cxx
+++ b/.conflict-base-0/Common/TableProducer/ft0CorrectedTable.cxx
@@ -9,22 +9,26 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <bitset>
-#include <string>
-#include "Framework/ConfigParamSpec.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Common/DataModel/FT0Corrected.h"
+#include "CollisionTypeHelper.h"
+
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/FT0Corrected.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/LHCConstants.h"
 #include "CommonConstants/PhysicsConstants.h"
 #include "DataFormatsFT0/Digit.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "CollisionTypeHelper.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/ConfigParamSpec.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TRandom3.h"
 
+#include <bitset>
+#include <string>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::aod;
diff --git a/.conflict-base-0/Common/TableProducer/fwdtrackToCollisionAssociator.cxx b/.conflict-base-0/Common/TableProducer/fwdtrackToCollisionAssociator.cxx
index 20d6e4c6a60..a8b6fa22baa 100644
--- a/.conflict-base-0/Common/TableProducer/fwdtrackToCollisionAssociator.cxx
+++ b/.conflict-base-0/Common/TableProducer/fwdtrackToCollisionAssociator.cxx
@@ -17,6 +17,7 @@
 #include "Common/Core/CollisionAssociation.h"
 #include "Common/DataModel/CollisionAssociationTables.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CommonConstants/LHCConstants.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
diff --git a/.conflict-base-0/Common/TableProducer/fwdtrackextension.cxx b/.conflict-base-0/Common/TableProducer/fwdtrackextension.cxx
index 4a78bf8de5f..965fca008f1 100644
--- a/.conflict-base-0/Common/TableProducer/fwdtrackextension.cxx
+++ b/.conflict-base-0/Common/TableProducer/fwdtrackextension.cxx
@@ -13,19 +13,20 @@
 // Task performing forward track DCA computation
 //
 
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonUtils/NameConf.h"
+#include "DetectorsBase/Propagator.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/Core/trackUtilities.h"
 #include "ReconstructionDataFormats/DCA.h"
-#include "DetectorsBase/Propagator.h"
-#include "CommonUtils/NameConf.h"
+#include "ReconstructionDataFormats/TrackFwd.h"
 
 #include "Math/SMatrix.h"
-#include "ReconstructionDataFormats/TrackFwd.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Common/TableProducer/match-mft-ft0.cxx b/.conflict-base-0/Common/TableProducer/match-mft-ft0.cxx
index a4b208a03c9..bc5e0feec12 100644
--- a/.conflict-base-0/Common/TableProducer/match-mft-ft0.cxx
+++ b/.conflict-base-0/Common/TableProducer/match-mft-ft0.cxx
@@ -18,31 +18,27 @@
 //        called aod::BCofMFT
 // \date 03/09/24
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
+#include "Common/Core/trackUtilities.h" //for getTrackPar()
 
-#include "MathUtils/Utils.h"
 #include "CommonConstants/LHCConstants.h"
-#include "Common/Core/trackUtilities.h"         //for getTrackPar()
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "MathUtils/Utils.h"
 #include "ReconstructionDataFormats/TrackFwd.h" //for propagate
 // https://github.com/AliceO2Group/AliceO2/blob/dev/DataFormats/Reconstruction/include/ReconstructionDataFormats/TrackFwd.h
-#include "CommonConstants/LHCConstants.h"
-#include "Math/MatrixFunctions.h"
-#include "Math/SMatrix.h"
+#include "Common/DataModel/MatchMFTFT0.h"
 
 #include "CCDB/BasicCCDBManager.h"
 #include "CCDB/CcdbApi.h"
-
-#include "DataFormatsParameters/GRPMagField.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "Field/MagneticField.h"
-#include "TGeoGlobalMagField.h"
-
+#include "CommonConstants/LHCConstants.h"
 #include "DataFormatsParameters/GRPMagField.h"
 #include "DetectorsBase/GeometryManager.h"
 #include "DetectorsBase/Propagator.h"
+#include "Field/MagneticField.h"
 
-#include "Common/DataModel/MatchMFTFT0.h"
+#include "Math/MatrixFunctions.h"
+#include "Math/SMatrix.h"
+#include "TGeoGlobalMagField.h"
 
 using SMatrix55 = ROOT::Math::SMatrix<double, 5, 5, ROOT::Math::MatRepSym<double, 5>>;
 using SMatrix5 = ROOT::Math::SVector<Double_t, 5>;
diff --git a/.conflict-base-0/Common/TableProducer/match-mft-mch-data-mc.cxx b/.conflict-base-0/Common/TableProducer/match-mft-mch-data-mc.cxx
index 11d59611772..1f330b45422 100644
--- a/.conflict-base-0/Common/TableProducer/match-mft-mch-data-mc.cxx
+++ b/.conflict-base-0/Common/TableProducer/match-mft-mch-data-mc.cxx
@@ -8,29 +8,31 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include <map>
-#include <string>
-#include <unordered_set>
-#include <unordered_map>
-#include <vector>
-
-#include "CCDB/BasicCCDBManager.h"
+#include "Common/DataModel/CollisionAssociationTables.h"
 #include "Common/DataModel/MatchMFTFT0.h"
 #include "Common/DataModel/MatchMFTMuonData.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsGlobalTracking/RecoContainer.h"
-#include "Common/DataModel/CollisionAssociationTables.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include "Field/MagneticField.h"
-#include "TGeoGlobalMagField.h"
-#include "DetectorsBase/Propagator.h"
 #include "DetectorsBase/GeometryManager.h"
-#include "MCHTracking/TrackExtrap.h"
+#include "DetectorsBase/Propagator.h"
+#include "Field/MagneticField.h"
 #include "GlobalTracking/MatchGlobalFwd.h"
+#include "MCHTracking/TrackExtrap.h"
+
 #include "Math/SMatrix.h"
 #include "Math/SVector.h"
+#include "TDatabasePDG.h"
+#include "TGeoGlobalMagField.h"
 #include "TLorentzVector.h"
 #include "TVector2.h"
-#include "TDatabasePDG.h"
+
+#include <map>
+#include <string>
+#include <unordered_map>
+#include <unordered_set>
+#include <vector>
 
 using namespace std;
 
@@ -40,9 +42,9 @@ using namespace o2::aod;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/DataTypes.h"
 #include "Framework/runDataProcessing.h"
 
diff --git a/.conflict-base-0/Common/TableProducer/match-mft-mch-data.cxx b/.conflict-base-0/Common/TableProducer/match-mft-mch-data.cxx
index 96471ddefab..eafcd54c51c 100644
--- a/.conflict-base-0/Common/TableProducer/match-mft-mch-data.cxx
+++ b/.conflict-base-0/Common/TableProducer/match-mft-mch-data.cxx
@@ -8,29 +8,31 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include <map>
-#include <string>
-#include <unordered_set>
-#include <unordered_map>
-#include <vector>
-
-#include "CCDB/BasicCCDBManager.h"
+#include "Common/DataModel/CollisionAssociationTables.h"
 #include "Common/DataModel/MatchMFTFT0.h"
 #include "Common/DataModel/MatchMFTMuonData.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsGlobalTracking/RecoContainer.h"
-#include "Common/DataModel/CollisionAssociationTables.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include "Field/MagneticField.h"
-#include "TGeoGlobalMagField.h"
-#include "DetectorsBase/Propagator.h"
 #include "DetectorsBase/GeometryManager.h"
-#include "MCHTracking/TrackExtrap.h"
+#include "DetectorsBase/Propagator.h"
+#include "Field/MagneticField.h"
 #include "GlobalTracking/MatchGlobalFwd.h"
+#include "MCHTracking/TrackExtrap.h"
+
 #include "Math/SMatrix.h"
 #include "Math/SVector.h"
+#include "TDatabasePDG.h"
+#include "TGeoGlobalMagField.h"
 #include "TLorentzVector.h"
 #include "TVector2.h"
-#include "TDatabasePDG.h"
+
+#include <map>
+#include <string>
+#include <unordered_map>
+#include <unordered_set>
+#include <vector>
 
 using namespace std;
 
@@ -40,9 +42,9 @@ using namespace o2::aod;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/DataTypes.h"
 #include "Framework/runDataProcessing.h"
 
diff --git a/.conflict-base-0/Common/TableProducer/mcCollsExtra.cxx b/.conflict-base-0/Common/TableProducer/mcCollsExtra.cxx
index 452930494ba..83523cf45d0 100644
--- a/.conflict-base-0/Common/TableProducer/mcCollsExtra.cxx
+++ b/.conflict-base-0/Common/TableProducer/mcCollsExtra.cxx
@@ -12,38 +12,40 @@
 // Quick and dirty task to correlate MC <-> data
 //
 
-#include <array>
-#include <cmath>
-#include <cstdlib>
-#include <vector>
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/McCollisionExtra.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
 #include "Math/Vector4D.h"
+#include <TDatabasePDG.h>
 #include <TFile.h>
 #include <TH2F.h>
-#include <TProfile.h>
 #include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
+#include <TProfile.h>
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/DataModel/McCollisionExtra.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Common/TableProducer/mftmchMatchingML.cxx b/.conflict-base-0/Common/TableProducer/mftmchMatchingML.cxx
index 4df90bbfdd1..78e1902d6b4 100644
--- a/.conflict-base-0/Common/TableProducer/mftmchMatchingML.cxx
+++ b/.conflict-base-0/Common/TableProducer/mftmchMatchingML.cxx
@@ -9,30 +9,36 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <math.h>
-#include <onnxruntime_cxx_api.h>
-#include <string>
-#include <regex>
-#include <TLorentzVector.h>
 #include "Common/DataModel/MftmchMatchingML.h"
+
+#include "Common/CCDB/EventSelectionParams.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+#include "Tools/ML/model.h"
+
+#include "CCDB/CcdbApi.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/CCDB/EventSelectionParams.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/Core/trackUtilities.h"
-#include "Common/Core/TrackSelection.h"
+#include "GlobalTracking/MatchGlobalFwd.h"
+#include "MCHTracking/TrackExtrap.h"
+#include "MCHTracking/TrackParam.h"
+#include "MFTTracking/Tracker.h"
 #include "ReconstructionDataFormats/TrackFwd.h"
+
 #include "Math/SMatrix.h"
-#include "DetectorsBase/Propagator.h"
-#include "MFTTracking/Tracker.h"
-#include "MCHTracking/TrackParam.h"
-#include "MCHTracking/TrackExtrap.h"
-#include "GlobalTracking/MatchGlobalFwd.h"
-#include "CCDB/CcdbApi.h"
-#include "Tools/ML/model.h"
+#include <TLorentzVector.h>
+
+#include <onnxruntime_cxx_api.h>
+
+#include <regex>
+#include <string>
+
+#include <math.h>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Common/TableProducer/multCentTable.cxx b/.conflict-base-0/Common/TableProducer/multCentTable.cxx
index 612125715cf..daed806ebb3 100644
--- a/.conflict-base-0/Common/TableProducer/multCentTable.cxx
+++ b/.conflict-base-0/Common/TableProducer/multCentTable.cxx
@@ -20,27 +20,29 @@
 //
 //===============================================================
 
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "MetadataHelper.h"
+
 #include "Common/Core/trackUtilities.h"
-#include "ReconstructionDataFormats/DCA.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "CommonUtils/NameConf.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/Tools/MultModule.h"
+#include "Common/Tools/StandardCCDBLoader.h"
+#include "Common/Tools/TrackPropagationModule.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "CCDB/CcdbApi.h"
+#include "CommonConstants/GeomConstants.h"
+#include "CommonUtils/NameConf.h"
+#include "DataFormatsCalibration/MeanVertexObject.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "DataFormatsCalibration/MeanVertexObject.h"
-#include "CommonConstants/GeomConstants.h"
-#include "Common/Tools/TrackPropagationModule.h"
-#include "Common/Tools/StandardCCDBLoader.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "MetadataHelper.h"
-#include "Common/Tools/MultModule.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/DCA.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Common/TableProducer/multiplicityExtraTable.cxx b/.conflict-base-0/Common/TableProducer/multiplicityExtraTable.cxx
index 001e75e6adb..13d9a43f3e7 100644
--- a/.conflict-base-0/Common/TableProducer/multiplicityExtraTable.cxx
+++ b/.conflict-base-0/Common/TableProducer/multiplicityExtraTable.cxx
@@ -8,20 +8,23 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include <CCDB/BasicCCDBManager.h> // megalinter thinks this is a C header...
-#include <bitset>
-#include "Framework/ConfigParamSpec.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "TableHelper.h"
+
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "DataFormatsFIT/Triggers.h"
-#include "TableHelper.h"
+
 #include "CCDB/CcdbApi.h"
 #include "CommonDataFormat/BunchFilling.h"
-#include "DataFormatsParameters/GRPObject.h"
+#include "DataFormatsFIT/Triggers.h"
 #include "DataFormatsParameters/GRPLHCIFData.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/ConfigParamSpec.h"
+#include "Framework/runDataProcessing.h"
+#include <CCDB/BasicCCDBManager.h> // megalinter thinks this is a C header...
+
+#include <bitset>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Common/TableProducer/multiplicityTable.cxx b/.conflict-base-0/Common/TableProducer/multiplicityTable.cxx
index 12cde8a9869..45a712e5803 100644
--- a/.conflict-base-0/Common/TableProducer/multiplicityTable.cxx
+++ b/.conflict-base-0/Common/TableProducer/multiplicityTable.cxx
@@ -15,26 +15,30 @@
 /// \author ALICE
 ///
 
-#include <vector>
-#include <algorithm>
-#include <map>
-#include <string>
+#include "MetadataHelper.h"
+#include "TableHelper.h"
 
-#include "Framework/ConfigParamSpec.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
+#include "PWGMM/Mult/DataModel/bestCollisionTable.h"
+
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/ConfigParamSpec.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "TableHelper.h"
-#include "MetadataHelper.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TList.h"
-#include "PWGMM/Mult/DataModel/bestCollisionTable.h"
+
+#include <algorithm>
+#include <map>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
@@ -100,9 +104,9 @@ struct MultiplicityTable {
   Produces<aod::PVMultZeqs> tablePVZeqs;        // 12
   Produces<aod::MultMCExtras> tableExtraMc;     // 13
   Produces<aod::Mult2MCExtras> tableExtraMult2MCExtras;
-  Produces<aod::MultHepMCHIs> multHepMCHIs;     // Not accounted for, produced using custom process function to avoid dependencies
-  Produces<aod::MFTMults> mftMults;             // Not accounted for, produced using custom process function to avoid dependencies
-  Produces<aod::MultsGlobal> multsGlobal;       // Not accounted for, produced based on process function processGlobalTrackingCounters
+  Produces<aod::MultHepMCHIs> multHepMCHIs; // Not accounted for, produced using custom process function to avoid dependencies
+  Produces<aod::MFTMults> mftMults;         // Not accounted for, produced using custom process function to avoid dependencies
+  Produces<aod::MultsGlobal> multsGlobal;   // Not accounted for, produced based on process function processGlobalTrackingCounters
 
   // For vertex-Z corrections in calibration
   Service<o2::ccdb::BasicCCDBManager> ccdb;
diff --git a/.conflict-base-0/Common/TableProducer/muonRealignment.cxx b/.conflict-base-0/Common/TableProducer/muonRealignment.cxx
index 58745af69a6..3d1516dd5fc 100644
--- a/.conflict-base-0/Common/TableProducer/muonRealignment.cxx
+++ b/.conflict-base-0/Common/TableProducer/muonRealignment.cxx
@@ -13,33 +13,34 @@
 /// \brief Task for muon re-alignment at analysis level
 /// \author Chi Zhang <chi.zhang@cern.ch>, CEA-Saclay
 
-#include <string>
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/ASoAHelpers.h"
+#include "Common/DataModel/CollisionAssociationTables.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/FwdTrackReAlignTables.h"
 
 #include "CCDB/BasicCCDBManager.h"
 #include "CCDB/CCDBTimeStampUtils.h"
-#include "CommonUtils/NameConf.h"
 #include "CommonUtils/ConfigurableParam.h"
+#include "CommonUtils/NameConf.h"
 #include "DataFormatsMCH/Cluster.h"
 #include "DataFormatsParameters/GRPObject.h"
-#include "DetectorsBase/GeometryManager.h"
 #include "DetectorsBase/GRPGeomHelper.h"
+#include "DetectorsBase/GeometryManager.h"
 #include "DetectorsBase/Propagator.h"
-#include "MathUtils/Cartesian.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "GlobalTracking/MatchGlobalFwd.h"
+#include "MCHBase/TrackerParam.h"
 #include "MCHGeometryTransformer/Transformations.h"
 #include "MCHTracking/Track.h"
 #include "MCHTracking/TrackExtrap.h"
-#include "MCHTracking/TrackParam.h"
 #include "MCHTracking/TrackFitter.h"
-#include "MCHBase/TrackerParam.h"
-#include "GlobalTracking/MatchGlobalFwd.h"
+#include "MCHTracking/TrackParam.h"
+#include "MathUtils/Cartesian.h"
 #include "ReconstructionDataFormats/TrackFwd.h"
-#include "Common/DataModel/FwdTrackReAlignTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/CollisionAssociationTables.h"
+
+#include <string>
 
 using namespace std;
 using namespace o2;
diff --git a/.conflict-base-0/Common/TableProducer/occupancyTableProducer.cxx b/.conflict-base-0/Common/TableProducer/occupancyTableProducer.cxx
index a700b394772..8f9c36bad2b 100644
--- a/.conflict-base-0/Common/TableProducer/occupancyTableProducer.cxx
+++ b/.conflict-base-0/Common/TableProducer/occupancyTableProducer.cxx
@@ -15,31 +15,29 @@
 ///         Ambg tracks were not used
 /// \author Rahul Verma (rahul.verma@iitb.ac.in) :: Marian I Ivanov (marian.ivanov@cern.ch)
 
-#include <vector>
-#include <unordered_map>
-#include <algorithm>
-#include <cmath>
-#include <string>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/O2DatabasePDGPlugin.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-
 #include "Common/DataModel/OccupancyTables.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
 #include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsFT0/Digit.h"
 #include "DataFormatsParameters/GRPLHCIFData.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
+#include <algorithm>
+#include <cmath>
+#include <string>
+#include <unordered_map>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Common/TableProducer/qVectorsTable.cxx b/.conflict-base-0/Common/TableProducer/qVectorsTable.cxx
index 9de8faf028f..b6d1e98d803 100644
--- a/.conflict-base-0/Common/TableProducer/qVectorsTable.cxx
+++ b/.conflict-base-0/Common/TableProducer/qVectorsTable.cxx
@@ -19,28 +19,27 @@
 ///
 
 // C++/ROOT includes.
+#include <TComplex.h>
+#include <TH3F.h>
+
 #include <chrono>
 #include <string>
 #include <vector>
-#include <TComplex.h>
-#include <TH3F.h>
 
 // o2Physics includes.
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-
 #include "Common/Core/EventPlaneHelper.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/FT0Corrected.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-
 #include "Common/DataModel/Qvectors.h"
-
-#include "Common/Core/TrackSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
 // o2 includes.
 #include "CCDB/BasicCCDBManager.h"
 #include "DetectorsCommonDataFormats/AlignParam.h"
diff --git a/.conflict-base-0/Common/TableProducer/timestamp.cxx b/.conflict-base-0/Common/TableProducer/timestamp.cxx
index 40ab7000772..a3d071cf305 100644
--- a/.conflict-base-0/Common/TableProducer/timestamp.cxx
+++ b/.conflict-base-0/Common/TableProducer/timestamp.cxx
@@ -16,14 +16,16 @@
 /// \brief  A task to fill the timestamp table from run number.
 ///         Uses headers from CCDB
 ///
-#include <vector>
-#include <map>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
+#include "MetadataHelper.h"
+
 #include "CCDB/BasicCCDBManager.h"
 #include "CommonDataFormat/InteractionRecord.h"
 #include "DetectorsRaw/HBFUtils.h"
-#include "MetadataHelper.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include <map>
+#include <vector>
 
 using namespace o2::framework;
 using namespace o2::header;
@@ -32,15 +34,15 @@ using namespace o2;
 o2::common::core::MetadataHelper metadataInfo; // Metadata helper
 
 struct TimestampTask {
-  Produces<aod::Timestamps> timestampTable;  /// Table with SOR timestamps produced by the task
-  Service<o2::ccdb::BasicCCDBManager> ccdb;  /// CCDB manager to access orbit-reset timestamp
-  o2::ccdb::CcdbApi ccdb_api;                /// API to access CCDB headers
+  Produces<aod::Timestamps> timestampTable; /// Table with SOR timestamps produced by the task
+  Service<o2::ccdb::BasicCCDBManager> ccdb; /// CCDB manager to access orbit-reset timestamp
+  o2::ccdb::CcdbApi ccdb_api;               /// API to access CCDB headers
   Configurable<bool> fatalOnInvalidTimestamp{"fatalOnInvalidTimestamp", false, "Generate fatal error for invalid timestamps"};
-  std::map<int, int64_t> mapRunToOrbitReset; /// Cache of orbit reset timestamps
+  std::map<int, int64_t> mapRunToOrbitReset;                      /// Cache of orbit reset timestamps
   std::map<int, std::pair<int64_t, int64_t>> mapRunToRunDuration; /// Cache of run duration timestamps
-  int lastRunNumber = 0;                     /// Last run number processed
-  int64_t orbitResetTimestamp = 0;           /// Orbit-reset timestamp in us
-  std::pair<int64_t, int64_t> runDuration;   /// Pair of SOR and EOR timestamps
+  int lastRunNumber = 0;                                          /// Last run number processed
+  int64_t orbitResetTimestamp = 0;                                /// Orbit-reset timestamp in us
+  std::pair<int64_t, int64_t> runDuration;                        /// Pair of SOR and EOR timestamps
 
   // Configurables
   Configurable<bool> verbose{"verbose", false, "verbose mode"};
diff --git a/.conflict-base-0/Common/TableProducer/trackDcaCovFillerRun2.cxx b/.conflict-base-0/Common/TableProducer/trackDcaCovFillerRun2.cxx
index d07833ae9e0..ca56615dfee 100644
--- a/.conflict-base-0/Common/TableProducer/trackDcaCovFillerRun2.cxx
+++ b/.conflict-base-0/Common/TableProducer/trackDcaCovFillerRun2.cxx
@@ -15,12 +15,14 @@
 // Run 2 AO2Ds cannot have their dcacov filled by the current track-propagation workflow as the workflow isn't designed for them, given Run 2 tracks are already propagated to the PV.
 // This task fills the DCA Cov (and DCA) tables for Run 2 tracks by "propagating" the tracks (though given they are already at the PV it doesn't actually do the propagation) and retrieving the DCA and DCA cov given by the propagateToDCABxByBz function
 
-#include <string>
-
 #include "TableHelper.h"
+
 #include "Common/Tools/TrackTuner.h"
+
 #include "DataFormatsParameters/GRPObject.h"
 
+#include <string>
+
 using namespace o2;
 using namespace o2::framework;
 // using namespace o2::framework::expressions;
diff --git a/.conflict-base-0/Common/TableProducer/trackPropagation.cxx b/.conflict-base-0/Common/TableProducer/trackPropagation.cxx
index e1b6528ce53..dbe1c93a56c 100644
--- a/.conflict-base-0/Common/TableProducer/trackPropagation.cxx
+++ b/.conflict-base-0/Common/TableProducer/trackPropagation.cxx
@@ -14,6 +14,7 @@
 //
 
 #include "TableHelper.h"
+
 #include "Common/Tools/TrackTuner.h"
 
 // The Run 3 AO2D stores the tracks at the point of innermost update. For a track with ITS this is the innermost (or second innermost)
diff --git a/.conflict-base-0/Common/TableProducer/trackPropagationTester.cxx b/.conflict-base-0/Common/TableProducer/trackPropagationTester.cxx
index 694ff77d3c0..7b851aa1ce0 100644
--- a/.conflict-base-0/Common/TableProducer/trackPropagationTester.cxx
+++ b/.conflict-base-0/Common/TableProducer/trackPropagationTester.cxx
@@ -23,24 +23,25 @@
 //
 //===============================================================
 
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/Core/trackUtilities.h"
-#include "ReconstructionDataFormats/DCA.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "CommonUtils/NameConf.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/Tools/StandardCCDBLoader.h"
+#include "Common/Tools/TrackPropagationModule.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "CCDB/CcdbApi.h"
+#include "CommonConstants/GeomConstants.h"
+#include "CommonUtils/NameConf.h"
+#include "DataFormatsCalibration/MeanVertexObject.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "DataFormatsCalibration/MeanVertexObject.h"
-#include "CommonConstants/GeomConstants.h"
-#include "Common/Tools/TrackPropagationModule.h"
-#include "Common/Tools/StandardCCDBLoader.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/DCA.h"
 
 // The Run 3 AO2D stores the tracks at the point of innermost update. For a track with ITS this is the innermost (or second innermost)
 // ITS layer. For a track without ITS, this is the TPC inner wall or for loopers in the TPC even a radius beyond that.
diff --git a/.conflict-base-0/Common/TableProducer/trackToCollisionAssociator.cxx b/.conflict-base-0/Common/TableProducer/trackToCollisionAssociator.cxx
index 62d90edaa9f..7c0e4fe147c 100644
--- a/.conflict-base-0/Common/TableProducer/trackToCollisionAssociator.cxx
+++ b/.conflict-base-0/Common/TableProducer/trackToCollisionAssociator.cxx
@@ -18,6 +18,7 @@
 #include "Common/Core/CollisionAssociation.h"
 #include "Common/DataModel/CollisionAssociationTables.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
diff --git a/.conflict-base-0/Common/TableProducer/trackextension.cxx b/.conflict-base-0/Common/TableProducer/trackextension.cxx
index 210f9adc122..1bfd9f700bb 100644
--- a/.conflict-base-0/Common/TableProducer/trackextension.cxx
+++ b/.conflict-base-0/Common/TableProducer/trackextension.cxx
@@ -13,17 +13,18 @@
 // Task performing basic track selection.
 //
 
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Multiplicity.h"
 #include "Common/Core/trackUtilities.h"
-#include "ReconstructionDataFormats/DCA.h"
-#include "DetectorsBase/Propagator.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CommonUtils/NameConf.h"
 #include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/DCA.h"
 #include <CCDB/BasicCCDBManager.h>
 
 using namespace o2;
diff --git a/.conflict-base-0/Common/TableProducer/trackselection.cxx b/.conflict-base-0/Common/TableProducer/trackselection.cxx
index 8ce5a88e0bd..505a24af68b 100644
--- a/.conflict-base-0/Common/TableProducer/trackselection.cxx
+++ b/.conflict-base-0/Common/TableProducer/trackselection.cxx
@@ -17,14 +17,17 @@
 /// \brief Task performing basic track selection.
 ///
 
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Common/Core/TrackSelection.h"
+
+#include "TableHelper.h"
+
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/Core/trackUtilities.h"
-#include "TableHelper.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Common/TableProducer/weakDecayIndices.cxx b/.conflict-base-0/Common/TableProducer/weakDecayIndices.cxx
index b2937e1c8a5..50358f9f82a 100644
--- a/.conflict-base-0/Common/TableProducer/weakDecayIndices.cxx
+++ b/.conflict-base-0/Common/TableProducer/weakDecayIndices.cxx
@@ -8,9 +8,9 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Common/TableProducer/zdcTaskInterCalib.cxx b/.conflict-base-0/Common/TableProducer/zdcTaskInterCalib.cxx
index 78054580b81..c4ed223b67e 100644
--- a/.conflict-base-0/Common/TableProducer/zdcTaskInterCalib.cxx
+++ b/.conflict-base-0/Common/TableProducer/zdcTaskInterCalib.cxx
@@ -13,17 +13,18 @@
 /// \brief Task for ZDC tower inter-calibration
 /// \author chiara.oppedisano@cern.ch
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/CCDB/EventSelectionParams.h"
 #include "Common/CCDB/TriggerAliases.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/ZDCInterCalib.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TH1F.h"
 #include "TH2F.h"
 
diff --git a/.conflict-base-0/Common/Tasks/centralityQa.cxx b/.conflict-base-0/Common/Tasks/centralityQa.cxx
index 9e39194415c..8fa08f047cb 100644
--- a/.conflict-base-0/Common/Tasks/centralityQa.cxx
+++ b/.conflict-base-0/Common/Tasks/centralityQa.cxx
@@ -8,12 +8,14 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TH1F.h"
 
 using namespace o2;
diff --git a/.conflict-base-0/Common/Tasks/checkDataModel.cxx b/.conflict-base-0/Common/Tasks/checkDataModel.cxx
index 33b059e870b..17fad881f68 100644
--- a/.conflict-base-0/Common/Tasks/checkDataModel.cxx
+++ b/.conflict-base-0/Common/Tasks/checkDataModel.cxx
@@ -25,8 +25,8 @@ void customize(std::vector<ConfigParamSpec>& workflowOptions)
   // workflowOptions.push_back(ConfigParamSpec{"isMC", VariantType::Bool, false, {"Check also MC tables if set"}});
 }
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 using namespace o2::framework::expressions;
 
 template <typename Table>
diff --git a/.conflict-base-0/Common/Tasks/checkDataModelMC.cxx b/.conflict-base-0/Common/Tasks/checkDataModelMC.cxx
index fb2762a02b7..14cf55589d7 100644
--- a/.conflict-base-0/Common/Tasks/checkDataModelMC.cxx
+++ b/.conflict-base-0/Common/Tasks/checkDataModelMC.cxx
@@ -13,8 +13,8 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Common/Tasks/cpvQa.cxx b/.conflict-base-0/Common/Tasks/cpvQa.cxx
index e549d89e33d..badf7e7adbd 100644
--- a/.conflict-base-0/Common/Tasks/cpvQa.cxx
+++ b/.conflict-base-0/Common/Tasks/cpvQa.cxx
@@ -13,9 +13,9 @@
 /// \author Sergey Evdokimov
 /// \since 25.10.2022
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Common/Tasks/evtPlanesResolution.cxx b/.conflict-base-0/Common/Tasks/evtPlanesResolution.cxx
index e493ff3f00e..741194a2c64 100644
--- a/.conflict-base-0/Common/Tasks/evtPlanesResolution.cxx
+++ b/.conflict-base-0/Common/Tasks/evtPlanesResolution.cxx
@@ -18,25 +18,26 @@
 ///
 
 // C++/ROOT includes.
+#include <TComplex.h>
+#include <TH1F.h>
+#include <TMath.h>
+#include <TProfile.h>
+
 #include <chrono>
 #include <string>
 #include <vector>
-#include <TComplex.h>
-#include <TProfile.h>
-#include <TMath.h>
-#include <TH1F.h>
 
 // o2Physics includes.
+#include "Common/Core/EventPlaneHelper.h"
+#include "Common/DataModel/EvtPlanes.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StaticFor.h"
-
-#include "Common/DataModel/EvtPlanes.h"
-#include "Common/Core/EventPlaneHelper.h"
+#include "Framework/runDataProcessing.h"
 
 // o2 includes.
 
@@ -146,7 +147,7 @@ struct evtPlanesResolution {
         fillHistosEvtPl<7>(evPl);
         break;
     } // End switch(centBin)
-  }   // End void process(...)
+  } // End void process(...)
 };
 
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
diff --git a/.conflict-base-0/Common/Tasks/flowTest.cxx b/.conflict-base-0/Common/Tasks/flowTest.cxx
index bb27c0cc504..f70831d5c9a 100644
--- a/.conflict-base-0/Common/Tasks/flowTest.cxx
+++ b/.conflict-base-0/Common/Tasks/flowTest.cxx
@@ -13,20 +13,21 @@
 // cross-PWG effort in tracking studies
 // includes basic tracking, V0s and Cascades
 
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGMM/Mult/DataModel/Index.h" // for Particles2Tracks table
+
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPObject.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-
-#include "PWGMM/Mult/DataModel/Index.h" // for Particles2Tracks table
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "ReconstructionDataFormats/Track.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Common/Tasks/ft0Qa.cxx b/.conflict-base-0/Common/Tasks/ft0Qa.cxx
index f7dcb8d75c4..6b200c6092f 100644
--- a/.conflict-base-0/Common/Tasks/ft0Qa.cxx
+++ b/.conflict-base-0/Common/Tasks/ft0Qa.cxx
@@ -9,17 +9,20 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <bitset>
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/FT0Corrected.h"
 #include "Common/DataModel/Multiplicity.h"
+
 #include "DataFormatsFT0/Digit.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
+
 #include "TH1F.h"
 #include "TH2F.h"
 
+#include <bitset>
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-base-0/Common/Tasks/integrationTest.cxx b/.conflict-base-0/Common/Tasks/integrationTest.cxx
index 04e0ad4778e..4768814154a 100644
--- a/.conflict-base-0/Common/Tasks/integrationTest.cxx
+++ b/.conflict-base-0/Common/Tasks/integrationTest.cxx
@@ -15,17 +15,18 @@
 //
 // Includes further QA if option enabled
 
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPObject.h"
 #include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "ReconstructionDataFormats/Track.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Common/Tasks/integrationTestCCDB.cxx b/.conflict-base-0/Common/Tasks/integrationTestCCDB.cxx
index 33dbc6dd3e4..1966ca70126 100644
--- a/.conflict-base-0/Common/Tasks/integrationTestCCDB.cxx
+++ b/.conflict-base-0/Common/Tasks/integrationTestCCDB.cxx
@@ -22,19 +22,20 @@
 //
 // +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPObject.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include "DetectorsBase/Propagator.h"
+#include "DataFormatsParameters/GRPObject.h"
 #include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "ReconstructionDataFormats/Track.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Common/Tasks/multiplicityDerivedQa.cxx b/.conflict-base-0/Common/Tasks/multiplicityDerivedQa.cxx
index 78f229fa2d6..64fe84840d3 100644
--- a/.conflict-base-0/Common/Tasks/multiplicityDerivedQa.cxx
+++ b/.conflict-base-0/Common/Tasks/multiplicityDerivedQa.cxx
@@ -12,13 +12,15 @@
 // This code does QA based on a saved derived dataset using the
 // tables provided by multiplicityTable.
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/McCollisionExtra.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TH1F.h"
 #include "TH2F.h"
 
diff --git a/.conflict-base-0/Common/Tasks/multiplicityQa.cxx b/.conflict-base-0/Common/Tasks/multiplicityQa.cxx
index 3fc2374c2cc..6b8a10d6f5f 100644
--- a/.conflict-base-0/Common/Tasks/multiplicityQa.cxx
+++ b/.conflict-base-0/Common/Tasks/multiplicityQa.cxx
@@ -22,13 +22,15 @@
 // - david.dobrigkeit.chinellato@cern.ch
 //
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/McCollisionExtra.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TH1F.h"
 #include "TH2F.h"
 
diff --git a/.conflict-base-0/Common/Tasks/orbitRangeTask.cxx b/.conflict-base-0/Common/Tasks/orbitRangeTask.cxx
index 250751c25ba..5cfb8c44f13 100644
--- a/.conflict-base-0/Common/Tasks/orbitRangeTask.cxx
+++ b/.conflict-base-0/Common/Tasks/orbitRangeTask.cxx
@@ -11,11 +11,13 @@
 
 // This task finds minimum and maximum orbit among all processed bcs
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "CommonConstants/LHCConstants.h"
 #include "OrbitRange.h"
+
+#include "CommonConstants/LHCConstants.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TMath.h"
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Common/Tasks/propagatorQa.cxx b/.conflict-base-0/Common/Tasks/propagatorQa.cxx
index f978f8bc564..47280cbd44e 100644
--- a/.conflict-base-0/Common/Tasks/propagatorQa.cxx
+++ b/.conflict-base-0/Common/Tasks/propagatorQa.cxx
@@ -14,20 +14,22 @@
 // Work in progress! More to follow, use at your own peril
 //
 
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "trackSelectionRequest.h"
+
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
 #include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
 #include "DetectorsBase/Propagator.h"
-#include "trackSelectionRequest.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "ReconstructionDataFormats/Track.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Common/Tasks/qVectorsCorrection.cxx b/.conflict-base-0/Common/Tasks/qVectorsCorrection.cxx
index 10e37a4c210..9400fa185c5 100644
--- a/.conflict-base-0/Common/Tasks/qVectorsCorrection.cxx
+++ b/.conflict-base-0/Common/Tasks/qVectorsCorrection.cxx
@@ -18,31 +18,31 @@
 ///
 
 // C++/ROOT includes.
-#include <chrono>
-#include <string>
-#include <vector>
 #include <TComplex.h>
 #include <TH1F.h>
 #include <TH2D.h>
 #include <TMath.h>
 #include <TVector2.h>
 
+#include <chrono>
+#include <string>
+#include <vector>
+
 // o2Physics includes.
+#include "Common/Core/EventPlaneHelper.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Qvectors.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StaticFor.h"
-
-#include "Common/DataModel/Qvectors.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/Core/EventPlaneHelper.h"
-#include "Common/Core/TrackSelection.h"
-
-#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/runDataProcessing.h"
 
 // o2 includes.
 
diff --git a/.conflict-base-0/Common/Tasks/trackqa.cxx b/.conflict-base-0/Common/Tasks/trackqa.cxx
index d10d42af8da..53f73517c83 100644
--- a/.conflict-base-0/Common/Tasks/trackqa.cxx
+++ b/.conflict-base-0/Common/Tasks/trackqa.cxx
@@ -13,15 +13,16 @@
 // Task producing basic tracking qa histograms
 //
 
-#include <utility> // std::swap
-#include <vector>
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/Core/TrackSelectionDefaults.h"
+
+#include <utility> // std::swap
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Common/Tasks/validation.cxx b/.conflict-base-0/Common/Tasks/validation.cxx
index 5c464aebb30..f3b79197d16 100644
--- a/.conflict-base-0/Common/Tasks/validation.cxx
+++ b/.conflict-base-0/Common/Tasks/validation.cxx
@@ -8,15 +8,16 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
 
 #include <TFile.h>
 #include <TH1F.h>
-#include <cmath>
+
 #include <array>
+#include <cmath>
 namespace o2::aod
 {
 } // namespace o2::aod
diff --git a/.conflict-base-0/Common/Tools/MultModule.h b/.conflict-base-0/Common/Tools/MultModule.h
index 1a445cb186a..3a372670e04 100644
--- a/.conflict-base-0/Common/Tools/MultModule.h
+++ b/.conflict-base-0/Common/Tools/MultModule.h
@@ -16,23 +16,28 @@
 #ifndef COMMON_TOOLS_MULTMODULE_H_
 #define COMMON_TOOLS_MULTMODULE_H_
 
-#include <vector>
-#include <memory>
-#include <cstdlib>
-#include <cmath>
-#include <array>
-#include <string>
-#include <map>
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/Configurable.h"
-#include "Framework/HistogramSpec.h"
 #include "TableHelper.h"
+
+#include "PWGMM/Mult/DataModel/bestCollisionTable.h"
+
 #include "Common/Core/TPCVDriftManager.h"
-#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/Centrality.h"
-#include "PWGMM/Mult/DataModel/bestCollisionTable.h"
+#include "Common/DataModel/Multiplicity.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/Configurable.h"
+#include "Framework/HistogramSpec.h"
+
 #include "TFormula.h"
 
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
+
 //__________________________________________
 // MultModule
 
diff --git a/.conflict-base-0/Common/Tools/Multiplicity/multCalibrator.cxx b/.conflict-base-0/Common/Tools/Multiplicity/multCalibrator.cxx
index e9931c0389f..38959bef8c9 100644
--- a/.conflict-base-0/Common/Tools/Multiplicity/multCalibrator.cxx
+++ b/.conflict-base-0/Common/Tools/Multiplicity/multCalibrator.cxx
@@ -16,16 +16,17 @@
 // - victor.gonzalez@cern.ch
 // - david.dobrigkeit.chinellato@cern.ch
 //
-#include "TList.h"
+#include "multCalibrator.h"
+
+#include "TArrayF.h"
+#include "TArrayL64.h"
 #include "TDirectory.h"
 #include "TFile.h"
-#include "TH1F.h"
 #include "TH1D.h"
+#include "TH1F.h"
+#include "TList.h"
 #include "TProfile.h"
 #include "TStopwatch.h"
-#include "TArrayL64.h"
-#include "TArrayF.h"
-#include "multCalibrator.h"
 
 using namespace std;
 
@@ -100,7 +101,7 @@ Bool_t multCalibrator::Calibrate()
     return kFALSE;
   }
 
-  //Step 1: verify if input file contains desired histograms
+  // Step 1: verify if input file contains desired histograms
   TH1D* hRaw[kNCentEstim];
   for (Int_t iv = 0; iv < kNCentEstim; iv++) {
     hRaw[iv] = (TH1D*)fileInput->Get(Form("multiplicity-qa/multiplicityQa/h%s", fCentEstimName[iv].Data()));
@@ -112,7 +113,7 @@ Bool_t multCalibrator::Calibrate()
 
   cout << "Histograms loaded! Will now calibrate..." << endl;
 
-  //Create output file
+  // Create output file
   TFile* fOut = new TFile(fOutputFileName.Data(), "RECREATE");
   TH1F* hCalib[kNCentEstim];
   for (Int_t iv = 0; iv < kNCentEstim; iv++) {
@@ -129,7 +130,7 @@ Bool_t multCalibrator::Calibrate()
 
 Double_t multCalibrator::GetRawMax(TH1* histo)
 {
-  //This function gets the max X value (right edge) which is filled.
+  // This function gets the max X value (right edge) which is filled.
   for (Int_t ii = histo->GetNbinsX(); ii > 0; ii--) {
     if (histo->GetBinContent(ii) < 1e-10)
       return histo->GetBinLowEdge(ii + 1);
@@ -139,24 +140,24 @@ Double_t multCalibrator::GetRawMax(TH1* histo)
 
 Double_t multCalibrator::GetBoundaryForPercentile(TH1* histo, Double_t lPercentileRequested, Double_t& lPrecisionEstimate)
 {
-  //This function returns the boundary for a specific percentile.
-  //It uses a linear interpolation in an attempt to get more precision
-  //than the binning of the histogram used for quantiling.
+  // This function returns the boundary for a specific percentile.
+  // It uses a linear interpolation in an attempt to get more precision
+  // than the binning of the histogram used for quantiling.
   //
-  //It also estimates a certain level of precision of the procedure
-  //by explicitly comparing the bin content of the bins around the boundary
-  //with the entire cross section, effectively reporting back a percentage
-  //that corresponds to those bins. If this percentage is O(percentile bin
-  //width requested), then the user should worry and we print out a warning.
+  // It also estimates a certain level of precision of the procedure
+  // by explicitly comparing the bin content of the bins around the boundary
+  // with the entire cross section, effectively reporting back a percentage
+  // that corresponds to those bins. If this percentage is O(percentile bin
+  // width requested), then the user should worry and we print out a warning.
 
   const Double_t lPrecisionConstant = 2.0;
 
   Double_t lRawMax = GetRawMax(histo);
 
   if (lPercentileRequested < 1e-7)
-    return lRawMax; //safeguard
+    return lRawMax; // safeguard
   if (lPercentileRequested > 100 - 1e-7)
-    return 0.0; //safeguard
+    return 0.0; // safeguard
 
   Double_t lReturnValue = 0.0;
   Double_t lPercentile = 100.0 - lPercentileRequested;
@@ -182,7 +183,7 @@ Double_t multCalibrator::GetBoundaryForPercentile(TH1* histo, Double_t lPercenti
   for (Long_t ibin = lFirstBin; ibin < lNBins; ibin++) {
     lCount += histo->GetBinContent(ibin);
     if (lCount >= lCountDesired) {
-      //Found bin I am looking for!
+      // Found bin I am looking for!
       Double_t lWidth = histo->GetBinWidth(ibin);
       Double_t lLeftPercentile = 100. * (lCount - histo->GetBinContent(ibin)) / lHadronicTotal;
       Double_t lRightPercentile = 100. * lCount / lHadronicTotal;
@@ -200,12 +201,12 @@ Double_t multCalibrator::GetBoundaryForPercentile(TH1* histo, Double_t lPercenti
 //________________________________________________________________
 void multCalibrator::SetStandardAdaptiveBoundaries()
 {
-  //Function to set standard adaptive boundaries
-  //Typically used in pp, goes to 0.001% binning for highest multiplicity
+  // Function to set standard adaptive boundaries
+  // Typically used in pp, goes to 0.001% binning for highest multiplicity
   lNDesiredBoundaries = 0;
   lDesiredBoundaries = new Double_t[1100];
   lDesiredBoundaries[0] = 100;
-  //From Low To High Multiplicity
+  // From Low To High Multiplicity
   for (Int_t ib = 1; ib < 91; ib++) {
     lNDesiredBoundaries++;
     lDesiredBoundaries[lNDesiredBoundaries] = lDesiredBoundaries[lNDesiredBoundaries - 1] - 1.0;
@@ -229,12 +230,12 @@ void multCalibrator::SetStandardAdaptiveBoundaries()
 //________________________________________________________________
 void multCalibrator::SetStandardOnePercentBoundaries()
 {
-  //Function to set standard adaptive boundaries
-  //Typically used in pp, goes to 0.001% binning for highest multiplicity
+  // Function to set standard adaptive boundaries
+  // Typically used in pp, goes to 0.001% binning for highest multiplicity
   lNDesiredBoundaries = 101;
   lDesiredBoundaries = new Double_t[101];
   lDesiredBoundaries[0] = 100;
-  //From Low To High Multiplicity
+  // From Low To High Multiplicity
   for (Int_t ib = 1; ib < 101; ib++)
     lDesiredBoundaries[ib] = lDesiredBoundaries[ib - 1] - 1.0;
   cout << "Set standard 1%-wide percentile boundaries! Nboundaries: " << lNDesiredBoundaries << endl;
@@ -243,10 +244,10 @@ void multCalibrator::SetStandardOnePercentBoundaries()
 //________________________________________________________________
 TH1F* multCalibrator::GetCalibrationHistogram(TH1* histoRaw, TString lHistoName)
 {
-  //This function returns a calibration histogram
+  // This function returns a calibration histogram
   //(pp or p-Pb like, no anchor point considered)
 
-  //Reset + recreate precision histogram
+  // Reset + recreate precision histogram
   ResetPrecisionHistogram();
 
   // Consistency check
@@ -256,10 +257,10 @@ TH1F* multCalibrator::GetCalibrationHistogram(TH1* histoRaw, TString lHistoName)
     cout << "Last boundary: " << lDesiredBoundaries[0] << endl;
   }
 
-  //Aux vars
+  // Aux vars
   Double_t lMiddleOfBins[1000];
   for (Long_t lB = 1; lB < lNDesiredBoundaries; lB++) {
-    //place squarely at the middle to ensure it's all fine
+    // place squarely at the middle to ensure it's all fine
     lMiddleOfBins[lB - 1] = 0.5 * (lDesiredBoundaries[lB] + lDesiredBoundaries[lB - 1]);
   }
   Double_t lBounds[lNDesiredBoundaries + 1];
@@ -276,7 +277,7 @@ TH1F* multCalibrator::GetCalibrationHistogram(TH1* histoRaw, TString lHistoName)
     lBounds[lDisplacedii] = GetBoundaryForPercentile(histoRaw, lDesiredBoundaries[ii], lPrecision[ii]);
     TString lPrecisionString = "(Precision OK)";
     if (ii != 0 && ii != lNDesiredBoundaries - 1) {
-      //check precision, please
+      // check precision, please
       if (lPrecision[ii] / TMath::Abs(lDesiredBoundaries[ii + 1] - lDesiredBoundaries[ii]) > fkPrecisionWarningThreshold)
         lPrecisionString = "(WARNING: BINNING MAY LEAD TO IMPRECISION!)";
       if (lPrecision[ii] / TMath::Abs(lDesiredBoundaries[ii - 1] - lDesiredBoundaries[ii]) > fkPrecisionWarningThreshold)
@@ -302,8 +303,8 @@ void multCalibrator::ResetPrecisionHistogram()
     delete fPrecisionHistogram;
     fPrecisionHistogram = 0x0;
   }
-  if (lNDesiredBoundaries > 0) { //only if initialized
-    //invert boundaries, please
+  if (lNDesiredBoundaries > 0) { // only if initialized
+    // invert boundaries, please
     Double_t lInverseDesiredBoundaries[1100];
     for (Int_t ii = 0; ii < lNDesiredBoundaries; ii++) {
       lInverseDesiredBoundaries[ii] = lDesiredBoundaries[lNDesiredBoundaries - (ii + 1)];
diff --git a/.conflict-base-0/Common/Tools/Multiplicity/multCalibrator.h b/.conflict-base-0/Common/Tools/Multiplicity/multCalibrator.h
index b5c618bdc3d..27e530983df 100644
--- a/.conflict-base-0/Common/Tools/Multiplicity/multCalibrator.h
+++ b/.conflict-base-0/Common/Tools/Multiplicity/multCalibrator.h
@@ -19,30 +19,30 @@
 #ifndef MULTCALIBRATOR_H
 #define MULTCALIBRATOR_H
 
+#include "TH1D.h"
+#include "TNamed.h"
+
 #include <iostream>
 #include <map>
 
-#include "TNamed.h"
-#include "TH1D.h"
-
 class multCalibrator : public TNamed
 {
 
  public:
-  //Constructors/Destructor
+  // Constructors/Destructor
   multCalibrator();
   multCalibrator(const char* name, const char* title = "Multiplicity Calibration Class");
   ~multCalibrator();
 
-  //void    Print(Option_t *option="") const;
+  // void    Print(Option_t *option="") const;
 
   //_________________________________________________________________________
-  //Interface: steering functions to be used in calibration macro
+  // Interface: steering functions to be used in calibration macro
 
-  //Set Filenames
+  // Set Filenames
   void SetInputFile(TString lFile) { fInputFileName = lFile.Data(); }
   void SetOutputFile(TString lFile) { fOutputFileName = lFile.Data(); }
-  //Set Boundaries to find
+  // Set Boundaries to find
   void SetBoundaries(Long_t lNB, Double_t* lB)
   {
     if (lNB < 2 || lNB > 1e+6) {
@@ -56,24 +56,24 @@ class multCalibrator : public TNamed
   void SetAnchorPointRaw(Float_t lRaw) { fAnchorPointValue = lRaw; }
   void SetAnchorPointPercentage(Float_t lPer) { fAnchorPointPercentage = lPer; }
 
-  void SetStandardAdaptiveBoundaries();   //standard adaptive (pp-like)
-  void SetStandardOnePercentBoundaries(); //standard 1% (Pb-Pb like)
+  void SetStandardAdaptiveBoundaries();   // standard adaptive (pp-like)
+  void SetStandardOnePercentBoundaries(); // standard 1% (Pb-Pb like)
 
-  //Master Function in this Class: To be called once filenames are set
+  // Master Function in this Class: To be called once filenames are set
   Bool_t Calibrate();
 
-  //Aux function. Keep public, accessible outside as rather useful utility
+  // Aux function. Keep public, accessible outside as rather useful utility
   TH1F* GetCalibrationHistogram(TH1* histoRaw, TString lHistoName = "hCalib");
 
-  //Auxiliary functions
+  // Auxiliary functions
   Double_t GetRawMax(TH1* histo);
   Double_t GetBoundaryForPercentile(TH1* histo, Double_t lPercentileRequested, Double_t& lPrecisionEstimate);
 
-  //Precision bookkeeping
-  TH1D* GetPrecisionHistogram() { return fPrecisionHistogram; }; //gets precision histogram from current object
-  void ResetPrecisionHistogram();                                //Reset precision histogram, if it exists
+  // Precision bookkeeping
+  TH1D* GetPrecisionHistogram() { return fPrecisionHistogram; }; // gets precision histogram from current object
+  void ResetPrecisionHistogram();                                // Reset precision histogram, if it exists
 
-  //Aliases for centrality estimators
+  // Aliases for centrality estimators
   enum fCentEstim {
     kCentRawV0M = 0,
     kCentRawT0M,
@@ -89,7 +89,7 @@ class multCalibrator : public TNamed
   static const TString fCentEstimName[kNCentEstim]; //! name (internal)
 
  private:
-  //Calibration Boundaries to locate
+  // Calibration Boundaries to locate
   Double_t* lDesiredBoundaries;
   Long_t lNDesiredBoundaries;
   Double_t fkPrecisionWarningThreshold;
@@ -105,7 +105,7 @@ class multCalibrator : public TNamed
   // TList object for storing histograms
   TList* fCalibHists;
 
-  TH1D* fPrecisionHistogram; //for bookkeeping of precision report
+  TH1D* fPrecisionHistogram; // for bookkeeping of precision report
 
   ClassDef(multCalibrator, 1);
   //(this classdef is only for bookkeeping, class will not usually
diff --git a/.conflict-base-0/Common/Tools/Multiplicity/multGlauberNBDFitter.cxx b/.conflict-base-0/Common/Tools/Multiplicity/multGlauberNBDFitter.cxx
index a765db72448..91a71b78eaf 100644
--- a/.conflict-base-0/Common/Tools/Multiplicity/multGlauberNBDFitter.cxx
+++ b/.conflict-base-0/Common/Tools/Multiplicity/multGlauberNBDFitter.cxx
@@ -26,13 +26,14 @@
  **********************************************/
 
 #include "multGlauberNBDFitter.h"
-#include "TList.h"
-#include "TFile.h"
+
 #include "TF1.h"
+#include "TFile.h"
+#include "TFitResult.h"
+#include "TList.h"
+#include "TProfile.h"
 #include "TStopwatch.h"
 #include "TVirtualFitter.h"
-#include "TProfile.h"
-#include "TFitResult.h"
 
 using namespace std;
 
@@ -63,14 +64,14 @@ multGlauberNBDFitter::multGlauberNBDFitter() : TNamed(),
   fNcoll = new Double_t[fMaxNpNcPairs];
   fContent = new Long_t[fMaxNpNcPairs];
 
-  //Ancestor histo
+  // Ancestor histo
   fhNanc = new TH1D("fhNanc", "", 1000, -0.5, 999.5);
 
-  //NBD
+  // NBD
   fNBD = new TF1("fNBD", "ROOT::Math::negative_binomial_pdf(x,[0],[1])", 0, 45000);
   fNBD->SetNpx(45000);
 
-  //master function
+  // master function
   fGlauberNBD = new TF1("fGlauberNBD", this, &multGlauberNBDFitter::ProbDistrib,
                         0, 50000, 4, "multGlauberNBDFitter", "ProbDistrib");
   fGlauberNBD->SetParameter(0, fMu);
@@ -105,19 +106,19 @@ multGlauberNBDFitter::multGlauberNBDFitter(const char* name, const char* title)
                                                                                   fFitOptions("R0"),
                                                                                   fFitNpx(5000)
 {
-  //Named constructor
+  // Named constructor
   fNpart = new Double_t[fMaxNpNcPairs];
   fNcoll = new Double_t[fMaxNpNcPairs];
   fContent = new Long_t[fMaxNpNcPairs];
 
-  //Ancestor histo
-  //fhNanc = new TH1D("fhNanc", "", fAncestorMode==2?10000:1000, -0.5, 999.5);
+  // Ancestor histo
+  // fhNanc = new TH1D("fhNanc", "", fAncestorMode==2?10000:1000, -0.5, 999.5);
 
-  //NBD
+  // NBD
   fNBD = new TF1("fNBD", "ROOT::Math::negative_binomial_pdf(x,[0],[1])", 0, 45000);
   fNBD->SetNpx(45000);
 
-  //master function
+  // master function
   fGlauberNBD = new TF1("fGlauberNBD", this, &multGlauberNBDFitter::ProbDistrib,
                         0, 50000, 5, "multGlauberNBDFitter", "ProbDistrib");
   fGlauberNBD->SetParameter(0, fMu);
@@ -157,18 +158,18 @@ multGlauberNBDFitter::~multGlauberNBDFitter()
 
 //______________________________________________________
 Double_t multGlauberNBDFitter::ProbDistrib(Double_t* x, Double_t* par)
-//Master fitter function
+// Master fitter function
 {
   Double_t lMultValue = x[0];
   Double_t lProbability = 0.0;
   ffChanged = kTRUE;
   const Double_t lAlmost0 = 1.e-13;
-  //Comment this line in order to make the code evaluate Nancestor all the time
+  // Comment this line in order to make the code evaluate Nancestor all the time
   if (TMath::Abs(fCurrentf - par[2]) < lAlmost0)
     ffChanged = kFALSE;
 
   //______________________________________________________
-  //Recalculate the ancestor distribution in case f changed
+  // Recalculate the ancestor distribution in case f changed
   if (ffChanged) {
     fCurrentf = par[2];
     fhNanc->Reset();
@@ -192,12 +193,12 @@ Double_t multGlauberNBDFitter::ProbDistrib(Double_t* x, Double_t* par)
     fhNanc->Scale(1. / fhNanc->Integral());
   }
   //______________________________________________________
-  //Actually evaluate function
+  // Actually evaluate function
   Int_t lStartBin = fhNanc->FindBin(0.0) + 1;
   for (Long_t iNanc = lStartBin; iNanc < fhNanc->GetNbinsX() + 1; iNanc++) {
     Double_t lNancestors = fhNanc->GetBinCenter(iNanc);
     Double_t lNancestorCount = fhNanc->GetBinContent(iNanc);
-    //if(lNancestorCount<1e-12&&lNancestors>10) break;
+    // if(lNancestorCount<1e-12&&lNancestors>10) break;
 
     // allow for variable mu in case requested
     Double_t lThisMu = (((Double_t)lNancestors)) * (par[0] + par[4] * lNancestors);
@@ -279,7 +280,7 @@ void multGlauberNBDFitter::InitAncestor()
 Bool_t multGlauberNBDFitter::DoFit()
 {
   InitAncestor();
-  //Try very hard, please
+  // Try very hard, please
   TVirtualFitter::SetMaxIterations(5000000);
   if (!InitializeNpNc()) {
     cout << "---> Initialization of Npart x Ncoll correlation info failed!" << endl;
@@ -317,12 +318,12 @@ Bool_t multGlauberNBDFitter::DoFit()
 //________________________________________________________________
 Bool_t multGlauberNBDFitter::InitializeNpNc()
 {
-  //This function initializes fhNpNc
-  //Warning: X == Npart, Y == Ncoll
+  // This function initializes fhNpNc
+  // Warning: X == Npart, Y == Ncoll
   Bool_t lReturnValue = kFALSE;
   if (fhNpNc) {
     fNNpNcPairs = 0;
-    //Sweep all allowed values of Npart, Ncoll; find counters
+    // Sweep all allowed values of Npart, Ncoll; find counters
     for (int xbin = 1; xbin < 500; xbin++) {
       for (int ybin = 1; ybin < 3000; ybin++) {
         if (fhNpNc->GetBinContent(fhNpNc->FindBin(xbin, ybin)) != 0) {
@@ -345,12 +346,12 @@ Bool_t multGlauberNBDFitter::InitializeNpNc()
 //________________________________________________________________
 Double_t multGlauberNBDFitter::ContinuousNBD(Double_t n, Double_t mu, Double_t k)
 {
-  //Adaptation of the negative binomial distribution
-  //for non-integer arguments: analytical continuation
+  // Adaptation of the negative binomial distribution
+  // for non-integer arguments: analytical continuation
   //
-  //This function would actually also be fine with integers;
-  //in fact it is equivalent to that if 'n' is typecast as
-  //an integer prior to use
+  // This function would actually also be fine with integers;
+  // in fact it is equivalent to that if 'n' is typecast as
+  // an integer prior to use
 
   Double_t F;
   Double_t f;
@@ -390,10 +391,10 @@ void multGlauberNBDFitter::CalculateAvNpNc(TProfile* lNPartProf, TProfile* lNCol
   cout << "Glauber NBD norm ..........: " << fnorm << endl;
   cout << "Glauber NBD dmu/dNanc .....: " << fdMu << endl;
 
-  //2-fold nested loop:
-  // + looping over all Nancestor combinations
-  // + looping over all possible final multiplicities
-  // ^---> final product already multiplicity-binned
+  // 2-fold nested loop:
+  //  + looping over all Nancestor combinations
+  //  + looping over all possible final multiplicities
+  //  ^---> final product already multiplicity-binned
 
   //______________________________________________________
   if (lLoRange < -1 && lHiRange < -1) {
diff --git a/.conflict-base-0/Common/Tools/Multiplicity/multGlauberNBDFitter.h b/.conflict-base-0/Common/Tools/Multiplicity/multGlauberNBDFitter.h
index 42d5cab046f..effd18e843f 100644
--- a/.conflict-base-0/Common/Tools/Multiplicity/multGlauberNBDFitter.h
+++ b/.conflict-base-0/Common/Tools/Multiplicity/multGlauberNBDFitter.h
@@ -12,56 +12,57 @@
 #ifndef MULTGLAUBERNBDFITTER_H
 #define MULTGLAUBERNBDFITTER_H
 
-#include <iostream>
-#include "TNamed.h"
 #include "TF1.h"
 #include "TH1.h"
 #include "TH1D.h"
 #include "TH2.h"
+#include "TNamed.h"
 #include "TProfile.h"
 
+#include <iostream>
+
 class multGlauberNBDFitter : public TNamed
 {
 
  public:
-  //basic functionality
+  // basic functionality
   multGlauberNBDFitter();
   multGlauberNBDFitter(const char* name, const char* title = "Glauber+NBD fitter");
   ~multGlauberNBDFitter();
 
-  //Master fitter function
+  // Master fitter function
   Double_t ProbDistrib(Double_t* x, Double_t* par);
 
   void InitAncestor();
 
-  //Do Fit: where everything happens
+  // Do Fit: where everything happens
   Bool_t DoFit();
 
-  //Set input characteristics: the 2D plot with Npart, Nanc
+  // Set input characteristics: the 2D plot with Npart, Nanc
   Bool_t SetNpartNcollCorrelation(TH2* hNpNc);
 
-  //Set main input to be fitted (the V0M distribution)
+  // Set main input to be fitted (the V0M distribution)
   Bool_t SetInputV0M(TH1* hV0M);
 
-  //Interface to get funtions if asked to
+  // Interface to get funtions if asked to
   TF1* GetNBD();
   TF1* GetGlauberNBD();
 
-  //Helper
+  // Helper
   Bool_t InitializeNpNc();
 
-  //Interface for debug
+  // Interface for debug
   void SetAncestorMode(Int_t lAncMode = 0) { fAncestorMode = lAncMode; }
   Int_t GetAncestorMode() { return fAncestorMode; }
   TH1D* GetAncestorHistogram() { return fhNanc; }
 
-  //Interface to set vals
+  // Interface to set vals
   void SetMu(Double_t lVal) { fMu = lVal; }
   void Setk(Double_t lVal) { fk = lVal; }
   void Setf(Double_t lVal) { ff = lVal; }
   void SetNorm(Double_t lVal) { fnorm = lVal; }
 
-  //Interface to get vals
+  // Interface to get vals
   Double_t GetMu() { return fMu; }
   Double_t Getk() { return fk; }
   Double_t Getf() { return ff; }
@@ -71,41 +72,41 @@ class multGlauberNBDFitter : public TNamed
   void SetFitOptions(TString lOpt);
   void SetFitNpx(Long_t lNpx);
 
-  //For ancestor mode 2
+  // For ancestor mode 2
   Double_t ContinuousNBD(Double_t n, Double_t mu, Double_t k);
 
-  //For estimating Npart, Ncoll in multiplicity bins
+  // For estimating Npart, Ncoll in multiplicity bins
   void CalculateAvNpNc(TProfile* lNPartProf, TProfile* lNCollProf, TH2F* lNPart2DPlot, TH2F* lNColl2DPlot, TH1F* hPercentileMap, Double_t lLoRange = -1, Double_t lHiRange = -1);
 
-  //void    Print(Option_t *option="") const;
+  // void    Print(Option_t *option="") const;
 
  private:
-  //This function serves as the (analytical) NBD
+  // This function serves as the (analytical) NBD
   TF1* fNBD;
 
-  //This function is the key fitting function
+  // This function is the key fitting function
   TF1* fGlauberNBD;
 
-  //Reference histo
-  TH1D* fhNanc; //basic ancestor distribution
-  TH2* fhNpNc;  //correlation between Npart and Ncoll
-  TH1* fhV0M;   //basic ancestor distribution
+  // Reference histo
+  TH1D* fhNanc; // basic ancestor distribution
+  TH2* fhNpNc;  // correlation between Npart and Ncoll
+  TH1* fhV0M;   // basic ancestor distribution
 
-  //Fitting utilities
+  // Fitting utilities
   Bool_t ffChanged;
   Double_t fCurrentf;
 
-  //0: truncation, 1: rounding, 2: analytical continuation
+  // 0: truncation, 1: rounding, 2: analytical continuation
   Int_t fAncestorMode;
 
-  //Buffer for (Npart, Ncoll) pairs in memory
+  // Buffer for (Npart, Ncoll) pairs in memory
   Double_t* fNpart;
   Double_t* fNcoll;
   Long_t* fContent;
-  Long_t fNNpNcPairs; //number of pairs to use
+  Long_t fNNpNcPairs; // number of pairs to use
   Long_t fMaxNpNcPairs;
 
-  //The actual output: mu, k, f, norm
+  // The actual output: mu, k, f, norm
   Double_t fMu;
   Double_t fdMu; // variable mu option
   Double_t fk;
diff --git a/.conflict-base-0/Common/Tools/Multiplicity/multMCCalibrator.cxx b/.conflict-base-0/Common/Tools/Multiplicity/multMCCalibrator.cxx
index 5b490daf77d..f0960da4b07 100644
--- a/.conflict-base-0/Common/Tools/Multiplicity/multMCCalibrator.cxx
+++ b/.conflict-base-0/Common/Tools/Multiplicity/multMCCalibrator.cxx
@@ -16,18 +16,20 @@
 // - victor.gonzalez@cern.ch
 // - david.dobrigkeit.chinellato@cern.ch
 //
-#include "TList.h"
+#include "multMCCalibrator.h"
+
+#include "multCalibrator.h"
+
+#include "TArrayF.h"
+#include "TArrayL64.h"
 #include "TDirectory.h"
-#include "TFile.h"
 #include "TF1.h"
-#include "TH1F.h"
+#include "TFile.h"
 #include "TH1D.h"
+#include "TH1F.h"
+#include "TList.h"
 #include "TProfile.h"
 #include "TStopwatch.h"
-#include "TArrayL64.h"
-#include "TArrayF.h"
-#include "multCalibrator.h"
-#include "multMCCalibrator.h"
 
 using namespace std;
 
@@ -79,11 +81,11 @@ Bool_t multMCCalibrator::Calibrate()
   cout << " * Output File............: " << fOutputFileName.Data() << endl;
   cout << endl;
 
-  //Opening data and simulation file...
+  // Opening data and simulation file...
   TFile* fileData = new TFile(fDataInputFileName.Data(), "READ");
   TFile* fileSim = new TFile(fSimInputFileName.Data(), "READ");
 
-  //Step 1: verify if input file contains desired histograms
+  // Step 1: verify if input file contains desired histograms
   TProfile* hProfData[multCalibrator::kNCentEstim];
   TProfile* hProfSim[multCalibrator::kNCentEstim];
   cout << " * acquiring input profiles..." << endl;
@@ -135,14 +137,14 @@ Bool_t multMCCalibrator::Calibrate()
 //________________________________________________________________
 TF1* multMCCalibrator::GetFit(TProfile* fProf, Bool_t lQuadratic)
 {
-  TString fFormula = "[0]*x"; //old/deprecated (avoid if possible, please)
+  TString fFormula = "[0]*x"; // old/deprecated (avoid if possible, please)
   if (lQuadratic)
     fFormula = "[0]+[1]*TMath::Power(x,[2])";
 
   // Function to return fit function to profile for posterior inversion
   TF1* fit = new TF1(Form("%s_fit", fProf->GetName()), fFormula.Data(), fProf->GetBinLowEdge(1), fProf->GetBinLowEdge(fProf->GetNbinsX()));
 
-  //Guesstimate inclination from data points in profile
+  // Guesstimate inclination from data points in profile
   Double_t lMeanInclination = 0;
   Long_t lInclinationCount = 0;
   for (Int_t ii = 2; ii < fProf->GetNbinsX(); ii++) {
@@ -158,7 +160,7 @@ TF1* multMCCalibrator::GetFit(TProfile* fProf, Bool_t lQuadratic)
   if (lInclinationCount >= 5)
     lMeanInclination /= lInclinationCount;
 
-  //Give it a little nudge, cause life's hard
+  // Give it a little nudge, cause life's hard
   fit->SetParameter(0, 0.0);
   fit->SetParameter(1, lMeanInclination);
   fit->SetParameter(2, 1.0);
diff --git a/.conflict-base-0/Common/Tools/Multiplicity/multMCCalibrator.h b/.conflict-base-0/Common/Tools/Multiplicity/multMCCalibrator.h
index f88bddf98c3..4e19d38acd1 100644
--- a/.conflict-base-0/Common/Tools/Multiplicity/multMCCalibrator.h
+++ b/.conflict-base-0/Common/Tools/Multiplicity/multMCCalibrator.h
@@ -19,31 +19,32 @@
 #ifndef MULTMCCALIBRATOR_H
 #define MULTMCCALIBRATOR_H
 
-#include <iostream>
-#include "TNamed.h"
 #include "TF1.h"
 #include "TH1D.h"
+#include "TNamed.h"
 #include "TProfile.h"
+
+#include <iostream>
 #include <map>
 
 class multMCCalibrator : public TNamed
 {
 
  public:
-  //Constructors/Destructor
+  // Constructors/Destructor
   multMCCalibrator();
   multMCCalibrator(const char* name, const char* title = "MC Multiplicity Calibration Class");
   ~multMCCalibrator();
 
   //_________________________________________________________________________
-  //Interface: steering functions to be used in calibration macro
+  // Interface: steering functions to be used in calibration macro
 
-  //Set Filenames
+  // Set Filenames
   void SetDataInputFile(TString lFile) { fDataInputFileName = lFile.Data(); }
   void SetSimInputFile(TString lFile) { fSimInputFileName = lFile.Data(); }
   void SetOutputFile(TString lFile) { fOutputFileName = lFile.Data(); }
 
-  //Master Function in this Class: To be called once filenames are set
+  // Master Function in this Class: To be called once filenames are set
   Bool_t Calibrate();
 
   TF1* GetFit(TProfile* fProf, Bool_t lQuadratic = kTRUE);
diff --git a/.conflict-base-0/Common/Tools/PID/checkPidPacking.cxx b/.conflict-base-0/Common/Tools/PID/checkPidPacking.cxx
index 84f72c4f48c..6416ab50669 100644
--- a/.conflict-base-0/Common/Tools/PID/checkPidPacking.cxx
+++ b/.conflict-base-0/Common/Tools/PID/checkPidPacking.cxx
@@ -16,14 +16,15 @@
 /// \since  03/05/2024
 ///
 
-#include <string>
-
 #include "Common/DataModel/PIDResponseTOF.h"
 #include "Common/DataModel/PIDResponseTPC.h"
-#include "TH1F.h"
+
 #include "TCanvas.h"
+#include "TH1F.h"
 #include "TRandom.h"
 
+#include <string>
+
 using namespace o2;
 
 template <typename T>
diff --git a/.conflict-base-0/Common/Tools/PID/handleParamBase.h b/.conflict-base-0/Common/Tools/PID/handleParamBase.h
index 01c2a66ab8b..263f05a1f0b 100644
--- a/.conflict-base-0/Common/Tools/PID/handleParamBase.h
+++ b/.conflict-base-0/Common/Tools/PID/handleParamBase.h
@@ -19,13 +19,16 @@
 #ifndef COMMON_TOOLS_PID_HANDLEPARAMBASE_H_
 #define COMMON_TOOLS_PID_HANDLEPARAMBASE_H_
 
-#include <map>
-#include <string>
 #include "CCDB/CcdbApi.h"
-#include <boost/program_options.hpp>
 #include "Framework/Logger.h"
+
 #include "TFile.h"
 
+#include <boost/program_options.hpp>
+
+#include <map>
+#include <string>
+
 // Global executable arguments
 namespace bpo = boost::program_options;
 bpo::variables_map arguments;             // Command line arguments
diff --git a/.conflict-base-0/Common/Tools/PID/handleParamTPCResponse.cxx b/.conflict-base-0/Common/Tools/PID/handleParamTPCResponse.cxx
index 64741503fae..abe70d1e1ba 100644
--- a/.conflict-base-0/Common/Tools/PID/handleParamTPCResponse.cxx
+++ b/.conflict-base-0/Common/Tools/PID/handleParamTPCResponse.cxx
@@ -14,14 +14,19 @@
 /// \author Jeremy Wilkinson
 /// \brief exec for writing and reading TPC PID Response object
 
+#include "handleParamBase.h"
+
+#include "Common/Core/PID/TPCPIDResponse.h"
+
+#include "Algorithm/RangeTokenizer.h"
+
+#include "TFile.h"
+
+#include <boost/algorithm/string.hpp>
+
 #include <array>
 #include <fstream>
 #include <sstream>
-#include <boost/algorithm/string.hpp>
-#include "TFile.h"
-#include "Common/Core/PID/TPCPIDResponse.h"
-#include "handleParamBase.h"
-#include "Algorithm/RangeTokenizer.h"
 using namespace o2::pid::tpc;
 
 bool initOptionsAndParse(bpo::options_description& options, int argc, char* argv[])
diff --git a/.conflict-base-0/Common/Tools/StandardCCDBLoader.h b/.conflict-base-0/Common/Tools/StandardCCDBLoader.h
index 6ba4c9be9a1..ac9bc97a950 100644
--- a/.conflict-base-0/Common/Tools/StandardCCDBLoader.h
+++ b/.conflict-base-0/Common/Tools/StandardCCDBLoader.h
@@ -16,12 +16,13 @@
 #ifndef COMMON_TOOLS_STANDARDCCDBLOADER_H_
 #define COMMON_TOOLS_STANDARDCCDBLOADER_H_
 
-#include <string>
-#include <cstdlib>
-#include <cmath>
-#include <array>
 #include "Framework/AnalysisDataModel.h"
 
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <string>
+
 //__________________________________________
 // Standard class to load stuff
 // such as matLUT, B and mean Vertex
diff --git a/.conflict-base-0/Common/Tools/TrackPropagationModule.h b/.conflict-base-0/Common/Tools/TrackPropagationModule.h
index fb957a87b9d..edaf8130b3d 100644
--- a/.conflict-base-0/Common/Tools/TrackPropagationModule.h
+++ b/.conflict-base-0/Common/Tools/TrackPropagationModule.h
@@ -16,16 +16,19 @@
 #ifndef COMMON_TOOLS_TRACKPROPAGATIONMODULE_H_
 #define COMMON_TOOLS_TRACKPROPAGATIONMODULE_H_
 
-#include <memory>
-#include <cstdlib>
-#include <cmath>
-#include <array>
-#include <string>
+#include "TableHelper.h"
+
+#include "Common/Tools/TrackTuner.h"
+
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/Configurable.h"
 #include "Framework/HistogramSpec.h"
-#include "Common/Tools/TrackTuner.h"
-#include "TableHelper.h"
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <memory>
+#include <string>
 
 //__________________________________________
 // track propagation module
diff --git a/.conflict-base-0/Common/Tools/TrackTuner.h b/.conflict-base-0/Common/Tools/TrackTuner.h
index 26937eb9131..aa951a4802f 100644
--- a/.conflict-base-0/Common/Tools/TrackTuner.h
+++ b/.conflict-base-0/Common/Tools/TrackTuner.h
@@ -18,35 +18,38 @@
 #ifndef COMMON_TOOLS_TRACKTUNER_H_
 #define COMMON_TOOLS_TRACKTUNER_H_
 
-#include <map>
-#include <memory>
-#include <string>
-#include <utility>
-#include <vector>
-#include <algorithm>
-#include <numbers>
-#include <fmt/core.h>
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
 #include "CCDB/BasicCCDBManager.h"
 #include "CCDB/CcdbApi.h"
 #include "CommonConstants/GeomConstants.h"
-#include "Common/Core/trackUtilities.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "CommonUtils/NameConf.h"
 #include "DataFormatsCalibration/MeanVertexObject.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include "DetectorsBase/Propagator.h"
 #include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/Configurable.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/DCA.h"
 #include "ReconstructionDataFormats/Track.h"
+
 #include <TGraphErrors.h>
 
+#include <fmt/core.h>
+
+#include <algorithm>
+#include <map>
+#include <memory>
+#include <numbers>
+#include <string>
+#include <utility>
+#include <vector>
+
 namespace o2::aod
 {
 namespace track_tuner
diff --git a/.conflict-base-0/Common/Tools/aodDataModelGraph.cxx b/.conflict-base-0/Common/Tools/aodDataModelGraph.cxx
index da854a700f5..c051a5dccc3 100644
--- a/.conflict-base-0/Common/Tools/aodDataModelGraph.cxx
+++ b/.conflict-base-0/Common/Tools/aodDataModelGraph.cxx
@@ -9,19 +9,23 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <fmt/printf.h>
-#include <utility>
-#include <string>
-#include <cstdio>
-#include "Framework/AnalysisDataModel.h"
 #include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGJE/DataModel/Jet.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponseTOF.h"
 #include "Common/DataModel/PIDResponseTPC.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "PWGJE/DataModel/Jet.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Framework/AnalysisDataModel.h"
+
+#include <fmt/printf.h>
+
+#include <cstdio>
+#include <string>
+#include <utility>
 
 using namespace o2::framework;
 using namespace o2::aod;
diff --git a/.conflict-base-0/Common/Tools/trackSelectionRequest.cxx b/.conflict-base-0/Common/Tools/trackSelectionRequest.cxx
index ed82f1ff7bf..e9d2ebbeca7 100644
--- a/.conflict-base-0/Common/Tools/trackSelectionRequest.cxx
+++ b/.conflict-base-0/Common/Tools/trackSelectionRequest.cxx
@@ -12,7 +12,9 @@
 // see header for a more detailed description.
 
 #include "trackSelectionRequest.h"
+
 #include "Framework/Logger.h"
+
 #include <iostream>
 
 std::ostream& operator<<(std::ostream& os, trackSelectionRequest const& c)
diff --git a/.conflict-base-0/Common/Tools/trackSelectionRequest.h b/.conflict-base-0/Common/Tools/trackSelectionRequest.h
index 123392611f0..38f4026c1b3 100644
--- a/.conflict-base-0/Common/Tools/trackSelectionRequest.h
+++ b/.conflict-base-0/Common/Tools/trackSelectionRequest.h
@@ -24,10 +24,12 @@
 #ifndef TRACKSELECTIONREQUEST_H
 #define TRACKSELECTIONREQUEST_H
 
-#include <iosfwd>
-#include <Rtypes.h>
 #include <TMath.h>
 
+#include <Rtypes.h>
+
+#include <iosfwd>
+
 class trackSelectionRequest
 {
  public:
diff --git a/.conflict-base-0/DPG/Tasks/AOTEvent/dEdxVsOccupancyWithTrackQAinfo.cxx b/.conflict-base-0/DPG/Tasks/AOTEvent/dEdxVsOccupancyWithTrackQAinfo.cxx
index c87fd48bc99..a9e90a1b33a 100644
--- a/.conflict-base-0/DPG/Tasks/AOTEvent/dEdxVsOccupancyWithTrackQAinfo.cxx
+++ b/.conflict-base-0/DPG/Tasks/AOTEvent/dEdxVsOccupancyWithTrackQAinfo.cxx
@@ -14,31 +14,32 @@
 ///
 /// \author Igor Altsybeev <Igor.Altsybeev@cern.ch>
 
-#include <vector>
-#include <map>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/CCDB/EventSelectionParams.h"
 #include "Common/CCDB/ctpRateFetcher.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "Framework/HistogramRegistry.h"
-#include "CommonDataFormat/BunchFilling.h"
-#include "DataFormatsParameters/GRPLHCIFData.h"
-#include "DataFormatsParameters/GRPECSObject.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonDataFormat/BunchFilling.h"
 #include "DataFormatsParameters/AggregatedRunInfo.h"
+#include "DataFormatsParameters/GRPECSObject.h"
+#include "DataFormatsParameters/GRPLHCIFData.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 
 #include "TH1F.h"
 #include "TH2F.h"
 #include "TH3.h"
 
+#include <map>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::aod::evsel;
diff --git a/.conflict-base-0/DPG/Tasks/AOTEvent/detectorOccupancyQa.cxx b/.conflict-base-0/DPG/Tasks/AOTEvent/detectorOccupancyQa.cxx
index 123cbd0e442..ec133b1bcea 100644
--- a/.conflict-base-0/DPG/Tasks/AOTEvent/detectorOccupancyQa.cxx
+++ b/.conflict-base-0/DPG/Tasks/AOTEvent/detectorOccupancyQa.cxx
@@ -14,30 +14,31 @@
 ///
 /// \author Igor Altsybeev <Igor.Altsybeev@cern.ch>
 
-#include <vector>
-#include <map>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/CCDB/EventSelectionParams.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "Framework/HistogramRegistry.h"
-#include "CommonDataFormat/BunchFilling.h"
-#include "DataFormatsParameters/GRPLHCIFData.h"
-#include "DataFormatsParameters/GRPECSObject.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonDataFormat/BunchFilling.h"
 #include "DataFormatsParameters/AggregatedRunInfo.h"
+#include "DataFormatsParameters/GRPECSObject.h"
+#include "DataFormatsParameters/GRPLHCIFData.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 
 #include "TH1F.h"
 #include "TH2F.h"
 #include "TH3.h"
 
+#include <map>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::aod::evsel;
diff --git a/.conflict-base-0/DPG/Tasks/AOTEvent/eventSelectionQa.cxx b/.conflict-base-0/DPG/Tasks/AOTEvent/eventSelectionQa.cxx
index 52ec04b0f2e..216522f528c 100644
--- a/.conflict-base-0/DPG/Tasks/AOTEvent/eventSelectionQa.cxx
+++ b/.conflict-base-0/DPG/Tasks/AOTEvent/eventSelectionQa.cxx
@@ -14,31 +14,33 @@
 ///
 /// \author Evgeny Kryshen <evgeny.kryshen@cern.ch>
 
-#include <map>
-#include <vector>
-#include <string>
-#include <unordered_map>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/CCDB/EventSelectionParams.h"
+#include "Common/DataModel/EventSelection.h"
+
 #include "CCDB/BasicCCDBManager.h"
-#include "Framework/HistogramRegistry.h"
 #include "CommonDataFormat/BunchFilling.h"
-#include "DataFormatsParameters/GRPLHCIFData.h"
-#include "DataFormatsParameters/GRPECSObject.h"
-#include "DataFormatsParameters/AggregatedRunInfo.h"
 #include "DataFormatsITSMFT/NoiseMap.h" // missing include in TimeDeadMap.h
-#include "DataFormatsITSMFT/TimeDeadMap.h"
 #include "DataFormatsITSMFT/ROFRecord.h"
-#include "ReconstructionDataFormats/Vertex.h"
+#include "DataFormatsITSMFT/TimeDeadMap.h"
+#include "DataFormatsParameters/AggregatedRunInfo.h"
+#include "DataFormatsParameters/GRPECSObject.h"
+#include "DataFormatsParameters/GRPLHCIFData.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 #include "ITSMFTBase/DPLAlpideParam.h"
 #include "ITSMFTReconstruction/ChipMappingITS.h"
+#include "ReconstructionDataFormats/Vertex.h"
+
 #include "TH1F.h"
 #include "TH2F.h"
 
+#include <map>
+#include <string>
+#include <unordered_map>
+#include <vector>
+
 using namespace o2::framework;
 using namespace o2;
 using namespace o2::aod::evsel;
diff --git a/.conflict-base-0/DPG/Tasks/AOTEvent/lumiQa.cxx b/.conflict-base-0/DPG/Tasks/AOTEvent/lumiQa.cxx
index 254e58f0b67..6f27ce2cb31 100644
--- a/.conflict-base-0/DPG/Tasks/AOTEvent/lumiQa.cxx
+++ b/.conflict-base-0/DPG/Tasks/AOTEvent/lumiQa.cxx
@@ -9,15 +9,16 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "CCDB/BasicCCDBManager.h"
-#include "Framework/HistogramRegistry.h"
-#include "DataFormatsParameters/GRPLHCIFData.h"
 #include "DataFormatsFT0/Digit.h"
-#include "TList.h"
+#include "DataFormatsParameters/GRPLHCIFData.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TH1.h"
+#include "TList.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/DPG/Tasks/AOTEvent/matchingQa.cxx b/.conflict-base-0/DPG/Tasks/AOTEvent/matchingQa.cxx
index 3b266f047e9..944db040d8c 100644
--- a/.conflict-base-0/DPG/Tasks/AOTEvent/matchingQa.cxx
+++ b/.conflict-base-0/DPG/Tasks/AOTEvent/matchingQa.cxx
@@ -9,14 +9,15 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
+#include "MetadataHelper.h"
+
 #include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsFT0/Digit.h"
 #include "DataFormatsParameters/GRPLHCIFData.h"
-#include "MetadataHelper.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/DPG/Tasks/AOTEvent/rofBorderQa.cxx b/.conflict-base-0/DPG/Tasks/AOTEvent/rofBorderQa.cxx
index 83f704960b6..a2a071e9e0d 100644
--- a/.conflict-base-0/DPG/Tasks/AOTEvent/rofBorderQa.cxx
+++ b/.conflict-base-0/DPG/Tasks/AOTEvent/rofBorderQa.cxx
@@ -12,27 +12,26 @@
 /// \brief QA task to study ROF border effect for different event, track and particle selection parameters
 /// \author Igor Altsybeev, Igor.Altsybeev@cern.ch
 
-#include <iostream>
-#include <string>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
+#include "Common/CCDB/EventSelectionParams.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/FT0Corrected.h"
 #include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/CCDB/EventSelectionParams.h"
 
 #include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPObject.h"
+#include "DataFormatsFT0/Digit.h"
 #include "DataFormatsParameters/GRPECSObject.h"
 #include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
-#include "Common/DataModel/FT0Corrected.h"
-#include "DataFormatsFT0/Digit.h"
+#include <iostream>
+#include <string>
 
 using namespace std;
 using namespace o2;
diff --git a/.conflict-base-0/DPG/Tasks/AOTEvent/rofOccupancyQa.cxx b/.conflict-base-0/DPG/Tasks/AOTEvent/rofOccupancyQa.cxx
index cbc8d7d56d1..c2040ac3e6e 100644
--- a/.conflict-base-0/DPG/Tasks/AOTEvent/rofOccupancyQa.cxx
+++ b/.conflict-base-0/DPG/Tasks/AOTEvent/rofOccupancyQa.cxx
@@ -14,20 +14,21 @@
 ///
 /// \author Igor Altsybeev <Igor.Altsybeev@cern.ch>
 
-#include <vector>
-
-#include "Framework/ConfigParamSpec.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/CCDB/EventSelectionParams.h"
+#include "Common/DataModel/EventSelection.h"
+
 #include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/LHCConstants.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/ConfigParamSpec.h"
 #include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+
+#include <vector>
 // #include "DataFormatsParameters/GRPLHCIFData.h"
-#include "ITSMFTBase/DPLAlpideParam.h"
 #include "DataFormatsParameters/AggregatedRunInfo.h"
+#include "ITSMFTBase/DPLAlpideParam.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/DPG/Tasks/AOTEvent/timeDependentQa.cxx b/.conflict-base-0/DPG/Tasks/AOTEvent/timeDependentQa.cxx
index 61fbb690e6c..497a2a4d986 100644
--- a/.conflict-base-0/DPG/Tasks/AOTEvent/timeDependentQa.cxx
+++ b/.conflict-base-0/DPG/Tasks/AOTEvent/timeDependentQa.cxx
@@ -14,27 +14,28 @@
 ///
 /// \author Evgeny Kryshen <evgeny.kryshen@cern.ch> and Igor Altsybeev <Igor.Altsybeev@cern.ch>
 
-#include <map>
-#include <vector>
-#include <string>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/CCDB/EventSelectionParams.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/CCDB/ctpRateFetcher.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "TPCCalibration/TPCMShapeCorrection.h"
-#include "DataFormatsParameters/AggregatedRunInfo.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsITSMFT/ROFRecord.h"
+#include "DataFormatsParameters/AggregatedRunInfo.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Vertex.h"
+#include "TPCCalibration/TPCMShapeCorrection.h"
 
 #include "TTree.h"
 
+#include <map>
+#include <string>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::aod::evsel;
diff --git a/.conflict-base-0/DPG/Tasks/AOTTrack/MonitorFilterBit.cxx b/.conflict-base-0/DPG/Tasks/AOTTrack/MonitorFilterBit.cxx
index b8fb6679b1c..5eed1a42ce0 100644
--- a/.conflict-base-0/DPG/Tasks/AOTTrack/MonitorFilterBit.cxx
+++ b/.conflict-base-0/DPG/Tasks/AOTTrack/MonitorFilterBit.cxx
@@ -15,12 +15,13 @@
 /// \brief Task performing basic checks on filter-bit selections.
 ///
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/Core/RecoDecay.h"
-#include "Framework/ASoAHelpers.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/DPG/Tasks/AOTTrack/PID/Combined/qaPIDWithV0s.cxx b/.conflict-base-0/DPG/Tasks/AOTTrack/PID/Combined/qaPIDWithV0s.cxx
index 3f1ed2a8640..3bc6803d041 100644
--- a/.conflict-base-0/DPG/Tasks/AOTTrack/PID/Combined/qaPIDWithV0s.cxx
+++ b/.conflict-base-0/DPG/Tasks/AOTTrack/PID/Combined/qaPIDWithV0s.cxx
@@ -16,18 +16,20 @@
 /// \brief  Task to monitor the PID performance making use of V0s
 ///
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/DPG/Tasks/AOTTrack/PID/HMPID/analysisHMPID.cxx b/.conflict-base-0/DPG/Tasks/AOTTrack/PID/HMPID/analysisHMPID.cxx
index c5a6b9d0597..6501fa74ed4 100644
--- a/.conflict-base-0/DPG/Tasks/AOTTrack/PID/HMPID/analysisHMPID.cxx
+++ b/.conflict-base-0/DPG/Tasks/AOTTrack/PID/HMPID/analysisHMPID.cxx
@@ -10,23 +10,24 @@
 // or submit itself to any jurisdiction.
 
 // O2 includes
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "ReconstructionDataFormats/TrackParametrization.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/Core/PID/PIDTOF.h"
-#include "Common/TableProducer/PID/pidTOFBase.h"
-#include "ReconstructionDataFormats/PID.h"
 #include "Common/Core/trackUtilities.h"
-#include "ReconstructionDataFormats/DCA.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/ASoA.h"
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/TableProducer/PID/pidTOFBase.h"
+
+#include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/DCA.h"
+#include "ReconstructionDataFormats/PID.h"
+#include "ReconstructionDataFormats/Track.h"
+#include "ReconstructionDataFormats/TrackParametrization.h"
 
 #include <TTree.h>
 
diff --git a/.conflict-base-0/DPG/Tasks/AOTTrack/PID/HMPID/qaHMPID.cxx b/.conflict-base-0/DPG/Tasks/AOTTrack/PID/HMPID/qaHMPID.cxx
index a4e01d6a980..b7e3da0df41 100644
--- a/.conflict-base-0/DPG/Tasks/AOTTrack/PID/HMPID/qaHMPID.cxx
+++ b/.conflict-base-0/DPG/Tasks/AOTTrack/PID/HMPID/qaHMPID.cxx
@@ -10,23 +10,24 @@
 // or submit itself to any jurisdiction.
 
 // O2 includes
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "ReconstructionDataFormats/TrackParametrization.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/Core/PID/PIDTOF.h"
-#include "Common/TableProducer/PID/pidTOFBase.h"
-#include "ReconstructionDataFormats/PID.h"
 #include "Common/Core/trackUtilities.h"
-#include "ReconstructionDataFormats/DCA.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/ASoA.h"
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/TableProducer/PID/pidTOFBase.h"
+
+#include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/DCA.h"
+#include "ReconstructionDataFormats/PID.h"
+#include "ReconstructionDataFormats/Track.h"
+#include "ReconstructionDataFormats/TrackParametrization.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFBeta.cxx b/.conflict-base-0/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFBeta.cxx
index 60ad0a9ab38..7661990a12b 100644
--- a/.conflict-base-0/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFBeta.cxx
+++ b/.conflict-base-0/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFBeta.cxx
@@ -15,16 +15,17 @@
 /// \brief  Task to produce the TOF QA plots for Beta
 ///
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/StaticFor.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/FT0Corrected.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/TableProducer/PID/pidTOFBase.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-base-0/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFBetaImp.cxx b/.conflict-base-0/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFBetaImp.cxx
index f503ab1d92d..ad445323605 100644
--- a/.conflict-base-0/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFBetaImp.cxx
+++ b/.conflict-base-0/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFBetaImp.cxx
@@ -15,16 +15,17 @@
 /// \brief  Task to produce the TOF QA plots for Beta. Version using dynamic columns. Interim solution for test and benchmarking
 ///
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/StaticFor.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/FT0Corrected.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/TableProducer/PID/pidTOFBase.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-base-0/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFEvTime.cxx b/.conflict-base-0/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFEvTime.cxx
index 204bff837fb..2e57d875f3e 100644
--- a/.conflict-base-0/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFEvTime.cxx
+++ b/.conflict-base-0/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFEvTime.cxx
@@ -15,20 +15,21 @@
 /// \brief  Tasks of the TOF PID quantities for the event times
 ///
 
-#include "TEfficiency.h"
-#include "THashList.h"
-
-#include "Framework/HistogramRegistry.h"
-#include "Framework/StaticFor.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/FT0Corrected.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/TableProducer/PID/pidTOFBase.h"
-#include "Framework/runDataProcessing.h"
+
 #include "CommonConstants/LHCConstants.h"
 #include "DataFormatsFT0/Digit.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TEfficiency.h"
+#include "THashList.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFMC.cxx b/.conflict-base-0/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFMC.cxx
index 73d1c72ad1e..8f35b228191 100644
--- a/.conflict-base-0/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFMC.cxx
+++ b/.conflict-base-0/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFMC.cxx
@@ -16,11 +16,12 @@
 ///
 
 // O2 includes
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/StaticFor.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Framework/runDataProcessing.h"
 
 using namespace o2;
diff --git a/.conflict-base-0/DPG/Tasks/AOTTrack/PID/TPC/qaPIDTPC.cxx b/.conflict-base-0/DPG/Tasks/AOTTrack/PID/TPC/qaPIDTPC.cxx
index 2794070498d..819b26a74c0 100644
--- a/.conflict-base-0/DPG/Tasks/AOTTrack/PID/TPC/qaPIDTPC.cxx
+++ b/.conflict-base-0/DPG/Tasks/AOTTrack/PID/TPC/qaPIDTPC.cxx
@@ -15,13 +15,14 @@
 /// \brief  Implementation for QA tasks of the TPC PID quantities
 ///
 
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/StaticFor.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/PIDResponse.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/DPG/Tasks/AOTTrack/PID/TPC/qaPIDTPCMC.cxx b/.conflict-base-0/DPG/Tasks/AOTTrack/PID/TPC/qaPIDTPCMC.cxx
index 993c2f7b24c..a84e874af6f 100644
--- a/.conflict-base-0/DPG/Tasks/AOTTrack/PID/TPC/qaPIDTPCMC.cxx
+++ b/.conflict-base-0/DPG/Tasks/AOTTrack/PID/TPC/qaPIDTPCMC.cxx
@@ -16,10 +16,11 @@
 ///
 
 // O2 includes
+#include "Common/DataModel/PIDResponse.h"
+
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/StaticFor.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Framework/runDataProcessing.h"
 
 using namespace o2;
diff --git a/.conflict-base-0/DPG/Tasks/AOTTrack/PID/TPC/qaPIDTPCSignal.cxx b/.conflict-base-0/DPG/Tasks/AOTTrack/PID/TPC/qaPIDTPCSignal.cxx
index bf8492b8036..44e12f36e3a 100644
--- a/.conflict-base-0/DPG/Tasks/AOTTrack/PID/TPC/qaPIDTPCSignal.cxx
+++ b/.conflict-base-0/DPG/Tasks/AOTTrack/PID/TPC/qaPIDTPCSignal.cxx
@@ -16,12 +16,13 @@
 /// \brief  Implementation for QA tasks of the TPC signal (lite task, refer to qaPIDTPC.cxx for full TPC QA for PID)
 ///
 
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/StaticFor.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/DPG/Tasks/AOTTrack/V0Cascades/perfK0sResolution.cxx b/.conflict-base-0/DPG/Tasks/AOTTrack/V0Cascades/perfK0sResolution.cxx
index 91effcc47b4..5a2a7aa0a21 100644
--- a/.conflict-base-0/DPG/Tasks/AOTTrack/V0Cascades/perfK0sResolution.cxx
+++ b/.conflict-base-0/DPG/Tasks/AOTTrack/V0Cascades/perfK0sResolution.cxx
@@ -9,22 +9,24 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <string>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "ReconstructionDataFormats/PID.h"
-#include "Common/Core/trackUtilities.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/Tools/TrackTuner.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/PID.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <string>
+
 using namespace o2;
 using namespace o2::track;
 using namespace o2::framework;
diff --git a/.conflict-base-0/DPG/Tasks/AOTTrack/V0Cascades/qaCascades.cxx b/.conflict-base-0/DPG/Tasks/AOTTrack/V0Cascades/qaCascades.cxx
index 4e42b50da2a..eed88c54dc2 100644
--- a/.conflict-base-0/DPG/Tasks/AOTTrack/V0Cascades/qaCascades.cxx
+++ b/.conflict-base-0/DPG/Tasks/AOTTrack/V0Cascades/qaCascades.cxx
@@ -16,20 +16,22 @@
 /// \brief  QA task for basic quantities on cascades
 ///
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/DPG/Tasks/AOTTrack/V0Cascades/qaEfficiencyV0s.cxx b/.conflict-base-0/DPG/Tasks/AOTTrack/V0Cascades/qaEfficiencyV0s.cxx
index a728b252007..bf09dd8f6b0 100644
--- a/.conflict-base-0/DPG/Tasks/AOTTrack/V0Cascades/qaEfficiencyV0s.cxx
+++ b/.conflict-base-0/DPG/Tasks/AOTTrack/V0Cascades/qaEfficiencyV0s.cxx
@@ -18,22 +18,24 @@
 ///
 
 // O2 includes
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/DCA.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 
 // ROOT includes
-#include "TPDGCode.h"
 #include "TEfficiency.h"
 #include "THashList.h"
+#include "TPDGCode.h"
 
 using namespace o2::framework;
 static constexpr int nSpecies = 2; // One per PDG
diff --git a/.conflict-base-0/DPG/Tasks/AOTTrack/V0Cascades/qaK0sTrackingEfficiency.cxx b/.conflict-base-0/DPG/Tasks/AOTTrack/V0Cascades/qaK0sTrackingEfficiency.cxx
index 6ee7c4e7a5c..75189988459 100644
--- a/.conflict-base-0/DPG/Tasks/AOTTrack/V0Cascades/qaK0sTrackingEfficiency.cxx
+++ b/.conflict-base-0/DPG/Tasks/AOTTrack/V0Cascades/qaK0sTrackingEfficiency.cxx
@@ -9,18 +9,20 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/DPG/Tasks/AOTTrack/V0Cascades/qaLamMomResolution.cxx b/.conflict-base-0/DPG/Tasks/AOTTrack/V0Cascades/qaLamMomResolution.cxx
index 9ee92d0a509..778ac59f79d 100644
--- a/.conflict-base-0/DPG/Tasks/AOTTrack/V0Cascades/qaLamMomResolution.cxx
+++ b/.conflict-base-0/DPG/Tasks/AOTTrack/V0Cascades/qaLamMomResolution.cxx
@@ -14,23 +14,26 @@
 /// \author Carolina Reetz c.reetz@cern.ch
 /// \brief  QA task to study momentum resolution of Lambda daughter tracks
 
-#include <string>
+#include "DPG/Tasks/AOTTrack/V0Cascades/qaLamMomResolution.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "ReconstructionDataFormats/PID.h"
-#include "Common/Core/trackUtilities.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "DPG/Tasks/AOTTrack/V0Cascades/qaLamMomResolution.h"
+
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/Tools/TrackTuner.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/PID.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <string>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
@@ -540,8 +543,8 @@ struct qaLamMomResolution {
             }
           }
         } // end Anti-Lambda
-      }   // end MC
-    }     // end V0 loop
+      } // end MC
+    } // end V0 loop
   }
   PROCESS_SWITCH(qaLamMomResolution, processMC, "Process MC", true);
 };
diff --git a/.conflict-base-0/DPG/Tasks/AOTTrack/V0Cascades/qaLamMomResolution.h b/.conflict-base-0/DPG/Tasks/AOTTrack/V0Cascades/qaLamMomResolution.h
index 603195404d4..67b8620ab6b 100644
--- a/.conflict-base-0/DPG/Tasks/AOTTrack/V0Cascades/qaLamMomResolution.h
+++ b/.conflict-base-0/DPG/Tasks/AOTTrack/V0Cascades/qaLamMomResolution.h
@@ -14,10 +14,11 @@
 #ifndef DPG_TASKS_AOTTRACK_V0CASCADES_QALAMMOMRESOLUTION_H_
 #define DPG_TASKS_AOTTRACK_V0CASCADES_QALAMMOMRESOLUTION_H_
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Common/Core/trackUtilities.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+
 namespace o2::aod
 {
 namespace qaLamMomResolution
diff --git a/.conflict-base-0/DPG/Tasks/AOTTrack/qaDcaMC.cxx b/.conflict-base-0/DPG/Tasks/AOTTrack/qaDcaMC.cxx
index 4054c59b33a..7e76026fed6 100644
--- a/.conflict-base-0/DPG/Tasks/AOTTrack/qaDcaMC.cxx
+++ b/.conflict-base-0/DPG/Tasks/AOTTrack/qaDcaMC.cxx
@@ -16,22 +16,24 @@
 ///
 
 // O2 includes
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/DCA.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
 
 // ROOT includes
-#include "TPDGCode.h"
 #include "TEfficiency.h"
 #include "THashList.h"
+#include "TPDGCode.h"
 
 using namespace o2::framework;
 
diff --git a/.conflict-base-0/DPG/Tasks/AOTTrack/qaEfficiency.cxx b/.conflict-base-0/DPG/Tasks/AOTTrack/qaEfficiency.cxx
index a55d205ed57..13703e3d92d 100644
--- a/.conflict-base-0/DPG/Tasks/AOTTrack/qaEfficiency.cxx
+++ b/.conflict-base-0/DPG/Tasks/AOTTrack/qaEfficiency.cxx
@@ -17,27 +17,29 @@
 ///
 
 // O2 includes
-#include <memory>
-#include <vector>
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/DCA.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
-#include "Common/Core/RecoDecay.h"
+
+#include <memory>
+#include <vector>
 
 // ROOT includes
-#include "TPDGCode.h"
 #include "TEfficiency.h"
 #include "THashList.h"
+#include "TPDGCode.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/DPG/Tasks/AOTTrack/qaEventTrack.cxx b/.conflict-base-0/DPG/Tasks/AOTTrack/qaEventTrack.cxx
index 09590267ed8..8bc884208cb 100644
--- a/.conflict-base-0/DPG/Tasks/AOTTrack/qaEventTrack.cxx
+++ b/.conflict-base-0/DPG/Tasks/AOTTrack/qaEventTrack.cxx
@@ -23,19 +23,20 @@
 
 #include "qaEventTrack.h"
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "ReconstructionDataFormats/DCA.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/Core/TrackSelectionDefaults.h"
 #include "Common/TableProducer/PID/pidTOFBase.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/DCA.h"
+
 #include <string>
 #include <vector>
 
diff --git a/.conflict-base-0/DPG/Tasks/AOTTrack/qaEventTrack.h b/.conflict-base-0/DPG/Tasks/AOTTrack/qaEventTrack.h
index e2230e37c87..274ec3d1d31 100644
--- a/.conflict-base-0/DPG/Tasks/AOTTrack/qaEventTrack.h
+++ b/.conflict-base-0/DPG/Tasks/AOTTrack/qaEventTrack.h
@@ -17,10 +17,11 @@
 /// \brief  Header file for QA tasks for the track and the event properties.
 ///
 
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
 
 // Output table declaration
 namespace o2::aod
diff --git a/.conflict-base-0/DPG/Tasks/AOTTrack/qaEventTrackLite.cxx b/.conflict-base-0/DPG/Tasks/AOTTrack/qaEventTrackLite.cxx
index eecb5d7c240..a5d381960b9 100644
--- a/.conflict-base-0/DPG/Tasks/AOTTrack/qaEventTrackLite.cxx
+++ b/.conflict-base-0/DPG/Tasks/AOTTrack/qaEventTrackLite.cxx
@@ -20,17 +20,18 @@
 
 #include "qaEventTrack.h"
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisDataModel.h"
-#include "ReconstructionDataFormats/DCA.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/Core/TrackSelectionDefaults.h"
+
 #include "DataFormatsTPC/BetheBlochAleph.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/DCA.h"
 #include "ReconstructionDataFormats/PID.h"
 
 #include "TF1.h"
diff --git a/.conflict-base-0/DPG/Tasks/AOTTrack/qaEventTrackLiteProducer.cxx b/.conflict-base-0/DPG/Tasks/AOTTrack/qaEventTrackLiteProducer.cxx
index 0184d5b39f0..945f6ec08f1 100644
--- a/.conflict-base-0/DPG/Tasks/AOTTrack/qaEventTrackLiteProducer.cxx
+++ b/.conflict-base-0/DPG/Tasks/AOTTrack/qaEventTrackLiteProducer.cxx
@@ -19,22 +19,24 @@
 
 #include "qaEventTrack.h"
 
-#include <vector>
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/McCollisionExtra.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/TableProducer/PID/pidTOFBase.h"
 
-#include "TRandom.h"
+#include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisDataModel.h"
 #include "ReconstructionDataFormats/DCA.h"
-#include "Common/Core/trackUtilities.h"
-#include "Common/DataModel/McCollisionExtra.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/TableProducer/PID/pidTOFBase.h"
+
+#include "TRandom.h"
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/DPG/Tasks/AOTTrack/qaFakeHits.cxx b/.conflict-base-0/DPG/Tasks/AOTTrack/qaFakeHits.cxx
index 1da3a6a6674..88a794770cc 100644
--- a/.conflict-base-0/DPG/Tasks/AOTTrack/qaFakeHits.cxx
+++ b/.conflict-base-0/DPG/Tasks/AOTTrack/qaFakeHits.cxx
@@ -17,17 +17,19 @@
 ///
 
 // O2 includes
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/DCA.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
 
 using namespace o2::framework;
 // Particle information
diff --git a/.conflict-base-0/DPG/Tasks/AOTTrack/qaMatchEff.cxx b/.conflict-base-0/DPG/Tasks/AOTTrack/qaMatchEff.cxx
index 704d3fa89ad..7b289d68de3 100644
--- a/.conflict-base-0/DPG/Tasks/AOTTrack/qaMatchEff.cxx
+++ b/.conflict-base-0/DPG/Tasks/AOTTrack/qaMatchEff.cxx
@@ -21,20 +21,21 @@
 //
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "CommonConstants/MathConstants.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "CommonConstants/MathConstants.h"
 //
 #include "Framework/AnalysisTask.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/runDataProcessing.h"
 //
+#include <set>
 #include <string>
 #include <vector>
-#include <set>
 //
 namespace extConfPar
 {
diff --git a/.conflict-base-0/DPG/Tasks/AOTTrack/qaPrimVtxVsTime.cxx b/.conflict-base-0/DPG/Tasks/AOTTrack/qaPrimVtxVsTime.cxx
index dd66692a4e2..1ac1b97b5c1 100644
--- a/.conflict-base-0/DPG/Tasks/AOTTrack/qaPrimVtxVsTime.cxx
+++ b/.conflict-base-0/DPG/Tasks/AOTTrack/qaPrimVtxVsTime.cxx
@@ -10,16 +10,18 @@
 // or submit itself to any jurisdiction.
 /// \author Mattia Faggin <mattia.faggin@cern.ch>, Padova University and INFN
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/CCDB/EventSelectionParams.h"
+#include "Common/DataModel/EventSelection.h"
+
 #include "CCDB/BasicCCDBManager.h"
-#include "Framework/HistogramRegistry.h"
 #include "CommonDataFormat/BunchFilling.h"
-#include "DataFormatsParameters/GRPLHCIFData.h"
 #include "DataFormatsParameters/GRPECSObject.h"
+#include "DataFormatsParameters/GRPLHCIFData.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TH1F.h"
 #include "TH2F.h"
 
diff --git a/.conflict-base-0/DPG/Tasks/AOTTrack/qaSignChargeMC.cxx b/.conflict-base-0/DPG/Tasks/AOTTrack/qaSignChargeMC.cxx
index e40dd0e76e9..d8ad1bf21bc 100644
--- a/.conflict-base-0/DPG/Tasks/AOTTrack/qaSignChargeMC.cxx
+++ b/.conflict-base-0/DPG/Tasks/AOTTrack/qaSignChargeMC.cxx
@@ -18,9 +18,9 @@
 
 // O2 includes
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2::framework;
 
diff --git a/.conflict-base-0/DPG/Tasks/AOTTrack/qaTrackSelection.cxx b/.conflict-base-0/DPG/Tasks/AOTTrack/qaTrackSelection.cxx
index f7ea3dd2f53..bf9f732d5c1 100644
--- a/.conflict-base-0/DPG/Tasks/AOTTrack/qaTrackSelection.cxx
+++ b/.conflict-base-0/DPG/Tasks/AOTTrack/qaTrackSelection.cxx
@@ -17,14 +17,15 @@
 ///
 
 // O2 includes
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/HistogramRegistry.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2::framework;
 
 struct QaTrackCuts {
diff --git a/.conflict-base-0/DPG/Tasks/AOTTrack/qaTrackSplitting.cxx b/.conflict-base-0/DPG/Tasks/AOTTrack/qaTrackSplitting.cxx
index 3125f1e7c03..c8abc81ae7e 100644
--- a/.conflict-base-0/DPG/Tasks/AOTTrack/qaTrackSplitting.cxx
+++ b/.conflict-base-0/DPG/Tasks/AOTTrack/qaTrackSplitting.cxx
@@ -15,13 +15,14 @@
 /// \brief  Task to analyse the numbers of particles reconstructed more than once
 ///
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/HistogramRegistry.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-base-0/DPG/Tasks/FDD/qaFDD.cxx b/.conflict-base-0/DPG/Tasks/FDD/qaFDD.cxx
index c985d7dbb9d..37914166c8e 100644
--- a/.conflict-base-0/DPG/Tasks/FDD/qaFDD.cxx
+++ b/.conflict-base-0/DPG/Tasks/FDD/qaFDD.cxx
@@ -9,19 +9,20 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Common/DataModel/EventSelection.h"
-#include "DataFormatsFDD/Digit.h"
-#include "DataFormatsFIT/Triggers.h"
 #include "Common/DataModel/FT0Corrected.h"
 
+#include "CCDB/BasicCCDBManager.h"
 #include "CCDB/CcdbApi.h"
 #include "CommonDataFormat/BunchFilling.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPObject.h"
+#include "DataFormatsFDD/Digit.h"
+#include "DataFormatsFIT/Triggers.h"
 #include "DataFormatsParameters/GRPLHCIFData.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TH1F.h"
 #include "TH2F.h"
 
diff --git a/.conflict-base-0/DPG/Tasks/FT0/ft0AnalysisTask.cxx b/.conflict-base-0/DPG/Tasks/FT0/ft0AnalysisTask.cxx
index a7d487fbdff..498847b65cd 100644
--- a/.conflict-base-0/DPG/Tasks/FT0/ft0AnalysisTask.cxx
+++ b/.conflict-base-0/DPG/Tasks/FT0/ft0AnalysisTask.cxx
@@ -9,19 +9,20 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <bitset>
-#include <map>
-#include <string>
-#include <numeric>
-
-#include "TH1.h"
-
 #include "Common/DataModel/EventSelection.h"
+
 #include "DataFormatsFT0/Digit.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
 
+#include "TH1.h"
+
+#include <bitset>
+#include <map>
+#include <numeric>
+#include <string>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::aod::evsel;
diff --git a/.conflict-base-0/DPG/Tasks/FT0/qaFT0TrgBased.cxx b/.conflict-base-0/DPG/Tasks/FT0/qaFT0TrgBased.cxx
index 35a2c2cc884..89bfed1dfe5 100644
--- a/.conflict-base-0/DPG/Tasks/FT0/qaFT0TrgBased.cxx
+++ b/.conflict-base-0/DPG/Tasks/FT0/qaFT0TrgBased.cxx
@@ -13,20 +13,13 @@
 /// \author Uliana Dmitrieva uliana.dmitrieva@cern.ch
 /// \brief  FT0 QA
 
-#include <bitset>
-#include <cstddef>
-#include <cstdint>
-#include <map>
-#include <string>
-#include <vector>
-
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/FT0Corrected.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "DataFormatsFT0/Digit.h"
 
 #include "CommonConstants/LHCConstants.h"
 #include "DataFormatsFIT/Triggers.h"
+#include "DataFormatsFT0/Digit.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
@@ -34,6 +27,13 @@
 #include "Framework/InitContext.h"
 #include "Framework/runDataProcessing.h"
 
+#include <bitset>
+#include <cstddef>
+#include <cstdint>
+#include <map>
+#include <string>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-base-0/DPG/Tasks/FV0/qaFV0.cxx b/.conflict-base-0/DPG/Tasks/FV0/qaFV0.cxx
index 295f981b0b7..fda2bc3b9c4 100644
--- a/.conflict-base-0/DPG/Tasks/FV0/qaFV0.cxx
+++ b/.conflict-base-0/DPG/Tasks/FV0/qaFV0.cxx
@@ -13,13 +13,6 @@
 /// \author Andreas Molander andreas.molander@cern.ch
 /// \brief  FV0 QA
 
-#include <bitset>
-#include <cstddef>
-#include <cstdint>
-#include <string>
-#include <map>
-#include <vector>
-
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
 
@@ -27,14 +20,21 @@
 #include "DataFormatsFIT/Triggers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/InitContext.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/HistogramSpec.h"
+#include "Framework/InitContext.h"
 #include "Framework/runDataProcessing.h"
 
 #include "TH1F.h"
 #include "TH2F.h"
 
+#include <bitset>
+#include <cstddef>
+#include <cstdint>
+#include <map>
+#include <string>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-base-0/DPG/Tasks/ITS/itsImpParStudies.cxx b/.conflict-base-0/DPG/Tasks/ITS/itsImpParStudies.cxx
index 67fba3b4989..6ed71d41aa5 100644
--- a/.conflict-base-0/DPG/Tasks/ITS/itsImpParStudies.cxx
+++ b/.conflict-base-0/DPG/Tasks/ITS/itsImpParStudies.cxx
@@ -10,33 +10,32 @@
 // or submit itself to any jurisdiction.
 /// \author Samuele Cattaruzzi <samuele.cattaruzzi@cern.ch>
 
-#include <string>
-
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "ReconstructionDataFormats/DCA.h"
+#include "Common/Core/TrackSelection.h"
 #include "Common/Core/trackUtilities.h" // for propagation to primary vertex
-
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "CommonUtils/NameConf.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Common/Core/TrackSelection.h"
-#include "DetectorsVertexing/PVertexer.h"
-#include "ReconstructionDataFormats/Vertex.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "Framework/RunningWorkflowInfo.h"
 #include "CCDB/CcdbApi.h"
-#include "DataFormatsCalibration/MeanVertexObject.h"
 #include "CommonConstants/GeomConstants.h"
+#include "CommonUtils/NameConf.h"
+#include "DataFormatsCalibration/MeanVertexObject.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "DetectorsVertexing/PVertexer.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "ReconstructionDataFormats/DCA.h"
+#include "ReconstructionDataFormats/Vertex.h"
 
 #include "iostream"
-#include "vector"
 #include "set"
+#include "vector"
+#include <string>
 
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-base-0/DPG/Tasks/Monitor/MC/taskMcSimpleQC.cxx b/.conflict-base-0/DPG/Tasks/Monitor/MC/taskMcSimpleQC.cxx
index 5f285fcc2b4..cb773c8beb2 100644
--- a/.conflict-base-0/DPG/Tasks/Monitor/MC/taskMcSimpleQC.cxx
+++ b/.conflict-base-0/DPG/Tasks/Monitor/MC/taskMcSimpleQC.cxx
@@ -12,12 +12,13 @@
 /// \brief Simple QC task to run
 /// \author Fabrizio Grosa, fabrizio.grosa@cern.ch (CERN)
 
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::aod;
@@ -36,7 +37,7 @@ struct mcSimpleQc {
       {"histNumGlobalTracks", ";#it{N}_{global tracks};entries", {HistType::kTH1F, {{200, -0.5, 200.}}}},                               //
       {"histNumPvContributors", ";#it{N}_{PV contributors};entries", {HistType::kTH1F, {{200, -0.5, 200.}}}},                           //
       {"histFracAmbiguousTracks", ";#it{N}_{ambiguous tracks} / #it{N}_{tracks};entries", {HistType::kTH1F, {{100, 0., 1.}}}}           //
-    }                                                                                                                                   //
+    } //
   };
 
   using CollisionsWithMCLabels = soa::Join<aod::Collisions, aod::McCollisionLabels>;
@@ -84,4 +85,5 @@ struct mcSimpleQc {
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
   return WorkflowSpec{adaptAnalysisTask<mcSimpleQc>(cfgc)};
-}
\ No newline at end of file
+}
+ 
\ No newline at end of file
diff --git a/.conflict-base-0/DPG/Tasks/TOF/tofOfflineCalib.cxx b/.conflict-base-0/DPG/Tasks/TOF/tofOfflineCalib.cxx
index ccfea13f1b1..cae7f462dec 100644
--- a/.conflict-base-0/DPG/Tasks/TOF/tofOfflineCalib.cxx
+++ b/.conflict-base-0/DPG/Tasks/TOF/tofOfflineCalib.cxx
@@ -16,15 +16,16 @@
 /// \brief  Task to produce calibration objects for the TOF. Based on AO2D or TOF skimmed data
 ///
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "tofSkimsTableCreator.h"
+
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/FT0Corrected.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "tofSkimsTableCreator.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/DPG/Tasks/TOF/tofSkimsTableCreator.cxx b/.conflict-base-0/DPG/Tasks/TOF/tofSkimsTableCreator.cxx
index 1c2d1a79608..9b4ed496252 100644
--- a/.conflict-base-0/DPG/Tasks/TOF/tofSkimsTableCreator.cxx
+++ b/.conflict-base-0/DPG/Tasks/TOF/tofSkimsTableCreator.cxx
@@ -16,15 +16,16 @@
 /// \brief  Task to defined the skimmed data format for the TOF skims
 ///
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "tofSkimsTableCreator.h"
+
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/FT0Corrected.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "tofSkimsTableCreator.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/DPG/Tasks/TOF/tofSkimsTableCreator.h b/.conflict-base-0/DPG/Tasks/TOF/tofSkimsTableCreator.h
index 4f0ec48ed06..aa79ae4cdf5 100644
--- a/.conflict-base-0/DPG/Tasks/TOF/tofSkimsTableCreator.h
+++ b/.conflict-base-0/DPG/Tasks/TOF/tofSkimsTableCreator.h
@@ -19,9 +19,10 @@
 #ifndef DPG_TASKS_TOF_TOFSKIMSTABLECREATOR_H_
 #define DPG_TASKS_TOF_TOFSKIMSTABLECREATOR_H_
 
-#include "Common/TableProducer/PID/pidTOFBase.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/FT0Corrected.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/TableProducer/PID/pidTOFBase.h"
+
 #include "Framework/AnalysisDataModel.h"
 
 namespace o2::aod
diff --git a/.conflict-base-0/DPG/Tasks/TPC/tpcSkimsTableCreator.h b/.conflict-base-0/DPG/Tasks/TPC/tpcSkimsTableCreator.h
index decb3a9de60..583e38efd32 100644
--- a/.conflict-base-0/DPG/Tasks/TPC/tpcSkimsTableCreator.h
+++ b/.conflict-base-0/DPG/Tasks/TPC/tpcSkimsTableCreator.h
@@ -19,11 +19,12 @@
 #ifndef DPG_TASKS_TPC_TPCSKIMSTABLECREATOR_H_
 #define DPG_TASKS_TPC_TPCSKIMSTABLECREATOR_H_
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/PIDResponse.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+
 namespace o2::aod
 {
 namespace tpcskims
diff --git a/.conflict-base-0/DPG/Tasks/TPC/tpcTreeCreatorLight.cxx b/.conflict-base-0/DPG/Tasks/TPC/tpcTreeCreatorLight.cxx
index 807c85ba414..d17d850a9da 100644
--- a/.conflict-base-0/DPG/Tasks/TPC/tpcTreeCreatorLight.cxx
+++ b/.conflict-base-0/DPG/Tasks/TPC/tpcTreeCreatorLight.cxx
@@ -17,7 +17,9 @@
 /// \author Jeremy Wilkinson <jeremy.wilkinson@cern.ch>
 
 #include "tpcTreeCreatorLight.h"
+
 #include <CCDB/BasicCCDBManager.h>
+
 #include <cmath>
 /// ROOT
 #include "TRandom3.h"
@@ -27,10 +29,10 @@
 #include "Framework/runDataProcessing.h"
 /// O2Physics
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
 
 using namespace o2;
 using namespace o2::framework;
@@ -197,8 +199,8 @@ struct TreeWriterTPCTOF {
       }
 
     } /// Loop tracks
-  }   /// process
-};    /// struct TreeWriterTPCTOF
+  } /// process
+}; /// struct TreeWriterTPCTOF
 
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
diff --git a/.conflict-base-0/DPG/Tasks/TPC/tpcTreeCreatorLight.h b/.conflict-base-0/DPG/Tasks/TPC/tpcTreeCreatorLight.h
index df02c1de1ec..f8d806da5da 100644
--- a/.conflict-base-0/DPG/Tasks/TPC/tpcTreeCreatorLight.h
+++ b/.conflict-base-0/DPG/Tasks/TPC/tpcTreeCreatorLight.h
@@ -17,11 +17,12 @@
 #ifndef DPG_TASKS_TPC_TPCTREECREATORLIGHT_H_
 #define DPG_TASKS_TPC_TPCTREECREATORLIGHT_H_
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/PIDResponse.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+
 enum ParticleSpecies {
   kPionTrack = BIT(0),
   kKaonTrack = BIT(1),
diff --git a/.conflict-base-0/EventFiltering/PWGCF/CFFilter.cxx b/.conflict-base-0/EventFiltering/PWGCF/CFFilter.cxx
index 7219ba03d45..30dbfe6f071 100644
--- a/.conflict-base-0/EventFiltering/PWGCF/CFFilter.cxx
+++ b/.conflict-base-0/EventFiltering/PWGCF/CFFilter.cxx
@@ -14,27 +14,27 @@
 ///
 /// \author Laura Serksnyte, TU München, laura.serksnyte@cern.ch
 
-#include <string>
-
-#include "../filterTables.h"
 #include "../../PWGCF/FemtoDream/FemtoUtils.h"
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/HistogramRegistry.h"
+#include "../filterTables.h"
 
 #include "PWGCF/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoDream/FemtoDreamParticleHisto.h"
+#include "PWGCF/FemtoDream/FemtoDreamContainer.h"
+#include "PWGCF/FemtoDream/FemtoDreamDetaDphiStar.h"
 #include "PWGCF/FemtoDream/FemtoDreamMath.h"
 #include "PWGCF/FemtoDream/FemtoDreamPairCleaner.h"
-#include "PWGCF/FemtoDream/FemtoDreamDetaDphiStar.h"
-#include "PWGCF/FemtoDream/FemtoDreamContainer.h"
+#include "PWGCF/FemtoDream/FemtoDreamParticleHisto.h"
 
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+
+#include <string>
+
 namespace
 {
 
diff --git a/.conflict-base-0/EventFiltering/PWGCF/CFFilterAll.cxx b/.conflict-base-0/EventFiltering/PWGCF/CFFilterAll.cxx
index efc7625b215..512c6d48f32 100644
--- a/.conflict-base-0/EventFiltering/PWGCF/CFFilterAll.cxx
+++ b/.conflict-base-0/EventFiltering/PWGCF/CFFilterAll.cxx
@@ -14,36 +14,36 @@
 ///
 /// \author Laura Serksnyte, TU München, laura.serksnyte@cern.ch; Anton Riedel, TU München, anton.riedel@cern.ch; Maximilian Korwieser, TU Munich, maximilian.korwieser@cern.ch
 
-#include <string>
-#include <vector>
-
 #include "../filterTables.h"
 
-#include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "DetectorsBase/Propagator.h"
+#include "PWGLF/Utils/strangenessBuilderHelper.h"
 
-#include "fairlogger/Logger.h"
+#include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/PIDResponseITS.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/Core/RecoDecay.h"
 
+#include "CCDB/BasicCCDBManager.h"
+#include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DetectorsBase/Propagator.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/Configurable.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
 
-#include "PWGLF/Utils/strangenessBuilderHelper.h"
-
 #include "Math/GenVector/Boost.h"
 #include "Math/Vector4D.h"
 #include "TMath.h"
 
+#include "fairlogger/Logger.h"
+
+#include <string>
+#include <vector>
+
 using namespace o2;
 using namespace o2::aod;
 using namespace o2::framework;
diff --git a/.conflict-base-0/EventFiltering/PWGCF/CFFilterPPPhi.cxx b/.conflict-base-0/EventFiltering/PWGCF/CFFilterPPPhi.cxx
index 623b5cb9086..1c849a7707b 100644
--- a/.conflict-base-0/EventFiltering/PWGCF/CFFilterPPPhi.cxx
+++ b/.conflict-base-0/EventFiltering/PWGCF/CFFilterPPPhi.cxx
@@ -14,29 +14,32 @@
 ///
 /// \author Anton Riedel, TU München, anton.riedel@cern.ch
 
-#include <Math/GenVector/Boost.h>
-#include <Math/Vector4D.h>
-#include <TMath.h>
-#include <iostream>
-#include <iterator>
-#include <string>
-
 #include "../filterTables.h"
 
-#include "Framework/Configurable.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonConstants/MathConstants.h"
+#include "DataFormatsTPC/BetheBlochAleph.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/Configurable.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
+
+#include <Math/GenVector/Boost.h>
+#include <Math/Vector4D.h>
+#include <TMath.h>
+
 #include "fairlogger/Logger.h"
-#include "CommonConstants/MathConstants.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "DataFormatsTPC/BetheBlochAleph.h"
+
+#include <iostream>
+#include <iterator>
+#include <string>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/EventFiltering/PWGCF/CFFilterQA.cxx b/.conflict-base-0/EventFiltering/PWGCF/CFFilterQA.cxx
index 372b3387dc1..2108c7bc0d7 100644
--- a/.conflict-base-0/EventFiltering/PWGCF/CFFilterQA.cxx
+++ b/.conflict-base-0/EventFiltering/PWGCF/CFFilterQA.cxx
@@ -14,33 +14,36 @@
 ///
 /// \author Laura Serksnyte, TU München, laura.serksnyte@cern.ch; Anton Riedel, TU München, anton.riedel@cern.ch
 
-#include <Framework/Configurable.h>
-#include <Math/GenVector/Boost.h>
-#include <Math/Vector4D.h>
-#include <TMath.h>
-#include <cstdint>
-#include <iostream>
-#include <iterator>
-#include <string>
-
 #include "../filterTables.h"
 
-#include "Framework/ASoAHelpers.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
-#include "CommonConstants/MathConstants.h"
+#include "PWGCF/DataModel/FemtoDerived.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGCF/DataModel/FemtoDerived.h"
-#include "DataFormatsTPC/BetheBlochAleph.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
 #include "CCDB/CcdbApi.h"
+#include "CommonConstants/MathConstants.h"
+#include "DataFormatsTPC/BetheBlochAleph.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include <Framework/Configurable.h>
+
+#include <Math/GenVector/Boost.h>
+#include <Math/Vector4D.h>
+#include <TMath.h>
+
+#include <cstdint>
+#include <iostream>
+#include <iterator>
+#include <string>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/EventFiltering/PWGCF/CFFilterTwoN.cxx b/.conflict-base-0/EventFiltering/PWGCF/CFFilterTwoN.cxx
index 2d2b64a1088..03d14a4713e 100644
--- a/.conflict-base-0/EventFiltering/PWGCF/CFFilterTwoN.cxx
+++ b/.conflict-base-0/EventFiltering/PWGCF/CFFilterTwoN.cxx
@@ -14,29 +14,28 @@
 ///
 /// \author Anton Riedel, TU München, anton.riedel@cern.ch
 
-#include <Framework/Configurable.h>
-#include <TMath.h>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/HistogramRegistry.h"
-
-#include "../filterTables.h"
 #include "../../PWGCF/FemtoDream/FemtoUtils.h"
+#include "../filterTables.h"
 
 #include "PWGCF/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoDream/FemtoDreamParticleHisto.h"
-#include "PWGCF/FemtoDream/FemtoDreamPairCleaner.h"
 #include "PWGCF/FemtoDream/FemtoDreamContainer.h"
+#include "PWGCF/FemtoDream/FemtoDreamDetaDphiStar.h"
 #include "PWGCF/FemtoDream/FemtoDreamMath.h"
 #include "PWGCF/FemtoDream/FemtoDreamPairCleaner.h"
-#include "PWGCF/FemtoDream/FemtoDreamDetaDphiStar.h"
-#include "PWGCF/FemtoDream/FemtoDreamContainer.h"
+#include "PWGCF/FemtoDream/FemtoDreamParticleHisto.h"
 
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
+
 #include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include <Framework/Configurable.h>
+
+#include <TMath.h>
 
 #include <vector>
 
diff --git a/.conflict-base-0/EventFiltering/PWGEM/EMPhotonFilter.cxx b/.conflict-base-0/EventFiltering/PWGEM/EMPhotonFilter.cxx
index a254c7245a1..119e36daa69 100644
--- a/.conflict-base-0/EventFiltering/PWGEM/EMPhotonFilter.cxx
+++ b/.conflict-base-0/EventFiltering/PWGEM/EMPhotonFilter.cxx
@@ -12,16 +12,19 @@
 // \brief software trigger for EM photon
 // \author daiki.sekihata@cern.ch
 
-#include "Math/Vector4D.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/CaloClusters.h"
-#include "DataFormatsPHOS/TriggerRecord.h"
 #include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+
+#include "Common/DataModel/CaloClusters.h"
 #include "EventFiltering/filterTables.h"
+
+#include "DataFormatsPHOS/TriggerRecord.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+
+#include "Math/Vector4D.h"
 
 using namespace o2;
 using namespace o2::soa;
diff --git a/.conflict-base-0/EventFiltering/PWGEM/EMPhotonFilterQC.cxx b/.conflict-base-0/EventFiltering/PWGEM/EMPhotonFilterQC.cxx
index de4d59f00da..d03bcd50908 100644
--- a/.conflict-base-0/EventFiltering/PWGEM/EMPhotonFilterQC.cxx
+++ b/.conflict-base-0/EventFiltering/PWGEM/EMPhotonFilterQC.cxx
@@ -12,18 +12,21 @@
 // \brief Quick QC task for CEFP for EM photon
 // \author daiki.sekihata@cern.ch
 
-#include "Math/Vector4D.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/CaloClusters.h"
-#include "DataFormatsPHOS/TriggerRecord.h"
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
 #include "PWGEM/PhotonMeson/Core/CutsLibrary.h"
+#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+
+#include "Common/DataModel/CaloClusters.h"
 #include "EventFiltering/filterTables.h"
+
+#include "DataFormatsPHOS/TriggerRecord.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+
+#include "Math/Vector4D.h"
 
 using namespace o2;
 using namespace o2::soa;
diff --git a/.conflict-base-0/EventFiltering/PWGEM/HeavyNeutralMesonFilter.cxx b/.conflict-base-0/EventFiltering/PWGEM/HeavyNeutralMesonFilter.cxx
index 6909d1561ee..46f86de11f0 100644
--- a/.conflict-base-0/EventFiltering/PWGEM/HeavyNeutralMesonFilter.cxx
+++ b/.conflict-base-0/EventFiltering/PWGEM/HeavyNeutralMesonFilter.cxx
@@ -16,32 +16,34 @@
 /// \author Nicolas Strangmann (nicolas.strangmann@cern.ch) - Goethe University Frankfurt; Maximilian Korwieser (maximilian.korwieser@cern.ch) - Technical University Munich
 ///
 
-#include <vector>
-#include <iterator>
-#include <string>
-
-#include "Math/GenVector/Boost.h"
-#include "Math/Vector4D.h"
-#include "TMath.h"
-#include "TRandom3.h"
-
 #include "PWGEM/PhotonMeson/Utils/HNMUtilities.h"
 #include "PWGJE/DataModel/EMCALMatchedCollisions.h"
 
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/PIDResponseITS.h"
-#include "fairlogger/Logger.h"
-#include "Framework/Configurable.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonConstants/MathConstants.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/Configurable.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
-#include "CommonConstants/MathConstants.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
+
+#include "Math/GenVector/Boost.h"
+#include "Math/Vector4D.h"
+#include "TMath.h"
+#include "TRandom3.h"
+
+#include "fairlogger/Logger.h"
+
+#include <iterator>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/EventFiltering/PWGHF/HFFilterPrepareMLSamples.cxx b/.conflict-base-0/EventFiltering/PWGHF/HFFilterPrepareMLSamples.cxx
index b7a9637ba10..cfbcb6573da 100644
--- a/.conflict-base-0/EventFiltering/PWGHF/HFFilterPrepareMLSamples.cxx
+++ b/.conflict-base-0/EventFiltering/PWGHF/HFFilterPrepareMLSamples.cxx
@@ -28,8 +28,6 @@
 #include "Common/DataModel/PIDResponseTPC.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
-#include <onnxruntime_cxx_api.h>
-
 #include <CCDB/BasicCCDBManager.h>
 #include <CCDB/CcdbApi.h>
 #include <CommonConstants/PhysicsConstants.h>
@@ -46,6 +44,8 @@
 
 #include <TPDGCode.h>
 
+#include <onnxruntime_cxx_api.h>
+
 #include <Rtypes.h>
 
 #include <array>
diff --git a/.conflict-base-0/EventFiltering/PWGJE/fullJetFilter.cxx b/.conflict-base-0/EventFiltering/PWGJE/fullJetFilter.cxx
index 25096b7bb7a..d8d851fde88 100644
--- a/.conflict-base-0/EventFiltering/PWGJE/fullJetFilter.cxx
+++ b/.conflict-base-0/EventFiltering/PWGJE/fullJetFilter.cxx
@@ -12,35 +12,36 @@
 // Full Jet Filter
 // Author: Gijs van Weelden
 
-#include <array>
-#include <cmath>
-#include <string>
-#include <string_view>
-#include <TMath.h>
+#include "../filterTables.h"
 
-#include <boost/algorithm/string/case_conv.hpp>
+#include "PWGJE/Core/FastJetUtilities.h"
+#include "PWGJE/Core/JetFinder.h"
+#include "PWGJE/DataModel/EMCALClusters.h"
+#include "PWGJE/DataModel/Jet.h"
+
+#include "Common/CCDB/TriggerAliases.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
 #include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsCTP/Configuration.h"
 #include "EMCALBase/Geometry.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoA.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/CCDB/TriggerAliases.h"
+#include <TMath.h>
 
-#include "PWGJE/DataModel/Jet.h"
-#include "PWGJE/DataModel/EMCALClusters.h"
-#include "PWGJE/Core/JetFinder.h"
-#include "PWGJE/Core/FastJetUtilities.h"
+#include <boost/algorithm/string/case_conv.hpp>
 
-#include "../filterTables.h"
+#include <array>
+#include <cmath>
+#include <string>
+#include <string_view>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/EventFiltering/PWGJE/jetFilter.cxx b/.conflict-base-0/EventFiltering/PWGJE/jetFilter.cxx
index 277f749d22b..d147a4a6849 100644
--- a/.conflict-base-0/EventFiltering/PWGJE/jetFilter.cxx
+++ b/.conflict-base-0/EventFiltering/PWGJE/jetFilter.cxx
@@ -11,32 +11,32 @@
 
 // Author: Filip Krizek
 
-#include <TMath.h>
-#include <cmath>
-#include <string>
-#include <vector>
+#include "../filterTables.h"
 
-#include "Framework/ASoA.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "ReconstructionDataFormats/Track.h"
+#include "PWGJE/Core/FastJetUtilities.h"
+#include "PWGJE/Core/JetBkgSubUtils.h"
+#include "PWGJE/Core/JetFinder.h"
+#include "PWGJE/DataModel/EMCALClusters.h"
+#include "PWGJE/DataModel/Jet.h"
 
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
-#include "PWGJE/Core/JetFinder.h"
-#include "PWGJE/Core/FastJetUtilities.h"
-#include "PWGJE/Core/JetBkgSubUtils.h"
-#include "PWGJE/DataModel/EMCALClusters.h"
-#include "PWGJE/DataModel/Jet.h"
+#include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
-#include "../filterTables.h"
+#include <TMath.h>
 
-#include "Framework/HistogramRegistry.h"
+#include <cmath>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/EventFiltering/PWGJE/jetHFFilter.cxx b/.conflict-base-0/EventFiltering/PWGJE/jetHFFilter.cxx
index 6657e785751..61f627256c5 100644
--- a/.conflict-base-0/EventFiltering/PWGJE/jetHFFilter.cxx
+++ b/.conflict-base-0/EventFiltering/PWGJE/jetHFFilter.cxx
@@ -11,31 +11,31 @@
 
 // Author: Nima Zardoshti
 
-#include <TMath.h>
-#include <cmath>
-#include <string>
+#include "../filterTables.h"
 
-#include "Framework/ASoA.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "ReconstructionDataFormats/Track.h"
+#include "PWGJE/Core/FastJetUtilities.h"
+#include "PWGJE/Core/JetBkgSubUtils.h"
+#include "PWGJE/Core/JetFinder.h"
+#include "PWGJE/DataModel/EMCALClusters.h"
+#include "PWGJE/DataModel/Jet.h"
 
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
-#include "PWGJE/Core/JetFinder.h"
-#include "PWGJE/Core/FastJetUtilities.h"
-#include "PWGJE/Core/JetBkgSubUtils.h"
-#include "PWGJE/DataModel/EMCALClusters.h"
-#include "PWGJE/DataModel/Jet.h"
+#include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
-#include "../filterTables.h"
+#include <TMath.h>
 
-#include "Framework/HistogramRegistry.h"
+#include <cmath>
+#include <string>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/EventFiltering/PWGLF/filterdoublephi.cxx b/.conflict-base-0/EventFiltering/PWGLF/filterdoublephi.cxx
index 0ee9f34b535..5b92f2ff092 100644
--- a/.conflict-base-0/EventFiltering/PWGLF/filterdoublephi.cxx
+++ b/.conflict-base-0/EventFiltering/PWGLF/filterdoublephi.cxx
@@ -14,37 +14,41 @@
 ///
 /// \author Sourav Kundu, sourav.kundu@cern.ch
 
+#include "../filterTables.h"
+
+#include "PWGLF/DataModel/ReducedDoublePhiTables.h"
+
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/PIDResponseITS.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
+#include "CommonConstants/MathConstants.h"
+#include "DataFormatsTPC/BetheBlochAleph.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 #include <Framework/Configurable.h>
+
 #include <Math/GenVector/Boost.h>
 #include <Math/Vector4D.h>
+#include <TDatabasePDG.h> // FIXME
 #include <TMath.h>
+#include <TPDGCode.h> // FIXME
+
 #include <fairlogger/Logger.h>
-#include <TDatabasePDG.h> // FIXME
-#include <TPDGCode.h>     // FIXME
 
 #include <iostream>
 #include <iterator>
 #include <string>
 #include <vector>
 
-#include "../filterTables.h"
-#include "PWGLF/DataModel/ReducedDoublePhiTables.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
-#include "CommonConstants/MathConstants.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "DataFormatsTPC/BetheBlochAleph.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "CCDB/CcdbApi.h"
-#include "Common/DataModel/PIDResponseITS.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-base-0/EventFiltering/PWGLF/filterf1proton.cxx b/.conflict-base-0/EventFiltering/PWGLF/filterf1proton.cxx
index abdfe9c272a..4a679fc22b8 100644
--- a/.conflict-base-0/EventFiltering/PWGLF/filterf1proton.cxx
+++ b/.conflict-base-0/EventFiltering/PWGLF/filterf1proton.cxx
@@ -14,43 +14,48 @@
 ///
 /// \author Sourav Kundu, sourav.kundu@cern.ch
 
+#include "../filterTables.h"
+
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/Utils/strangenessBuilderHelper.h"
+
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
+#include "CommonConstants/MathConstants.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DataFormatsTPC/BetheBlochAleph.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+#include "ReconstructionDataFormats/TrackParametrization.h"
 #include <Framework/Configurable.h>
+
 #include <Math/GenVector/Boost.h>
 #include <Math/Vector4D.h>
 #include <TLorentzVector.h>
 #include <TMath.h>
+
 #include <fairlogger/Logger.h>
+
 #include <iostream>
 #include <iterator>
 #include <string>
 #include <vector>
 
-#include "DataFormatsParameters/GRPMagField.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "ReconstructionDataFormats/TrackParametrization.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "../filterTables.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
-#include "CommonConstants/MathConstants.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/Utils/strangenessBuilderHelper.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "DataFormatsTPC/BetheBlochAleph.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "CCDB/CcdbApi.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-base-0/EventFiltering/PWGLF/nucleiFilter.cxx b/.conflict-base-0/EventFiltering/PWGLF/nucleiFilter.cxx
index 54f3ed507ad..bd82fd3c2f8 100644
--- a/.conflict-base-0/EventFiltering/PWGLF/nucleiFilter.cxx
+++ b/.conflict-base-0/EventFiltering/PWGLF/nucleiFilter.cxx
@@ -10,37 +10,38 @@
 // or submit itself to any jurisdiction.
 // O2 includes
 
-#include <cmath>
-#include <string>
+#include "../filterTables.h"
 
-#include "Math/Vector4D.h"
-#include "Math/GenVector/Boost.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/DataModel/Vtx3BodyTables.h"
+#include "PWGLF/DataModel/pidTOFGeneric.h"
+
+#include "Common/Core/PID/PIDTOF.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DataFormatsTOF/ParameterContainers.h"
 #include "DataFormatsTPC/BetheBlochAleph.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
 
-#include "PWGLF/DataModel/Vtx3BodyTables.h"
-#include "../filterTables.h"
+#include "Math/GenVector/Boost.h"
+#include "Math/Vector4D.h"
 
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/trackUtilities.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "DataFormatsTOF/ParameterContainers.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "PWGLF/DataModel/pidTOFGeneric.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "Common/Core/PID/PIDTOF.h"
+#include <cmath>
+#include <string>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/EventFiltering/PWGLF/strangenessFilter.cxx b/.conflict-base-0/EventFiltering/PWGLF/strangenessFilter.cxx
index ceabf8eddfb..e54fb617c1a 100644
--- a/.conflict-base-0/EventFiltering/PWGLF/strangenessFilter.cxx
+++ b/.conflict-base-0/EventFiltering/PWGLF/strangenessFilter.cxx
@@ -14,32 +14,37 @@
 /// \author Francesca Ercolessi (francesca.ercolessi@cern.ch)
 /// \since June 1, 2021
 
-#include <cmath>
-#include "TVector3.h"
+#include "../filterTables.h"
+
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/Utils/strangenessBuilderHelper.h"
+
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "DCAFitter/DCAFitterN.h"
 #include "DataFormatsParameters/GRPMagField.h"
 #include "DataFormatsParameters/GRPObject.h"
-#include "DCAFitter/DCAFitterN.h"
 #include "DetectorsBase/Propagator.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
 #include "ReconstructionDataFormats/TrackParametrization.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "../filterTables.h"
-#include "PWGLF/Utils/strangenessBuilderHelper.h"
+
+#include "TVector3.h"
+
+#include <cmath>
 
 using namespace o2;
 using namespace o2::framework;
@@ -778,7 +783,7 @@ struct strangenessFilter {
     }
 
     for (auto& casc : cascadesBase) { // loop over cascades
-      hCandidate->Fill(0.5); // All candidates
+      hCandidate->Fill(0.5);          // All candidates
 
       const auto bachTrack = casc.bachelor_as<TrackCandidates>();
       const auto v0Dau = casc.v0_as<o2::aod::V0s>();
diff --git a/.conflict-base-0/EventFiltering/PWGUD/diffractionBCFilter.cxx b/.conflict-base-0/EventFiltering/PWGUD/diffractionBCFilter.cxx
index c6ce85ec845..d07fe3c0948 100644
--- a/.conflict-base-0/EventFiltering/PWGUD/diffractionBCFilter.cxx
+++ b/.conflict-base-0/EventFiltering/PWGUD/diffractionBCFilter.cxx
@@ -14,13 +14,15 @@
 // \author P. Buehler, paul.buehler@oeaw.ac.at
 // \since December, 2022
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "PWGUD/TableProducer/DGBCCandProducer.h"
+#include "../filterTables.h"
+
 #include "PWGUD/Core/DGCutparHolder.h"
 #include "PWGUD/Core/DGSelector.h"
 #include "PWGUD/Core/UDHelpers.h"
-#include "../filterTables.h"
+#include "PWGUD/TableProducer/DGBCCandProducer.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/EventFiltering/PWGUD/diffractionFilter.cxx b/.conflict-base-0/EventFiltering/PWGUD/diffractionFilter.cxx
index c5adfcf90c5..07bbf115535 100644
--- a/.conflict-base-0/EventFiltering/PWGUD/diffractionFilter.cxx
+++ b/.conflict-base-0/EventFiltering/PWGUD/diffractionFilter.cxx
@@ -14,14 +14,17 @@
 // \author P. Buehler, paul.buehler@oeaw.ac.at
 // \since June 1, 2021
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/StaticFor.h"
-#include "Common/DataModel/EventSelection.h"
+#include "../filterTables.h"
+
 #include "PWGUD/Core/DGCutparHolder.h"
 #include "PWGUD/Core/DGSelector.h"
 #include "PWGUD/Core/UDHelpers.h"
-#include "../filterTables.h"
+
+#include "Common/DataModel/EventSelection.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/EventFiltering/cefpTask.cxx b/.conflict-base-0/EventFiltering/cefpTask.cxx
index 64cf4435b85..584c8292903 100644
--- a/.conflict-base-0/EventFiltering/cefpTask.cxx
+++ b/.conflict-base-0/EventFiltering/cefpTask.cxx
@@ -10,6 +10,19 @@
 // or submit itself to any jurisdiction.
 // O2 includes
 
+#include "filterTables.h"
+
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonConstants/LHCConstants.h"
+#include "CommonDataFormat/InteractionRecord.h"
+#include "DataFormatsCTP/Scalers.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+
 #include <fmt/format.h>
 #include <rapidjson/document.h>
 #include <rapidjson/filereadstream.h>
@@ -18,21 +31,9 @@
 #include <random>
 #include <string>
 #include <string_view>
-#include <vector>
 #include <unordered_map>
 #include <utility>
-
-#include "filterTables.h"
-
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/HistogramRegistry.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "CommonConstants/LHCConstants.h"
-#include "CommonDataFormat/InteractionRecord.h"
-#include "DataFormatsCTP/Scalers.h"
+#include <vector>
 
 // we need to add workflow options before including Framework/runDataProcessing
 void customize(std::vector<o2::framework::ConfigParamSpec>& workflowOptions)
diff --git a/.conflict-base-0/EventFiltering/filterTables.h b/.conflict-base-0/EventFiltering/filterTables.h
index 1371d152e75..1ae7472fea6 100644
--- a/.conflict-base-0/EventFiltering/filterTables.h
+++ b/.conflict-base-0/EventFiltering/filterTables.h
@@ -12,10 +12,10 @@
 #define EVENTFILTERING_FILTERTABLES_H_
 
 #include <array>
-#include <unordered_map>
+#include <cstdint>
 #include <string>
+#include <unordered_map>
 #include <vector>
-#include <cstdint>
 
 namespace o2::aod
 {
diff --git a/.conflict-base-0/EventFiltering/macros/checkBCRange.C b/.conflict-base-0/EventFiltering/macros/checkBCRange.C
index 9bcc14981f4..76bdab016b0 100644
--- a/.conflict-base-0/EventFiltering/macros/checkBCRange.C
+++ b/.conflict-base-0/EventFiltering/macros/checkBCRange.C
@@ -10,12 +10,13 @@
 // or submit itself to any jurisdiction.
 // O2 includes
 
-#include <iostream>
+#include "CommonDataFormat/IRFrame.h"
+#include "CommonDataFormat/InteractionRecord.h"
+
 #include <TFile.h>
 #include <TTree.h>
 
-#include "CommonDataFormat/InteractionRecord.h"
-#include "CommonDataFormat/IRFrame.h"
+#include <iostream>
 
 using o2::InteractionRecord;
 using o2::dataformats::IRFrame;
diff --git a/.conflict-base-0/EventFiltering/macros/checkBCrangesSkimming.C b/.conflict-base-0/EventFiltering/macros/checkBCrangesSkimming.C
index f71212238c3..078aac59999 100644
--- a/.conflict-base-0/EventFiltering/macros/checkBCrangesSkimming.C
+++ b/.conflict-base-0/EventFiltering/macros/checkBCrangesSkimming.C
@@ -10,16 +10,18 @@
 // or submit itself to any jurisdiction.
 // O2 includes
 
-#include <cmath>
-#include <vector>
-#include <regex>
-#include <iostream>
+#include "CommonDataFormat/IRFrame.h"
+#include "CommonDataFormat/InteractionRecord.h"
+
 #include <TFile.h>
 #include <TGrid.h>
 #include <TH1.h>
 #include <TTree.h>
-#include "CommonDataFormat/InteractionRecord.h"
-#include "CommonDataFormat/IRFrame.h"
+
+#include <cmath>
+#include <iostream>
+#include <regex>
+#include <vector>
 
 using o2::InteractionRecord;
 using o2::dataformats::IRFrame;
diff --git a/.conflict-base-0/EventFiltering/macros/checkSkimming.C b/.conflict-base-0/EventFiltering/macros/checkSkimming.C
index 5496f303873..d7888dbd43e 100644
--- a/.conflict-base-0/EventFiltering/macros/checkSkimming.C
+++ b/.conflict-base-0/EventFiltering/macros/checkSkimming.C
@@ -10,15 +10,15 @@
 // or submit itself to any jurisdiction.
 
 #include <TCanvas.h>
-#include <TH1.h>
 #include <TFile.h>
+#include <TH1.h>
 #include <TStyle.h>
 
 #include <fstream>
 #include <iostream>
-#include <vector>
-#include <string>
 #include <regex>
+#include <string>
+#include <vector>
 
 void checkSkimming(std::string original_path = "AnalysisResults.root", std::string skimmed_path = "AnalysisResults_skimmed.root", TFile* outputFile = nullptr, bool skipDownscaled = true)
 {
@@ -129,4 +129,5 @@ void checkSkimming(std::string listName = "period.txt", bool skipDownscaled = tr
     counter++;
   }
   outputFile->Close();
-}
\ No newline at end of file
+}
+ 
\ No newline at end of file
diff --git a/.conflict-base-0/EventFiltering/macros/splitFile.C b/.conflict-base-0/EventFiltering/macros/splitFile.C
index b38149dca42..51da9f1aae7 100644
--- a/.conflict-base-0/EventFiltering/macros/splitFile.C
+++ b/.conflict-base-0/EventFiltering/macros/splitFile.C
@@ -10,12 +10,13 @@
 // or submit itself to any jurisdiction.
 // O2 includes
 
-#include <iostream>
-#include <string>
-#include "TFile.h"
 #include "TDirectory.h"
+#include "TFile.h"
 #include "TTree.h"
 
+#include <iostream>
+#include <string>
+
 void splitFile(const char* inputFileName = "bcSelection.root", const char* outputFileName1 = "bcRanges.root")
 {
   // Open the input ROOT file
diff --git a/.conflict-base-0/EventFiltering/macros/uploadOTSobjects.C b/.conflict-base-0/EventFiltering/macros/uploadOTSobjects.C
index 2a9be2de17e..0e950545aaf 100644
--- a/.conflict-base-0/EventFiltering/macros/uploadOTSobjects.C
+++ b/.conflict-base-0/EventFiltering/macros/uploadOTSobjects.C
@@ -10,13 +10,10 @@
 // or submit itself to any jurisdiction.
 //
 
-#include <fstream>
-#include <iostream>
-#include <vector>
-#include <string>
-#include <map>
-#include <array>
-#include <cmath>
+#include "EventFiltering/ZorroHelper.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonConstants/LHCConstants.h"
 
 #include "TFile.h"
 #include "TGrid.h"
@@ -25,9 +22,13 @@
 #include "TSystem.h"
 #include "TTree.h"
 
-#include "CCDB/BasicCCDBManager.h"
-#include "EventFiltering/ZorroHelper.h"
-#include "CommonConstants/LHCConstants.h"
+#include <array>
+#include <cmath>
+#include <fstream>
+#include <iostream>
+#include <map>
+#include <string>
+#include <vector>
 
 constexpr uint32_t chunkSize = 1000000;
 
diff --git a/.conflict-base-0/EventFiltering/selectBCRange.cxx b/.conflict-base-0/EventFiltering/selectBCRange.cxx
index 8a2d200e8e6..99261d38b4a 100644
--- a/.conflict-base-0/EventFiltering/selectBCRange.cxx
+++ b/.conflict-base-0/EventFiltering/selectBCRange.cxx
@@ -9,16 +9,17 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
+#include "filterTables.h"
+
 #include "Common/DataModel/EventSelection.h"
+
 #include "CommonConstants/LHCConstants.h"
-#include "CommonDataFormat/InteractionRecord.h"
 #include "CommonDataFormat/IRFrame.h"
+#include "CommonDataFormat/InteractionRecord.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/Logger.h"
 #include "Framework/runDataProcessing.h"
 
-#include "filterTables.h"
-
 using namespace o2;
 using namespace o2::framework;
 using o2::dataformats::IRFrame;
diff --git a/.conflict-base-0/PWGCF/Core/AnalysisConfigurableCuts.h b/.conflict-base-0/PWGCF/Core/AnalysisConfigurableCuts.h
index 886d78c95fe..65288471902 100644
--- a/.conflict-base-0/PWGCF/Core/AnalysisConfigurableCuts.h
+++ b/.conflict-base-0/PWGCF/Core/AnalysisConfigurableCuts.h
@@ -11,12 +11,14 @@
 #ifndef PWGCF_CORE_ANALYSISCONFIGURABLECUTS_H_
 #define PWGCF_CORE_ANALYSISCONFIGURABLECUTS_H_
 
+#include <TMath.h>
+#include <TNamed.h>
+#include <TObject.h>
+
+#include <Rtypes.h>
+
 #include <string>
 #include <vector>
-#include <Rtypes.h>
-#include <TObject.h>
-#include <TNamed.h>
-#include <TMath.h>
 
 namespace o2
 {
diff --git a/.conflict-base-0/PWGCF/Core/CorrelationContainer.cxx b/.conflict-base-0/PWGCF/Core/CorrelationContainer.cxx
index 1421288bd18..9ef399d2acb 100644
--- a/.conflict-base-0/PWGCF/Core/CorrelationContainer.cxx
+++ b/.conflict-base-0/PWGCF/Core/CorrelationContainer.cxx
@@ -15,20 +15,22 @@
 // Author: Jan Fiete Grosse-Oetringhaus
 
 #include "PWGCF/Core/CorrelationContainer.h"
-#include "Framework/StepTHn.h"
+
+#include "CommonConstants/MathConstants.h"
+#include "Framework/HistogramSpec.h"
 #include "Framework/Logger.h"
-#include "THnSparse.h"
-#include "TMath.h"
-#include "TList.h"
+#include "Framework/StepTHn.h"
+
+#include "TCanvas.h"
 #include "TCollection.h"
+#include "TF1.h"
 #include "TH1D.h"
 #include "TH2D.h"
 #include "TH3D.h"
-#include "TCanvas.h"
-#include "TF1.h"
 #include "THn.h"
-#include "Framework/HistogramSpec.h"
-#include "CommonConstants/MathConstants.h"
+#include "THnSparse.h"
+#include "TList.h"
+#include "TMath.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGCF/Core/CorrelationContainer.h b/.conflict-base-0/PWGCF/Core/CorrelationContainer.h
index b037b7d7ad4..7d30c042de0 100644
--- a/.conflict-base-0/PWGCF/Core/CorrelationContainer.h
+++ b/.conflict-base-0/PWGCF/Core/CorrelationContainer.h
@@ -14,9 +14,10 @@
 
 // encapsulate histogram and corrections for correlation analysis
 
+#include "Framework/HistogramSpec.h"
+
 #include "TNamed.h"
 #include "TString.h"
-#include "Framework/HistogramSpec.h"
 
 class TH1;
 class TH1F;
diff --git a/.conflict-base-0/PWGCF/Core/PairCuts.h b/.conflict-base-0/PWGCF/Core/PairCuts.h
index b90094f30e2..a65647f1d65 100644
--- a/.conflict-base-0/PWGCF/Core/PairCuts.h
+++ b/.conflict-base-0/PWGCF/Core/PairCuts.h
@@ -12,11 +12,11 @@
 #ifndef O2_ANALYSIS_PAIRCUTS_H
 #define O2_ANALYSIS_PAIRCUTS_H
 
-#include <cmath>
-
-#include "Framework/Logger.h"
-#include "Framework/HistogramRegistry.h"
 #include "CommonConstants/MathConstants.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/Logger.h"
+
+#include <cmath>
 
 // Functions which cut on particle pairs (decays, conversions, two-track cuts)
 //
@@ -147,7 +147,7 @@ bool PairCuts::twoTrackCut(T const& track1, T const& track2, int magField)
       }
 
       if (dphistarminabs < mTwoTrackDistance && std::fabs(deta) < mTwoTrackDistance) {
-        //LOGF(debug, "Removed track pair %ld %ld with %f %f %f %f %d %f %f %d %d", track1.index(), track2.index(), deta, dphistarminabs, track1.phi2(), track1.pt(), track1.sign(), track2.phi2(), track2.pt(), track2.sign(), magField);
+        // LOGF(debug, "Removed track pair %ld %ld with %f %f %f %f %d %f %f %d %d", track1.index(), track2.index(), deta, dphistarminabs, track1.phi2(), track1.pt(), track1.sign(), track2.phi2(), track2.pt(), track2.sign(), magField);
         return true;
       }
 
@@ -163,7 +163,7 @@ bool PairCuts::twoTrackCut(T const& track1, T const& track2, int magField)
 template <typename T>
 bool PairCuts::conversionCut(T const& track1, T const& track2, Particle conv, double cut)
 {
-  //LOGF(info, "pt is %f %f", track1.pt(), track2.pt());
+  // LOGF(info, "pt is %f %f", track1.pt(), track2.pt());
 
   if (cut < 0) {
     return false;
@@ -304,7 +304,7 @@ double PairCuts::getInvMassSquaredFast(T const& track1, double m0_1, T const& tr
 
   double mass2 = m0_1 * m0_1 + m0_2 * m0_2 + 2.0f * (std::sqrt(e1squ * e2squ) - (pt1 * pt2 * (cosDeltaPhi + 1.0f / tantheta1 / tantheta2)));
 
-  //LOGF(debug, "%f %f %f %f %f %f %f %f %f", pt1, eta1, phi1, pt2, eta2, phi2, m0_1, m0_2, mass2);
+  // LOGF(debug, "%f %f %f %f %f %f %f %f %f", pt1, eta1, phi1, pt2, eta2, phi2, m0_1, m0_2, mass2);
 
   return mass2;
 }
diff --git a/.conflict-base-0/PWGCF/DataModel/FemtoDerived.h b/.conflict-base-0/PWGCF/DataModel/FemtoDerived.h
index 4caf0166303..7e916d543ff 100644
--- a/.conflict-base-0/PWGCF/DataModel/FemtoDerived.h
+++ b/.conflict-base-0/PWGCF/DataModel/FemtoDerived.h
@@ -12,18 +12,21 @@
 #ifndef PWGCF_DATAMODEL_FEMTODERIVED_H_
 #define PWGCF_DATAMODEL_FEMTODERIVED_H_
 
-#include <cmath>
-#include "Framework/ASoA.h"
-#include "MathUtils/Utils.h"
-#include "Framework/DataTypes.h"
 #include "PWGHF/Core/HfHelper.h"
 #include "PWGHF/DataModel/CandidateReconstructionTables.h"
 #include "PWGHF/DataModel/CandidateSelectionTables.h"
+
 #include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoA.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/DataTypes.h"
 #include "Framework/Expressions.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
+#include "MathUtils/Utils.h"
+
+#include <cmath>
 
 namespace o2::aod
 {
diff --git a/.conflict-base-0/PWGCF/DataModel/SPTableZDC.h b/.conflict-base-0/PWGCF/DataModel/SPTableZDC.h
index fcafff23c90..19896dd0c32 100644
--- a/.conflict-base-0/PWGCF/DataModel/SPTableZDC.h
+++ b/.conflict-base-0/PWGCF/DataModel/SPTableZDC.h
@@ -14,13 +14,14 @@
 #ifndef PWGCF_DATAMODEL_SPTABLEZDC_H_
 #define PWGCF_DATAMODEL_SPTABLEZDC_H_
 
-#include <cmath>
-
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/Core/RecoDecay.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/AnalysisDataModel.h"
 
+#include <cmath>
+
 namespace o2::aod
 {
 namespace sptablezdc
diff --git a/.conflict-base-0/PWGCF/EbyEFluctuations/Tasks/Diff_pT_fluct_PID.cxx b/.conflict-base-0/PWGCF/EbyEFluctuations/Tasks/Diff_pT_fluct_PID.cxx
index 5710ab1e864..16afcb3219e 100644
--- a/.conflict-base-0/PWGCF/EbyEFluctuations/Tasks/Diff_pT_fluct_PID.cxx
+++ b/.conflict-base-0/PWGCF/EbyEFluctuations/Tasks/Diff_pT_fluct_PID.cxx
@@ -13,37 +13,37 @@
 ///           v0(pT) along with its statistical uncertainity using subsampling technique.
 /// \author Anna Binoy (anna.binoy@niser.ac.in)
 
-#include <CCDB/BasicCCDBManager.h>
-#include <algorithm>
-#include <numeric>
-#include <cmath>
-#include <vector>
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/HistogramSpec.h"
+#include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StaticFor.h"
-
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
+#include "Framework/runDataProcessing.h"
+#include <CCDB/BasicCCDBManager.h>
 
 #include "TDatabasePDG.h"
-#include "TLorentzVector.h"
+#include "TF1.h"
+#include "TH1D.h"
+#include "TH2D.h"
 #include "TList.h"
+#include "TLorentzVector.h"
+#include "TMath.h"
 #include "TProfile.h"
 #include "TProfile2D.h"
-#include "TH2D.h"
-#include "TH1D.h"
 #include "TRandom3.h"
-#include "TMath.h"
-#include "TF1.h"
+
+#include <algorithm>
+#include <cmath>
+#include <numeric>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGCF/EbyEFluctuations/Tasks/FactorialMomentsTask.cxx b/.conflict-base-0/PWGCF/EbyEFluctuations/Tasks/FactorialMomentsTask.cxx
index c76556ec26f..4c905ede9ed 100644
--- a/.conflict-base-0/PWGCF/EbyEFluctuations/Tasks/FactorialMomentsTask.cxx
+++ b/.conflict-base-0/PWGCF/EbyEFluctuations/Tasks/FactorialMomentsTask.cxx
@@ -13,22 +13,24 @@
 /// \author Salman Malik
 /// \author Balwan Singh
 
-#include <iostream>
-#include <array>
-#include <TH1F.h>
 #include "TRandom.h"
+#include <TH1F.h>
+
+#include <array>
+#include <iostream>
 // O2 includes
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "ReconstructionDataFormats/GlobalTrackID.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "Framework/ASoAHelpers.h"
 using std::array;
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGCF/EbyEFluctuations/Tasks/NetProtonCumulants.cxx b/.conflict-base-0/PWGCF/EbyEFluctuations/Tasks/NetProtonCumulants.cxx
index a18b0b97df9..79ea94ab5ad 100644
--- a/.conflict-base-0/PWGCF/EbyEFluctuations/Tasks/NetProtonCumulants.cxx
+++ b/.conflict-base-0/PWGCF/EbyEFluctuations/Tasks/NetProtonCumulants.cxx
@@ -9,26 +9,27 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <CCDB/BasicCCDBManager.h>
-#include <cmath>
-#include <vector>
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/HistogramRegistry.h"
-
-#include "Common/DataModel/EventSelection.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include <CCDB/BasicCCDBManager.h>
 
 #include "TList.h"
+#include "TMath.h"
 #include "TProfile.h"
 #include "TProfile2D.h"
 #include "TRandom3.h"
-#include "TMath.h"
+
+#include <cmath>
+#include <vector>
 
 namespace o2::aod
 {
diff --git a/.conflict-base-0/PWGCF/EbyEFluctuations/Tasks/RobustFluctuationObservables.cxx b/.conflict-base-0/PWGCF/EbyEFluctuations/Tasks/RobustFluctuationObservables.cxx
index f4d50ac9c7a..2db80cf4351 100644
--- a/.conflict-base-0/PWGCF/EbyEFluctuations/Tasks/RobustFluctuationObservables.cxx
+++ b/.conflict-base-0/PWGCF/EbyEFluctuations/Tasks/RobustFluctuationObservables.cxx
@@ -12,35 +12,34 @@
 /// \brief This task is a QA task to accumulate basic event- and track-level plots.
 /// \author Igor Altsybeev, Igor.Altsybeev@cern.ch
 
-#include <iostream>
-#include <string>
-#include <memory>
-#include <vector>
-#include <map>
-
-#include "TF1.h"
-#include "TGraphErrors.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
+#include "Common/CCDB/EventSelectionParams.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/FT0Corrected.h"
 #include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/CCDB/EventSelectionParams.h"
 
 #include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPObject.h"
+#include "DataFormatsFT0/Digit.h"
 #include "DataFormatsParameters/GRPECSObject.h"
 #include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
-#include "Common/DataModel/FT0Corrected.h"
-#include "DataFormatsFT0/Digit.h"
+#include "TF1.h"
+#include "TGraphErrors.h"
 
-#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include <iostream>
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
 
 using namespace std;
 using namespace o2;
@@ -2293,8 +2292,8 @@ struct RobustFluctuationObservables {
         }
 
       } // end of v0 loop
-    }   // end of if (flagIncludeQAHistK0S)
-  }     // end of processRobustFluctuationObservables()
+    } // end of if (flagIncludeQAHistK0S)
+  } // end of processRobustFluctuationObservables()
 
   // shortcut function to fill 2D histograms
   void fillHistForThisCut(string cutName, int multNTracksPV, int multTrk, int nTracksGlobalAccepted, double multT0A, double multT0C, double multV0A, double /*t0cCentr*/, int bc)
diff --git a/.conflict-base-0/PWGCF/EbyEFluctuations/Tasks/antiprotonCumulantsMc.cxx b/.conflict-base-0/PWGCF/EbyEFluctuations/Tasks/antiprotonCumulantsMc.cxx
index f0398450cae..3da35749d11 100644
--- a/.conflict-base-0/PWGCF/EbyEFluctuations/Tasks/antiprotonCumulantsMc.cxx
+++ b/.conflict-base-0/PWGCF/EbyEFluctuations/Tasks/antiprotonCumulantsMc.cxx
@@ -13,48 +13,49 @@
 /// \brief Task for analyzing efficiency of proton, and net-proton distributions in MC reconstructed and generated, and calculating net-proton cumulants
 /// \author Swati Saha
 
-#include <CCDB/BasicCCDBManager.h>
-#include <cstdlib>
-#include <cmath>
-#include <array>
-#include <vector>
-#include <string>
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/StepTHn.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/PIDResponseITS.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CommonConstants/PhysicsConstants.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "DataFormatsParameters/GRPObject.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include <TList.h>
-#include <TProfile.h>
-#include <TProfile2D.h>
-#include <TRandom3.h>
-#include <TMath.h>
-#include <TH1F.h>
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+#include <CCDB/BasicCCDBManager.h>
+
 #include <TDirectory.h>
+#include <TF1.h>
+#include <TFile.h>
+#include <TH1F.h>
+#include <TH2F.h>
 #include <THn.h>
+#include <TList.h>
 #include <TLorentzVector.h>
 #include <TMath.h>
 #include <TObjArray.h>
-#include <TFile.h>
-#include <TH2F.h>
-#include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <TF1.h>
+#include <TProfile.h>
+#include <TProfile2D.h>
+#include <TRandom3.h>
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGCF/EbyEFluctuations/Tasks/kaonIsospinFluctuations.cxx b/.conflict-base-0/PWGCF/EbyEFluctuations/Tasks/kaonIsospinFluctuations.cxx
index 4170d078843..7284bbc329b 100644
--- a/.conflict-base-0/PWGCF/EbyEFluctuations/Tasks/kaonIsospinFluctuations.cxx
+++ b/.conflict-base-0/PWGCF/EbyEFluctuations/Tasks/kaonIsospinFluctuations.cxx
@@ -14,22 +14,21 @@
 ///
 /// \author Rahul Verma (rahul.verma@iitb.ac.in) :: Sadhana Dash (sadhana@phy.iitb.ac.in)
 
-#include <algorithm>
-#include <vector>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/O2DatabasePDGPlugin.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/DataModel/mcCentrality.h"
 
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 
-#include "PWGLF/DataModel/mcCentrality.h"
+#include <algorithm>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGCF/EbyEFluctuations/Tasks/meanPtFlucId.cxx b/.conflict-base-0/PWGCF/EbyEFluctuations/Tasks/meanPtFlucId.cxx
index d6eca57ad0e..e010e737227 100644
--- a/.conflict-base-0/PWGCF/EbyEFluctuations/Tasks/meanPtFlucId.cxx
+++ b/.conflict-base-0/PWGCF/EbyEFluctuations/Tasks/meanPtFlucId.cxx
@@ -16,26 +16,27 @@
 ///
 /// \author Tanu Gahlaut <tanu.gahlaut@cern.ch>
 
-#include <utility>
-#include <vector>
-#include <string>
-#include <TPDGCode.h>
+#include "Common/Core/RecoDecay.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "CCDB/BasicCCDBManager.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/HistogramSpec.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/Core/RecoDecay.h"
-#include "CCDB/BasicCCDBManager.h"
+#include <TPDGCode.h>
+
+#include <string>
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGCF/EbyEFluctuations/Tasks/nchCumulantsId.cxx b/.conflict-base-0/PWGCF/EbyEFluctuations/Tasks/nchCumulantsId.cxx
index 2d4ba400285..acd5185be1b 100644
--- a/.conflict-base-0/PWGCF/EbyEFluctuations/Tasks/nchCumulantsId.cxx
+++ b/.conflict-base-0/PWGCF/EbyEFluctuations/Tasks/nchCumulantsId.cxx
@@ -13,8 +13,11 @@
 /// \brief Event by Event conserved charges fluctuations
 /// \author Pravata Panigrahi <pravata.panigrahi@cern.ch> :: Sadhana Dash(sadhana@phy.iitb.ac.in)
 
-#include <algorithm>
-#include <vector>
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
@@ -24,11 +27,8 @@
 #include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/runDataProcessing.h"
 
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include <algorithm>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGCF/EbyEFluctuations/Tasks/netprotonCumulantsMc.cxx b/.conflict-base-0/PWGCF/EbyEFluctuations/Tasks/netprotonCumulantsMc.cxx
index 36a797a17a9..62318743462 100644
--- a/.conflict-base-0/PWGCF/EbyEFluctuations/Tasks/netprotonCumulantsMc.cxx
+++ b/.conflict-base-0/PWGCF/EbyEFluctuations/Tasks/netprotonCumulantsMc.cxx
@@ -13,48 +13,49 @@
 /// \brief Task for analyzing efficiency of proton, and net-proton distributions in MC reconstructed and generated, and calculating net-proton cumulants
 /// \author Swati Saha
 
-#include <CCDB/BasicCCDBManager.h>
-#include <cstdlib>
-#include <cmath>
-#include <array>
-#include <vector>
-#include <string>
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/StepTHn.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/PIDResponseITS.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CommonConstants/PhysicsConstants.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "DataFormatsParameters/GRPObject.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include <TList.h>
-#include <TProfile.h>
-#include <TProfile2D.h>
-#include <TRandom3.h>
-#include <TMath.h>
-#include <TH1F.h>
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+#include <CCDB/BasicCCDBManager.h>
+
 #include <TDirectory.h>
+#include <TF1.h>
+#include <TFile.h>
+#include <TH1F.h>
+#include <TH2F.h>
 #include <THn.h>
+#include <TList.h>
 #include <TLorentzVector.h>
 #include <TMath.h>
 #include <TObjArray.h>
-#include <TFile.h>
-#include <TH2F.h>
-#include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <TF1.h>
+#include <TProfile.h>
+#include <TProfile2D.h>
+#include <TRandom3.h>
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGCF/Femto/DataModel/PionDeuteronTables.h b/.conflict-base-0/PWGCF/Femto/DataModel/PionDeuteronTables.h
index 89754a8cc97..89fc4cdfa8f 100644
--- a/.conflict-base-0/PWGCF/Femto/DataModel/PionDeuteronTables.h
+++ b/.conflict-base-0/PWGCF/Femto/DataModel/PionDeuteronTables.h
@@ -15,8 +15,8 @@
 /// \author CMY
 /// \date 2025-04-10
 
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
 
 #ifndef PWGCF_FEMTO_DATAMODEL_PIONDEUTERONTABLES_H_
 #define PWGCF_FEMTO_DATAMODEL_PIONDEUTERONTABLES_H_
diff --git a/.conflict-base-0/PWGCF/Femto3D/Core/femto3dPairTask.h b/.conflict-base-0/PWGCF/Femto3D/Core/femto3dPairTask.h
index db5949f4ae0..12638089841 100755
--- a/.conflict-base-0/PWGCF/Femto3D/Core/femto3dPairTask.h
+++ b/.conflict-base-0/PWGCF/Femto3D/Core/femto3dPairTask.h
@@ -24,14 +24,15 @@
 // #include "Framework/Logger.h"
 // #include "Common/DataModel/Multiplicity.h"
 
-#include <vector>
-#include <memory>
+#include "CommonConstants/MathConstants.h"
+#include "CommonConstants/PhysicsConstants.h"
+
+#include "TDatabasePDG.h"
 #include "TLorentzVector.h"
 #include "TVector3.h"
-#include "TDatabasePDG.h"
 
-#include "CommonConstants/PhysicsConstants.h"
-#include "CommonConstants/MathConstants.h"
+#include <memory>
+#include <vector>
 
 double particle_mass(const int PDGcode)
 {
diff --git a/.conflict-base-0/PWGCF/Femto3D/DataModel/PIDutils.h b/.conflict-base-0/PWGCF/Femto3D/DataModel/PIDutils.h
index 9e28f7b5863..2c2eda3e2ce 100644
--- a/.conflict-base-0/PWGCF/Femto3D/DataModel/PIDutils.h
+++ b/.conflict-base-0/PWGCF/Femto3D/DataModel/PIDutils.h
@@ -19,10 +19,11 @@
 #ifndef PWGCF_FEMTO3D_DATAMODEL_PIDUTILS_H_
 #define PWGCF_FEMTO3D_DATAMODEL_PIDUTILS_H_
 
+#include "Common/DataModel/PIDResponse.h"
+
 #include <type_traits>
 #include <utility>
 #include <vector>
-#include "Common/DataModel/PIDResponse.h"
 
 namespace o2::aod::singletrackselector
 {
diff --git a/.conflict-base-0/PWGCF/Femto3D/DataModel/singletrackselector.h b/.conflict-base-0/PWGCF/Femto3D/DataModel/singletrackselector.h
index c7323d15a32..2156db8bf2e 100644
--- a/.conflict-base-0/PWGCF/Femto3D/DataModel/singletrackselector.h
+++ b/.conflict-base-0/PWGCF/Femto3D/DataModel/singletrackselector.h
@@ -17,16 +17,18 @@
 #define PWGCF_FEMTO3D_DATAMODEL_SINGLETRACKSELECTOR_H_
 
 // #include <experimental/type_traits>
-#include <utility>
-#include <vector>
+#include "PWGCF/Femto3D/DataModel/PIDutils.h"
 
-#include "Framework/ASoA.h"
-#include "Framework/AnalysisDataModel.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/PIDResponseITS.h"
+
+#include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
 #include "Framework/Logger.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "PWGCF/Femto3D/DataModel/PIDutils.h"
+
+#include <utility>
+#include <vector>
 
 namespace o2::aod
 {
diff --git a/.conflict-base-0/PWGCF/Femto3D/TableProducer/Converters/singleTrackSelectorConverter.cxx b/.conflict-base-0/PWGCF/Femto3D/TableProducer/Converters/singleTrackSelectorConverter.cxx
index 4a44e331e9b..5ca57c11369 100644
--- a/.conflict-base-0/PWGCF/Femto3D/TableProducer/Converters/singleTrackSelectorConverter.cxx
+++ b/.conflict-base-0/PWGCF/Femto3D/TableProducer/Converters/singleTrackSelectorConverter.cxx
@@ -13,11 +13,13 @@
 /// \author Sofia Tomassini, Gleb Romanenko, Nicolò Jacazio
 /// \since 03 May 2024
 
-#include <fairlogger/Logger.h>
 #include "PWGCF/Femto3D/DataModel/singletrackselector.h"
+
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
 
+#include <fairlogger/Logger.h>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-base-0/PWGCF/Femto3D/TableProducer/Converters/singleTrackSelectorConverterV1.cxx b/.conflict-base-0/PWGCF/Femto3D/TableProducer/Converters/singleTrackSelectorConverterV1.cxx
index 584760ce74a..a664b83e39d 100644
--- a/.conflict-base-0/PWGCF/Femto3D/TableProducer/Converters/singleTrackSelectorConverterV1.cxx
+++ b/.conflict-base-0/PWGCF/Femto3D/TableProducer/Converters/singleTrackSelectorConverterV1.cxx
@@ -13,11 +13,13 @@
 /// \author Sofia Tomassini, Gleb Romanenko, Nicolò Jacazio
 /// \since 03 May 2024
 
-#include <fairlogger/Logger.h>
 #include "PWGCF/Femto3D/DataModel/singletrackselector.h"
+
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
 
+#include <fairlogger/Logger.h>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-base-0/PWGCF/Femto3D/TableProducer/singleTrackSelector.cxx b/.conflict-base-0/PWGCF/Femto3D/TableProducer/singleTrackSelector.cxx
index 729538a1470..188aedb2077 100644
--- a/.conflict-base-0/PWGCF/Femto3D/TableProducer/singleTrackSelector.cxx
+++ b/.conflict-base-0/PWGCF/Femto3D/TableProducer/singleTrackSelector.cxx
@@ -13,32 +13,31 @@
 /// \author Sofia Tomassini, Gleb Romanenko, Nicolò Jacazio
 /// \since 31 May 2023
 
-#include <fairlogger/Logger.h>
-#include <Framework/AnalysisDataModel.h>
-
-#include <vector>
-#include <string>
-#include <utility>
+#include "PWGCF/Femto3D/DataModel/singletrackselector.h"
 
+#include "Common/CCDB/ctpRateFetcher.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/PIDResponseITS.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 #include "EventFiltering/Zorro.h"
 #include "EventFiltering/ZorroSummary.h"
 
-#include "PWGCF/Femto3D/DataModel/singletrackselector.h"
-
+#include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/Propagator.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/PIDResponseITS.h"
-#include "Common/CCDB/ctpRateFetcher.h"
+#include <Framework/AnalysisDataModel.h>
 
-#include "DetectorsBase/Propagator.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
+#include <fairlogger/Logger.h>
+
+#include <string>
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGCF/Femto3D/TableProducer/singleTrackSelectorExtra.cxx b/.conflict-base-0/PWGCF/Femto3D/TableProducer/singleTrackSelectorExtra.cxx
index 0f065371ca8..6387eb2b450 100644
--- a/.conflict-base-0/PWGCF/Femto3D/TableProducer/singleTrackSelectorExtra.cxx
+++ b/.conflict-base-0/PWGCF/Femto3D/TableProducer/singleTrackSelectorExtra.cxx
@@ -15,13 +15,13 @@
 
 // this task produces a dummy "SingleCollExtras" table that is now required in the analysis tasks. Needed to have a compatibility with old der. data
 
-#include <fairlogger/Logger.h>
-#include <Framework/AnalysisDataModel.h>
-
 #include "PWGCF/Femto3D/DataModel/singletrackselector.h"
 
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
+#include <Framework/AnalysisDataModel.h>
+
+#include <fairlogger/Logger.h>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGCF/Femto3D/TableProducer/singleTrackSelectorPIDMaker.cxx b/.conflict-base-0/PWGCF/Femto3D/TableProducer/singleTrackSelectorPIDMaker.cxx
index ebdc786469b..3bb5e025d7d 100644
--- a/.conflict-base-0/PWGCF/Femto3D/TableProducer/singleTrackSelectorPIDMaker.cxx
+++ b/.conflict-base-0/PWGCF/Femto3D/TableProducer/singleTrackSelectorPIDMaker.cxx
@@ -14,17 +14,17 @@
 /// \author Sofia Tomassini, Gleb Romanenko, Nicolò Jacazio
 /// \since 22 January 2025
 
-#include <fairlogger/Logger.h>
-#include <Framework/AnalysisDataModel.h>
-
-#include <vector>
-#include <string>
-#include <unordered_map>
-
 #include "PWGCF/Femto3D/DataModel/singletrackselector.h"
 
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
+#include <Framework/AnalysisDataModel.h>
+
+#include <fairlogger/Logger.h>
+
+#include <string>
+#include <unordered_map>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGCF/Femto3D/Tasks/femto3dPairTask.cxx b/.conflict-base-0/PWGCF/Femto3D/Tasks/femto3dPairTask.cxx
index 83aa740795c..bf02d11da69 100644
--- a/.conflict-base-0/PWGCF/Femto3D/Tasks/femto3dPairTask.cxx
+++ b/.conflict-base-0/PWGCF/Femto3D/Tasks/femto3dPairTask.cxx
@@ -13,31 +13,34 @@
 /// \author Sofia Tomassini, Gleb Romanenko, Nicolò Jacazio
 /// \since 31 May 2023
 
-#include <ctime>
-#include <algorithm> // std::random_shuffle
-#include <random>
-#include <chrono>
-#include <vector>
-#include <map>
-#include <memory>
-#include <utility>
-#include <TParameter.h>
-#include <TH1F.h>
-
 #include "PWGCF/Femto3D/Core/femto3dPairTask.h"
+
 #include "PWGCF/Femto3D/DataModel/singletrackselector.h"
-#include "TLorentzVector.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
+#include "Common/DataModel/Multiplicity.h"
+
 #include "Framework/ASoA.h"
-#include "Framework/DataTypes.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/DataTypes.h"
 #include "Framework/Expressions.h"
+#include "Framework/HistogramRegistry.h"
 #include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
 #include "MathUtils/Utils.h"
-#include "Common/DataModel/Multiplicity.h"
+
+#include "TLorentzVector.h"
+#include <TH1F.h>
+#include <TParameter.h>
+
+#include <algorithm> // std::random_shuffle
+#include <chrono>
+#include <ctime>
+#include <map>
+#include <memory>
+#include <random>
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::soa;
diff --git a/.conflict-base-0/PWGCF/Femto3D/Tasks/femto3dPairTaskMC.cxx b/.conflict-base-0/PWGCF/Femto3D/Tasks/femto3dPairTaskMC.cxx
index b776d34e629..ecf9e90392d 100644
--- a/.conflict-base-0/PWGCF/Femto3D/Tasks/femto3dPairTaskMC.cxx
+++ b/.conflict-base-0/PWGCF/Femto3D/Tasks/femto3dPairTaskMC.cxx
@@ -13,27 +13,29 @@
 /// \author Sofia Tomassini, Gleb Romanenko, Nicolò Jacazio
 /// \since 31 May 2023
 
-#include <vector>
-#include <map>
-#include <memory>
-#include <utility>
-#include <TParameter.h>
-#include <TH1F.h>
-
 #include "PWGCF/Femto3D/Core/femto3dPairTask.h"
 #include "PWGCF/Femto3D/DataModel/singletrackselector.h"
-#include "TLorentzVector.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
+#include "Common/DataModel/Multiplicity.h"
+
 #include "Framework/ASoA.h"
-#include "Framework/DataTypes.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/DataTypes.h"
 #include "Framework/Expressions.h"
+#include "Framework/HistogramRegistry.h"
 #include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
 #include "MathUtils/Utils.h"
-#include "Common/DataModel/Multiplicity.h"
+
+#include "TLorentzVector.h"
+#include <TH1F.h>
+#include <TParameter.h>
+
+#include <map>
+#include <memory>
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::soa;
diff --git a/.conflict-base-0/PWGCF/Femto3D/Tasks/femto3dQA.cxx b/.conflict-base-0/PWGCF/Femto3D/Tasks/femto3dQA.cxx
index 64858324b48..dacc092da86 100644
--- a/.conflict-base-0/PWGCF/Femto3D/Tasks/femto3dQA.cxx
+++ b/.conflict-base-0/PWGCF/Femto3D/Tasks/femto3dQA.cxx
@@ -13,26 +13,27 @@
 /// \author Sofia Tomassini, Gleb Romanenko, Nicolò Jacazio
 /// \since 31 May 2023
 
-#include <vector>
-#include <memory>
-#include <utility>
+#include "PWGCF/Femto3D/Core/femto3dPairTask.h"
+#include "PWGCF/Femto3D/DataModel/singletrackselector.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include <TParameter.h>
-#include <TH1F.h>
+#include "Common/DataModel/Multiplicity.h"
 
 #include "Framework/ASoA.h"
-#include "MathUtils/Utils.h"
-#include "Framework/DataTypes.h"
-#include "Common/DataModel/Multiplicity.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/DataTypes.h"
 #include "Framework/Expressions.h"
-
+#include "Framework/HistogramRegistry.h"
 #include "Framework/StaticFor.h"
-#include "PWGCF/Femto3D/DataModel/singletrackselector.h"
-#include "PWGCF/Femto3D/Core/femto3dPairTask.h"
+#include "Framework/runDataProcessing.h"
+#include "MathUtils/Utils.h"
+
+#include <TH1F.h>
+#include <TParameter.h>
+
+#include <memory>
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::soa;
diff --git a/.conflict-base-0/PWGCF/Femto3D/Tools/checkPacking.cxx b/.conflict-base-0/PWGCF/Femto3D/Tools/checkPacking.cxx
index 51d26443200..e71c73ac2cb 100644
--- a/.conflict-base-0/PWGCF/Femto3D/Tools/checkPacking.cxx
+++ b/.conflict-base-0/PWGCF/Femto3D/Tools/checkPacking.cxx
@@ -17,8 +17,9 @@
 ///
 
 #include "PWGCF/Femto3D/DataModel/singletrackselector.h"
-#include "TH1F.h"
+
 #include "TCanvas.h"
+#include "TH1F.h"
 #include "TRandom.h"
 
 using namespace o2;
diff --git a/.conflict-base-0/PWGCF/FemtoDream/Core/femtoDreamCascadeSelection.h b/.conflict-base-0/PWGCF/FemtoDream/Core/femtoDreamCascadeSelection.h
index 2a07c851d09..a861036d640 100644
--- a/.conflict-base-0/PWGCF/FemtoDream/Core/femtoDreamCascadeSelection.h
+++ b/.conflict-base-0/PWGCF/FemtoDream/Core/femtoDreamCascadeSelection.h
@@ -22,20 +22,21 @@
 #ifndef PWGCF_FEMTODREAM_CORE_FEMTODREAMCASCADESELECTION_H_
 #define PWGCF_FEMTODREAM_CORE_FEMTODREAMCASCADESELECTION_H_
 
-#include <iostream>
-#include <string>
-#include <vector>
-
-#include <TDatabasePDG.h> // FIXME
-
 #include "PWGCF/FemtoDream/Core/femtoDreamObjectSelection.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamSelection.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamTrackSelection.h"
 
 #include "Common/Core/RecoDecay.h"
+
 #include "Framework/HistogramRegistry.h"
 #include "ReconstructionDataFormats/PID.h"
 
+#include <TDatabasePDG.h> // FIXME
+
+#include <iostream>
+#include <string>
+#include <vector>
+
 using namespace o2::framework;
 
 namespace o2::analysis::femtoDream
diff --git a/.conflict-base-0/PWGCF/FemtoDream/Core/femtoDreamCollisionSelection.h b/.conflict-base-0/PWGCF/FemtoDream/Core/femtoDreamCollisionSelection.h
index 8fe58ce9d7b..b0b56eaf92b 100644
--- a/.conflict-base-0/PWGCF/FemtoDream/Core/femtoDreamCollisionSelection.h
+++ b/.conflict-base-0/PWGCF/FemtoDream/Core/femtoDreamCollisionSelection.h
@@ -16,13 +16,15 @@
 #ifndef PWGCF_FEMTODREAM_CORE_FEMTODREAMCOLLISIONSELECTION_H_
 #define PWGCF_FEMTODREAM_CORE_FEMTODREAMCOLLISIONSELECTION_H_
 
-#include <string>
-#include <iostream>
 #include "Common/CCDB/TriggerAliases.h"
 #include "Common/DataModel/EventSelection.h"
+
 #include "Framework/HistogramRegistry.h"
 #include "Framework/Logger.h"
 
+#include <iostream>
+#include <string>
+
 using namespace o2::framework;
 
 namespace o2::analysis::femtoDream
diff --git a/.conflict-base-0/PWGCF/FemtoDream/Core/femtoDreamContainer.h b/.conflict-base-0/PWGCF/FemtoDream/Core/femtoDreamContainer.h
index 5e0222a4f07..78a25e29c08 100644
--- a/.conflict-base-0/PWGCF/FemtoDream/Core/femtoDreamContainer.h
+++ b/.conflict-base-0/PWGCF/FemtoDream/Core/femtoDreamContainer.h
@@ -19,18 +19,20 @@
 #ifndef PWGCF_FEMTODREAM_CORE_FEMTODREAMCONTAINER_H_
 #define PWGCF_FEMTODREAM_CORE_FEMTODREAMCONTAINER_H_
 
-#include <fairlogger/Logger.h>
-#include <vector>
-#include <string>
-
-#include "Framework/HistogramRegistry.h"
+#include "PWGCF/DataModel/FemtoDerived.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamMath.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
-#include "PWGCF/DataModel/FemtoDerived.h"
+
+#include "Framework/HistogramRegistry.h"
 
 #include "Math/Vector4D.h"
 #include "TMath.h"
 
+#include <fairlogger/Logger.h>
+
+#include <string>
+#include <vector>
+
 using namespace o2::framework;
 
 namespace o2::analysis::femtoDream
diff --git a/.conflict-base-0/PWGCF/FemtoDream/Core/femtoDreamContainerThreeBody.h b/.conflict-base-0/PWGCF/FemtoDream/Core/femtoDreamContainerThreeBody.h
index a6c60793060..fdfc05252b0 100644
--- a/.conflict-base-0/PWGCF/FemtoDream/Core/femtoDreamContainerThreeBody.h
+++ b/.conflict-base-0/PWGCF/FemtoDream/Core/femtoDreamContainerThreeBody.h
@@ -20,16 +20,18 @@
 #ifndef PWGCF_FEMTODREAM_CORE_FEMTODREAMCONTAINERTHREEBODY_H_
 #define PWGCF_FEMTODREAM_CORE_FEMTODREAMCONTAINERTHREEBODY_H_
 
-#include <fairlogger/Logger.h>
-#include <vector>
-#include <string>
+#include "PWGCF/FemtoDream/Core/femtoDreamMath.h"
 
 #include "Framework/HistogramRegistry.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamMath.h"
 
 #include "Math/Vector4D.h"
-#include "TMath.h"
 #include "TDatabasePDG.h"
+#include "TMath.h"
+
+#include <fairlogger/Logger.h>
+
+#include <string>
+#include <vector>
 
 using namespace o2::framework;
 
diff --git a/.conflict-base-0/PWGCF/FemtoDream/Core/femtoDreamDetaDphiStar.h b/.conflict-base-0/PWGCF/FemtoDream/Core/femtoDreamDetaDphiStar.h
index 58dc6c9ded4..23f35a9af9c 100644
--- a/.conflict-base-0/PWGCF/FemtoDream/Core/femtoDreamDetaDphiStar.h
+++ b/.conflict-base-0/PWGCF/FemtoDream/Core/femtoDreamDetaDphiStar.h
@@ -16,11 +16,13 @@
 #ifndef PWGCF_FEMTODREAM_CORE_FEMTODREAMDETADPHISTAR_H_
 #define PWGCF_FEMTODREAM_CORE_FEMTODREAMDETADPHISTAR_H_
 
+#include "PWGCF/DataModel/FemtoDerived.h"
+
+#include "Framework/HistogramRegistry.h"
+
 #include <memory>
 #include <string>
 #include <vector>
-#include "PWGCF/DataModel/FemtoDerived.h"
-#include "Framework/HistogramRegistry.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGCF/FemtoDream/Core/femtoDreamEventHisto.h b/.conflict-base-0/PWGCF/FemtoDream/Core/femtoDreamEventHisto.h
index 2d668d15c58..23bbbccce64 100644
--- a/.conflict-base-0/PWGCF/FemtoDream/Core/femtoDreamEventHisto.h
+++ b/.conflict-base-0/PWGCF/FemtoDream/Core/femtoDreamEventHisto.h
@@ -17,6 +17,7 @@
 #define PWGCF_FEMTODREAM_CORE_FEMTODREAMEVENTHISTO_H_
 
 #include "PWGCF/DataModel/FemtoDerived.h"
+
 #include "Framework/HistogramRegistry.h"
 
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGCF/FemtoDream/Core/femtoDreamMath.h b/.conflict-base-0/PWGCF/FemtoDream/Core/femtoDreamMath.h
index aba07f96c9c..7a895486cc0 100644
--- a/.conflict-base-0/PWGCF/FemtoDream/Core/femtoDreamMath.h
+++ b/.conflict-base-0/PWGCF/FemtoDream/Core/femtoDreamMath.h
@@ -16,13 +16,13 @@
 #ifndef PWGCF_FEMTODREAM_CORE_FEMTODREAMMATH_H_
 #define PWGCF_FEMTODREAM_CORE_FEMTODREAMMATH_H_
 
-#include <iostream>
-
-#include "Math/Vector4D.h"
 #include "Math/Boost.h"
+#include "Math/Vector4D.h"
 #include "TLorentzVector.h"
 #include "TMath.h"
 
+#include <iostream>
+
 namespace o2::analysis::femtoDream
 {
 
diff --git a/.conflict-base-0/PWGCF/FemtoDream/Core/femtoDreamObjectSelection.h b/.conflict-base-0/PWGCF/FemtoDream/Core/femtoDreamObjectSelection.h
index d01ce564f66..b89c87a2037 100644
--- a/.conflict-base-0/PWGCF/FemtoDream/Core/femtoDreamObjectSelection.h
+++ b/.conflict-base-0/PWGCF/FemtoDream/Core/femtoDreamObjectSelection.h
@@ -16,15 +16,16 @@
 #ifndef PWGCF_FEMTODREAM_CORE_FEMTODREAMOBJECTSELECTION_H_
 #define PWGCF_FEMTODREAM_CORE_FEMTODREAMOBJECTSELECTION_H_
 
+#include "PWGCF/DataModel/FemtoDerived.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamSelection.h"
+
+#include "Framework/HistogramRegistry.h"
+#include "ReconstructionDataFormats/PID.h"
+
 #include <algorithm>
 #include <string>
 #include <vector>
 
-#include "PWGCF/FemtoDream/Core/femtoDreamSelection.h"
-#include "ReconstructionDataFormats/PID.h"
-#include "Framework/HistogramRegistry.h"
-#include "PWGCF/DataModel/FemtoDerived.h"
-
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-base-0/PWGCF/FemtoDream/Core/femtoDreamPairCleaner.h b/.conflict-base-0/PWGCF/FemtoDream/Core/femtoDreamPairCleaner.h
index 3b248657b1f..ca58aa4c18e 100644
--- a/.conflict-base-0/PWGCF/FemtoDream/Core/femtoDreamPairCleaner.h
+++ b/.conflict-base-0/PWGCF/FemtoDream/Core/femtoDreamPairCleaner.h
@@ -17,6 +17,7 @@
 #define PWGCF_FEMTODREAM_CORE_FEMTODREAMPAIRCLEANER_H_
 
 #include "PWGCF/DataModel/FemtoDerived.h"
+
 #include "Framework/HistogramRegistry.h"
 
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h b/.conflict-base-0/PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h
index 4148e8b3efc..3f771c48c1f 100644
--- a/.conflict-base-0/PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h
+++ b/.conflict-base-0/PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h
@@ -18,11 +18,14 @@
 #ifndef PWGCF_FEMTODREAM_CORE_FEMTODREAMPARTICLEHISTO_H_
 #define PWGCF_FEMTODREAM_CORE_FEMTODREAMPARTICLEHISTO_H_
 
-#include <TMath.h>
-#include <string>
 #include "PWGCF/DataModel/FemtoDerived.h"
-#include "Framework/HistogramRegistry.h"
+
 #include "CommonConstants/PhysicsConstants.h"
+#include "Framework/HistogramRegistry.h"
+
+#include <TMath.h>
+
+#include <string>
 
 using namespace o2::framework;
 
diff --git a/.conflict-base-0/PWGCF/FemtoDream/Core/femtoDreamSelection.h b/.conflict-base-0/PWGCF/FemtoDream/Core/femtoDreamSelection.h
index 0e3592bf650..d50d10e929c 100644
--- a/.conflict-base-0/PWGCF/FemtoDream/Core/femtoDreamSelection.h
+++ b/.conflict-base-0/PWGCF/FemtoDream/Core/femtoDreamSelection.h
@@ -16,10 +16,12 @@
 #ifndef PWGCF_FEMTODREAM_CORE_FEMTODREAMSELECTION_H_
 #define PWGCF_FEMTODREAM_CORE_FEMTODREAMSELECTION_H_
 
-#include <cmath>
-#include "Framework/HistogramRegistry.h"
 #include "PWGCF/DataModel/FemtoDerived.h"
 
+#include "Framework/HistogramRegistry.h"
+
+#include <cmath>
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-base-0/PWGCF/FemtoDream/Core/femtoDreamTrackSelection.h b/.conflict-base-0/PWGCF/FemtoDream/Core/femtoDreamTrackSelection.h
index 9cab0f9e78b..78cf91947eb 100644
--- a/.conflict-base-0/PWGCF/FemtoDream/Core/femtoDreamTrackSelection.h
+++ b/.conflict-base-0/PWGCF/FemtoDream/Core/femtoDreamTrackSelection.h
@@ -17,20 +17,22 @@
 #ifndef PWGCF_FEMTODREAM_CORE_FEMTODREAMTRACKSELECTION_H_
 #define PWGCF_FEMTODREAM_CORE_FEMTODREAMTRACKSELECTION_H_
 
-#include <string>
-#include <vector>
-#include <cmath>
-#include <iostream>
-
 #include "PWGCF/DataModel/FemtoDerived.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/PIDResponseITS.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamObjectSelection.h"
+
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamObjectSelection.h"
-#include "ReconstructionDataFormats/PID.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/PIDResponseITS.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/HistogramRegistry.h"
+#include "ReconstructionDataFormats/PID.h"
+
+#include <cmath>
+#include <iostream>
+#include <string>
+#include <vector>
 
 using namespace o2::framework;
 
diff --git a/.conflict-base-0/PWGCF/FemtoDream/Core/femtoDreamUtils.h b/.conflict-base-0/PWGCF/FemtoDream/Core/femtoDreamUtils.h
index c5db8dcc70e..b03de6e9f06 100644
--- a/.conflict-base-0/PWGCF/FemtoDream/Core/femtoDreamUtils.h
+++ b/.conflict-base-0/PWGCF/FemtoDream/Core/femtoDreamUtils.h
@@ -16,11 +16,13 @@
 #ifndef PWGCF_FEMTODREAM_CORE_FEMTODREAMUTILS_H_
 #define PWGCF_FEMTODREAM_CORE_FEMTODREAMUTILS_H_
 
-#include <vector>
-#include <string>
-#include "CommonConstants/PhysicsConstants.h"
 #include "PWGCF/DataModel/FemtoDerived.h"
 
+#include "CommonConstants/PhysicsConstants.h"
+
+#include <string>
+#include <vector>
+
 namespace o2::analysis::femtoDream
 {
 
diff --git a/.conflict-base-0/PWGCF/FemtoDream/Core/femtoDreamV0Selection.h b/.conflict-base-0/PWGCF/FemtoDream/Core/femtoDreamV0Selection.h
index 40158105a5b..fde9af93474 100644
--- a/.conflict-base-0/PWGCF/FemtoDream/Core/femtoDreamV0Selection.h
+++ b/.conflict-base-0/PWGCF/FemtoDream/Core/femtoDreamV0Selection.h
@@ -18,18 +18,19 @@
 #ifndef PWGCF_FEMTODREAM_CORE_FEMTODREAMV0SELECTION_H_
 #define PWGCF_FEMTODREAM_CORE_FEMTODREAMV0SELECTION_H_
 
-#include <iostream>
-#include <string>
-#include <vector>
-
 #include "PWGCF/FemtoDream/Core/femtoDreamObjectSelection.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamSelection.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamTrackSelection.h"
 
 #include "Common/Core/RecoDecay.h"
+
 #include "Framework/HistogramRegistry.h"
 #include "ReconstructionDataFormats/PID.h"
 
+#include <iostream>
+#include <string>
+#include <vector>
+
 using namespace o2::framework;
 
 namespace o2::analysis::femtoDream
diff --git a/.conflict-base-0/PWGCF/FemtoDream/TableProducer/femtoDreamProducerReducedTask.cxx b/.conflict-base-0/PWGCF/FemtoDream/TableProducer/femtoDreamProducerReducedTask.cxx
index a879a18517f..69a39e24b07 100644
--- a/.conflict-base-0/PWGCF/FemtoDream/TableProducer/femtoDreamProducerReducedTask.cxx
+++ b/.conflict-base-0/PWGCF/FemtoDream/TableProducer/femtoDreamProducerReducedTask.cxx
@@ -15,29 +15,33 @@
 /// \author Georgios Mantzaridis, TU München, georgios.mantzaridis@tum.de
 /// \author Anton Riedel, TU München, anton.riedel@tum.de
 
-#include <vector>
-#include "TMath.h"
-#include "CCDB/BasicCCDBManager.h"
+#include "PWGCF/DataModel/FemtoDerived.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamCollisionSelection.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamTrackSelection.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
-#include "PWGCF/DataModel/FemtoDerived.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/PIDResponseITS.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/PIDResponseITS.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+
 #include "Math/Vector4D.h"
+#include "TMath.h"
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis::femtoDream;
diff --git a/.conflict-base-0/PWGCF/FemtoDream/TableProducer/femtoDreamProducerTask.cxx b/.conflict-base-0/PWGCF/FemtoDream/TableProducer/femtoDreamProducerTask.cxx
index 7272382f357..a92292fafaa 100644
--- a/.conflict-base-0/PWGCF/FemtoDream/TableProducer/femtoDreamProducerTask.cxx
+++ b/.conflict-base-0/PWGCF/FemtoDream/TableProducer/femtoDreamProducerTask.cxx
@@ -13,35 +13,40 @@
 /// \brief Tasks that produces the track tables used for the pairing
 /// \author Laura Serksnyte, TU München, laura.serksnyte@tum.de
 
-#include <CCDB/BasicCCDBManager.h>
-#include <fairlogger/Logger.h>
-#include <vector>
-#include <string>
+#include "PWGCF/DataModel/FemtoDerived.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamCascadeSelection.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamCollisionSelection.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamTrackSelection.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamV0Selection.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/PIDResponseITS.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+#include "EventFiltering/Zorro.h"
+
 #include "DataFormatsParameters/GRPMagField.h"
 #include "DataFormatsParameters/GRPObject.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamCollisionSelection.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamTrackSelection.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamV0Selection.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamCascadeSelection.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
-#include "EventFiltering/Zorro.h"
-#include "PWGCF/DataModel/FemtoDerived.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "TMath.h"
+#include <CCDB/BasicCCDBManager.h>
+
 #include "Math/Vector4D.h"
+#include "TMath.h"
+
+#include <fairlogger/Logger.h>
+
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGCF/FemtoDream/TableProducer/femtoDreamProducerTaskWithCascades.cxx b/.conflict-base-0/PWGCF/FemtoDream/TableProducer/femtoDreamProducerTaskWithCascades.cxx
index a7e02ec87e6..e76c0245622 100644
--- a/.conflict-base-0/PWGCF/FemtoDream/TableProducer/femtoDreamProducerTaskWithCascades.cxx
+++ b/.conflict-base-0/PWGCF/FemtoDream/TableProducer/femtoDreamProducerTaskWithCascades.cxx
@@ -13,35 +13,40 @@
 /// \brief Tasks that produces the track tables used for the pairing
 /// \author Laura Serksnyte, TU München, laura.serksnyte@tum.de
 
-#include <CCDB/BasicCCDBManager.h>
-#include <fairlogger/Logger.h>
-#include <vector>
-#include <string>
+#include "PWGCF/DataModel/FemtoDerived.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamCascadeSelection.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamCollisionSelection.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamTrackSelection.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamV0Selection.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/PIDResponseITS.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+#include "EventFiltering/Zorro.h"
+
 #include "DataFormatsParameters/GRPMagField.h"
 #include "DataFormatsParameters/GRPObject.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamCollisionSelection.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamTrackSelection.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamV0Selection.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamCascadeSelection.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
-#include "EventFiltering/Zorro.h"
-#include "PWGCF/DataModel/FemtoDerived.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "TMath.h"
+#include <CCDB/BasicCCDBManager.h>
+
 #include "Math/Vector4D.h"
+#include "TMath.h"
+
+#include <fairlogger/Logger.h>
+
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGCF/FemtoDream/Tasks/femtoDreamCollisionMasker.cxx b/.conflict-base-0/PWGCF/FemtoDream/Tasks/femtoDreamCollisionMasker.cxx
index fddbee16a88..b0bfcf727c5 100644
--- a/.conflict-base-0/PWGCF/FemtoDream/Tasks/femtoDreamCollisionMasker.cxx
+++ b/.conflict-base-0/PWGCF/FemtoDream/Tasks/femtoDreamCollisionMasker.cxx
@@ -14,23 +14,24 @@
 /// \author Anton Riedel, TU München, anton.riedel@tum.de
 /// \author Laura Serksnyte, TU München, laura.serksnyte@tum.de
 
-#include <cstdint>
-#include <vector>
-#include <string>
-#include <bitset>
-#include <algorithm>
-#include <random>
-#include <chrono>
+#include "PWGCF/DataModel/FemtoDerived.h"
 
-#include "fairlogger/Logger.h"
-#include "Framework/Configurable.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
+#include "Framework/Configurable.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
 
-#include "PWGCF/DataModel/FemtoDerived.h"
+#include "fairlogger/Logger.h"
+
+#include <algorithm>
+#include <bitset>
+#include <chrono>
+#include <cstdint>
+#include <random>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-base-0/PWGCF/FemtoDream/Tasks/femtoDreamDebugCascade.cxx b/.conflict-base-0/PWGCF/FemtoDream/Tasks/femtoDreamDebugCascade.cxx
index 54324361ec0..47f77a2732a 100644
--- a/.conflict-base-0/PWGCF/FemtoDream/Tasks/femtoDreamDebugCascade.cxx
+++ b/.conflict-base-0/PWGCF/FemtoDream/Tasks/femtoDreamDebugCascade.cxx
@@ -14,23 +14,25 @@
 /// \author Luca Barioglio, TU München, luca.barioglio@cern.ch
 /// \author Georgios Mantzaridis, TU München, luca.barioglio@cern.ch
 
-#include <cstdint>
-#include <iostream>
-#include <vector>
+#include "PWGCF/DataModel/FemtoDerived.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamEventHisto.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamMath.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
+
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/runDataProcessing.h"
+
 #include "fairlogger/Logger.h"
 
-#include "PWGCF/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamEventHisto.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamMath.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
+#include <cstdint>
+#include <iostream>
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis::femtoDream;
diff --git a/.conflict-base-0/PWGCF/FemtoDream/Tasks/femtoDreamDebugTrack.cxx b/.conflict-base-0/PWGCF/FemtoDream/Tasks/femtoDreamDebugTrack.cxx
index 68fab988fb9..71fdcdb426c 100644
--- a/.conflict-base-0/PWGCF/FemtoDream/Tasks/femtoDreamDebugTrack.cxx
+++ b/.conflict-base-0/PWGCF/FemtoDream/Tasks/femtoDreamDebugTrack.cxx
@@ -13,7 +13,10 @@
 /// \brief Tasks that reads the particle tables and fills QA histograms for tracks
 /// \author Luca Barioglio, TU München, luca.barioglio@cern.ch
 
-#include <Framework/Expressions.h>
+#include "PWGCF/DataModel/FemtoDerived.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamEventHisto.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h"
+
 #include "DataFormatsParameters/GRPObject.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
@@ -21,10 +24,7 @@
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
 #include "Framework/runDataProcessing.h"
-
-#include "PWGCF/FemtoDream/Core/femtoDreamEventHisto.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h"
-#include "PWGCF/DataModel/FemtoDerived.h"
+#include <Framework/Expressions.h>
 
 using namespace o2;
 using namespace o2::analysis::femtoDream;
diff --git a/.conflict-base-0/PWGCF/FemtoDream/Tasks/femtoDreamDebugV0.cxx b/.conflict-base-0/PWGCF/FemtoDream/Tasks/femtoDreamDebugV0.cxx
index 91010d4368e..3dc0c5f9875 100644
--- a/.conflict-base-0/PWGCF/FemtoDream/Tasks/femtoDreamDebugV0.cxx
+++ b/.conflict-base-0/PWGCF/FemtoDream/Tasks/femtoDreamDebugV0.cxx
@@ -13,24 +13,25 @@
 /// \brief Tasks that reads the particle tables and fills QA histograms for V0s
 /// \author Luca Barioglio, TU München, luca.barioglio@cern.ch
 
-#include <cstdint>
-#include <iostream>
-#include <vector>
-
-#include "TVector3.h"
+#include "PWGCF/DataModel/FemtoDerived.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamEventHisto.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h"
 
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TVector3.h"
+
 #include "fairlogger/Logger.h"
 
-#include "PWGCF/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamEventHisto.h"
+#include <cstdint>
+#include <iostream>
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis::femtoDream;
diff --git a/.conflict-base-0/PWGCF/FemtoDream/Tasks/femtoDreamHashTask.cxx b/.conflict-base-0/PWGCF/FemtoDream/Tasks/femtoDreamHashTask.cxx
index fe0aa6c0e3d..00ecf5a4af1 100644
--- a/.conflict-base-0/PWGCF/FemtoDream/Tasks/femtoDreamHashTask.cxx
+++ b/.conflict-base-0/PWGCF/FemtoDream/Tasks/femtoDreamHashTask.cxx
@@ -15,10 +15,12 @@
 /// \author Andi Mathis, TU München, andreas.mathis@ph.tum.de
 
 #include "PWGCF/DataModel/FemtoDerived.h"
+
 #include "Common/Core/EventMixing.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "Framework/ASoAHelpers.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGCF/FemtoDream/Tasks/femtoDreamPairTaskTrackCascade.cxx b/.conflict-base-0/PWGCF/FemtoDream/Tasks/femtoDreamPairTaskTrackCascade.cxx
index 05696761afa..cbf191e34cd 100644
--- a/.conflict-base-0/PWGCF/FemtoDream/Tasks/femtoDreamPairTaskTrackCascade.cxx
+++ b/.conflict-base-0/PWGCF/FemtoDream/Tasks/femtoDreamPairTaskTrackCascade.cxx
@@ -11,23 +11,26 @@
 /// \file femtoDreamPairTaskTrackTrack.cxx
 /// \brief Tasks that reads the track tables used for the pairing and builds pairs of two tracks
 /// \author Andi Mathis, TU München, andreas.mathis@ph.tum.de
-#include <sys/stat.h>
-#include <cstdint>
-#include <vector>
-#include <string>
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/Expressions.h"
 #include "PWGCF/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamEventHisto.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamPairCleaner.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamContainer.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamDetaDphiStar.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamEventHisto.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamPairCleaner.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/Expressions.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+
+#include <sys/stat.h>
+
+#include <cstdint>
+#include <string>
+#include <vector>
 using namespace o2;
 using namespace o2::aod;
 using namespace o2::soa;
diff --git a/.conflict-base-0/PWGCF/FemtoDream/Tasks/femtoDreamPairTaskTrackTrack.cxx b/.conflict-base-0/PWGCF/FemtoDream/Tasks/femtoDreamPairTaskTrackTrack.cxx
index 9f080fd2dd0..2e2eda2f68e 100644
--- a/.conflict-base-0/PWGCF/FemtoDream/Tasks/femtoDreamPairTaskTrackTrack.cxx
+++ b/.conflict-base-0/PWGCF/FemtoDream/Tasks/femtoDreamPairTaskTrackTrack.cxx
@@ -15,28 +15,30 @@
 /// \author Georgios Mantzaridis, TU München, georgios.mantzaridis@tum.de
 /// \author Anton Riedel, TU München, anton.riedel@tum.de
 
-#include <cstdint>
-#include <vector>
-#include <bitset>
-#include <string>
-#include "TRandom3.h"
+#include "PWGCF/DataModel/FemtoDerived.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamContainer.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamDetaDphiStar.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamEventHisto.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamPairCleaner.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
+#include "Framework/Configurable.h"
+#include "Framework/Expressions.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
+#include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "Framework/Configurable.h"
-#include "Framework/Expressions.h"
+#include "Framework/runDataProcessing.h"
 
-#include "PWGCF/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamEventHisto.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamPairCleaner.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamContainer.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamDetaDphiStar.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
+#include "TRandom3.h"
+
+#include <bitset>
+#include <cstdint>
+#include <string>
+#include <vector>
 
 using namespace o2::aod;
 using namespace o2::soa;
diff --git a/.conflict-base-0/PWGCF/FemtoDream/Tasks/femtoDreamPairTaskTrackV0.cxx b/.conflict-base-0/PWGCF/FemtoDream/Tasks/femtoDreamPairTaskTrackV0.cxx
index 7798f3d59c8..428375e1cf9 100644
--- a/.conflict-base-0/PWGCF/FemtoDream/Tasks/femtoDreamPairTaskTrackV0.cxx
+++ b/.conflict-base-0/PWGCF/FemtoDream/Tasks/femtoDreamPairTaskTrackV0.cxx
@@ -13,25 +13,27 @@
 /// \brief Tasks that reads the track tables used for the pairing and builds pairs of two tracks
 /// \author Andi Mathis, TU München, andreas.mathis@ph.tum.de
 
-#include <sys/stat.h>
-#include <cstdint>
-#include <vector>
-#include <string>
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/Expressions.h"
-
 #include "PWGCF/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamEventHisto.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamPairCleaner.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamContainer.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamDetaDphiStar.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamEventHisto.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamPairCleaner.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/Expressions.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+
+#include <sys/stat.h>
+
+#include <cstdint>
+#include <string>
+#include <vector>
+
 using namespace o2;
 using namespace o2::aod;
 using namespace o2::soa;
diff --git a/.conflict-base-0/PWGCF/FemtoDream/Tasks/femtoDreamTripletTaskTrackTrackTrack.cxx b/.conflict-base-0/PWGCF/FemtoDream/Tasks/femtoDreamTripletTaskTrackTrackTrack.cxx
index 899de5659b1..9542b6c364b 100644
--- a/.conflict-base-0/PWGCF/FemtoDream/Tasks/femtoDreamTripletTaskTrackTrackTrack.cxx
+++ b/.conflict-base-0/PWGCF/FemtoDream/Tasks/femtoDreamTripletTaskTrackTrackTrack.cxx
@@ -13,24 +13,26 @@
 /// \brief Tasks that reads the track tables and creates track triplets; only three identical particles can be used
 /// \author Laura Serksnyte, TU München, laura.serksnyte@tum.de
 
-#include <vector>
-#include <string>
+#include "PWGCF/DataModel/FemtoDerived.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamContainerThreeBody.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamDetaDphiStar.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamEventHisto.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamPairCleaner.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
+#include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TDatabasePDG.h"
 
-#include "PWGCF/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamEventHisto.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamPairCleaner.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamContainerThreeBody.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamDetaDphiStar.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis::femtoDream;
diff --git a/.conflict-base-0/PWGCF/FemtoDream/Tasks/femtoDreamTripletTaskTrackTrackV0.cxx b/.conflict-base-0/PWGCF/FemtoDream/Tasks/femtoDreamTripletTaskTrackTrackV0.cxx
index 136b8f9d5ff..a01e51ce3a8 100644
--- a/.conflict-base-0/PWGCF/FemtoDream/Tasks/femtoDreamTripletTaskTrackTrackV0.cxx
+++ b/.conflict-base-0/PWGCF/FemtoDream/Tasks/femtoDreamTripletTaskTrackTrackV0.cxx
@@ -13,25 +13,27 @@
 /// \brief Tasks that reads the track and V0 tables and creates triplets; only two identical tracks and a V0 can be used
 /// \author Laura Serksnyte, TU München, laura.serksnyte@tum.de
 
-#include <vector>
-#include <bitset>
-#include <string>
+#include "PWGCF/DataModel/FemtoDerived.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamContainerThreeBody.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamDetaDphiStar.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamEventHisto.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamPairCleaner.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
+#include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TDatabasePDG.h"
 
-#include "PWGCF/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamEventHisto.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamPairCleaner.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamContainerThreeBody.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamDetaDphiStar.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
+#include <bitset>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis::femtoDream;
diff --git a/.conflict-base-0/PWGCF/FemtoDream/Utils/femtoDreamCutCulator.cxx b/.conflict-base-0/PWGCF/FemtoDream/Utils/femtoDreamCutCulator.cxx
index d6aa862851f..a1a6653c799 100644
--- a/.conflict-base-0/PWGCF/FemtoDream/Utils/femtoDreamCutCulator.cxx
+++ b/.conflict-base-0/PWGCF/FemtoDream/Utils/femtoDreamCutCulator.cxx
@@ -13,13 +13,15 @@
 /// \brief Executable that encodes physical selection criteria in a bit-wise
 /// selection \author Andi Mathis, TU München, andreas.mathis@ph.tum.de
 
-#include <iostream>
-#include <random>
-#include <string>
 #include "PWGCF/FemtoDream/Utils/femtoDreamCutCulator.h"
+
+#include "PWGCF/DataModel/FemtoDerived.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamSelection.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamTrackSelection.h"
-#include "PWGCF/DataModel/FemtoDerived.h"
+
+#include <iostream>
+#include <random>
+#include <string>
 
 using namespace o2::analysis::femtoDream;
 
diff --git a/.conflict-base-0/PWGCF/FemtoDream/Utils/femtoDreamCutCulator.h b/.conflict-base-0/PWGCF/FemtoDream/Utils/femtoDreamCutCulator.h
index f54a9ff62a4..dea6efebb3a 100644
--- a/.conflict-base-0/PWGCF/FemtoDream/Utils/femtoDreamCutCulator.h
+++ b/.conflict-base-0/PWGCF/FemtoDream/Utils/femtoDreamCutCulator.h
@@ -18,21 +18,22 @@
 #ifndef PWGCF_FEMTODREAM_UTILS_FEMTODREAMCUTCULATOR_H_
 #define PWGCF_FEMTODREAM_UTILS_FEMTODREAMCUTCULATOR_H_
 
+#include "PWGCF/FemtoDream/Core/femtoDreamCascadeSelection.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamSelection.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamTrackSelection.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamV0Selection.h"
+
+#include <boost/property_tree/json_parser.hpp>
+#include <boost/property_tree/ptree.hpp>
+
+#include <algorithm>
 #include <bitset>
 #include <functional>
 #include <iostream>
+#include <iterator>
 #include <random>
 #include <string>
 #include <vector>
-#include <algorithm>
-#include <iterator>
-#include <boost/property_tree/json_parser.hpp>
-#include <boost/property_tree/ptree.hpp>
-
-#include "PWGCF/FemtoDream/Core/femtoDreamSelection.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamTrackSelection.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamV0Selection.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamCascadeSelection.h"
 
 namespace o2::analysis::femtoDream
 {
diff --git a/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniverse3DContainer.h b/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniverse3DContainer.h
index 864487cdcb0..4579ec9ffd7 100644
--- a/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniverse3DContainer.h
+++ b/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniverse3DContainer.h
@@ -17,15 +17,18 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSE3DCONTAINER_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSE3DCONTAINER_H_
 
-#include <fairlogger/Logger.h>
-#include <vector>
-#include <string>
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
 
 #include "Framework/HistogramRegistry.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
+
 #include "Math/Vector4D.h"
-#include "TMath.h"
 #include "TDatabasePDG.h"
+#include "TMath.h"
+
+#include <fairlogger/Logger.h>
+
+#include <string>
+#include <vector>
 
 using namespace o2::framework;
 
diff --git a/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniverseAngularContainer.h b/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniverseAngularContainer.h
index 4d267fb67d3..92a2359e497 100644
--- a/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniverseAngularContainer.h
+++ b/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniverseAngularContainer.h
@@ -20,17 +20,20 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEANGULARCONTAINER_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEANGULARCONTAINER_H_
 
-#include <fairlogger/Logger.h>
-#include <vector>
-#include <string>
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
 
-#include "Framework/HistogramRegistry.h"
 #include "Common/Core/RecoDecay.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
+
+#include "Framework/HistogramRegistry.h"
 
 #include "Math/Vector4D.h"
-#include "TMath.h"
 #include "TDatabasePDG.h"
+#include "TMath.h"
+
+#include <fairlogger/Logger.h>
+
+#include <string>
+#include <vector>
 
 using namespace o2::framework;
 
diff --git a/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniverseCascadeSelection.h b/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniverseCascadeSelection.h
index 3a389da705e..d5ddc7a1948 100644
--- a/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniverseCascadeSelection.h
+++ b/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniverseCascadeSelection.h
@@ -21,15 +21,18 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSECASCADESELECTION_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSECASCADESELECTION_H_
 
-#include <string>
-#include <vector>
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseObjectSelection.h"
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseSelection.h"
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
+
 #include "Common/Core/RecoDecay.h"
+
 #include "Framework/HistogramRegistry.h"
 #include "ReconstructionDataFormats/PID.h"
 
+#include <string>
+#include <vector>
+
 namespace o2::analysis::femto_universe
 {
 namespace femto_universe_cascade_selection
diff --git a/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniverseCollisionSelection.h b/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniverseCollisionSelection.h
index 633bba05760..ab47405cb9c 100644
--- a/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniverseCollisionSelection.h
+++ b/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniverseCollisionSelection.h
@@ -18,11 +18,13 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSECOLLISIONSELECTION_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSECOLLISIONSELECTION_H_
 
-#include <string>
 #include "Common/CCDB/TriggerAliases.h"
+
 #include "Framework/HistogramRegistry.h"
 #include "Framework/Logger.h"
 
+#include <string>
+
 using namespace o2::framework;
 
 namespace o2::analysis::femto_universe
diff --git a/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniverseCutculator.h b/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniverseCutculator.h
index 40b7c425e5c..58e278cdde7 100644
--- a/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniverseCutculator.h
+++ b/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniverseCutculator.h
@@ -18,19 +18,20 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSECUTCULATOR_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSECUTCULATOR_H_
 
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseSelection.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseV0Selection.h"
+
+#include <boost/property_tree/json_parser.hpp>
+#include <boost/property_tree/ptree.hpp>
+
+#include <algorithm>
 #include <bitset>
 #include <iostream>
+#include <iterator>
 #include <random>
 #include <string>
 #include <vector>
-#include <algorithm>
-#include <iterator>
-#include <boost/property_tree/json_parser.hpp>
-#include <boost/property_tree/ptree.hpp>
-
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseSelection.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseV0Selection.h"
 
 namespace o2::analysis::femto_universe
 {
diff --git a/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h b/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h
index e8941e7cbd9..d7a0d70f38a 100644
--- a/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h
+++ b/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h
@@ -19,16 +19,19 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEDETADPHISTAR_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEDETADPHISTAR_H_
 
-#include <memory>
-#include <string>
-#include <vector>
-#include "TMath.h"
-#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseFemtoContainer.h"
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseAngularContainer.h"
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseContainer.h"
-#include "Framework/HistogramRegistry.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseFemtoContainer.h"
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
+#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
+
+#include "Framework/HistogramRegistry.h"
+
+#include "TMath.h"
+
+#include <memory>
+#include <string>
+#include <vector>
 
 namespace o2::analysis
 {
diff --git a/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniverseEfficiencyCalculator.h b/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniverseEfficiencyCalculator.h
index a96b70180aa..da40cfbf4d3 100644
--- a/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniverseEfficiencyCalculator.h
+++ b/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniverseEfficiencyCalculator.h
@@ -16,15 +16,17 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEEFFICIENCYCALCULATOR_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEEFFICIENCYCALCULATOR_H_
 
-#include <vector>
-#include <map>
-#include <string>
-#include <algorithm>
+#include "FemtoUniverseParticleHisto.h"
 
-#include "Framework/Configurable.h"
-#include "CCDB/BasicCCDBManager.h"
 #include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
-#include "FemtoUniverseParticleHisto.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "Framework/Configurable.h"
+
+#include <algorithm>
+#include <map>
+#include <string>
+#include <vector>
 
 namespace o2::analysis::femto_universe::efficiency
 {
diff --git a/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h b/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h
index 03d4b5b1fb4..dfe2bd35d62 100644
--- a/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h
+++ b/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h
@@ -18,6 +18,7 @@
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEEVENTHISTO_H_
 
 #include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
+
 #include "Framework/HistogramRegistry.h"
 
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniverseFemtoContainer.h b/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniverseFemtoContainer.h
index 4719561ccf6..8f5954429cd 100644
--- a/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniverseFemtoContainer.h
+++ b/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniverseFemtoContainer.h
@@ -20,16 +20,18 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEFEMTOCONTAINER_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEFEMTOCONTAINER_H_
 
-#include <fairlogger/Logger.h>
-#include <vector>
-#include <string>
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
 
 #include "Framework/HistogramRegistry.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
 
 #include "Math/Vector4D.h"
-#include "TMath.h"
 #include "TDatabasePDG.h"
+#include "TMath.h"
+
+#include <fairlogger/Logger.h>
+
+#include <string>
+#include <vector>
 
 using namespace o2::framework;
 
diff --git a/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h b/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h
index ec40ea035e6..aee87f1a057 100644
--- a/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h
+++ b/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h
@@ -19,14 +19,14 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEMATH_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEMATH_H_
 
-#include <vector>
-#include <algorithm>
-
-#include "Math/Vector4D.h"
 #include "Math/Boost.h"
+#include "Math/Vector4D.h"
 #include "TLorentzVector.h"
 #include "TMath.h"
 
+#include <algorithm>
+#include <vector>
+
 namespace o2::analysis::femto_universe
 {
 
diff --git a/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniverseObjectSelection.h b/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniverseObjectSelection.h
index 07491f92c8f..f01de84b75d 100644
--- a/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniverseObjectSelection.h
+++ b/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniverseObjectSelection.h
@@ -17,15 +17,16 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEOBJECTSELECTION_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEOBJECTSELECTION_H_
 
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseSelection.h"
+#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
+
+#include "Framework/HistogramRegistry.h"
+#include "ReconstructionDataFormats/PID.h"
+
 #include <algorithm>
 #include <string>
 #include <vector>
 
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseSelection.h"
-#include "ReconstructionDataFormats/PID.h"
-#include "Framework/HistogramRegistry.h"
-#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
-
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniversePairAngularWithCentMultKt.h b/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniversePairAngularWithCentMultKt.h
index 31b256f43f7..b63455ee3cf 100644
--- a/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniversePairAngularWithCentMultKt.h
+++ b/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniversePairAngularWithCentMultKt.h
@@ -17,9 +17,10 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEPAIRANGULARWITHCENTMULTKT_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEPAIRANGULARWITHCENTMULTKT_H_
 
+#include "Framework/HistogramRegistry.h"
+
 #include <string>
 #include <vector>
-#include "Framework/HistogramRegistry.h"
 
 namespace o2::analysis::femto_universe
 {
diff --git a/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h b/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h
index b27d8e25abf..32da4810b85 100644
--- a/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h
+++ b/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h
@@ -20,6 +20,7 @@
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEPAIRCLEANER_H_
 
 #include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
+
 #include "Framework/HistogramRegistry.h"
 
 namespace o2::analysis::femto_universe
diff --git a/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniversePairSHCentMultKt.h b/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniversePairSHCentMultKt.h
index ea8626cbe32..5c33b6cf30e 100644
--- a/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniversePairSHCentMultKt.h
+++ b/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniversePairSHCentMultKt.h
@@ -16,11 +16,12 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEPAIRSHCENTMULTKT_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEPAIRSHCENTMULTKT_H_
 
-#include <vector>
-#include <string>
+#include "Framework/HistogramRegistry.h"
+
 #include <complex>
 #include <memory>
-#include "Framework/HistogramRegistry.h"
+#include <string>
+#include <vector>
 
 // using namespace o2::constants::physics;
 
diff --git a/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniversePairWithCentMultKt.h b/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniversePairWithCentMultKt.h
index 5cfef9c433f..1f2651ad2f6 100644
--- a/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniversePairWithCentMultKt.h
+++ b/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniversePairWithCentMultKt.h
@@ -17,9 +17,10 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEPAIRWITHCENTMULTKT_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEPAIRWITHCENTMULTKT_H_
 
+#include "Framework/HistogramRegistry.h"
+
 #include <string>
 #include <vector>
-#include "Framework/HistogramRegistry.h"
 
 namespace o2::analysis::femto_universe
 {
diff --git a/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h b/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h
index 865efa0f36d..b14edcb3aad 100644
--- a/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h
+++ b/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h
@@ -20,11 +20,13 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEPARTICLEHISTO_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEPARTICLEHISTO_H_
 
-#include <string>
-#include <optional>
 #include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
-#include "Framework/HistogramRegistry.h"
+
 #include "CommonConstants/MathConstants.h"
+#include "Framework/HistogramRegistry.h"
+
+#include <optional>
+#include <string>
 
 using namespace o2::framework; // o2-linter: disable=using-directive
 
diff --git a/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniversePhiSelection.h b/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniversePhiSelection.h
index 0ee0bfe4162..c43217ceb72 100644
--- a/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniversePhiSelection.h
+++ b/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniversePhiSelection.h
@@ -19,18 +19,20 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEPHISELECTION_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEPHISELECTION_H_
 
-#include <string>
-#include <vector>
-
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseObjectSelection.h"
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseSelection.h"
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
 
 #include "Common/Core/RecoDecay.h"
+
 #include "Framework/HistogramRegistry.h"
 #include "ReconstructionDataFormats/PID.h"
+
 #include "TLorentzVector.h"
 
+#include <string>
+#include <vector>
+
 namespace o2::analysis::femto_universe
 {
 namespace femto_universe_phi_selection
diff --git a/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniverseSHContainer.h b/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniverseSHContainer.h
index 558874133cb..25b875a0333 100644
--- a/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniverseSHContainer.h
+++ b/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniverseSHContainer.h
@@ -17,18 +17,21 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSESHCONTAINER_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSESHCONTAINER_H_
 
-#include <fairlogger/Logger.h>
-#include <vector>
-#include <string>
-#include <complex>
-#include <memory>
-
-#include "Framework/HistogramRegistry.h"
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseSpherHarMath.h"
+
+#include "Framework/HistogramRegistry.h"
+
 #include "Math/Vector4D.h"
-#include "TMath.h"
 #include "TDatabasePDG.h"
+#include "TMath.h"
+
+#include <fairlogger/Logger.h>
+
+#include <complex>
+#include <memory>
+#include <string>
+#include <vector>
 
 namespace o2::analysis::femto_universe
 {
diff --git a/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniverseSoftPionRemoval.h b/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniverseSoftPionRemoval.h
index 9631b5b3377..4a97c83865d 100644
--- a/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniverseSoftPionRemoval.h
+++ b/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniverseSoftPionRemoval.h
@@ -16,11 +16,12 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSESOFTPIONREMOVAL_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSESOFTPIONREMOVAL_H_
 
-#include <vector>
-
 #include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
+
 #include "Framework/HistogramRegistry.h"
 
+#include <vector>
+
 namespace o2::analysis::femto_universe
 {
 
diff --git a/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniverseSpherHarMath.h b/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniverseSpherHarMath.h
index d92560ceb72..0efa7593a9f 100644
--- a/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniverseSpherHarMath.h
+++ b/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniverseSpherHarMath.h
@@ -16,14 +16,14 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSESPHERHARMATH_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSESPHERHARMATH_H_
 
-#include <vector>
-#include <algorithm>
-
-#include "Math/Vector4D.h"
 #include "Math/Boost.h"
+#include "Math/Vector4D.h"
 #include "TLorentzVector.h"
 #include "TMath.h"
 
+#include <algorithm>
+#include <vector>
+
 namespace o2::analysis::femto_universe
 {
 
diff --git a/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h b/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h
index 75276f24a6d..51c711c8165 100644
--- a/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h
+++ b/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h
@@ -18,17 +18,19 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSETRACKSELECTION_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSETRACKSELECTION_H_
 
-#include <string>
-#include <vector>
-#include <cmath>
-
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseObjectSelection.h"
 #include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseObjectSelection.h"
-#include "ReconstructionDataFormats/PID.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/HistogramRegistry.h"
+#include "ReconstructionDataFormats/PID.h"
+
+#include <cmath>
+#include <string>
+#include <vector>
 
 // using namespace o2::framework;
 
diff --git a/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniverseV0Selection.h b/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniverseV0Selection.h
index 805da180cc3..8b45f664f15 100644
--- a/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniverseV0Selection.h
+++ b/.conflict-base-0/PWGCF/FemtoUniverse/Core/FemtoUniverseV0Selection.h
@@ -19,17 +19,18 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEV0SELECTION_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEV0SELECTION_H_
 
-#include <string>
-#include <vector>
-
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseObjectSelection.h"
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseSelection.h"
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
 
 #include "Common/Core/RecoDecay.h"
+
 #include "Framework/HistogramRegistry.h"
 #include "ReconstructionDataFormats/PID.h"
 
+#include <string>
+#include <vector>
+
 namespace o2::analysis::femto_universe
 {
 namespace femto_universe_v0_selection
diff --git a/.conflict-base-0/PWGCF/FemtoUniverse/Core/femtoUtils.h b/.conflict-base-0/PWGCF/FemtoUniverse/Core/femtoUtils.h
index 70a02e98b8c..ddc1833c335 100644
--- a/.conflict-base-0/PWGCF/FemtoUniverse/Core/femtoUtils.h
+++ b/.conflict-base-0/PWGCF/FemtoUniverse/Core/femtoUtils.h
@@ -17,12 +17,14 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUTILS_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUTILS_H_
 
-#include <vector>
-#include <functional>
-#include <algorithm>
-#include "Framework/ASoAHelpers.h"
 #include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
 
+#include "Framework/ASoAHelpers.h"
+
+#include <algorithm>
+#include <functional>
+#include <vector>
+
 namespace o2::analysis::femto_universe
 {
 
diff --git a/.conflict-base-0/PWGCF/FemtoUniverse/DataModel/FemtoDerived.h b/.conflict-base-0/PWGCF/FemtoUniverse/DataModel/FemtoDerived.h
index c103b52791e..83bf3f7fd72 100644
--- a/.conflict-base-0/PWGCF/FemtoUniverse/DataModel/FemtoDerived.h
+++ b/.conflict-base-0/PWGCF/FemtoUniverse/DataModel/FemtoDerived.h
@@ -16,15 +16,17 @@
 #ifndef PWGCF_FEMTOUNIVERSE_DATAMODEL_FEMTODERIVED_H_
 #define PWGCF_FEMTOUNIVERSE_DATAMODEL_FEMTODERIVED_H_
 
-#include <cmath>
-#include "Framework/ASoA.h"
-#include "MathUtils/Utils.h"
-#include "Framework/DataTypes.h"
 #include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoA.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/DataTypes.h"
 #include "Framework/Expressions.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
+#include "MathUtils/Utils.h"
+
+#include <cmath>
 
 namespace o2::aod
 {
diff --git a/.conflict-base-0/PWGCF/FemtoUniverse/Macros/calculateEfficiencyCorrection.cxx b/.conflict-base-0/PWGCF/FemtoUniverse/Macros/calculateEfficiencyCorrection.cxx
index 3880661d9f7..3d3137abc4a 100644
--- a/.conflict-base-0/PWGCF/FemtoUniverse/Macros/calculateEfficiencyCorrection.cxx
+++ b/.conflict-base-0/PWGCF/FemtoUniverse/Macros/calculateEfficiencyCorrection.cxx
@@ -21,15 +21,16 @@
 #include <TH2F.h>
 #include <TH3F.h>
 #include <TSystem.h>
-#include <unistd.h>
 
 #include <cassert>
 #include <cmath>
 #include <filesystem> // NOLINT
-#include <iostream>
 #include <format>
+#include <iostream>
 #include <string>
 
+#include <unistd.h>
+
 namespace fs = std::filesystem;
 
 auto* getHistogram(TFile* file, const std::string& name)
diff --git a/.conflict-base-0/PWGCF/FemtoUniverse/TableProducer/femtoUniverseProducerReducedTask.cxx b/.conflict-base-0/PWGCF/FemtoUniverse/TableProducer/femtoUniverseProducerReducedTask.cxx
index 4ae5b3b01f2..9eee793ee74 100644
--- a/.conflict-base-0/PWGCF/FemtoUniverse/TableProducer/femtoUniverseProducerReducedTask.cxx
+++ b/.conflict-base-0/PWGCF/FemtoUniverse/TableProducer/femtoUniverseProducerReducedTask.cxx
@@ -16,29 +16,32 @@
 /// \author Anton Riedel, TU München, anton.riedel@tum.de
 /// \author Zuzanna Chochulska, WUT Warsaw & CTU Prague, zchochul@cern.ch
 
-#include <CCDB/BasicCCDBManager.h>
-#include <vector>
-
-#include "TMath.h"
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseCollisionSelection.h"
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
+#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
 #include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+#include <CCDB/BasicCCDBManager.h>
+
 #include "Math/Vector4D.h"
-#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
+#include "TMath.h"
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis::femto_universe;
diff --git a/.conflict-base-0/PWGCF/FemtoUniverse/TableProducer/femtoUniverseProducerTaskV0Only.cxx b/.conflict-base-0/PWGCF/FemtoUniverse/TableProducer/femtoUniverseProducerTaskV0Only.cxx
index 968d3fab7ba..d7da7c67b8c 100644
--- a/.conflict-base-0/PWGCF/FemtoUniverse/TableProducer/femtoUniverseProducerTaskV0Only.cxx
+++ b/.conflict-base-0/PWGCF/FemtoUniverse/TableProducer/femtoUniverseProducerTaskV0Only.cxx
@@ -13,30 +13,33 @@
 /// \author Andi Mathis, TU München, andreas.mathis@ph.tum.de
 /// \author Zuzanna Chochulska, WUT Warsaw & CTU Prague, zchochul@cern.ch
 
-#include <CCDB/BasicCCDBManager.h>
-#include <vector>
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseCollisionSelection.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseV0Selection.h"
+#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "DataFormatsParameters/GRPMagField.h"
 #include "DataFormatsParameters/GRPObject.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseCollisionSelection.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseV0Selection.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
-#include "Math/Vector4D.h"
-#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "ReconstructionDataFormats/Track.h"
+#include <CCDB/BasicCCDBManager.h>
+
+#include "Math/Vector4D.h"
 #include "TMath.h"
 
+#include <vector>
+
 using namespace o2;
 using namespace o2::analysis::femto_universe;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGCF/FemtoUniverse/Tasks/femtoUniverseCutCulator.cxx b/.conflict-base-0/PWGCF/FemtoUniverse/Tasks/femtoUniverseCutCulator.cxx
index 6e5af4e8d52..bae1565238a 100644
--- a/.conflict-base-0/PWGCF/FemtoUniverse/Tasks/femtoUniverseCutCulator.cxx
+++ b/.conflict-base-0/PWGCF/FemtoUniverse/Tasks/femtoUniverseCutCulator.cxx
@@ -14,14 +14,16 @@
 /// \author Andi Mathis, TU München, andreas.mathis@ph.tum.de
 /// \author Zuzanna Chochulska, WUT Warsaw & CTU Prague, zchochul@cern.ch
 
-#include <filesystem>
-#include <iostream>
-#include <random>
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseCutculator.h"
+
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseSelection.h"
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
 #include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
 
+#include <filesystem>
+#include <iostream>
+#include <random>
+
 using namespace o2::analysis::femto_universe;
 
 /// The function takes the path to the dpl-config.json as a argument and the
diff --git a/.conflict-base-0/PWGCF/FemtoUniverse/Tasks/femtoUniverseDebugTrack.cxx b/.conflict-base-0/PWGCF/FemtoUniverse/Tasks/femtoUniverseDebugTrack.cxx
index 984ab7d973e..da9e59016d9 100644
--- a/.conflict-base-0/PWGCF/FemtoUniverse/Tasks/femtoUniverseDebugTrack.cxx
+++ b/.conflict-base-0/PWGCF/FemtoUniverse/Tasks/femtoUniverseDebugTrack.cxx
@@ -14,6 +14,12 @@
 /// \author Luca Barioglio, TU München, luca.barioglio@cern.ch
 /// \author Zuzanna Chochulska, WUT Warsaw & CTU Prague, zchochul@cern.ch
 
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
+#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
+#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
+
 #include "DataFormatsParameters/GRPObject.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
@@ -22,12 +28,6 @@
 #include "Framework/StepTHn.h"
 #include "Framework/runDataProcessing.h"
 
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
-#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
-#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
-
 using namespace o2;
 using namespace o2::analysis::femto_universe;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGCF/FemtoUniverse/Tasks/femtoUniverseDebugV0.cxx b/.conflict-base-0/PWGCF/FemtoUniverse/Tasks/femtoUniverseDebugV0.cxx
index fe1bf2e7983..1207d1ff10f 100644
--- a/.conflict-base-0/PWGCF/FemtoUniverse/Tasks/femtoUniverseDebugV0.cxx
+++ b/.conflict-base-0/PWGCF/FemtoUniverse/Tasks/femtoUniverseDebugV0.cxx
@@ -14,24 +14,27 @@
 /// \author Luca Barioglio, TU München, luca.barioglio@cern.ch
 /// \author Zuzanna Chochulska, WUT Warsaw & CTU Prague, zchochul@cern.ch
 
-#include <fairlogger/Logger.h>
-#include <cstdint>
-#include <vector>
-#include <TDatabasePDG.h>
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
+#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
+#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
+
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
+#include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/runDataProcessing.h"
 
-#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
-#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
+#include <TDatabasePDG.h>
+
+#include <fairlogger/Logger.h>
+
+#include <cstdint>
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis::femto_universe;
diff --git a/.conflict-base-0/PWGCF/FemtoUniverse/Tasks/femtoUniverseEfficiencyTask.cxx b/.conflict-base-0/PWGCF/FemtoUniverse/Tasks/femtoUniverseEfficiencyTask.cxx
index fcd9c56d452..dd13cdcede2 100644
--- a/.conflict-base-0/PWGCF/FemtoUniverse/Tasks/femtoUniverseEfficiencyTask.cxx
+++ b/.conflict-base-0/PWGCF/FemtoUniverse/Tasks/femtoUniverseEfficiencyTask.cxx
@@ -17,20 +17,22 @@
 /// \author Zuzanna Chochulska, WUT Warsaw & CTU Prague, zchochul@cern.ch
 
 // O2 includes
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseCollisionSelection.h"
+#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
+#include "PWGLF/DataModel/LFResonanceTables.h"
+
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/Core/trackUtilities.h"
+
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseCollisionSelection.h"
-#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
-#include "Framework/O2DatabasePDGPlugin.h"
 
 #include "TPDGCode.h"
 
diff --git a/.conflict-base-0/PWGCF/FemtoUniverse/Tasks/femtoUniverseHashTask.cxx b/.conflict-base-0/PWGCF/FemtoUniverse/Tasks/femtoUniverseHashTask.cxx
index 6f7a7d5db2b..0ec405b26ff 100644
--- a/.conflict-base-0/PWGCF/FemtoUniverse/Tasks/femtoUniverseHashTask.cxx
+++ b/.conflict-base-0/PWGCF/FemtoUniverse/Tasks/femtoUniverseHashTask.cxx
@@ -15,10 +15,12 @@
 /// \author Zuzanna Chochulska, WUT Warsaw & CTU Prague, zchochul@cern.ch
 
 #include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
+
 #include "Common/Core/EventMixing.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "Framework/ASoAHelpers.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackCascadeExtended.cxx b/.conflict-base-0/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackCascadeExtended.cxx
index dd019a046db..e2e06229f40 100644
--- a/.conflict-base-0/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackCascadeExtended.cxx
+++ b/.conflict-base-0/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackCascadeExtended.cxx
@@ -14,22 +14,24 @@
 /// \author Barbara Chytla, WUT Warsaw, barbara.chytla@cern.ch
 /// \author Shirajum Monira, WUT Warsaw, shirajum.monira@cern.ch
 
-#include <vector>
-#include <set>
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/StepTHn.h"
-#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseContainer.h"
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
 #include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
+#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
+
+#include <set>
+#include <vector>
 
 using namespace o2;
 using namespace o2::soa;
diff --git a/.conflict-base-0/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackD0.cxx b/.conflict-base-0/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackD0.cxx
index 3e68a275452..7e28f498fbb 100644
--- a/.conflict-base-0/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackD0.cxx
+++ b/.conflict-base-0/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackD0.cxx
@@ -17,38 +17,37 @@
 /// \author Zuzanna Chochulska, WUT Warsaw & CTU Prague, zchochul@cern.ch
 /// \author Katarzyna Gwiździel, WUT Warsaw, katarzyna.gwizdziel@cern.ch
 
-#include <vector>
-#include <string>
-
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "ReconstructionDataFormats/PID.h"
-
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/RecoDecay.h"
-
-#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseFemtoContainer.h"
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseAngularContainer.h"
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h"
-#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseSoftPionRemoval.h"
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseEfficiencyCalculator.h"
-
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseFemtoContainer.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseSoftPionRemoval.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
+#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
+#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
 #include "PWGHF/Core/HfHelper.h"
 #include "PWGHF/Core/SelectorCuts.h"
 #include "PWGHF/DataModel/CandidateReconstructionTables.h"
 #include "PWGHF/DataModel/CandidateSelectionTables.h"
 
+#include "Common/Core/RecoDecay.h"
+#include "Common/DataModel/PIDResponse.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/PID.h"
+
+#include <string>
+#include <vector>
+
 using namespace o2;
 using namespace o2::analysis;
 using namespace o2::analysis::femto_universe;
diff --git a/.conflict-base-0/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackNucleus.cxx b/.conflict-base-0/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackNucleus.cxx
index f5fe1dc91a4..8c4462f3973 100644
--- a/.conflict-base-0/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackNucleus.cxx
+++ b/.conflict-base-0/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackNucleus.cxx
@@ -18,29 +18,31 @@
 /// \author Alicja Płachta, WUT Warsaw, alicja.plachta.stud@pw.edu.pl
 /// \author Anna-Mariia Andrushko, WUT Warsaw, anna-mariia.andrushko@cern.ch
 
-#include <vector>
-#include <string>
-#include <cmath>
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseFemtoContainer.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairWithCentMultKt.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
+#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
+#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
+
+#include "Common/DataModel/PIDResponse.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
+#include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/PID.h"
-#include "Common/DataModel/PIDResponse.h"
 
-#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseFemtoContainer.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h"
-#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairWithCentMultKt.h"
+#include <cmath>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis::femto_universe;
diff --git a/.conflict-base-0/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrack.cxx b/.conflict-base-0/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrack.cxx
index f4eb45752dc..1d623d6ec24 100644
--- a/.conflict-base-0/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrack.cxx
+++ b/.conflict-base-0/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrack.cxx
@@ -16,24 +16,25 @@
 /// \author Anton Riedel, TU München, anton.riedel@tum.de
 /// \author Zuzanna Chochulska, WUT Warsaw & CTU Prague, zchochul@cern.ch
 
-#include <vector>
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseAngularContainer.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseFemtoContainer.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
+#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
+#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
+#include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 
-#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseFemtoContainer.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseAngularContainer.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h"
-#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis::femto_universe;
diff --git a/.conflict-base-0/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrack3DMultKtExtended.cxx b/.conflict-base-0/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrack3DMultKtExtended.cxx
index f5c6242f456..4cb264949b1 100644
--- a/.conflict-base-0/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrack3DMultKtExtended.cxx
+++ b/.conflict-base-0/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrack3DMultKtExtended.cxx
@@ -14,30 +14,33 @@
 /// \remark This file is inherited from ~/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackMultKtExtended.cxx on 10/01/2024
 /// \author Pritam Chakraborty, WUT Warsaw, pritam.chakraborty@pw.edu.pl
 
-#include <vector>
-#include <string>
-#include "TRandom2.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverse3DContainer.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseContainer.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairWithCentMultKt.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
+#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
+#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
+
+#include "Common/DataModel/PIDResponse.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
+#include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/PID.h"
-#include "Common/DataModel/PIDResponse.h"
 
-#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverse3DContainer.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseContainer.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h"
-#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairWithCentMultKt.h"
+#include "TRandom2.h"
+
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis::femto_universe;
diff --git a/.conflict-base-0/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackExtended.cxx b/.conflict-base-0/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackExtended.cxx
index 06665491396..7760a8f2451 100644
--- a/.conflict-base-0/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackExtended.cxx
+++ b/.conflict-base-0/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackExtended.cxx
@@ -16,24 +16,24 @@
 /// \author Anton Riedel, TU München, anton.riedel@tum.de
 /// \author Zuzanna Chochulska, WUT Warsaw & CTU Prague, zchochul@cern.ch
 
-#include <Framework/O2DatabasePDGPlugin.h>
-#include <string>
-#include <vector>
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseContainer.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEfficiencyCorrection.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
+#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
 
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/PID.h"
+#include <Framework/O2DatabasePDGPlugin.h>
 
-#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseContainer.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEfficiencyCorrection.h"
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis::femto_universe;
diff --git a/.conflict-base-0/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackMC.cxx b/.conflict-base-0/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackMC.cxx
index 5b74f18a31e..66214ba9fd2 100644
--- a/.conflict-base-0/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackMC.cxx
+++ b/.conflict-base-0/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackMC.cxx
@@ -17,28 +17,31 @@
 /// \author Zuzanna Chochulska, WUT Warsaw, zuzanna.chochulska.stud@pw.edu.pl
 /// \author Zuzanna Chochulska, WUT Warsaw & CTU Prague, zchochul@cern.ch
 
-#include <vector>
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseContainer.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairAngularWithCentMultKt.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
+#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
+#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
+
+#include "Common/DataModel/PIDResponse.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
+#include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "TDatabasePDG.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/PID.h"
-#include "Common/DataModel/PIDResponse.h"
 
-#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseContainer.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h"
-#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairAngularWithCentMultKt.h"
+#include "TDatabasePDG.h"
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis::femto_universe;
diff --git a/.conflict-base-0/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackMcTruth.cxx b/.conflict-base-0/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackMcTruth.cxx
index d74b76ab237..804dc30e9d7 100644
--- a/.conflict-base-0/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackMcTruth.cxx
+++ b/.conflict-base-0/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackMcTruth.cxx
@@ -14,24 +14,26 @@
 /// \author Malgorzata Janik, WUT, majanik@cern.ch
 /// \author Zuzanna Chochulska, WUT Warsaw & CTU Prague, zchochul@cern.ch
 
-#include <vector>
-#include <random>
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseContainer.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
+#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
+#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
+#include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TDatabasePDG.h"
 
-#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseContainer.h"
-#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
+#include <random>
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis::femto_universe;
diff --git a/.conflict-base-0/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackMultKtExtended.cxx b/.conflict-base-0/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackMultKtExtended.cxx
index 76487c59269..23b0bab4057 100644
--- a/.conflict-base-0/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackMultKtExtended.cxx
+++ b/.conflict-base-0/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackMultKtExtended.cxx
@@ -17,29 +17,32 @@
 /// \author Zuzanna Chochulska, WUT Warsaw & CTU Prague, zchochul@cern.ch
 /// \author Alicja Płachta, WUT Warsaw, alicja.plachta.stud@pw.edu.pl
 
-#include <vector>
-#include <string>
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseFemtoContainer.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairWithCentMultKt.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
+#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
+#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
+
+#include "Common/DataModel/PIDResponse.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
+#include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "TDatabasePDG.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/PID.h"
-#include "Common/DataModel/PIDResponse.h"
 
-#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseFemtoContainer.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h"
-#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairWithCentMultKt.h"
+#include "TDatabasePDG.h"
+
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis::femto_universe;
diff --git a/.conflict-base-0/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackSpherHarMultKtExtended.cxx b/.conflict-base-0/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackSpherHarMultKtExtended.cxx
index 05c910b0b24..ccb74fb5600 100644
--- a/.conflict-base-0/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackSpherHarMultKtExtended.cxx
+++ b/.conflict-base-0/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackSpherHarMultKtExtended.cxx
@@ -14,29 +14,32 @@
 /// \remark This file is inherited from ~/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrack3DMultKtExtended.cxx on 17/06/2024
 /// \author Pritam Chakraborty, WUT Warsaw, pritam.chakraborty@pw.edu.pl
 
-#include <vector>
-#include <string>
-#include "TRandom2.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairSHCentMultKt.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseSHContainer.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
+#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
+#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
+
+#include "Common/DataModel/PIDResponse.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
+#include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/PID.h"
-#include "Common/DataModel/PIDResponse.h"
 
-#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseSHContainer.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h"
-#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairSHCentMultKt.h"
+#include "TRandom2.h"
+
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis::femto_universe;
diff --git a/.conflict-base-0/PWGCF/FemtoWorld/Core/FemtoWorldCollisionSelection.h b/.conflict-base-0/PWGCF/FemtoWorld/Core/FemtoWorldCollisionSelection.h
index d2404f3e214..d581dcaa4ee 100644
--- a/.conflict-base-0/PWGCF/FemtoWorld/Core/FemtoWorldCollisionSelection.h
+++ b/.conflict-base-0/PWGCF/FemtoWorld/Core/FemtoWorldCollisionSelection.h
@@ -17,13 +17,14 @@
 #ifndef PWGCF_FEMTOWORLD_CORE_FEMTOWORLDCOLLISIONSELECTION_H_
 #define PWGCF_FEMTOWORLD_CORE_FEMTOWORLDCOLLISIONSELECTION_H_
 
-#include <string>
-#include <iostream>
-
 #include "Common/CCDB/TriggerAliases.h"
+
 #include "Framework/HistogramRegistry.h"
 #include "Framework/Logger.h"
 
+#include <iostream>
+#include <string>
+
 using namespace o2::framework;
 
 namespace o2::analysis::femtoWorld
diff --git a/.conflict-base-0/PWGCF/FemtoWorld/Core/FemtoWorldContainer.h b/.conflict-base-0/PWGCF/FemtoWorld/Core/FemtoWorldContainer.h
index a80af060d56..5bf2a122062 100644
--- a/.conflict-base-0/PWGCF/FemtoWorld/Core/FemtoWorldContainer.h
+++ b/.conflict-base-0/PWGCF/FemtoWorld/Core/FemtoWorldContainer.h
@@ -18,19 +18,20 @@
 #ifndef PWGCF_FEMTOWORLD_CORE_FEMTOWORLDCONTAINER_H_
 #define PWGCF_FEMTOWORLD_CORE_FEMTOWORLDCONTAINER_H_
 
-#include <vector>
-#include <string>
-#include "Framework/HistogramRegistry.h"
 #include "PWGCF/FemtoWorld/Core/FemtoWorldMath.h"
 
+#include "CommonConstants/MathConstants.h"
+#include "Framework/HistogramRegistry.h"
+
 #include "Math/Vector4D.h"
-#include "TMath.h"
 #include "TDatabasePDG.h"
-
 #include "TLorentzVector.h"
-#include "CommonConstants/MathConstants.h"
+#include "TMath.h"
 #include "TRandom.h"
 
+#include <string>
+#include <vector>
+
 using namespace o2::framework;
 
 namespace o2::analysis::femtoWorld
diff --git a/.conflict-base-0/PWGCF/FemtoWorld/Core/FemtoWorldDetaDphiStar.h b/.conflict-base-0/PWGCF/FemtoWorld/Core/FemtoWorldDetaDphiStar.h
index f7262481a77..c7085de74ce 100644
--- a/.conflict-base-0/PWGCF/FemtoWorld/Core/FemtoWorldDetaDphiStar.h
+++ b/.conflict-base-0/PWGCF/FemtoWorld/Core/FemtoWorldDetaDphiStar.h
@@ -17,13 +17,14 @@
 #ifndef PWGCF_FEMTOWORLD_CORE_FEMTOWORLDDETADPHISTAR_H_
 #define PWGCF_FEMTOWORLD_CORE_FEMTOWORLDDETADPHISTAR_H_
 
-#include <string>
-#include <memory>
-#include <vector>
-
 #include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
+
 #include "Framework/HistogramRegistry.h"
 
+#include <memory>
+#include <string>
+#include <vector>
+
 namespace o2::analysis
 {
 namespace femtoWorld
diff --git a/.conflict-base-0/PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h b/.conflict-base-0/PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h
index fade16ebb00..c7c1c672816 100644
--- a/.conflict-base-0/PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h
+++ b/.conflict-base-0/PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h
@@ -18,6 +18,7 @@
 #define FEMTOWORLDEVENTHISTO_H_
 
 #include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
+
 #include "Framework/HistogramRegistry.h"
 
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGCF/FemtoWorld/Core/FemtoWorldMath.h b/.conflict-base-0/PWGCF/FemtoWorld/Core/FemtoWorldMath.h
index 6eff2f212b8..921b34aa8f5 100644
--- a/.conflict-base-0/PWGCF/FemtoWorld/Core/FemtoWorldMath.h
+++ b/.conflict-base-0/PWGCF/FemtoWorld/Core/FemtoWorldMath.h
@@ -17,8 +17,8 @@
 #ifndef FEMTOWORLDMATH_H_
 #define FEMTOWORLDMATH_H_
 
-#include "Math/Vector4D.h"
 #include "Math/Boost.h"
+#include "Math/Vector4D.h"
 #include "TLorentzVector.h"
 #include "TMath.h"
 
diff --git a/.conflict-base-0/PWGCF/FemtoWorld/Core/FemtoWorldObjectSelection.h b/.conflict-base-0/PWGCF/FemtoWorld/Core/FemtoWorldObjectSelection.h
index d940f9d13ef..2ab9c7a05f2 100644
--- a/.conflict-base-0/PWGCF/FemtoWorld/Core/FemtoWorldObjectSelection.h
+++ b/.conflict-base-0/PWGCF/FemtoWorld/Core/FemtoWorldObjectSelection.h
@@ -18,8 +18,8 @@
 
 #include "PWGCF/FemtoWorld/Core/FemtoWorldSelection.h"
 
-#include "ReconstructionDataFormats/PID.h"
 #include "Framework/HistogramRegistry.h"
+#include "ReconstructionDataFormats/PID.h"
 
 using namespace o2::framework;
 
diff --git a/.conflict-base-0/PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h b/.conflict-base-0/PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h
index 5c20af3813e..f0f6b24dead 100644
--- a/.conflict-base-0/PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h
+++ b/.conflict-base-0/PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h
@@ -18,6 +18,7 @@
 #define PWGCF_FEMTOWORLD_CORE_FEMTOWORLDPAIRCLEANER_H_
 
 #include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
+
 #include "Framework/HistogramRegistry.h"
 
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGCF/FemtoWorld/Core/FemtoWorldPairWithCentrality.h b/.conflict-base-0/PWGCF/FemtoWorld/Core/FemtoWorldPairWithCentrality.h
index 2a2548b5d5b..fee7b1aed33 100644
--- a/.conflict-base-0/PWGCF/FemtoWorld/Core/FemtoWorldPairWithCentrality.h
+++ b/.conflict-base-0/PWGCF/FemtoWorld/Core/FemtoWorldPairWithCentrality.h
@@ -13,10 +13,11 @@
 #ifndef PWGCF_FEMTOWORLD_CORE_FEMTOWORLDPAIRWITHCENTRALITY_H_
 #define PWGCF_FEMTOWORLD_CORE_FEMTOWORLDPAIRWITHCENTRALITY_H_
 
-#include <string>
+#include "Framework/HistogramRegistry.h"
+
 #include <iostream>
+#include <string>
 #include <vector>
-#include "Framework/HistogramRegistry.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h b/.conflict-base-0/PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h
index 0671c267200..574fa371ae8 100644
--- a/.conflict-base-0/PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h
+++ b/.conflict-base-0/PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h
@@ -17,10 +17,12 @@
 #ifndef PWGCF_FEMTOWORLD_CORE_FEMTOWORLDPARTICLEHISTO_H_
 #define PWGCF_FEMTOWORLD_CORE_FEMTOWORLDPARTICLEHISTO_H_
 
-#include <string>
 #include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
+
 #include "Framework/HistogramRegistry.h"
 
+#include <string>
+
 using namespace o2::framework;
 // using namespace o2::aod::o2::aod;
 
diff --git a/.conflict-base-0/PWGCF/FemtoWorld/Core/FemtoWorldPhiSelection.h b/.conflict-base-0/PWGCF/FemtoWorld/Core/FemtoWorldPhiSelection.h
index 39040d70ec0..52ed3db69ed 100644
--- a/.conflict-base-0/PWGCF/FemtoWorld/Core/FemtoWorldPhiSelection.h
+++ b/.conflict-base-0/PWGCF/FemtoWorld/Core/FemtoWorldPhiSelection.h
@@ -19,19 +19,20 @@
 #ifndef PWGCF_FEMTOWORLD_CORE_FEMTOWORLDPHISELECTION_H_
 #define PWGCF_FEMTOWORLD_CORE_FEMTOWORLDPHISELECTION_H_
 
-#include <string>
-#include <vector>
-
-#include <TDatabasePDG.h> // FIXME
-
 #include "PWGCF/FemtoWorld/Core/FemtoWorldObjectSelection.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldTrackSelection.h"
 #include "PWGCF/FemtoWorld/Core/FemtoWorldSelection.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldTrackSelection.h"
 
-#include "ReconstructionDataFormats/PID.h"
 #include "Common/Core/RecoDecay.h"
+
 #include "Framework/HistogramRegistry.h"
+#include "ReconstructionDataFormats/PID.h"
+
 #include "TLorentzVector.h"
+#include <TDatabasePDG.h> // FIXME
+
+#include <string>
+#include <vector>
 
 using namespace o2::framework;
 
diff --git a/.conflict-base-0/PWGCF/FemtoWorld/Core/FemtoWorldPionContainer.h b/.conflict-base-0/PWGCF/FemtoWorld/Core/FemtoWorldPionContainer.h
index 9c68ac7c76e..fe4641b9463 100644
--- a/.conflict-base-0/PWGCF/FemtoWorld/Core/FemtoWorldPionContainer.h
+++ b/.conflict-base-0/PWGCF/FemtoWorld/Core/FemtoWorldPionContainer.h
@@ -18,19 +18,20 @@
 #ifndef PWGCF_FEMTOWORLD_CORE_FEMTOWORLDPIONCONTAINER_H_
 #define PWGCF_FEMTOWORLD_CORE_FEMTOWORLDPIONCONTAINER_H_
 
-#include <vector>
-#include <string>
-#include "Framework/HistogramRegistry.h"
 #include "PWGCF/FemtoWorld/Core/FemtoWorldMath.h"
 
+#include "CommonConstants/MathConstants.h"
+#include "Framework/HistogramRegistry.h"
+
 #include "Math/Vector4D.h"
-#include "TMath.h"
 #include "TDatabasePDG.h"
-
 #include "TLorentzVector.h"
-#include "CommonConstants/MathConstants.h"
+#include "TMath.h"
 #include "TRandom.h"
 
+#include <string>
+#include <vector>
+
 using namespace o2::framework;
 
 namespace o2::analysis::femtoWorld
diff --git a/.conflict-base-0/PWGCF/FemtoWorld/Core/FemtoWorldTrackSelection.h b/.conflict-base-0/PWGCF/FemtoWorld/Core/FemtoWorldTrackSelection.h
index 1853be4bd3c..ea06a1433a4 100644
--- a/.conflict-base-0/PWGCF/FemtoWorld/Core/FemtoWorldTrackSelection.h
+++ b/.conflict-base-0/PWGCF/FemtoWorld/Core/FemtoWorldTrackSelection.h
@@ -18,14 +18,16 @@
 #ifndef FEMTOWORLDTRACKSELECTION_H_
 #define FEMTOWORLDTRACKSELECTION_H_
 
+#include "PWGCF/FemtoWorld/Core/FemtoWorldObjectSelection.h"
 #include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldObjectSelection.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "ReconstructionDataFormats/PID.h"
 #include "Framework/HistogramRegistry.h"
+#include "ReconstructionDataFormats/PID.h"
+
 #include <cmath>
 #include <iostream>
 
@@ -278,7 +280,7 @@ class FemtoWorldTrackSelection : public FemtoWorldObjectSelection<float, femtoWo
                                                                           "Maximal DCA_z (cm)",
                                                                           "Minimal DCA (cm)",
                                                                           "Maximal PID (nSigma)"}; ///< Helper information for the different selections
-};                                                                                                 // namespace femtoWorld
+}; // namespace femtoWorld
 
 template <o2::aod::femtoworldparticle::ParticleType part, o2::aod::femtoworldparticle::TrackType tracktype, typename cutContainerType>
 void FemtoWorldTrackSelection::init(HistogramRegistry* registry)
diff --git a/.conflict-base-0/PWGCF/FemtoWorld/Core/FemtoWorldUtils.h b/.conflict-base-0/PWGCF/FemtoWorld/Core/FemtoWorldUtils.h
index 6f7ae6e31e3..a918e674e45 100644
--- a/.conflict-base-0/PWGCF/FemtoWorld/Core/FemtoWorldUtils.h
+++ b/.conflict-base-0/PWGCF/FemtoWorld/Core/FemtoWorldUtils.h
@@ -18,8 +18,9 @@
 #ifndef FEMTOWORLD_UTILS_H_
 #define FEMTOWORLD_UTILS_H_
 
-#include "Framework/ASoAHelpers.h"
 #include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
+
+#include "Framework/ASoAHelpers.h"
 #include <CCDB/BasicCCDBManager.h>
 
 #include <vector>
diff --git a/.conflict-base-0/PWGCF/FemtoWorld/Core/FemtoWorldV0Selection.h b/.conflict-base-0/PWGCF/FemtoWorld/Core/FemtoWorldV0Selection.h
index b86171502e8..e5202efbc65 100644
--- a/.conflict-base-0/PWGCF/FemtoWorld/Core/FemtoWorldV0Selection.h
+++ b/.conflict-base-0/PWGCF/FemtoWorld/Core/FemtoWorldV0Selection.h
@@ -20,12 +20,13 @@
 #define FEMTOWORLDV0SELECTION_H_
 
 #include "PWGCF/FemtoWorld/Core/FemtoWorldObjectSelection.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldTrackSelection.h"
 #include "PWGCF/FemtoWorld/Core/FemtoWorldSelection.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldTrackSelection.h"
 
-#include "ReconstructionDataFormats/PID.h"
 #include "Common/Core/RecoDecay.h"
+
 #include "Framework/HistogramRegistry.h"
+#include "ReconstructionDataFormats/PID.h"
 
 using namespace o2::framework;
 
diff --git a/.conflict-base-0/PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h b/.conflict-base-0/PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h
index d112f11c2ab..4d3071b5575 100644
--- a/.conflict-base-0/PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h
+++ b/.conflict-base-0/PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h
@@ -12,16 +12,18 @@
 #ifndef PWGCF_FEMTOWORLD_DATAMODEL_FEMTOWORLDDERIVED_H_
 #define PWGCF_FEMTOWORLD_DATAMODEL_FEMTOWORLDDERIVED_H_
 
-#include <cmath>
-#include "Framework/ASoA.h"
-#include "MathUtils/Utils.h"
-#include "Framework/DataTypes.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoA.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/DataTypes.h"
 #include "Framework/Expressions.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Centrality.h"
+#include "MathUtils/Utils.h"
+
+#include <cmath>
 
 namespace o2::aod
 {
diff --git a/.conflict-base-0/PWGCF/FemtoWorld/TableProducer/femtoWorldProducerReducedTask.cxx b/.conflict-base-0/PWGCF/FemtoWorld/TableProducer/femtoWorldProducerReducedTask.cxx
index 06bb8dff109..c6380dd97d2 100644
--- a/.conflict-base-0/PWGCF/FemtoWorld/TableProducer/femtoWorldProducerReducedTask.cxx
+++ b/.conflict-base-0/PWGCF/FemtoWorld/TableProducer/femtoWorldProducerReducedTask.cxx
@@ -16,23 +16,25 @@
 #include "PWGCF/FemtoWorld/Core/FemtoWorldCollisionSelection.h"
 #include "PWGCF/FemtoWorld/Core/FemtoWorldTrackSelection.h"
 #include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "DataFormatsParameters/GRPObject.h"
+#include <CCDB/BasicCCDBManager.h>
+
 #include "Math/Vector4D.h"
 #include "TMath.h"
-#include <CCDB/BasicCCDBManager.h>
 
 using namespace o2;
 using namespace o2::analysis::femtoWorld;
diff --git a/.conflict-base-0/PWGCF/FemtoWorld/TableProducer/femtoWorldProducerTask.cxx b/.conflict-base-0/PWGCF/FemtoWorld/TableProducer/femtoWorldProducerTask.cxx
index ce5b415b275..861e7ff8005 100644
--- a/.conflict-base-0/PWGCF/FemtoWorld/TableProducer/femtoWorldProducerTask.cxx
+++ b/.conflict-base-0/PWGCF/FemtoWorld/TableProducer/femtoWorldProducerTask.cxx
@@ -14,38 +14,38 @@
 /// \author Andi Mathis, TU München, andreas.mathis@ph.tum.de
 /// \author Zuzanna Chochulska, WUT Warsaw, zchochul@cern.ch
 
-#include <TDatabasePDG.h> // FIXME
-
-#include "CCDB/BasicCCDBManager.h"
 #include "PWGCF/FemtoWorld/Core/FemtoWorldCollisionSelection.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldPhiSelection.h"
 #include "PWGCF/FemtoWorld/Core/FemtoWorldTrackSelection.h"
 #include "PWGCF/FemtoWorld/Core/FemtoWorldV0Selection.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldPhiSelection.h"
 #include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h"
-
 #include "PWGHF/Core/HfHelper.h"
 #include "PWGHF/DataModel/CandidateReconstructionTables.h"
 #include "PWGHF/DataModel/CandidateSelectionTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "TLorentzVector.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsParameters/GRPMagField.h"
 #include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
 #include "Math/Vector4D.h"
+#include "TLorentzVector.h"
 #include "TMath.h"
+#include <TDatabasePDG.h> // FIXME
 
 using namespace o2;
 using namespace o2::analysis::femtoWorld;
diff --git a/.conflict-base-0/PWGCF/FemtoWorld/TableProducer/femtoWorldProducerTaskV0Only.cxx b/.conflict-base-0/PWGCF/FemtoWorld/TableProducer/femtoWorldProducerTaskV0Only.cxx
index b576f2c125b..0e635dc97ee 100644
--- a/.conflict-base-0/PWGCF/FemtoWorld/TableProducer/femtoWorldProducerTaskV0Only.cxx
+++ b/.conflict-base-0/PWGCF/FemtoWorld/TableProducer/femtoWorldProducerTaskV0Only.cxx
@@ -17,23 +17,25 @@
 #include "PWGCF/FemtoWorld/Core/FemtoWorldTrackSelection.h"
 #include "PWGCF/FemtoWorld/Core/FemtoWorldV0Selection.h"
 #include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "DataFormatsParameters/GRPObject.h"
+#include <CCDB/BasicCCDBManager.h>
+
 #include "Math/Vector4D.h"
 #include "TMath.h"
-#include <CCDB/BasicCCDBManager.h>
 
 using namespace o2;
 using namespace o2::analysis::femtoWorld;
diff --git a/.conflict-base-0/PWGCF/FemtoWorld/Tasks/femtoWorldDebugTrack.cxx b/.conflict-base-0/PWGCF/FemtoWorld/Tasks/femtoWorldDebugTrack.cxx
index cb5fd945b3c..a0f158df070 100644
--- a/.conflict-base-0/PWGCF/FemtoWorld/Tasks/femtoWorldDebugTrack.cxx
+++ b/.conflict-base-0/PWGCF/FemtoWorld/Tasks/femtoWorldDebugTrack.cxx
@@ -13,18 +13,18 @@
 /// \brief Tasks that reads the particle tables and fills QA histograms for tracks
 /// \author Luca Barioglio, TU München, luca.barioglio@cern.ch
 
+#include "PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldUtils.h"
+#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
+
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-#include "DataFormatsParameters/GRPObject.h"
-
-#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldUtils.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::analysis::femtoWorld;
diff --git a/.conflict-base-0/PWGCF/FemtoWorld/Tasks/femtoWorldDebugV0.cxx b/.conflict-base-0/PWGCF/FemtoWorld/Tasks/femtoWorldDebugV0.cxx
index b2080ba4789..31c37c84772 100644
--- a/.conflict-base-0/PWGCF/FemtoWorld/Tasks/femtoWorldDebugV0.cxx
+++ b/.conflict-base-0/PWGCF/FemtoWorld/Tasks/femtoWorldDebugV0.cxx
@@ -13,18 +13,18 @@
 /// \brief Tasks that reads the particle tables and fills QA histograms for V0s
 /// \author Luca Barioglio, TU München, luca.barioglio@cern.ch
 
+#include "PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldUtils.h"
+#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
+
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-#include "DataFormatsParameters/GRPObject.h"
-
-#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldUtils.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::analysis::femtoWorld;
diff --git a/.conflict-base-0/PWGCF/FemtoWorld/Tasks/femtoWorldEfficiencyTask.cxx b/.conflict-base-0/PWGCF/FemtoWorld/Tasks/femtoWorldEfficiencyTask.cxx
index 9cad450302f..a4fb0717a75 100644
--- a/.conflict-base-0/PWGCF/FemtoWorld/Tasks/femtoWorldEfficiencyTask.cxx
+++ b/.conflict-base-0/PWGCF/FemtoWorld/Tasks/femtoWorldEfficiencyTask.cxx
@@ -16,20 +16,22 @@
 /// \author Barbara Chytla, WUT Warsaw, barbara.chytla@cern.ch
 
 // O2 includes
+#include "PWGCF/FemtoWorld/Core/FemtoWorldCollisionSelection.h"
+#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
+#include "PWGLF/DataModel/LFResonanceTables.h"
+
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/Core/trackUtilities.h"
+
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldCollisionSelection.h"
-#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
-#include "Framework/O2DatabasePDGPlugin.h"
 
 #include "TPDGCode.h"
 
diff --git a/.conflict-base-0/PWGCF/FemtoWorld/Tasks/femtoWorldEfficiencyTaskDe.cxx b/.conflict-base-0/PWGCF/FemtoWorld/Tasks/femtoWorldEfficiencyTaskDe.cxx
index b0108b37a2b..cd0d2e4b247 100644
--- a/.conflict-base-0/PWGCF/FemtoWorld/Tasks/femtoWorldEfficiencyTaskDe.cxx
+++ b/.conflict-base-0/PWGCF/FemtoWorld/Tasks/femtoWorldEfficiencyTaskDe.cxx
@@ -16,19 +16,21 @@
 /// \author Barbara Chytla, WUT Warsaw, barbara.chytla@cern.ch
 
 // O2 includes
+#include "PWGCF/FemtoWorld/Core/FemtoWorldCollisionSelection.h"
+#include "PWGLF/DataModel/LFResonanceTables.h"
+
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/Core/trackUtilities.h"
+
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldCollisionSelection.h"
-#include "Framework/O2DatabasePDGPlugin.h"
 
 #include "TPDGCode.h"
 
diff --git a/.conflict-base-0/PWGCF/FemtoWorld/Tasks/femtoWorldHashTask.cxx b/.conflict-base-0/PWGCF/FemtoWorld/Tasks/femtoWorldHashTask.cxx
index 4a6bdac3a2b..a990af3bf9e 100644
--- a/.conflict-base-0/PWGCF/FemtoWorld/Tasks/femtoWorldHashTask.cxx
+++ b/.conflict-base-0/PWGCF/FemtoWorld/Tasks/femtoWorldHashTask.cxx
@@ -16,11 +16,12 @@
 /// \author Zuzanna Chochulska, WUT Warsaw, zchochul@cern.ch
 
 #include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
+
 #include "Common/Core/EventMixing.h"
-#include "Framework/AnalysisTask.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "Framework/ASoAHelpers.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskPionPion.cxx b/.conflict-base-0/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskPionPion.cxx
index a2d061ed1f4..07185918140 100644
--- a/.conflict-base-0/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskPionPion.cxx
+++ b/.conflict-base-0/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskPionPion.cxx
@@ -15,20 +15,20 @@
 /// \author Zuzanna Chochulska, WUT Warsaw, zchochul@cern.ch
 /// \author Alicja Plachta, WUT Warsaw
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/StepTHn.h"
-
-#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldDetaDphiStar.h"
 #include "PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h"
 #include "PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h"
 #include "PWGCF/FemtoWorld/Core/FemtoWorldPionContainer.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldDetaDphiStar.h"
 #include "PWGCF/FemtoWorld/Core/FemtoWorldUtils.h"
+#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::analysis::femtoWorld;
diff --git a/.conflict-base-0/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskProtonAntiproton.cxx b/.conflict-base-0/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskProtonAntiproton.cxx
index 066307a91d4..46f6f802ae6 100644
--- a/.conflict-base-0/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskProtonAntiproton.cxx
+++ b/.conflict-base-0/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskProtonAntiproton.cxx
@@ -15,20 +15,20 @@
 /// \author Zuzanna Chochulska, WUT Warsaw, zchochul@cern.ch
 /// \author Barbara Chytła, WUT Warsaw, barbara.chytla.stud@pw.edu.pl
 
+#include "PWGCF/FemtoWorld/Core/FemtoWorldContainer.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldDetaDphiStar.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldUtils.h"
+#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-
-#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldContainer.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldDetaDphiStar.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldUtils.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::analysis::femtoWorld;
diff --git a/.conflict-base-0/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskTrackD0.cxx b/.conflict-base-0/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskTrackD0.cxx
index 8f1452c1c49..6a1fa8331c6 100644
--- a/.conflict-base-0/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskTrackD0.cxx
+++ b/.conflict-base-0/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskTrackD0.cxx
@@ -14,24 +14,23 @@
 /// \author Andi Mathis, TU München, andreas.mathis@ph.tum.de
 /// \author Zuzanna Chochulska, WUT Warsaw, zchochul@cern.ch
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/StepTHn.h"
-
-#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h"
 #include "PWGCF/FemtoWorld/Core/FemtoWorldContainer.h"
 #include "PWGCF/FemtoWorld/Core/FemtoWorldDetaDphiStar.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h"
 #include "PWGCF/FemtoWorld/Core/FemtoWorldUtils.h"
-
+#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
 #include "PWGHF/DataModel/CandidateReconstructionTables.h"
 #include "PWGHF/DataModel/CandidateSelectionTables.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::analysis::femtoWorld;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskTrackPhi.cxx b/.conflict-base-0/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskTrackPhi.cxx
index e5201b379d5..3e6c1a066bb 100644
--- a/.conflict-base-0/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskTrackPhi.cxx
+++ b/.conflict-base-0/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskTrackPhi.cxx
@@ -14,20 +14,20 @@
 /// \author Andi Mathis, TU München, andreas.mathis@ph.tum.de
 /// \author Zuzanna Chochulska, WUT Warsaw, zchochul@cern.ch
 
+#include "PWGCF/FemtoWorld/Core/FemtoWorldContainer.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldDetaDphiStar.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldUtils.h"
+#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-
-#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldContainer.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldDetaDphiStar.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldUtils.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::analysis::femtoWorld;
diff --git a/.conflict-base-0/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskTrackTrack.cxx b/.conflict-base-0/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskTrackTrack.cxx
index 4037bd991e0..1cacc212d47 100644
--- a/.conflict-base-0/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskTrackTrack.cxx
+++ b/.conflict-base-0/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskTrackTrack.cxx
@@ -14,20 +14,20 @@
 /// \author Andi Mathis, TU München, andreas.mathis@ph.tum.de
 /// \author Zuzanna Chochulska, WUT Warsaw, zchochul@cern.ch
 
+#include "PWGCF/FemtoWorld/Core/FemtoWorldContainer.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldDetaDphiStar.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldUtils.h"
+#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-
-#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldContainer.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldDetaDphiStar.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldUtils.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::analysis::femtoWorld;
diff --git a/.conflict-base-0/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskTrackV0.cxx b/.conflict-base-0/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskTrackV0.cxx
index 36094a0f16a..2d8be41c0c1 100644
--- a/.conflict-base-0/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskTrackV0.cxx
+++ b/.conflict-base-0/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskTrackV0.cxx
@@ -13,20 +13,20 @@
 /// \brief Tasks that reads the track tables used for the pairing and builds pairs of two tracks
 /// \author Andi Mathis, TU München, andreas.mathis@ph.tum.de
 
+#include "PWGCF/FemtoWorld/Core/FemtoWorldContainer.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldDetaDphiStar.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldUtils.h"
+#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-
-#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldContainer.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldDetaDphiStar.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldUtils.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::analysis::femtoWorld;
diff --git a/.conflict-base-0/PWGCF/FemtoWorld/Tasks/femtoWorldPionAllPairTask.cxx b/.conflict-base-0/PWGCF/FemtoWorld/Tasks/femtoWorldPionAllPairTask.cxx
index 44278d89471..ba41e02a12d 100644
--- a/.conflict-base-0/PWGCF/FemtoWorld/Tasks/femtoWorldPionAllPairTask.cxx
+++ b/.conflict-base-0/PWGCF/FemtoWorld/Tasks/femtoWorldPionAllPairTask.cxx
@@ -15,23 +15,24 @@
 /// \author Zuzanna Chochulska, WUT Warsaw, zchochul@cern.ch
 /// \author Deependra Sharma, IITB, deependra.sharma@cern.ch
 
+#include "PWGCF/FemtoWorld/Core/FemtoWorldContainer.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldDetaDphiStar.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldMath.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldPairWithCentrality.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldUtils.h"
+#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-#include "TDatabasePDG.h"
+#include "Framework/runDataProcessing.h"
 
-#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldContainer.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldDetaDphiStar.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldUtils.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldMath.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldPairWithCentrality.h"
+#include "TDatabasePDG.h"
 
 using namespace o2;
 using namespace o2::analysis::femtoWorld;
diff --git a/.conflict-base-0/PWGCF/FemtoWorld/Tasks/femtoWorldPionPairTaskTrackTrack.cxx b/.conflict-base-0/PWGCF/FemtoWorld/Tasks/femtoWorldPionPairTaskTrackTrack.cxx
index 9d83c1ca3ec..3bba47662c9 100644
--- a/.conflict-base-0/PWGCF/FemtoWorld/Tasks/femtoWorldPionPairTaskTrackTrack.cxx
+++ b/.conflict-base-0/PWGCF/FemtoWorld/Tasks/femtoWorldPionPairTaskTrackTrack.cxx
@@ -15,20 +15,20 @@
 /// \author Zuzanna Chochulska, WUT Warsaw, zchochul@cern.ch
 /// \author Deependra Sharma, IITB, deependra.sharma@cern.ch
 
+#include "PWGCF/FemtoWorld/Core/FemtoWorldContainer.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldDetaDphiStar.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldUtils.h"
+#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-
-#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldContainer.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldDetaDphiStar.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldUtils.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::analysis::femtoWorld;
diff --git a/.conflict-base-0/PWGCF/Flow/TableProducer/zdcQVectors.cxx b/.conflict-base-0/PWGCF/Flow/TableProducer/zdcQVectors.cxx
index c748b1f51ec..095bc857326 100644
--- a/.conflict-base-0/PWGCF/Flow/TableProducer/zdcQVectors.cxx
+++ b/.conflict-base-0/PWGCF/Flow/TableProducer/zdcQVectors.cxx
@@ -14,47 +14,48 @@
 /// \since  11/2024
 /// \brief  In this task the energy calibration and recentring of Q-vectors constructed in the ZDCs will be done
 
-#include <stdlib.h>
-#include <cmath>
-#include <algorithm>
-#include <numeric>
-#include <vector>
-#include <typeinfo>
-#include <memory>
-#include <string>
+#include "PWGCF/DataModel/SPTableZDC.h"
 
-#include "CCDB/BasicCCDBManager.h"
 #include "Common/CCDB/EventSelectionParams.h"
 #include "Common/CCDB/TriggerAliases.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "Framework/AnalysisTask.h"
+#include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StaticFor.h"
-
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/GlobalTrackID.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "PWGCF/DataModel/SPTableZDC.h"
 
+#include "TCanvas.h"
+#include "TF1.h"
+#include "TFitResult.h"
 #include "TH1F.h"
 #include "TH2F.h"
-#include "TProfile.h"
 #include "TObjArray.h"
-#include "TF1.h"
-#include "TFitResult.h"
-#include "TCanvas.h"
-#include "TSystem.h"
+#include "TProfile.h"
 #include "TROOT.h"
+#include "TSystem.h"
+
+#include <algorithm>
+#include <cmath>
+#include <memory>
+#include <numeric>
+#include <string>
+#include <typeinfo>
+#include <vector>
+
+#include <stdlib.h>
 
 #define O2_DEFINE_CONFIGURABLE(NAME, TYPE, DEFAULT, HELP) Configurable<TYPE> NAME{#NAME, DEFAULT, HELP};
 
@@ -80,7 +81,7 @@ std::vector<double> pyZDC = {-1.75, -1.75, 1.75, 1.75};
 double alphaZDC = 0.395;
 
 // q-vectors before (q) and after (qRec) recentering.
-std::vector<double> q(4); // start values of [QxA, QyA, QxC, QyC]
+std::vector<double> q(4);     // start values of [QxA, QyA, QxC, QyC]
 std::vector<double> qNoEq(4); // start values of [QxA, QyA, QxC, QyC]
 
 // for energy calibration
diff --git a/.conflict-base-0/PWGCF/Flow/Tasks/flowAnalysisGF.cxx b/.conflict-base-0/PWGCF/Flow/Tasks/flowAnalysisGF.cxx
index 08e223befb6..38b5ddf9eb7 100644
--- a/.conflict-base-0/PWGCF/Flow/Tasks/flowAnalysisGF.cxx
+++ b/.conflict-base-0/PWGCF/Flow/Tasks/flowAnalysisGF.cxx
@@ -9,35 +9,36 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <CCDB/BasicCCDBManager.h>
-#include <DataFormatsParameters/GRPObject.h>
-#include <DataFormatsParameters/GRPMagField.h>
-#include <algorithm>
-#include <numeric>
-#include <vector>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/HistogramRegistry.h"
-
-#include "Common/DataModel/EventSelection.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-
-#include "GFWPowerArray.h"
-#include "GFW.h"
-#include "GFWCumulant.h"
 #include "FlowContainer.h"
 #include "FlowPtContainer.h"
+#include "GFW.h"
 #include "GFWConfig.h"
+#include "GFWCumulant.h"
+#include "GFWPowerArray.h"
 #include "GFWWeights.h"
+
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include <CCDB/BasicCCDBManager.h>
+#include <DataFormatsParameters/GRPMagField.h>
+#include <DataFormatsParameters/GRPObject.h>
+
+#include <TF1.h>
 #include <TProfile.h>
 #include <TRandom3.h>
-#include <TF1.h>
+
+#include <algorithm>
+#include <numeric>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGCF/Flow/Tasks/flowEfficiencyCasc.cxx b/.conflict-base-0/PWGCF/Flow/Tasks/flowEfficiencyCasc.cxx
index 25e23838586..e47d25cc6bf 100644
--- a/.conflict-base-0/PWGCF/Flow/Tasks/flowEfficiencyCasc.cxx
+++ b/.conflict-base-0/PWGCF/Flow/Tasks/flowEfficiencyCasc.cxx
@@ -14,23 +14,27 @@
 /// \since  Feb/21/2025
 /// \brief  This task is to calculate V0s and cascades local density efficiency
 
-#include <vector>
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
+#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/DataModel/cascqaanalysis.h"
+
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGLF/DataModel/cascqaanalysis.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 #include <TPDGCode.h>
 
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-base-0/PWGCF/Flow/Tasks/flowEsePHe3.cxx b/.conflict-base-0/PWGCF/Flow/Tasks/flowEsePHe3.cxx
index 2a4955c1419..1577b36037e 100644
--- a/.conflict-base-0/PWGCF/Flow/Tasks/flowEsePHe3.cxx
+++ b/.conflict-base-0/PWGCF/Flow/Tasks/flowEsePHe3.cxx
@@ -14,41 +14,41 @@
 /// \brief  task to calculate the P He3 flow correlation.
 // C++/ROOT includes.
 #include <CCDB/BasicCCDBManager.h>
-#include <chrono>
-#include <string>
-#include <vector>
-#include <utility>
-#include <memory>
-#include <TF1.h>
+
 #include <TComplex.h>
+#include <TF1.h>
 #include <TH1F.h>
 #include <TH2D.h>
 #include <TMath.h>
 #include <TVector2.h>
 
-// o2Physics includes.
-#include "Framework/ASoA.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/StaticFor.h"
-
-#include "DataFormatsTPC/BetheBlochAleph.h"
+#include <chrono>
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
 
-#include "Common/DataModel/Qvectors.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Multiplicity.h"
+// o2Physics includes.
 #include "Common/Core/EventPlaneHelper.h"
 #include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/PIDResponseITS.h"
+#include "Common/DataModel/Qvectors.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
 #include "CommonConstants/PhysicsConstants.h"
+#include "DataFormatsTPC/BetheBlochAleph.h"
+#include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGCF/Flow/Tasks/flowGfwOmegaXi.cxx b/.conflict-base-0/PWGCF/Flow/Tasks/flowGfwOmegaXi.cxx
index 741f4b5b33a..0dbc93d8bdd 100644
--- a/.conflict-base-0/PWGCF/Flow/Tasks/flowGfwOmegaXi.cxx
+++ b/.conflict-base-0/PWGCF/Flow/Tasks/flowGfwOmegaXi.cxx
@@ -196,7 +196,7 @@ struct FlowGfwOmegaXi {
 
   using TracksPID = soa::Join<aod::pidTPCPi, aod::pidTPCKa, aod::pidTPCPr, aod::pidTOFPi, aod::pidTOFKa, aod::pidTOFPr>;
   using AodTracks = soa::Filtered<soa::Join<aod::Tracks, aod::TrackSelection, o2::aod::TrackSelectionExtension, aod::TracksExtra, TracksPID, aod::TracksIU>>; // tracks filter
-  using AodCollisions = soa::Filtered<soa::Join<aod::Collisions, aod::EvSels, aod::CentFT0Cs, aod::Mults>>;  // collisions filter
+  using AodCollisions = soa::Filtered<soa::Join<aod::Collisions, aod::EvSels, aod::CentFT0Cs, aod::Mults>>;                                                   // collisions filter
   using DaughterTracks = soa::Join<aod::Tracks, aod::TracksExtra, aod::TracksDCA, TracksPID, aod::TrackSelection, o2::aod::TrackSelectionExtension>;
 
   // Connect to ccdb
diff --git a/.conflict-base-0/PWGCF/Flow/Tasks/flowGfwTask.cxx b/.conflict-base-0/PWGCF/Flow/Tasks/flowGfwTask.cxx
index e5854dcf43b..9e2d03f41d1 100644
--- a/.conflict-base-0/PWGCF/Flow/Tasks/flowGfwTask.cxx
+++ b/.conflict-base-0/PWGCF/Flow/Tasks/flowGfwTask.cxx
@@ -14,40 +14,41 @@
 /// \since  Mar 28, 2024
 /// \brief  Multiparticle flow measurements with FT0 and ZDC
 
-#include <CCDB/BasicCCDBManager.h>
-#include <DataFormatsParameters/GRPMagField.h>
-#include <cmath>
-#include <vector>
-#include <string>
-#include <memory>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/AnalysisDataModel.h"
+#include "FlowContainer.h"
+#include "GFW.h"
+#include "GFWCumulant.h"
+#include "GFWPowerArray.h"
+#include "GFWWeights.h"
 
-#include "Common/DataModel/EventSelection.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/GlobalTrackID.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "TPDGCode.h"
+#include <CCDB/BasicCCDBManager.h>
+#include <DataFormatsParameters/GRPMagField.h>
 
-#include "GFWPowerArray.h"
-#include "GFW.h"
-#include "GFWCumulant.h"
-#include "GFWWeights.h"
-#include "FlowContainer.h"
 #include "TList.h"
+#include "TPDGCode.h"
+#include <TF1.h>
 #include <TProfile.h>
 #include <TRandom3.h>
-#include <TF1.h>
+
+#include <cmath>
+#include <memory>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGCF/Flow/Tasks/flowMc.cxx b/.conflict-base-0/PWGCF/Flow/Tasks/flowMc.cxx
index b310096ef40..81ed7e3f95b 100644
--- a/.conflict-base-0/PWGCF/Flow/Tasks/flowMc.cxx
+++ b/.conflict-base-0/PWGCF/Flow/Tasks/flowMc.cxx
@@ -14,34 +14,39 @@
 /// \since  Feb/5/2025
 /// \brief  QC of synthetic flow exercise
 
-#include <CCDB/BasicCCDBManager.h>
-#include <vector>
-#include <string>
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "FlowContainer.h"
+#include "GFW.h"
+#include "GFWCumulant.h"
+#include "GFWPowerArray.h"
+#include "GFWWeights.h"
+
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGMM/Mult/DataModel/Index.h" // for Particles2Tracks table
+
 #include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
 #include "Common/Core/trackUtilities.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "DataFormatsParameters/GRPObject.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "DataFormatsParameters/GRPMagField.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGMM/Mult/DataModel/Index.h" // for Particles2Tracks table
-#include "GFWPowerArray.h"
-#include "GFW.h"
-#include "GFWCumulant.h"
-#include "GFWWeights.h"
-#include "FlowContainer.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+#include <CCDB/BasicCCDBManager.h>
+
+#include <TF1.h>
+#include <TPDGCode.h>
 #include <TProfile.h>
 #include <TRandom3.h>
-#include <TPDGCode.h>
-#include <TF1.h>
+
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGCF/Flow/Tasks/flowPidCme.cxx b/.conflict-base-0/PWGCF/Flow/Tasks/flowPidCme.cxx
index bd91bdc4450..0248af750d6 100644
--- a/.conflict-base-0/PWGCF/Flow/Tasks/flowPidCme.cxx
+++ b/.conflict-base-0/PWGCF/Flow/Tasks/flowPidCme.cxx
@@ -14,39 +14,40 @@
 /// \brief  task to calculate the pikp cme signal and bacground.
 // C++/ROOT includes.
 #include <CCDB/BasicCCDBManager.h>
-#include <chrono>
-#include <string>
-#include <vector>
-#include <utility>
-#include <memory>
-#include <TF1.h>
+
 #include <TComplex.h>
+#include <TF1.h>
 #include <TH1F.h>
 #include <TH2D.h>
 #include <TMath.h>
 #include <TVector2.h>
 
-// o2Physics includes.
-#include "Framework/ASoA.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/StaticFor.h"
+#include <chrono>
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
 
-#include "Common/DataModel/Qvectors.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Multiplicity.h"
+// o2Physics includes.
 #include "Common/Core/EventPlaneHelper.h"
 #include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/PIDResponseITS.h"
+#include "Common/DataModel/Qvectors.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
 #include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
 
 // o2 includes.
 
diff --git a/.conflict-base-0/PWGCF/Flow/Tasks/flowPtEfficiency.cxx b/.conflict-base-0/PWGCF/Flow/Tasks/flowPtEfficiency.cxx
index 217b6f7fb36..a66de51e212 100644
--- a/.conflict-base-0/PWGCF/Flow/Tasks/flowPtEfficiency.cxx
+++ b/.conflict-base-0/PWGCF/Flow/Tasks/flowPtEfficiency.cxx
@@ -14,29 +14,31 @@
 /// \since  Jun/08/2023
 /// \brief  a task to calculate the pt efficiency
 
-#include <CCDB/BasicCCDBManager.h>
-#include <vector>
-#include <string>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/HistogramRegistry.h"
+#include "FlowContainer.h"
+#include "GFW.h"
+#include "GFWCumulant.h"
+#include "GFWPowerArray.h"
+#include "GFWWeights.h"
 
 #include "Common/Core/RecoDecay.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
-#include "GFWPowerArray.h"
-#include "GFW.h"
-#include "GFWCumulant.h"
-#include "GFWWeights.h"
-#include "FlowContainer.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include <CCDB/BasicCCDBManager.h>
+
+#include <TPDGCode.h>
 #include <TProfile.h>
 #include <TRandom3.h>
-#include <TPDGCode.h>
+
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGCF/Flow/Tasks/flowQa.cxx b/.conflict-base-0/PWGCF/Flow/Tasks/flowQa.cxx
index 1eaa6d8437d..3d52e9ec429 100644
--- a/.conflict-base-0/PWGCF/Flow/Tasks/flowQa.cxx
+++ b/.conflict-base-0/PWGCF/Flow/Tasks/flowQa.cxx
@@ -14,36 +14,38 @@
 /// \since  Feb/23/2025
 /// \brief  jira: PWGCF-254, QA for flow analysis
 
-#include <CCDB/BasicCCDBManager.h>
-#include <cmath>
-#include <vector>
-#include <unordered_map>
-#include <string>
-#include <memory>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/HistogramRegistry.h"
+#include "FlowContainer.h"
+#include "GFW.h"
+#include "GFWCumulant.h"
+#include "GFWPowerArray.h"
+#include "GFWWeights.h"
 
-#include "Common/DataModel/EventSelection.h"
+#include "Common/CCDB/ctpRateFetcher.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/CCDB/ctpRateFetcher.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include <CCDB/BasicCCDBManager.h>
 
-#include "GFWPowerArray.h"
-#include "GFW.h"
-#include "GFWCumulant.h"
-#include "GFWWeights.h"
-#include "FlowContainer.h"
 #include "TList.h"
+#include <TF1.h>
+#include <TObjArray.h>
 #include <TProfile.h>
 #include <TRandom3.h>
-#include <TObjArray.h>
-#include <TF1.h>
+
+#include <cmath>
+#include <memory>
+#include <string>
+#include <unordered_map>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGCF/Flow/Tasks/flowRunbyRun.cxx b/.conflict-base-0/PWGCF/Flow/Tasks/flowRunbyRun.cxx
index 620063e1d5d..b0221c34c3c 100644
--- a/.conflict-base-0/PWGCF/Flow/Tasks/flowRunbyRun.cxx
+++ b/.conflict-base-0/PWGCF/Flow/Tasks/flowRunbyRun.cxx
@@ -15,36 +15,38 @@
 /// \since  Oct/30/2024
 /// \brief  jira: PWGCF-254, produce Run-by-Run QA plots and flow analysis for Run3
 
-#include <CCDB/BasicCCDBManager.h>
-#include <cmath>
-#include <vector>
-#include <unordered_map>
-#include <map>
-#include <string>
-#include <memory>
-#include <utility>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/HistogramRegistry.h"
+#include "FlowContainer.h"
+#include "GFW.h"
+#include "GFWCumulant.h"
+#include "GFWPowerArray.h"
+#include "GFWWeights.h"
 
-#include "Common/DataModel/EventSelection.h"
+#include "Common/CCDB/ctpRateFetcher.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/CCDB/ctpRateFetcher.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include <CCDB/BasicCCDBManager.h>
 
-#include "GFWPowerArray.h"
-#include "GFW.h"
-#include "GFWCumulant.h"
-#include "GFWWeights.h"
-#include "FlowContainer.h"
 #include "TList.h"
+#include <TF1.h>
 #include <TProfile.h>
 #include <TRandom3.h>
-#include <TF1.h>
+
+#include <cmath>
+#include <map>
+#include <memory>
+#include <string>
+#include <unordered_map>
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGCF/Flow/Tasks/flowSP.cxx b/.conflict-base-0/PWGCF/Flow/Tasks/flowSP.cxx
index f37c15eac01..cc3f51e91d0 100644
--- a/.conflict-base-0/PWGCF/Flow/Tasks/flowSP.cxx
+++ b/.conflict-base-0/PWGCF/Flow/Tasks/flowSP.cxx
@@ -14,35 +14,37 @@
 /// \since  01/12/2024
 /// \brief  task to evaluate flow with respect to spectator plane.
 
-#include <CCDB/BasicCCDBManager.h>
-#include <DataFormatsParameters/GRPObject.h>
-#include <DataFormatsParameters/GRPMagField.h>
-#include <algorithm>
-#include <numeric>
-#include <vector>
-#include <string>
-#include <unordered_map>
+#include "GFWWeights.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/O2DatabasePDGPlugin.h"
+#include "PWGCF/DataModel/SPTableZDC.h"
 
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/Centrality.h"
-#include "Common/Core/RecoDecay.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include <CCDB/BasicCCDBManager.h>
+#include <DataFormatsParameters/GRPMagField.h>
+#include <DataFormatsParameters/GRPObject.h>
 
-#include "PWGCF/DataModel/SPTableZDC.h"
-#include "GFWWeights.h"
 #include "TF1.h"
 #include "TPDGCode.h"
 
+#include <algorithm>
+#include <numeric>
+#include <string>
+#include <unordered_map>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-base-0/PWGCF/Flow/Tasks/flowTask.cxx b/.conflict-base-0/PWGCF/Flow/Tasks/flowTask.cxx
index 9ebe74d1f76..bb6d1749e5d 100644
--- a/.conflict-base-0/PWGCF/Flow/Tasks/flowTask.cxx
+++ b/.conflict-base-0/PWGCF/Flow/Tasks/flowTask.cxx
@@ -14,36 +14,38 @@
 /// \since  Dec/10/2023
 /// \brief  jira: PWGCF-254, task to measure flow observables with cumulant method
 
-#include <CCDB/BasicCCDBManager.h>
-#include <cmath>
-#include <vector>
-#include <unordered_map>
-#include <string>
-#include <memory>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/HistogramRegistry.h"
+#include "FlowContainer.h"
+#include "GFW.h"
+#include "GFWCumulant.h"
+#include "GFWPowerArray.h"
+#include "GFWWeights.h"
 
-#include "Common/DataModel/EventSelection.h"
+#include "Common/CCDB/ctpRateFetcher.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/CCDB/ctpRateFetcher.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include <CCDB/BasicCCDBManager.h>
 
-#include "GFWPowerArray.h"
-#include "GFW.h"
-#include "GFWCumulant.h"
-#include "GFWWeights.h"
-#include "FlowContainer.h"
 #include "TList.h"
+#include <TF1.h>
+#include <TObjArray.h>
 #include <TProfile.h>
 #include <TRandom3.h>
-#include <TObjArray.h>
-#include <TF1.h>
+
+#include <cmath>
+#include <memory>
+#include <string>
+#include <unordered_map>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGCF/GenericFramework/Core/BootstrapProfile.h b/.conflict-base-0/PWGCF/GenericFramework/Core/BootstrapProfile.h
index 829c58cc11a..e7d0b62e45e 100644
--- a/.conflict-base-0/PWGCF/GenericFramework/Core/BootstrapProfile.h
+++ b/.conflict-base-0/PWGCF/GenericFramework/Core/BootstrapProfile.h
@@ -16,11 +16,11 @@
 #ifndef PWGCF_GENERICFRAMEWORK_CORE_BOOTSTRAPPROFILE_H_
 #define PWGCF_GENERICFRAMEWORK_CORE_BOOTSTRAPPROFILE_H_
 
-#include "TProfile.h"
-#include "TList.h"
-#include "TString.h"
 #include "TCollection.h"
+#include "TList.h"
 #include "TMath.h"
+#include "TProfile.h"
+#include "TString.h"
 
 class BootstrapProfile : public TProfile
 {
diff --git a/.conflict-base-0/PWGCF/GenericFramework/Core/FlowContainer.h b/.conflict-base-0/PWGCF/GenericFramework/Core/FlowContainer.h
index bb330c049b6..5cba4eed279 100644
--- a/.conflict-base-0/PWGCF/GenericFramework/Core/FlowContainer.h
+++ b/.conflict-base-0/PWGCF/GenericFramework/Core/FlowContainer.h
@@ -15,23 +15,24 @@
 
 #ifndef PWGCF_GENERICFRAMEWORK_CORE_FLOWCONTAINER_H_
 #define PWGCF_GENERICFRAMEWORK_CORE_FLOWCONTAINER_H_
-#include <vector>
-#include "TH3F.h"
-#include "TProfile2D.h"
-#include "TProfile.h"
-#include "TNamed.h"
+#include "ProfileSubset.h"
+
+#include "Framework/HistogramSpec.h"
+
+#include "TAxis.h"
+#include "TCollection.h"
+#include "TFile.h"
 #include "TH1.h"
+#include "TH3F.h"
 #include "TMath.h"
-#include "TFile.h"
-#include "TAxis.h"
-#include "TString.h"
+#include "TNamed.h"
 #include "TObjArray.h"
+#include "TProfile.h"
+#include "TProfile2D.h"
 #include "TRandom.h"
 #include "TString.h"
-#include "TCollection.h"
-#include "TAxis.h"
-#include "ProfileSubset.h"
-#include "Framework/HistogramSpec.h"
+
+#include <vector>
 
 class FlowContainer : public TNamed
 {
diff --git a/.conflict-base-0/PWGCF/GenericFramework/Core/FlowPtContainer.cxx b/.conflict-base-0/PWGCF/GenericFramework/Core/FlowPtContainer.cxx
index 33f2e303711..5e3e3a45306 100644
--- a/.conflict-base-0/PWGCF/GenericFramework/Core/FlowPtContainer.cxx
+++ b/.conflict-base-0/PWGCF/GenericFramework/Core/FlowPtContainer.cxx
@@ -14,9 +14,10 @@
 /// \author Emil Gorm Nielsen, NBI, emil.gorm.nielsen@cern.ch
 
 #include "FlowPtContainer.h"
+
 #include <algorithm>
-#include <vector>
 #include <cstdio>
+#include <vector>
 
 FlowPtContainer::FlowPtContainer() : fCMTermList(0),
                                      fCorrList(0),
diff --git a/.conflict-base-0/PWGCF/GenericFramework/Core/FlowPtContainer.h b/.conflict-base-0/PWGCF/GenericFramework/Core/FlowPtContainer.h
index 207e1a36fe7..b0bd6b6a72c 100644
--- a/.conflict-base-0/PWGCF/GenericFramework/Core/FlowPtContainer.h
+++ b/.conflict-base-0/PWGCF/GenericFramework/Core/FlowPtContainer.h
@@ -16,18 +16,21 @@
 #ifndef PWGCF_GENERICFRAMEWORK_CORE_FLOWPTCONTAINER_H_
 #define PWGCF_GENERICFRAMEWORK_CORE_FLOWPTCONTAINER_H_
 
-#include <algorithm>
-#include <vector>
-#include <complex>
-#include <variant>
 #include "BootstrapProfile.h"
-#include "TNamed.h"
-#include "TList.h"
-#include "TCollection.h"
-#include "Framework/HistogramSpec.h"
 #include "GFW.h"
 #include "GFWConfig.h"
 
+#include "Framework/HistogramSpec.h"
+
+#include "TCollection.h"
+#include "TList.h"
+#include "TNamed.h"
+
+#include <algorithm>
+#include <complex>
+#include <variant>
+#include <vector>
+
 namespace o2::analysis::genericframework::eventweight
 {
 enum EventWeight {
diff --git a/.conflict-base-0/PWGCF/GenericFramework/Core/GFWConfig.h b/.conflict-base-0/PWGCF/GenericFramework/Core/GFWConfig.h
index 779d06b604e..949a16e23d1 100644
--- a/.conflict-base-0/PWGCF/GenericFramework/Core/GFWConfig.h
+++ b/.conflict-base-0/PWGCF/GenericFramework/Core/GFWConfig.h
@@ -12,13 +12,15 @@
 #ifndef PWGCF_GENERICFRAMEWORK_CORE_GFWCONFIG_H_
 #define PWGCF_GENERICFRAMEWORK_CORE_GFWCONFIG_H_
 
+#include "GFW.h"
+
+#include <TMath.h>
+#include <TObject.h>
+
 #include <algorithm>
+#include <string>
 #include <utility>
 #include <vector>
-#include <string>
-#include <TObject.h>
-#include <TMath.h>
-#include "GFW.h"
 
 namespace o2
 {
diff --git a/.conflict-base-0/PWGCF/GenericFramework/Core/GFWPowerArray.h b/.conflict-base-0/PWGCF/GenericFramework/Core/GFWPowerArray.h
index ba38f2fcc54..8b0a5eca32c 100644
--- a/.conflict-base-0/PWGCF/GenericFramework/Core/GFWPowerArray.h
+++ b/.conflict-base-0/PWGCF/GenericFramework/Core/GFWPowerArray.h
@@ -16,9 +16,9 @@
 #ifndef PWGCF_GENERICFRAMEWORK_CORE_GFWPOWERARRAY_H_
 #define PWGCF_GENERICFRAMEWORK_CORE_GFWPOWERARRAY_H_
 
-#include <vector>
 #include <cmath>
 #include <string>
+#include <vector>
 
 typedef std::vector<int> HarSet;
 class GFWPowerArray
diff --git a/.conflict-base-0/PWGCF/GenericFramework/Core/GFWWeights.cxx b/.conflict-base-0/PWGCF/GenericFramework/Core/GFWWeights.cxx
index 4d2d41cd85d..b729213d80d 100644
--- a/.conflict-base-0/PWGCF/GenericFramework/Core/GFWWeights.cxx
+++ b/.conflict-base-0/PWGCF/GenericFramework/Core/GFWWeights.cxx
@@ -10,7 +10,9 @@
 // or submit itself to any jurisdiction.
 
 #include "GFWWeights.h"
+
 #include "TMath.h"
+
 #include <cstdio>
 
 GFWWeights::GFWWeights() : TNamed("", ""),
diff --git a/.conflict-base-0/PWGCF/GenericFramework/Core/GFWWeights.h b/.conflict-base-0/PWGCF/GenericFramework/Core/GFWWeights.h
index f60783ccec8..c0be3f7caeb 100644
--- a/.conflict-base-0/PWGCF/GenericFramework/Core/GFWWeights.h
+++ b/.conflict-base-0/PWGCF/GenericFramework/Core/GFWWeights.h
@@ -18,13 +18,13 @@
 
 #include "Framework/Logger.h"
 
-#include "TObjArray.h"
-#include "TNamed.h"
-#include "TH3D.h"
-#include "TH2D.h"
-#include "TH1D.h"
-#include "TFile.h"
 #include "TCollection.h"
+#include "TFile.h"
+#include "TH1D.h"
+#include "TH2D.h"
+#include "TH3D.h"
+#include "TNamed.h"
+#include "TObjArray.h"
 #include "TString.h"
 
 class GFWWeights : public TNamed
diff --git a/.conflict-base-0/PWGCF/GenericFramework/Core/GFWWeightsList.cxx b/.conflict-base-0/PWGCF/GenericFramework/Core/GFWWeightsList.cxx
index 11a6ffe3159..104c6c77907 100644
--- a/.conflict-base-0/PWGCF/GenericFramework/Core/GFWWeightsList.cxx
+++ b/.conflict-base-0/PWGCF/GenericFramework/Core/GFWWeightsList.cxx
@@ -14,9 +14,10 @@
 /// \since  Dec/25/2024
 /// \brief  one object to hold a list of GFWWeights objects,
 
-#include <utility>
 #include "GFWWeightsList.h"
 
+#include <utility>
+
 GFWWeightsList::GFWWeightsList() : TNamed("", ""), list(0)
 {
   runNumberMap.clear();
diff --git a/.conflict-base-0/PWGCF/GenericFramework/Core/GFWWeightsList.h b/.conflict-base-0/PWGCF/GenericFramework/Core/GFWWeightsList.h
index c0f208a7088..dab5b345fa0 100644
--- a/.conflict-base-0/PWGCF/GenericFramework/Core/GFWWeightsList.h
+++ b/.conflict-base-0/PWGCF/GenericFramework/Core/GFWWeightsList.h
@@ -16,15 +16,16 @@
 
 #ifndef PWGCF_GENERICFRAMEWORK_CORE_GFWWEIGHTSLIST_H_
 #define PWGCF_GENERICFRAMEWORK_CORE_GFWWEIGHTSLIST_H_
-#include <map>
-#include <cstdio>
-#include <string>
-#include <vector>
+#include "GFWWeights.h"
 
 #include "Framework/Logger.h"
 
 #include "TObjArray.h"
-#include "GFWWeights.h"
+
+#include <cstdio>
+#include <map>
+#include <string>
+#include <vector>
 
 class GFWWeightsList : public TNamed
 {
diff --git a/.conflict-base-0/PWGCF/GenericFramework/Core/ProfileSubset.cxx b/.conflict-base-0/PWGCF/GenericFramework/Core/ProfileSubset.cxx
index 66969f699af..333f1eea5e0 100644
--- a/.conflict-base-0/PWGCF/GenericFramework/Core/ProfileSubset.cxx
+++ b/.conflict-base-0/PWGCF/GenericFramework/Core/ProfileSubset.cxx
@@ -10,6 +10,7 @@
 // or submit itself to any jurisdiction.
 
 #include "ProfileSubset.h"
+
 #include "TProfile2D.h"
 
 TProfile* ProfileSubset::GetSubset(bool onX, const char* name, int firstbin, int lastbin, int l_nbins, double* l_binarray)
diff --git a/.conflict-base-0/PWGCF/GenericFramework/Core/ProfileSubset.h b/.conflict-base-0/PWGCF/GenericFramework/Core/ProfileSubset.h
index fc920b898c4..f2b09d1a640 100644
--- a/.conflict-base-0/PWGCF/GenericFramework/Core/ProfileSubset.h
+++ b/.conflict-base-0/PWGCF/GenericFramework/Core/ProfileSubset.h
@@ -16,9 +16,9 @@
 #ifndef PWGCF_GENERICFRAMEWORK_CORE_PROFILESUBSET_H_
 #define PWGCF_GENERICFRAMEWORK_CORE_PROFILESUBSET_H_
 
+#include "TError.h"
 #include "TProfile.h"
 #include "TProfile2D.h"
-#include "TError.h"
 
 class ProfileSubset : public TProfile2D
 {
diff --git a/.conflict-base-0/PWGCF/GenericFramework/Tasks/flowGenericFramework.cxx b/.conflict-base-0/PWGCF/GenericFramework/Tasks/flowGenericFramework.cxx
index 79e56fbcff6..31aa9d9e194 100644
--- a/.conflict-base-0/PWGCF/GenericFramework/Tasks/flowGenericFramework.cxx
+++ b/.conflict-base-0/PWGCF/GenericFramework/Tasks/flowGenericFramework.cxx
@@ -13,42 +13,43 @@
 /// \brief Task to analyse angular and transverse momentum correlations with GFW
 /// \author Emil Gorm Nielsen, NBI, emil.gorm.nielsen@cern.ch
 
-#include <CCDB/BasicCCDBManager.h>
-#include <DataFormatsParameters/GRPObject.h>
-#include <DataFormatsParameters/GRPMagField.h>
-#include <algorithm>
-#include <numeric>
-#include <vector>
-#include <complex>
-#include <string>
-#include <map>
-#include <utility>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/HistogramRegistry.h"
-
-#include "Common/DataModel/EventSelection.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/PIDResponse.h"
-
-#include "GFWPowerArray.h"
-#include "GFW.h"
-#include "GFWCumulant.h"
 #include "FlowContainer.h"
 #include "FlowPtContainer.h"
+#include "GFW.h"
 #include "GFWConfig.h"
+#include "GFWCumulant.h"
+#include "GFWPowerArray.h"
 #include "GFWWeights.h"
 #include "GFWWeightsList.h"
-#include <TProfile.h>
-#include <TRandom3.h>
+
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include <CCDB/BasicCCDBManager.h>
+#include <DataFormatsParameters/GRPMagField.h>
+#include <DataFormatsParameters/GRPObject.h>
+
 #include <TF1.h>
 #include <TPDGCode.h>
+#include <TProfile.h>
+#include <TRandom3.h>
+
+#include <algorithm>
+#include <complex>
+#include <map>
+#include <numeric>
+#include <string>
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGCF/JCorran/Core/FlowJHistManager.cxx b/.conflict-base-0/PWGCF/JCorran/Core/FlowJHistManager.cxx
index 880ec409dbd..4a13ac5f31d 100644
--- a/.conflict-base-0/PWGCF/JCorran/Core/FlowJHistManager.cxx
+++ b/.conflict-base-0/PWGCF/JCorran/Core/FlowJHistManager.cxx
@@ -16,6 +16,7 @@
 
 // O2 Physics headers.
 #include "PWGCF/JCorran/Core/FlowJHistManager.h"
+
 #include "CommonConstants/MathConstants.h"
 
 // Namespaces.
diff --git a/.conflict-base-0/PWGCF/JCorran/Core/FlowJHistManager.h b/.conflict-base-0/PWGCF/JCorran/Core/FlowJHistManager.h
index e067a9f00b5..3c7b1773eac 100644
--- a/.conflict-base-0/PWGCF/JCorran/Core/FlowJHistManager.h
+++ b/.conflict-base-0/PWGCF/JCorran/Core/FlowJHistManager.h
@@ -16,16 +16,17 @@
 #define PWGCF_JCORRAN_CORE_FLOWJHISTMANAGER_H_
 
 /* Header files. */
-#include <vector>
-#include <array>
-#include <string>
-#include <string_view>
 #include "TH1.h"
 #include "TH2.h"
 #include "TH3.h"
 #include "TProfile.h"
 #include "TProfile2D.h"
 
+#include <array>
+#include <string>
+#include <string_view>
+#include <vector>
+
 // O2 headers. //
 #include "Framework/HistogramRegistry.h"
 
diff --git a/.conflict-base-0/PWGCF/JCorran/Core/FlowJSPCAnalysis.h b/.conflict-base-0/PWGCF/JCorran/Core/FlowJSPCAnalysis.h
index ba584d1e1eb..d1bd45354ec 100644
--- a/.conflict-base-0/PWGCF/JCorran/Core/FlowJSPCAnalysis.h
+++ b/.conflict-base-0/PWGCF/JCorran/Core/FlowJSPCAnalysis.h
@@ -16,15 +16,17 @@
 #define PWGCF_JCORRAN_CORE_FLOWJSPCANALYSIS_H_
 
 /* Header files. */
-#include <array>
-#include <vector>
 #include <TComplex.h>
 #include <TProfile.h>
 
+#include <array>
+#include <vector>
+
 // O2 headers. //
-#include "Framework/HistogramRegistry.h"
 #include "PWGCF/JCorran/Core/JQVectors.h"
+
 #include "CommonConstants/MathConstants.h"
+#include "Framework/HistogramRegistry.h"
 
 class FlowJSPCAnalysis
 {
diff --git a/.conflict-base-0/PWGCF/JCorran/Core/JFFlucAnalysis.cxx b/.conflict-base-0/PWGCF/JCorran/Core/JFFlucAnalysis.cxx
index 9dc4189a810..4c3b01adeca 100644
--- a/.conflict-base-0/PWGCF/JCorran/Core/JFFlucAnalysis.cxx
+++ b/.conflict-base-0/PWGCF/JCorran/Core/JFFlucAnalysis.cxx
@@ -12,10 +12,12 @@
 /// \author Jasper Parkkila (jparkkil@cern.ch)
 /// \since Sep 2022
 
-#include <TMath.h>
+#include "JFFlucAnalysis.h"
+
 #include <TComplex.h>
+#include <TMath.h>
+
 #include <algorithm>
-#include "JFFlucAnalysis.h"
 
 JFFlucAnalysis::JFFlucAnalysis() : TNamed(),
                                    fVertex(0),
diff --git a/.conflict-base-0/PWGCF/JCorran/Core/JFFlucAnalysis.h b/.conflict-base-0/PWGCF/JCorran/Core/JFFlucAnalysis.h
index 01589a09849..039dc51d421 100644
--- a/.conflict-base-0/PWGCF/JCorran/Core/JFFlucAnalysis.h
+++ b/.conflict-base-0/PWGCF/JCorran/Core/JFFlucAnalysis.h
@@ -15,13 +15,15 @@
 #ifndef PWGCF_JCORRAN_CORE_JFFLUCANALYSIS_H_
 #define PWGCF_JCORRAN_CORE_JFFLUCANALYSIS_H_
 
-#include <experimental/type_traits>
 #include "JQVectors.h"
+
 #include <TComplex.h>
-#include <TNamed.h>
 #include <TH1.h>
 #include <THn.h>
 #include <THnSparse.h>
+#include <TNamed.h>
+
+#include <experimental/type_traits>
 
 class JFFlucAnalysis : public TNamed
 {
diff --git a/.conflict-base-0/PWGCF/JCorran/Core/JFFlucAnalysisO2Hist.cxx b/.conflict-base-0/PWGCF/JCorran/Core/JFFlucAnalysisO2Hist.cxx
index b3419ff7dc8..55520ba8158 100644
--- a/.conflict-base-0/PWGCF/JCorran/Core/JFFlucAnalysisO2Hist.cxx
+++ b/.conflict-base-0/PWGCF/JCorran/Core/JFFlucAnalysisO2Hist.cxx
@@ -12,10 +12,12 @@
 /// \since Sep 2024
 
 #include "JFFlucAnalysisO2Hist.h"
-#include <vector>
-#include <memory>
+
 #include "CommonConstants/MathConstants.h"
 
+#include <memory>
+#include <vector>
+
 using namespace o2;
 
 JFFlucAnalysisO2Hist::JFFlucAnalysisO2Hist(HistogramRegistry& registry, AxisSpec& axisMultiplicity, AxisSpec& phiAxis, AxisSpec& etaAxis, AxisSpec& zvtAxis, AxisSpec& ptAxis, AxisSpec& massAxis, const TString& folder) : JFFlucAnalysis()
diff --git a/.conflict-base-0/PWGCF/JCorran/Core/JFFlucAnalysisO2Hist.h b/.conflict-base-0/PWGCF/JCorran/Core/JFFlucAnalysisO2Hist.h
index a9de2fd7864..1c65334d607 100644
--- a/.conflict-base-0/PWGCF/JCorran/Core/JFFlucAnalysisO2Hist.h
+++ b/.conflict-base-0/PWGCF/JCorran/Core/JFFlucAnalysisO2Hist.h
@@ -15,6 +15,7 @@
 #define PWGCF_JCORRAN_CORE_JFFLUCANALYSISO2HIST_H_
 
 #include "JFFlucAnalysis.h"
+
 #include "Framework/HistogramRegistry.h"
 
 using namespace o2;
diff --git a/.conflict-base-0/PWGCF/JCorran/Core/JQVectors.h b/.conflict-base-0/PWGCF/JCorran/Core/JQVectors.h
index c96aac454b7..210968d23ec 100644
--- a/.conflict-base-0/PWGCF/JCorran/Core/JQVectors.h
+++ b/.conflict-base-0/PWGCF/JCorran/Core/JQVectors.h
@@ -15,9 +15,10 @@
 #ifndef PWGCF_JCORRAN_CORE_JQVECTORS_H_
 #define PWGCF_JCORRAN_CORE_JQVECTORS_H_
 
-#include <experimental/type_traits>
 #include <TMath.h>
 
+#include <experimental/type_traits>
+
 template <class Q, UInt_t nh, UInt_t nk>
 class JQVectorsGapBase
 {
diff --git a/.conflict-base-0/PWGCF/JCorran/TableProducer/JCatalyst.cxx b/.conflict-base-0/PWGCF/JCorran/TableProducer/JCatalyst.cxx
index e0cb26994e3..7b354a1541e 100644
--- a/.conflict-base-0/PWGCF/JCorran/TableProducer/JCatalyst.cxx
+++ b/.conflict-base-0/PWGCF/JCorran/TableProducer/JCatalyst.cxx
@@ -12,28 +12,29 @@
 /// \author Dong Jo Kim (djkim@jyu.fi)
 /// \since Sep 2022
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
 #include <CCDB/BasicCCDBManager.h>
-#include <Math/Vector4D.h>
+
 #include <Math/LorentzVector.h>
+#include <Math/Vector4D.h>
 #include <TRandom.h>
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/ASoAHelpers.h"
-
 // centrality
-#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Centrality.h"
 
 ////TODO: remove redundant:
-#include "Framework/HistogramRegistry.h"
-
-#include "DCAFitter/DCAFitterN.h"
 #include "PWGHF/DataModel/CandidateReconstructionTables.h"
+
 #include "Common/Core/trackUtilities.h"
+
+#include "DCAFitter/DCAFitterN.h"
+#include "Framework/HistogramRegistry.h"
 #include "ReconstructionDataFormats/DCA.h"
 #include "ReconstructionDataFormats/V0.h"
 ////
diff --git a/.conflict-base-0/PWGCF/JCorran/Tasks/flowJNUACreation.cxx b/.conflict-base-0/PWGCF/JCorran/Tasks/flowJNUACreation.cxx
index 31edc2a7c3d..ab4fef15591 100644
--- a/.conflict-base-0/PWGCF/JCorran/Tasks/flowJNUACreation.cxx
+++ b/.conflict-base-0/PWGCF/JCorran/Tasks/flowJNUACreation.cxx
@@ -13,31 +13,31 @@
 // \author  Maxim Virta (maxim.virta@cern.ch)
 
 // Standard headers.
+#include <TRandom3.h>
+
 #include <chrono>
 #include <string>
 #include <vector>
-#include <TRandom3.h>
 
 // O2 headers. //
 // The first two are mandatory.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
 #include "CCDB/BasicCCDBManager.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 
 // O2 Physics headers. //
+#include "PWGCF/JCorran/Core/FlowJHistManager.h"
+
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/FT0Corrected.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/Core/TrackSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
-#include "PWGCF/JCorran/Core/FlowJHistManager.h"
-
 // Namespaces and definitions.
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGCF/JCorran/Tasks/flowJSPCAnalysis.cxx b/.conflict-base-0/PWGCF/JCorran/Tasks/flowJSPCAnalysis.cxx
index 2ce4568348f..ad7a05b7a07 100644
--- a/.conflict-base-0/PWGCF/JCorran/Tasks/flowJSPCAnalysis.cxx
+++ b/.conflict-base-0/PWGCF/JCorran/Tasks/flowJSPCAnalysis.cxx
@@ -13,34 +13,34 @@
 // \author  Maxim Virta (maxim.virta@cern.ch), Cindy Mordasini (cindy.mordasini@cern.ch)
 
 // Standard headers.
+#include <TRandom3.h>
+
 #include <chrono>
 #include <string>
 #include <vector>
-#include <TRandom3.h>
 
 // O2 headers. //
 // The first two are mandatory.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 
 // O2 Physics headers. //
+#include "PWGCF/DataModel/CorrelationsDerived.h"
+#include "PWGCF/JCorran/Core/FlowJHistManager.h"
+#include "PWGCF/JCorran/Core/FlowJSPCAnalysis.h"
+#include "PWGCF/JCorran/Core/FlowJSPCObservables.h"
+#include "PWGCF/JCorran/DataModel/JCatalyst.h"
+
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/FT0Corrected.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/Core/TrackSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
-#include "PWGCF/DataModel/CorrelationsDerived.h"
-#include "PWGCF/JCorran/DataModel/JCatalyst.h"
-#include "PWGCF/JCorran/Core/FlowJSPCAnalysis.h"
-#include "PWGCF/JCorran/Core/FlowJSPCObservables.h"
-#include "PWGCF/JCorran/Core/FlowJHistManager.h"
-
 // Namespaces and definitions.
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGCF/JCorran/Tasks/jEPDzeroFlowAnalysis.cxx b/.conflict-base-0/PWGCF/JCorran/Tasks/jEPDzeroFlowAnalysis.cxx
index be132b44684..2fe4adb49ca 100644
--- a/.conflict-base-0/PWGCF/JCorran/Tasks/jEPDzeroFlowAnalysis.cxx
+++ b/.conflict-base-0/PWGCF/JCorran/Tasks/jEPDzeroFlowAnalysis.cxx
@@ -11,52 +11,47 @@
 /// \author junlee.kim@cern.ch
 /// \since Jul 2024
 
-#include <experimental/type_traits>
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <chrono>
-#include <string>
-#include <vector>
-
-#include "TLorentzVector.h"
-#include "TRandom3.h"
-#include "TF1.h"
-#include "TVector2.h"
-#include "Math/Vector3D.h"
-#include "Math/Vector4D.h"
-#include "Math/GenVector/Boost.h"
-#include <TMath.h>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/StaticFor.h"
+#include "PWGCF/DataModel/CorrelationsDerived.h"
 
+#include "Common/Core/EventPlaneHelper.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Qvectors.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "Common/Core/trackUtilities.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/Core/EventPlaneHelper.h"
-
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
 #include "CommonConstants/PhysicsConstants.h"
-
-#include "ReconstructionDataFormats/Track.h"
-
-#include "DataFormatsParameters/GRPObject.h"
 #include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/StaticFor.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
-#include "CCDB/CcdbApi.h"
-#include "CCDB/BasicCCDBManager.h"
+#include "Math/GenVector/Boost.h"
+#include "Math/Vector3D.h"
+#include "Math/Vector4D.h"
+#include "TF1.h"
+#include "TLorentzVector.h"
+#include "TRandom3.h"
+#include "TVector2.h"
+#include <TMath.h>
 
-#include "PWGCF/DataModel/CorrelationsDerived.h"
+#include <array>
+#include <chrono>
+#include <cmath>
+#include <cstdlib>
+#include <experimental/type_traits>
+#include <string>
+#include <vector>
 
 using namespace std;
 using namespace o2;
diff --git a/.conflict-base-0/PWGCF/JCorran/Tasks/jEPFlowAnalysis.cxx b/.conflict-base-0/PWGCF/JCorran/Tasks/jEPFlowAnalysis.cxx
index f3f43744f19..fc36ab43d35 100644
--- a/.conflict-base-0/PWGCF/JCorran/Tasks/jEPFlowAnalysis.cxx
+++ b/.conflict-base-0/PWGCF/JCorran/Tasks/jEPFlowAnalysis.cxx
@@ -11,20 +11,20 @@
 /// \author Maxim Virta (maxim.virta@cern.ch)
 /// \since Jul 2024
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/HistogramRegistry.h"
+#include "JEPFlowAnalysis.h"
 
-#include "Common/DataModel/EventSelection.h"
-#include "Common/Core/TrackSelection.h"
-#include "Framework/runDataProcessing.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "FlowJHistManager.h"
 
-#include "Common/DataModel/Qvectors.h"
 #include "Common/Core/EventPlaneHelper.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Qvectors.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "FlowJHistManager.h"
-#include "JEPFlowAnalysis.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGCF/JCorran/Tasks/jFlucEfficiencyTask.cxx b/.conflict-base-0/PWGCF/JCorran/Tasks/jFlucEfficiencyTask.cxx
index 59ca8b18903..e50baa4c1cb 100644
--- a/.conflict-base-0/PWGCF/JCorran/Tasks/jFlucEfficiencyTask.cxx
+++ b/.conflict-base-0/PWGCF/JCorran/Tasks/jFlucEfficiencyTask.cxx
@@ -14,20 +14,23 @@
 /// \author DongJo Kim, Jasper Parkkila, Bong-Hwi Lim (djkim@cern.ch, jparkkil@cern.ch, bong-hwi.lim@cern.ch)
 /// \since March 2024
 
-#include <vector>
-#include <string>
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/O2DatabasePDGPlugin.h"
+#include "PWGCF/DataModel/CorrelationsDerived.h"
+#include "PWGLF/Utils/collisionCuts.h"
+
 #include "Common/Core/TrackSelection.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "PWGCF/DataModel/CorrelationsDerived.h"
-#include "PWGLF/Utils/collisionCuts.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGCF/JCorran/Tasks/jflucAnalysisTask.cxx b/.conflict-base-0/PWGCF/JCorran/Tasks/jflucAnalysisTask.cxx
index 6e0ba68d2df..12e2a599f55 100644
--- a/.conflict-base-0/PWGCF/JCorran/Tasks/jflucAnalysisTask.cxx
+++ b/.conflict-base-0/PWGCF/JCorran/Tasks/jflucAnalysisTask.cxx
@@ -12,25 +12,27 @@
 /// \author Dong Jo Kim (djkim@jyu.fi)
 /// \since Sep 2022
 
-#include <deque>
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "Framework/AnalysisTask.h"
 #include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-
-#include "Common/DataModel/EventSelection.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Centrality.h"
+#include "Framework/RunningWorkflowInfo.h"
 #include "ReconstructionDataFormats/V0.h"
 
+#include <deque>
+
 // #include "CCDB/BasicCCDBManager.h"
 
-#include "PWGCF/JCorran/DataModel/JCatalyst.h"
-#include "PWGCF/DataModel/CorrelationsDerived.h"
 #include "JFFlucAnalysis.h"
 #include "JFFlucAnalysisO2Hist.h"
+
+#include "PWGCF/DataModel/CorrelationsDerived.h"
+#include "PWGCF/JCorran/DataModel/JCatalyst.h"
+
 #include "Framework/runDataProcessing.h"
 
 using namespace o2;
diff --git a/.conflict-base-0/PWGCF/JCorran/Tasks/jflucWeightsLoader.cxx b/.conflict-base-0/PWGCF/JCorran/Tasks/jflucWeightsLoader.cxx
index 244035fd310..438a73d4bbf 100644
--- a/.conflict-base-0/PWGCF/JCorran/Tasks/jflucWeightsLoader.cxx
+++ b/.conflict-base-0/PWGCF/JCorran/Tasks/jflucWeightsLoader.cxx
@@ -12,27 +12,27 @@
 /// \since May 2024
 // o2-linter: disable='doc/file'
 
-#include <experimental/type_traits>
-#include <string>
-#include <TFile.h>
-#include <THn.h>
-
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/HistogramRegistry.h"
+#include "PWGCF/DataModel/CorrelationsDerived.h"
+#include "PWGCF/JCorran/DataModel/JCatalyst.h"
 
-#include "Common/DataModel/EventSelection.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/Centrality.h"
-#include "ReconstructionDataFormats/V0.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
 #include "CCDB/BasicCCDBManager.h"
-
-#include "PWGCF/JCorran/DataModel/JCatalyst.h"
-#include "PWGCF/DataModel/CorrelationsDerived.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
 #include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/V0.h"
+
+#include <TFile.h>
+#include <THn.h>
+
+#include <experimental/type_traits>
+#include <string>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGCF/MultiparticleCorrelations/Tasks/multiparticle-correlations-ar.cxx b/.conflict-base-0/PWGCF/MultiparticleCorrelations/Tasks/multiparticle-correlations-ar.cxx
index 5b1539deb9e..fb891b91365 100644
--- a/.conflict-base-0/PWGCF/MultiparticleCorrelations/Tasks/multiparticle-correlations-ar.cxx
+++ b/.conflict-base-0/PWGCF/MultiparticleCorrelations/Tasks/multiparticle-correlations-ar.cxx
@@ -13,23 +13,27 @@
 /// \brief multiparticle-correlations-ar - Task belonging to Anton Riedel for computing multiparticle correlations
 /// \author Anton Riedel, TU München, anton.riedel@tum.de
 
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/Expressions.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TComplex.h"
 #include <TMath.h>
+
 #include "fairlogger/Logger.h"
+
 #include <algorithm>
+#include <array>
 #include <cstdint>
 #include <iostream>
-#include <string_view>
+#include <numeric>
 #include <string>
+#include <string_view>
 #include <vector>
-#include <array>
-#include <numeric>
-#include "TComplex.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/Expressions.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGCF/MultiparticleCorrelations/Tasks/threeParticleCorrelations.cxx b/.conflict-base-0/PWGCF/MultiparticleCorrelations/Tasks/threeParticleCorrelations.cxx
index 299867abfd7..02fe0addf20 100644
--- a/.conflict-base-0/PWGCF/MultiparticleCorrelations/Tasks/threeParticleCorrelations.cxx
+++ b/.conflict-base-0/PWGCF/MultiparticleCorrelations/Tasks/threeParticleCorrelations.cxx
@@ -13,20 +13,23 @@
 /// \brief Task for producing particle correlations
 /// \author Joey Staa <joey.staa@fysik.lu.se>
 
-#include <algorithm>
+#include "RecoDecay.h"
+
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "CCDB/BasicCCDBManager.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/McCollisionExtra.h"
 #include "Common/DataModel/PIDResponse.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
-#include "RecoDecay.h"
 #include "TPDGCode.h"
 
+#include <algorithm>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-base-0/PWGCF/TableProducer/dptDptFilter.cxx b/.conflict-base-0/PWGCF/TableProducer/dptDptFilter.cxx
index 30f55cf3c3f..c55cec45f1e 100644
--- a/.conflict-base-0/PWGCF/TableProducer/dptDptFilter.cxx
+++ b/.conflict-base-0/PWGCF/TableProducer/dptDptFilter.cxx
@@ -13,40 +13,43 @@
 /// \brief Filters collisions and tracks according to selection criteria
 /// \author victor.gonzalez.sebastian@gmail.com
 
-#include <cmath>
-#include <algorithm>
-#include <string>
-#include <vector>
+#include "PWGCF/TableProducer/dptDptFilter.h"
+
+#include "PWGCF/Core/AnalysisConfigurableCuts.h"
+#include "PWGCF/DataModel/DptDptFiltered.h"
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
 #include "Common/Core/TableHelper.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/CollisionAssociationTables.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGCF/Core/AnalysisConfigurableCuts.h"
-#include "PWGCF/DataModel/DptDptFiltered.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/CollisionAssociationTables.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/RunningWorkflowInfo.h"
-#include <TROOT.h>
-#include <TPDGCode.h>
-#include <TParameter.h>
-#include <TList.h>
+#include "Framework/runDataProcessing.h"
+
 #include <TDirectory.h>
 #include <TFolder.h>
 #include <TH1.h>
 #include <TH2.h>
 #include <TH3.h>
+#include <TList.h>
+#include <TPDGCode.h>
+#include <TParameter.h>
 #include <TProfile3D.h>
+#include <TROOT.h>
 
-#include "PWGCF/TableProducer/dptDptFilter.h"
+#include <algorithm>
+#include <cmath>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGCF/TableProducer/dptDptFilter.h b/.conflict-base-0/PWGCF/TableProducer/dptDptFilter.h
index 18076266f1a..b107156d5f3 100644
--- a/.conflict-base-0/PWGCF/TableProducer/dptDptFilter.h
+++ b/.conflict-base-0/PWGCF/TableProducer/dptDptFilter.h
@@ -16,33 +16,36 @@
 #ifndef PWGCF_TABLEPRODUCER_DPTDPTFILTER_H_
 #define PWGCF_TABLEPRODUCER_DPTDPTFILTER_H_
 
+#include "PWGCF/Core/AnalysisConfigurableCuts.h"
+
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "ReconstructionDataFormats/PID.h"
 #include <CCDB/BasicCCDBManager.h>
-#include <TPDGCode.h>
-#include <TMCProcess.h>
+
 #include <TF1.h>
 #include <TList.h>
-#include <vector>
+#include <TMCProcess.h>
+#include <TPDGCode.h>
+
 #include <bitset>
-#include <string>
-#include <iomanip>
 #include <fstream>
-#include <locale>
-#include <sstream>
-#include <ranges>
 #include <functional>
+#include <iomanip>
+#include <locale>
 #include <map>
-
-#include "ReconstructionDataFormats/PID.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/Core/TrackSelectionDefaults.h"
-#include "PWGCF/Core/AnalysisConfigurableCuts.h"
+#include <ranges>
+#include <sstream>
+#include <string>
+#include <vector>
 
 namespace o2
 {
diff --git a/.conflict-base-0/PWGCF/Tasks/dptDptCorrelations.cxx b/.conflict-base-0/PWGCF/Tasks/dptDptCorrelations.cxx
index 065e4be286f..33b64e32bdc 100644
--- a/.conflict-base-0/PWGCF/Tasks/dptDptCorrelations.cxx
+++ b/.conflict-base-0/PWGCF/Tasks/dptDptCorrelations.cxx
@@ -13,7 +13,26 @@
 /// \brief implements two-particle correlations base data collection
 /// \author victor.gonzalez.sebastian@gmail.com
 
+#include "PWGCF/Core/AnalysisConfigurableCuts.h"
+#include "PWGCF/Core/PairCuts.h"
+#include "PWGCF/DataModel/DptDptFiltered.h"
+#include "PWGCF/TableProducer/dptDptFilter.h"
+
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/TableHelper.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
 #include <CCDB/BasicCCDBManager.h>
+
 #include <TDirectory.h>
 #include <TFolder.h>
 #include <TH1.h>
@@ -24,28 +43,12 @@
 #include <TProfile3D.h>
 #include <TROOT.h>
 #include <TVector2.h>
+
+#include <cmath>
 #include <cstdio>
+#include <ctime>
 #include <string>
 #include <vector>
-#include <cmath>
-#include <ctime>
-
-#include "Common/Core/TrackSelection.h"
-#include "Common/Core/TableHelper.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "PWGCF/Core/AnalysisConfigurableCuts.h"
-#include "PWGCF/Core/PairCuts.h"
-#include "PWGCF/DataModel/DptDptFiltered.h"
-#include "PWGCF/TableProducer/dptDptFilter.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGCF/Tasks/dptDptFilterQa.cxx b/.conflict-base-0/PWGCF/Tasks/dptDptFilterQa.cxx
index 85dee751438..876fd8ccb5e 100644
--- a/.conflict-base-0/PWGCF/Tasks/dptDptFilterQa.cxx
+++ b/.conflict-base-0/PWGCF/Tasks/dptDptFilterQa.cxx
@@ -13,15 +13,16 @@
 /// \brief basic checks for the behavior of the filter task
 /// \author victor.gonzalez.sebastian@gmail.com
 
-#include <cmath>
-#include <string>
+#include "PWGCF/DataModel/DptDptFiltered.h"
+#include "PWGCF/TableProducer/dptDptFilter.h"
 
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGCF/DataModel/DptDptFiltered.h"
-#include "PWGCF/TableProducer/dptDptFilter.h"
+
+#include <cmath>
+#include <string>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGCF/Tasks/matchRecoGen.cxx b/.conflict-base-0/PWGCF/Tasks/matchRecoGen.cxx
index 57ab00301b7..1881b17b268 100644
--- a/.conflict-base-0/PWGCF/Tasks/matchRecoGen.cxx
+++ b/.conflict-base-0/PWGCF/Tasks/matchRecoGen.cxx
@@ -13,25 +13,24 @@
 /// \brief basic check for the matching between generator level and detector level
 /// \author victor.gonzalez.sebastian@gmail.com
 
-#include <cmath>
-#include <string>
-#include <vector>
+#include "PWGCF/Core/AnalysisConfigurableCuts.h"
+#include "PWGCF/DataModel/DptDptFiltered.h"
+#include "PWGCF/TableProducer/dptDptFilter.h"
 
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGCF/Core/AnalysisConfigurableCuts.h"
-#include "PWGCF/DataModel/DptDptFiltered.h"
-#include "PWGCF/TableProducer/dptDptFilter.h"
+
 #include <TDirectory.h>
 #include <TFolder.h>
 #include <TH1.h>
@@ -42,6 +41,10 @@
 #include <TProfile3D.h>
 #include <TROOT.h>
 
+#include <cmath>
+#include <string>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::soa;
diff --git a/.conflict-base-0/PWGCF/Tutorial/CFTutorialTask1.cxx b/.conflict-base-0/PWGCF/Tutorial/CFTutorialTask1.cxx
index f79eb1871c2..14a541f45e1 100644
--- a/.conflict-base-0/PWGCF/Tutorial/CFTutorialTask1.cxx
+++ b/.conflict-base-0/PWGCF/Tutorial/CFTutorialTask1.cxx
@@ -12,12 +12,13 @@
 /// \author Luca Barioglio
 
 // O2 includes
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-base-0/PWGCF/Tutorial/CFTutorialTask2.cxx b/.conflict-base-0/PWGCF/Tutorial/CFTutorialTask2.cxx
index bf40ce17353..ae0bc6d6ae1 100644
--- a/.conflict-base-0/PWGCF/Tutorial/CFTutorialTask2.cxx
+++ b/.conflict-base-0/PWGCF/Tutorial/CFTutorialTask2.cxx
@@ -12,12 +12,13 @@
 /// \author Luca Barioglio
 
 // O2 includes
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-base-0/PWGCF/Tutorial/CFTutorialTask3.cxx b/.conflict-base-0/PWGCF/Tutorial/CFTutorialTask3.cxx
index 42b76f9f0db..d04fbe969ac 100644
--- a/.conflict-base-0/PWGCF/Tutorial/CFTutorialTask3.cxx
+++ b/.conflict-base-0/PWGCF/Tutorial/CFTutorialTask3.cxx
@@ -12,12 +12,13 @@
 /// \author Luca Barioglio
 
 // O2 includes
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-base-0/PWGCF/Tutorial/CFTutorialTask4.cxx b/.conflict-base-0/PWGCF/Tutorial/CFTutorialTask4.cxx
index a21f1ff7949..46790dca80f 100644
--- a/.conflict-base-0/PWGCF/Tutorial/CFTutorialTask4.cxx
+++ b/.conflict-base-0/PWGCF/Tutorial/CFTutorialTask4.cxx
@@ -12,12 +12,13 @@
 /// \author Luca Barioglio
 
 // O2 includes
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
+
 #include "CommonConstants/PhysicsConstants.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 #include "TLorentzVector.h"
 
diff --git a/.conflict-base-0/PWGCF/Tutorial/CFTutorialTask5.cxx b/.conflict-base-0/PWGCF/Tutorial/CFTutorialTask5.cxx
index 5357950aab1..a9f30b5db71 100644
--- a/.conflict-base-0/PWGCF/Tutorial/CFTutorialTask5.cxx
+++ b/.conflict-base-0/PWGCF/Tutorial/CFTutorialTask5.cxx
@@ -12,12 +12,13 @@
 /// \author Luca Barioglio
 
 // O2 includes
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
+
 #include "CommonConstants/PhysicsConstants.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 #include "TLorentzVector.h"
 
diff --git a/.conflict-base-0/PWGCF/Tutorial/post-config.json b/.conflict-base-0/PWGCF/Tutorial/post-config.json
index 4b484b32088..4c7a012c0fe 100644
--- a/.conflict-base-0/PWGCF/Tutorial/post-config.json
+++ b/.conflict-base-0/PWGCF/Tutorial/post-config.json
@@ -1,128 +1,128 @@
 {
-  "internal-dpl-clock": "",
-  "internal-dpl-aod-reader": {
-    "time-limit": "0",
-    "orbit-offset-enumeration": "0",
-    "orbit-multiplier-enumeration": "0",
-    "start-value-enumeration": "0",
-    "end-value-enumeration": "-1",
-    "step-value-enumeration": "1",
-    "aod-file": "FemtoAO2D.root"
-  },
-  "femto-dream-debug-track": {
-    "cfgCutTable": {
-      "labels_rows": "",
-      "labels_cols": [
-        "MaxPt",
-        "PIDthr",
-        "nSigmaTPC",
-        "nSigmaTPCTOF",
-        "MaxP"
-      ],
-      "values": [
-        [
-          "4.05",
-          "1",
-          "3.5",
-          "3.5",
-          "1"
-        ]
-      ]
+    "internal-dpl-clock": "",
+    "internal-dpl-aod-reader": {
+        "time-limit": "0",
+        "orbit-offset-enumeration": "0",
+        "orbit-multiplier-enumeration": "0",
+        "start-value-enumeration": "0",
+        "end-value-enumeration": "-1",
+        "step-value-enumeration": "1",
+        "aod-file": "FemtoAO2D.root"
     },
-    "ccfgNspecies": "1",
-    "ConfPDGCodePartOne": "2212",
-    "ConfCutPartOne": "168072266",
-    "ConfPIDPartOne": {
-      "values": [
-        "0"
-      ]
-    }
-  },
-  "femto-dream-pair-task-track-track": {
-    "cfgCutTable": {
-      "labels_rows": [
-        "PartOne",
-        "PartTwo"
-      ],
-      "labels_cols": [
-        "MaxPt",
-        "PIDthr",
-        "nSigmaTPC",
-        "nSigmaTPCTOF",
-        "MaxP"
-      ],
-      "values": [
-        [
-          "4.05",
-          "1",
-          "3",
-          "3",
-          "1"
-        ],
-        [
-          "4.05",
-          "1",
-          "3",
-          "3",
-          "1"
-        ]
-      ]
+    "femto-dream-debug-track": {
+        "cfgCutTable": {
+            "labels_rows": "",
+            "labels_cols": [
+                "MaxPt",
+                "PIDthr",
+                "nSigmaTPC",
+                "nSigmaTPCTOF",
+                "MaxP"
+            ],
+            "values": [
+                [
+                    "4.05",
+                    "1",
+                    "3.5",
+                    "3.5",
+                    "1"
+                ]
+            ]
+        },
+        "ccfgNspecies": "1",
+        "ConfPDGCodePartOne": "2212",
+        "ConfCutPartOne": "168072266",
+        "ConfPIDPartOne": {
+            "values": [
+                "0"
+            ]
+        }
     },
-    "ccfgNspecies": "1",
-    "ConfPDGCodePartOne": "2212",
-    "ConfCutPartOne": "168072266",
-    "ConfPIDPartOne": {
-      "values": [
-        "0"
-      ]
+    "femto-dream-pair-task-track-track": {
+        "cfgCutTable": {
+            "labels_rows": [
+                "PartOne",
+                "PartTwo"
+            ],
+            "labels_cols": [
+                "MaxPt",
+                "PIDthr",
+                "nSigmaTPC",
+                "nSigmaTPCTOF",
+                "MaxP"
+            ],
+            "values": [
+                [
+                    "4.05",
+                    "1",
+                    "3",
+                    "3",
+                    "1"
+                ],
+                [
+                    "4.05",
+                    "1",
+                    "3",
+                    "3",
+                    "1"
+                ]
+            ]
+        },
+        "ccfgNspecies": "1",
+        "ConfPDGCodePartOne": "2212",
+        "ConfCutPartOne": "168072266",
+        "ConfPIDPartOne": {
+            "values": [
+                "0"
+            ]
+        },
+        "ConfIsSame": "false",
+        "ConfPDGCodePartTwo": "2212",
+        "ConfCutPartTwo": "168072266",
+        "ConfPIDPartTwo": {
+            "values": [
+                "0"
+            ]
+        },
+        "CfgMultBins": {
+            "values": [
+                "0",
+                "0",
+                "20",
+                "40",
+                "60",
+                "80",
+                "100",
+                "200",
+                "99999"
+            ]
+        },
+        "CfgkstarBins": {
+            "values": [
+                "1500",
+                "0",
+                "6"
+            ]
+        },
+        "CfgkTBins": {
+            "values": [
+                "150",
+                "0",
+                "9"
+            ]
+        },
+        "CfgmTBins": {
+            "values": [
+                "225",
+                "0",
+                "7.5"
+            ]
+        },
+        "ConfNEventsMix": "5",
+        "ConfIsCPR": "true",
+        "processSameEvent": "true",
+        "processMixedEvent": "true"
     },
-    "ConfIsSame": "false",
-    "ConfPDGCodePartTwo": "2212",
-    "ConfCutPartTwo": "168072266",
-    "ConfPIDPartTwo": {
-      "values": [
-        "0"
-      ]
-    },
-    "CfgMultBins": {
-      "values": [
-        "0",
-        "0",
-        "20",
-        "40",
-        "60",
-        "80",
-        "100",
-        "200",
-        "99999"
-      ]
-    },
-    "CfgkstarBins": {
-      "values": [
-        "1500",
-        "0",
-        "6"
-      ]
-    },
-    "CfgkTBins": {
-      "values": [
-        "150",
-        "0",
-        "9"
-      ]
-    },
-    "CfgmTBins": {
-      "values": [
-        "225",
-        "0",
-        "7.5"
-      ]
-    },
-    "ConfNEventsMix": "5",
-    "ConfIsCPR": "true",
-    "processSameEvent": "true",
-    "processMixedEvent": "true"
-  },
-  "internal-dpl-injected-dummy-sink": "",
-  "internal-dpl-aod-global-analysis-file-sink": ""
+    "internal-dpl-injected-dummy-sink": "",
+    "internal-dpl-aod-global-analysis-file-sink": ""
 }
diff --git a/.conflict-base-0/PWGCF/Tutorial/prod-config.json b/.conflict-base-0/PWGCF/Tutorial/prod-config.json
index 8be00067d90..934b219a50a 100644
--- a/.conflict-base-0/PWGCF/Tutorial/prod-config.json
+++ b/.conflict-base-0/PWGCF/Tutorial/prod-config.json
@@ -1,47 +1,47 @@
 {
-  "internal-dpl-clock": "",
-  "internal-dpl-aod-reader": {
-    "time-limit": "0",
-    "orbit-offset-enumeration": "0",
-    "orbit-multiplier-enumeration": "0",
-    "start-value-enumeration": "0",
-    "end-value-enumeration": "-1",
-    "step-value-enumeration": "1",
-    "aod-file": "AO2D.root"
-  },
-  "internal-dpl-aod-index-builder": "",
-  "internal-dpl-aod-spawner": "",
-  "fdd-converter": "",
-  "timestamp-task": {
-    "verbose": "false",
-    "rct-path": "RCT/RunInformation/",
-    "start-orbit-path": "GRP/StartOrbit",
-    "ccdb-url": "http://alice-ccdb.cern.ch",
-    "isRun2MC": "false"
-  },
-  "tpc-pid": {
-    "param-file": "",
-    "param-signal": "BetheBloch",
-    "param-sigma": "TPCReso",
-    "ccdb-url": "http://alice-ccdb.cern.ch",
-    "ccdbPath": "Analysis/PID/TPC/Response",
-    "ccdb-timestamp": "-1",
-    "pid-el": "-1",
-    "pid-mu": "-1",
-    "pid-pi": "-1",
-    "pid-ka": "-1",
-    "pid-pr": "-1",
-    "pid-de": "-1",
-    "pid-tr": "-1",
-    "pid-he": "-1",
-    "pid-al": "-1"
-  },
-  "bc-selection-task": {
-    "processRun2": "false",
-    "processRun3": "true"
-  },
-  "tof-signal": "",
-  "track-propagation": {
+    "internal-dpl-clock": "",
+    "internal-dpl-aod-reader": {
+        "time-limit": "0",
+        "orbit-offset-enumeration": "0",
+        "orbit-multiplier-enumeration": "0",
+        "start-value-enumeration": "0",
+        "end-value-enumeration": "-1",
+        "step-value-enumeration": "1",
+        "aod-file": "AO2D.root"
+    },
+    "internal-dpl-aod-index-builder": "",
+    "internal-dpl-aod-spawner": "",
+    "fdd-converter": "",
+    "timestamp-task": {
+        "verbose": "false",
+        "rct-path": "RCT/RunInformation/",
+        "start-orbit-path": "GRP/StartOrbit",
+        "ccdb-url": "http://alice-ccdb.cern.ch",
+        "isRun2MC": "false"
+    },
+    "tpc-pid": {
+        "param-file": "",
+        "param-signal": "BetheBloch",
+        "param-sigma": "TPCReso",
+        "ccdb-url": "http://alice-ccdb.cern.ch",
+        "ccdbPath": "Analysis/PID/TPC/Response",
+        "ccdb-timestamp": "-1",
+        "pid-el": "-1",
+        "pid-mu": "-1",
+        "pid-pi": "-1",
+        "pid-ka": "-1",
+        "pid-pr": "-1",
+        "pid-de": "-1",
+        "pid-tr": "-1",
+        "pid-he": "-1",
+        "pid-al": "-1"
+    },
+    "bc-selection-task": {
+        "processRun2": "false",
+        "processRun3": "true"
+    },
+    "tof-signal": "",
+    "track-propagation": {
         "ccdb-url": "http://alice-ccdb.cern.ch",
         "lutPath": "GLO/Param/MatLUT",
         "geoPath": "GLO/Config/GeometryAligned",
@@ -50,196 +50,196 @@
         "processStandard": "true",
         "processCovariance": "false"
     },
-  "tof-pid-base": {},
-  "tof-pid": {
-    "param-file": "",
-    "param-sigma": "TOFResoParams",
-    "ccdb-url": "http://alice-ccdb.cern.ch",
-    "ccdbPath": "Analysis/PID/TOF",
-    "ccdb-timestamp": "-1",
-    "pid-el": "-1",
-    "pid-mu": "-1",
-    "pid-pi": "-1",
-    "pid-ka": "-1",
-    "pid-pr": "-1",
-    "pid-de": "-1",
-    "pid-tr": "-1",
-    "pid-he": "-1",
-    "pid-al": "-1",
-    "processEvTime": "true",
-    "processNoEvTime": "false"
-  },
-  "lambdakzero-builder": {
-    "dcanegtopv": "0.1",
-    "dcapostopv": "0.1",
-    "mincrossedrows": "70",
-    "isRun2": "1",
-    "v0cospa": "0.995",
-    "dcav0dau": "1",
-    "v0radius": "5",
-    "useMatCorrType": "0",
-    "rejDiffCollTracks": "0",
+    "tof-pid-base": {},
+    "tof-pid": {
+        "param-file": "",
+        "param-sigma": "TOFResoParams",
+        "ccdb-url": "http://alice-ccdb.cern.ch",
+        "ccdbPath": "Analysis/PID/TOF",
+        "ccdb-timestamp": "-1",
+        "pid-el": "-1",
+        "pid-mu": "-1",
+        "pid-pi": "-1",
+        "pid-ka": "-1",
+        "pid-pr": "-1",
+        "pid-de": "-1",
+        "pid-tr": "-1",
+        "pid-he": "-1",
+        "pid-al": "-1",
+        "processEvTime": "true",
+        "processNoEvTime": "false"
+    },
+    "lambdakzero-builder": {
+        "dcanegtopv": "0.1",
+        "dcapostopv": "0.1",
+        "mincrossedrows": "70",
+        "isRun2": "1",
+        "v0cospa": "0.995",
+        "dcav0dau": "1",
+        "v0radius": "5",
+        "useMatCorrType": "0",
+        "rejDiffCollTracks": "0",
         "processRun2": "false",
         "processRun3": "true"
-  },
-  "event-selection-task": {
-    "syst": "pp",
-    "muonSelection": "0",
-    "customDeltaBC": "300",
-    "isMC": "false",
-    "processRun2": "false",
-    "processRun3": "true"
-  },
-  "multiplicity-table": {
-    "processRun2": "false",
-    "processRun3": "true"
-  },
-  "femto-dream-producer-task": {
-    "ConfDebugOutput": "true",
-    "ConfIsTrigger": "false",
-    "ConfIsRun3": "true",
-    "ConfEvtZvtx": "10",
-    "ConfEvtTriggerCheck": "true",
-    "ConfEvtTriggerSel": "0",
-    "ConfEvtOfflineCheck": "true",
-    "ConfStoreV0": "true",
-    "ConfTrkSign": {
-      "values": [
-        "-1",
-        "1"
-      ]
-    },
-    "ConfTrkPtMin": {
-      "values": [
-        "0.4",
-        "0.6",
-        "0.5"
-      ]
-    },
-    "ConfTrkEtaMax": {
-      "values": [
-        "0.8",
-        "0.7",
-        "0.9"
-      ]
-    },
-    "ConfTrkTPCnClsMin": {
-      "values": [
-        "80",
-        "70",
-        "60"
-      ]
-    },
-    "ConfTrkTPCfClsMin": {
-      "values": [
-        "0.7",
-        "0.8",
-        "0.9"
-      ]
-    },
-    "ConfTrkTPCcRowsMin": {
-      "values": [
-        "70",
-        "60",
-        "80"
-      ]
-    },
-    "ConfTrkTPCsClsMax": {
-      "values": [
-        "0.1",
-        "160"
-      ]
-    },
-    "ConfTrkITSnClsMin": {
-      "values": [
-        "-1",
-        "2",
-        "4"
-      ]
-    },
-    "ConfTrkITSnClsIbMin": {
-      "values": [
-        "-1",
-        "1"
-      ]
     },
-    "ConfTrkDCAxyMax": {
-      "values": [
-        "0.1",
-        "3.5"
-      ]
-    },
-    "ConfTrkDCAzMax": {
-      "values": [
-        "0.2",
-        "3.5"
-      ]
-    },
-    "ConfTrkPIDnSigmaMax": {
-      "values": [
-        "3.5",
-        "3",
-        "2.5"
-      ]
-    },
-    "ConfTrkTPIDspecies": {
-      "values": [
-        "2",
-        "4"
-      ]
-    },
-    "ConfV0Sign": {
-      "values": [
-        "-1",
-        "1"
-      ]
-    },
-    "ConfV0PtMin": {
-      "values": [
-        "0.3",
-        "0.4",
-        "0.5"
-      ]
-    },
-    "ConfV0DCAdaughMax": {
-      "values": [
-        "1.2",
-        "1.5"
-      ]
-    },
-    "ConfV0CPAMin": {
-      "values": [
-        "0.90",
-        "0.995"
-      ]
-    },
-    "ConfV0TranRadMin": {
-      "values": [
-        "0.2"
-      ]
-    },
-    "ConfV0TranRadMax": {
-      "values": [
-        "100"
-      ]
-    },
-    "ConfV0DecVecMax": {
-      "values": [
-        "100"
-      ]
+    "event-selection-task": {
+        "syst": "pp",
+        "muonSelection": "0",
+        "customDeltaBC": "300",
+        "isMC": "false",
+        "processRun2": "false",
+        "processRun3": "true"
     },
-    "ConfV0DaughTPIDspecies": {
-      "values": [
-        "2",
-        "4"
-      ]
+    "multiplicity-table": {
+        "processRun2": "false",
+        "processRun3": "true"
     },
-    "ConfInvMassLowLimit": "0",
-    "ConfInvMassUpLimit": "100"
-  },
-  "track-selection": {
-    "isRun3": "true"
-  },
-  "internal-dpl-aod-global-analysis-file-sink": "",
-  "internal-dpl-aod-writer": ""
+    "femto-dream-producer-task": {
+        "ConfDebugOutput": "true",
+        "ConfIsTrigger": "false",
+        "ConfIsRun3": "true",
+        "ConfEvtZvtx": "10",
+        "ConfEvtTriggerCheck": "true",
+        "ConfEvtTriggerSel": "0",
+        "ConfEvtOfflineCheck": "true",
+        "ConfStoreV0": "true",
+        "ConfTrkSign": {
+            "values": [
+                "-1",
+                "1"
+            ]
+        },
+        "ConfTrkPtMin": {
+            "values": [
+                "0.4",
+                "0.6",
+                "0.5"
+            ]
+        },
+        "ConfTrkEtaMax": {
+            "values": [
+                "0.8",
+                "0.7",
+                "0.9"
+            ]
+        },
+        "ConfTrkTPCnClsMin": {
+            "values": [
+                "80",
+                "70",
+                "60"
+            ]
+        },
+        "ConfTrkTPCfClsMin": {
+            "values": [
+                "0.7",
+                "0.8",
+                "0.9"
+            ]
+        },
+        "ConfTrkTPCcRowsMin": {
+            "values": [
+                "70",
+                "60",
+                "80"
+            ]
+        },
+        "ConfTrkTPCsClsMax": {
+            "values": [
+                "0.1",
+                "160"
+            ]
+        },
+        "ConfTrkITSnClsMin": {
+            "values": [
+                "-1",
+                "2",
+                "4"
+            ]
+        },
+        "ConfTrkITSnClsIbMin": {
+            "values": [
+                "-1",
+                "1"
+            ]
+        },
+        "ConfTrkDCAxyMax": {
+            "values": [
+                "0.1",
+                "3.5"
+            ]
+        },
+        "ConfTrkDCAzMax": {
+            "values": [
+                "0.2",
+                "3.5"
+            ]
+        },
+        "ConfTrkPIDnSigmaMax": {
+            "values": [
+                "3.5",
+                "3",
+                "2.5"
+            ]
+        },
+        "ConfTrkTPIDspecies": {
+            "values": [
+                "2",
+                "4"
+            ]
+        },
+        "ConfV0Sign": {
+            "values": [
+                "-1",
+                "1"
+            ]
+        },
+        "ConfV0PtMin": {
+            "values": [
+                "0.3",
+                "0.4",
+                "0.5"
+            ]
+        },
+        "ConfV0DCAdaughMax": {
+            "values": [
+                "1.2",
+                "1.5"
+            ]
+        },
+        "ConfV0CPAMin": {
+            "values": [
+                "0.90",
+                "0.995"
+            ]
+        },
+        "ConfV0TranRadMin": {
+            "values": [
+                "0.2"
+            ]
+        },
+        "ConfV0TranRadMax": {
+            "values": [
+                "100"
+            ]
+        },
+        "ConfV0DecVecMax": {
+            "values": [
+                "100"
+            ]
+        },
+        "ConfV0DaughTPIDspecies": {
+            "values": [
+                "2",
+                "4"
+            ]
+        },
+        "ConfInvMassLowLimit": "0",
+        "ConfInvMassUpLimit": "100"
+    },
+    "track-selection": {
+        "isRun3": "true"
+    },
+    "internal-dpl-aod-global-analysis-file-sink": "",
+    "internal-dpl-aod-writer": ""
 }
diff --git a/.conflict-base-0/PWGCF/Tutorial/run-config.json b/.conflict-base-0/PWGCF/Tutorial/run-config.json
index 424db80fbb8..1c7c55db103 100644
--- a/.conflict-base-0/PWGCF/Tutorial/run-config.json
+++ b/.conflict-base-0/PWGCF/Tutorial/run-config.json
@@ -1,135 +1,135 @@
 {
-  "internal-dpl-clock": "",
-  "internal-dpl-aod-reader": {
-    "time-limit": "0",
-    "orbit-offset-enumeration": "0",
-    "orbit-multiplier-enumeration": "0",
-    "start-value-enumeration": "0",
-    "end-value-enumeration": "-1",
-    "step-value-enumeration": "1",
-    "aod-file": "AO2D.root"
-  },
-  "internal-dpl-aod-index-builder": "",
-  "internal-dpl-aod-spawner": "",
-  "fdd-converter": "",
-  "timestamp-task": {
-    "verbose": "false",
-    "rct-path": "RCT/RunInformation/",
-    "start-orbit-path": "GRP/StartOrbit",
-    "ccdb-url": "http://alice-ccdb.cern.ch",
-    "isRun2MC": "false"
-  },
-  "tpc-pid": {
-    "param-file": "",
-    "param-signal": "BetheBloch",
-    "param-sigma": "TPCReso",
-    "ccdb-url": "http://alice-ccdb.cern.ch",
-    "ccdbPath": "Analysis/PID/TPC/Response",
-    "ccdb-timestamp": "-1",
-    "pid-el": "-1",
-    "pid-mu": "-1",
-    "pid-pi": "-1",
-    "pid-ka": "-1",
-    "pid-pr": "-1",
-    "pid-de": "-1",
-    "pid-tr": "-1",
-    "pid-he": "-1",
-    "pid-al": "-1"
-  },
-  "bc-selection-task": {
-    "processRun2": "false",
-    "processRun3": "true"
-  },
-  "tof-signal": "",
-  "track-propagation": {
-    "ccdb-url": "http://alice-ccdb.cern.ch",
-    "lutPath": "GLO/Param/MatLUT",
-    "geoPath": "GLO/Config/GeometryAligned",
-    "grpPath": "GLO/GRP/GRP",
-    "mVtxPath": "GLO/Calib/MeanVertex",
-    "processStandard": "true",
-    "processCovariance": "false"
-  },
-  "event-selection-task": {
-    "syst": "pp",
-    "muonSelection": "0",
-    "customDeltaBC": "300",
-    "isMC": "false",
-    "processRun2": "false",
-    "processRun3": "true"
-  },
-  "multiplicity-table": {
-    "processRun2": "false",
-    "processRun3": "true"
-  },
-  "track-selection": {
-    "isRun3": "true"
-  },
-  "c-f-tutorial-task0": "",
-  "c-f-tutorial-task1": "",
-  "c-f-tutorial-task2": {
-    "ConfZvtxCut": "10",
-    "ConfEtaCut": "0.8",
-    "ConfMaxPtCut": "3",
-    "ConfMinPtCut": "0.5",
-    "ConfMinNSigmaTPCCut": "3"
-  },
-  "c-f-tutorial-task3": {
-    "ConfZvtxCut": "10",
-    "ConfEtaCut": "0.8",
-    "ConfMaxPtCut": "3",
-    "ConfMinPtCut": "0.5",
-    "ConfMinNSigmaTPCCut": "3",
-    "ConfChargeCut": "0"
-  },
-  "c-f-tutorial-task4": {
-    "ConfZvtxCut": "10",
-    "ConfEtaCut": "0.8",
-    "ConfMaxPtCut": "3",
-    "ConfMinPtCut": "0.5",
-    "ConfMinNSigmaTPCCut": "3",
-    "ConfChargeCut": "0"
-  },
-  "c-f-tutorial-task5": {
-    "ConfZvtxCut": "10",
-    "ConfEtaCut": "0.8",
-    "ConfMaxPtCut": "3",
-    "ConfMinPtCut": "0.5",
-    "ConfMinNSigmaTPCCut": "3",
-    "ConfChargeCut": "0",
-    "ConfMultBins": {
-      "values": [
-        "0",
-        "0",
-        "20",
-        "40",
-        "60",
-        "80",
-        "100",
-        "200",
-        "99999"
-      ]
+    "internal-dpl-clock": "",
+    "internal-dpl-aod-reader": {
+        "time-limit": "0",
+        "orbit-offset-enumeration": "0",
+        "orbit-multiplier-enumeration": "0",
+        "start-value-enumeration": "0",
+        "end-value-enumeration": "-1",
+        "step-value-enumeration": "1",
+        "aod-file": "AO2D.root"
     },
-    "ConfVtxBins": {
-      "values": [
-        "0",
-        "-10",
-        "-8",
-        "-6",
-        "-4",
-        "-2",
-        "0",
-        "2",
-        "4",
-        "6",
-        "8",
-        "10"
-      ]
+    "internal-dpl-aod-index-builder": "",
+    "internal-dpl-aod-spawner": "",
+    "fdd-converter": "",
+    "timestamp-task": {
+        "verbose": "false",
+        "rct-path": "RCT/RunInformation/",
+        "start-orbit-path": "GRP/StartOrbit",
+        "ccdb-url": "http://alice-ccdb.cern.ch",
+        "isRun2MC": "false"
     },
-    "processSame": "true",
-    "processMixed": "true",
-    "processMixedEventInterface": "true"
-  },
-  "internal-dpl-aod-global-analysis-file-sink": "",
-  "internal-dpl-aod-writer": ""
+    "tpc-pid": {
+        "param-file": "",
+        "param-signal": "BetheBloch",
+        "param-sigma": "TPCReso",
+        "ccdb-url": "http://alice-ccdb.cern.ch",
+        "ccdbPath": "Analysis/PID/TPC/Response",
+        "ccdb-timestamp": "-1",
+        "pid-el": "-1",
+        "pid-mu": "-1",
+        "pid-pi": "-1",
+        "pid-ka": "-1",
+        "pid-pr": "-1",
+        "pid-de": "-1",
+        "pid-tr": "-1",
+        "pid-he": "-1",
+        "pid-al": "-1"
+    },
+    "bc-selection-task": {
+        "processRun2": "false",
+        "processRun3": "true"
+    },
+    "tof-signal": "",
+    "track-propagation": {
+        "ccdb-url": "http://alice-ccdb.cern.ch",
+        "lutPath": "GLO/Param/MatLUT",
+        "geoPath": "GLO/Config/GeometryAligned",
+        "grpPath": "GLO/GRP/GRP",
+        "mVtxPath": "GLO/Calib/MeanVertex",
+        "processStandard": "true",
+        "processCovariance": "false"
+    },
+    "event-selection-task": {
+        "syst": "pp",
+        "muonSelection": "0",
+        "customDeltaBC": "300",
+        "isMC": "false",
+        "processRun2": "false",
+        "processRun3": "true"
+    },
+    "multiplicity-table": {
+        "processRun2": "false",
+        "processRun3": "true"
+    },
+    "track-selection": {
+        "isRun3": "true"
+    },
+    "c-f-tutorial-task0": "",
+    "c-f-tutorial-task1": "",
+    "c-f-tutorial-task2": {
+        "ConfZvtxCut": "10",
+        "ConfEtaCut": "0.8",
+        "ConfMaxPtCut": "3",
+        "ConfMinPtCut": "0.5",
+        "ConfMinNSigmaTPCCut": "3"
+    },
+    "c-f-tutorial-task3": {
+        "ConfZvtxCut": "10",
+        "ConfEtaCut": "0.8",
+        "ConfMaxPtCut": "3",
+        "ConfMinPtCut": "0.5",
+        "ConfMinNSigmaTPCCut": "3",
+        "ConfChargeCut": "0"
+    },
+    "c-f-tutorial-task4": {
+        "ConfZvtxCut": "10",
+        "ConfEtaCut": "0.8",
+        "ConfMaxPtCut": "3",
+        "ConfMinPtCut": "0.5",
+        "ConfMinNSigmaTPCCut": "3",
+        "ConfChargeCut": "0"
+    },
+    "c-f-tutorial-task5": {
+        "ConfZvtxCut": "10",
+        "ConfEtaCut": "0.8",
+        "ConfMaxPtCut": "3",
+        "ConfMinPtCut": "0.5",
+        "ConfMinNSigmaTPCCut": "3",
+        "ConfChargeCut": "0",
+        "ConfMultBins": {
+            "values": [
+                "0",
+                "0",
+                "20",
+                "40",
+                "60",
+                "80",
+                "100",
+                "200",
+                "99999"
+            ]
+        },
+        "ConfVtxBins": {
+            "values": [
+                "0",
+                "-10",
+                "-8",
+                "-6",
+                "-4",
+                "-2",
+                "0",
+                "2",
+                "4",
+                "6",
+                "8",
+                "10"
+            ]
+        },
+        "processSame": "true",
+        "processMixed": "true",
+        "processMixedEventInterface": "true"
+    },
+    "internal-dpl-aod-global-analysis-file-sink": "",
+    "internal-dpl-aod-writer": ""
 }
diff --git a/.conflict-base-0/PWGCF/TwoParticleCorrelations/Core/EventSelectionFilterAndAnalysis.cxx b/.conflict-base-0/PWGCF/TwoParticleCorrelations/Core/EventSelectionFilterAndAnalysis.cxx
index 57a65059663..cb2ca3398b2 100644
--- a/.conflict-base-0/PWGCF/TwoParticleCorrelations/Core/EventSelectionFilterAndAnalysis.cxx
+++ b/.conflict-base-0/PWGCF/TwoParticleCorrelations/Core/EventSelectionFilterAndAnalysis.cxx
@@ -9,11 +9,13 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <boost/regex.hpp>
-#include <TObjArray.h>
+#include "EventSelectionFilterAndAnalysis.h"
 
 #include "Framework/AnalysisTask.h"
-#include "EventSelectionFilterAndAnalysis.h"
+
+#include <TObjArray.h>
+
+#include <boost/regex.hpp>
 
 using namespace o2;
 using namespace o2::analysis::PWGCF;
diff --git a/.conflict-base-0/PWGCF/TwoParticleCorrelations/Core/EventSelectionFilterAndAnalysis.h b/.conflict-base-0/PWGCF/TwoParticleCorrelations/Core/EventSelectionFilterAndAnalysis.h
index 72e8d6672c0..63a10c2bd78 100644
--- a/.conflict-base-0/PWGCF/TwoParticleCorrelations/Core/EventSelectionFilterAndAnalysis.h
+++ b/.conflict-base-0/PWGCF/TwoParticleCorrelations/Core/EventSelectionFilterAndAnalysis.h
@@ -11,15 +11,17 @@
 #ifndef EVENTSELECTIONFILTERANDANALYSIS_H
 #define EVENTSELECTIONFILTERANDANALYSIS_H
 
-#include <Rtypes.h>
-#include <TString.h>
-#include <TObject.h>
-#include <TNamed.h>
+#include "SelectionFilterAndAnalysis.h"
+#include "SkimmingConfigurableCuts.h"
+
 #include <TList.h>
+#include <TNamed.h>
+#include <TObject.h>
+#include <TString.h>
 
 #include <fairlogger/Logger.h>
-#include "SkimmingConfigurableCuts.h"
-#include "SelectionFilterAndAnalysis.h"
+
+#include <Rtypes.h>
 
 namespace o2
 {
diff --git a/.conflict-base-0/PWGCF/TwoParticleCorrelations/Core/FilterAndAnalysisFramework.cxx b/.conflict-base-0/PWGCF/TwoParticleCorrelations/Core/FilterAndAnalysisFramework.cxx
index ba83f4aa2ed..40c4cebf8c8 100644
--- a/.conflict-base-0/PWGCF/TwoParticleCorrelations/Core/FilterAndAnalysisFramework.cxx
+++ b/.conflict-base-0/PWGCF/TwoParticleCorrelations/Core/FilterAndAnalysisFramework.cxx
@@ -9,14 +9,16 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
+#include "FilterAndAnalysisFramework.h"
+
+#include <TList.h>
+#include <TObjString.h>
+
 #include <fairlogger/Logger.h>
+
 #include <iomanip>
 #include <map>
 #include <string>
-#include <TList.h>
-#include <TObjString.h>
-
-#include "FilterAndAnalysisFramework.h"
 
 using namespace o2;
 using namespace o2::analysis::PWGCF;
diff --git a/.conflict-base-0/PWGCF/TwoParticleCorrelations/Core/FilterAndAnalysisFramework.h b/.conflict-base-0/PWGCF/TwoParticleCorrelations/Core/FilterAndAnalysisFramework.h
index fa3b7aaeb6e..54d1656ad3d 100644
--- a/.conflict-base-0/PWGCF/TwoParticleCorrelations/Core/FilterAndAnalysisFramework.h
+++ b/.conflict-base-0/PWGCF/TwoParticleCorrelations/Core/FilterAndAnalysisFramework.h
@@ -11,18 +11,21 @@
 #ifndef PWGCF_TWOPARTICLECORRELATIONS_CORE_FILTERANDANALYSISFRAMEWORK_H_
 #define PWGCF_TWOPARTICLECORRELATIONS_CORE_FILTERANDANALYSISFRAMEWORK_H_
 
+#include "PWGCF/TwoParticleCorrelations/Core/EventSelectionFilterAndAnalysis.h"
+#include "PWGCF/TwoParticleCorrelations/Core/PIDSelectionFilterAndAnalysis.h"
+#include "PWGCF/TwoParticleCorrelations/Core/TrackSelectionFilterAndAnalysis.h"
+
 #include <CCDB/BasicCCDBManager.h>
-#include <vector>
-#include <string>
-#include <Rtypes.h>
-#include <TString.h>
-#include <TObject.h>
-#include <TNamed.h>
+
 #include <TList.h>
+#include <TNamed.h>
+#include <TObject.h>
+#include <TString.h>
 
-#include "PWGCF/TwoParticleCorrelations/Core/EventSelectionFilterAndAnalysis.h"
-#include "PWGCF/TwoParticleCorrelations/Core/TrackSelectionFilterAndAnalysis.h"
-#include "PWGCF/TwoParticleCorrelations/Core/PIDSelectionFilterAndAnalysis.h"
+#include <Rtypes.h>
+
+#include <string>
+#include <vector>
 
 namespace o2
 {
diff --git a/.conflict-base-0/PWGCF/TwoParticleCorrelations/Core/PIDSelectionFilterAndAnalysis.cxx b/.conflict-base-0/PWGCF/TwoParticleCorrelations/Core/PIDSelectionFilterAndAnalysis.cxx
index bfe06121f9e..519b3a825e1 100644
--- a/.conflict-base-0/PWGCF/TwoParticleCorrelations/Core/PIDSelectionFilterAndAnalysis.cxx
+++ b/.conflict-base-0/PWGCF/TwoParticleCorrelations/Core/PIDSelectionFilterAndAnalysis.cxx
@@ -9,14 +9,17 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <boost/regex.hpp>
-#include <TObjArray.h>
+#include "PIDSelectionFilterAndAnalysis.h"
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PIDSelectionFilterAndAnalysis.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+
+#include <TObjArray.h>
+
+#include <boost/regex.hpp>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGCF/TwoParticleCorrelations/Core/PIDSelectionFilterAndAnalysis.h b/.conflict-base-0/PWGCF/TwoParticleCorrelations/Core/PIDSelectionFilterAndAnalysis.h
index 1d8645b351c..530a2f95658 100644
--- a/.conflict-base-0/PWGCF/TwoParticleCorrelations/Core/PIDSelectionFilterAndAnalysis.h
+++ b/.conflict-base-0/PWGCF/TwoParticleCorrelations/Core/PIDSelectionFilterAndAnalysis.h
@@ -11,14 +11,15 @@
 #ifndef PIDSELECTIONFILTERANDANALYSIS_H
 #define PIDSELECTIONFILTERANDANALYSIS_H
 
-#include <Rtypes.h>
-#include <TString.h>
-#include <TObject.h>
-#include <TNamed.h>
+#include "SelectionFilterAndAnalysis.h"
+#include "SkimmingConfigurableCuts.h"
+
 #include <TList.h>
+#include <TNamed.h>
+#include <TObject.h>
+#include <TString.h>
 
-#include "SkimmingConfigurableCuts.h"
-#include "SelectionFilterAndAnalysis.h"
+#include <Rtypes.h>
 
 #undef INCORPORATEBAYESIANPID
 
diff --git a/.conflict-base-0/PWGCF/TwoParticleCorrelations/Core/SelectionFilterAndAnalysis.cxx b/.conflict-base-0/PWGCF/TwoParticleCorrelations/Core/SelectionFilterAndAnalysis.cxx
index 1c816268063..eb15706406d 100644
--- a/.conflict-base-0/PWGCF/TwoParticleCorrelations/Core/SelectionFilterAndAnalysis.cxx
+++ b/.conflict-base-0/PWGCF/TwoParticleCorrelations/Core/SelectionFilterAndAnalysis.cxx
@@ -9,13 +9,15 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <boost/regex.hpp>
-#include <TObjArray.h>
+#include "SelectionFilterAndAnalysis.h"
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
-#include "SelectionFilterAndAnalysis.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+
+#include <TObjArray.h>
+
+#include <boost/regex.hpp>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGCF/TwoParticleCorrelations/Core/SelectionFilterAndAnalysis.h b/.conflict-base-0/PWGCF/TwoParticleCorrelations/Core/SelectionFilterAndAnalysis.h
index f3680d188f4..ea88f12edca 100644
--- a/.conflict-base-0/PWGCF/TwoParticleCorrelations/Core/SelectionFilterAndAnalysis.h
+++ b/.conflict-base-0/PWGCF/TwoParticleCorrelations/Core/SelectionFilterAndAnalysis.h
@@ -11,11 +11,12 @@
 #ifndef SELECTIONFILTERANDANALYSIS_H
 #define SELECTIONFILTERANDANALYSIS_H
 
-#include <Rtypes.h>
-#include <TString.h>
-#include <TObject.h>
-#include <TNamed.h>
 #include <TList.h>
+#include <TNamed.h>
+#include <TObject.h>
+#include <TString.h>
+
+#include <Rtypes.h>
 
 namespace o2
 {
diff --git a/.conflict-base-0/PWGCF/TwoParticleCorrelations/Core/SkimmingConfigurableCuts.cxx b/.conflict-base-0/PWGCF/TwoParticleCorrelations/Core/SkimmingConfigurableCuts.cxx
index 81436952bd0..9c9c131e768 100644
--- a/.conflict-base-0/PWGCF/TwoParticleCorrelations/Core/SkimmingConfigurableCuts.cxx
+++ b/.conflict-base-0/PWGCF/TwoParticleCorrelations/Core/SkimmingConfigurableCuts.cxx
@@ -9,11 +9,13 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <regex>
+#include "PWGCF/TwoParticleCorrelations/Core/SkimmingConfigurableCuts.h"
+
 #include <TObjArray.h>
 
 #include <fairlogger/Logger.h>
-#include "PWGCF/TwoParticleCorrelations/Core/SkimmingConfigurableCuts.h"
+
+#include <regex>
 
 using namespace o2;
 using namespace o2::analysis::PWGCF;
diff --git a/.conflict-base-0/PWGCF/TwoParticleCorrelations/Core/SkimmingConfigurableCuts.h b/.conflict-base-0/PWGCF/TwoParticleCorrelations/Core/SkimmingConfigurableCuts.h
index 53e1c56dcaa..823f6a848ac 100644
--- a/.conflict-base-0/PWGCF/TwoParticleCorrelations/Core/SkimmingConfigurableCuts.h
+++ b/.conflict-base-0/PWGCF/TwoParticleCorrelations/Core/SkimmingConfigurableCuts.h
@@ -11,20 +11,23 @@
 #ifndef SKIMMING_CONFIGURABLE_CUTS_CLASSES_H
 #define SKIMMING_CONFIGURABLE_CUTS_CLASSES_H
 
-#include <Rtypes.h>
-#include <TString.h>
-#include <TObject.h>
-#include <TNamed.h>
-#include <TMath.h>
-#include <TList.h>
+#include "Framework/DataTypes.h"
+
 #include <TF1.h>
-#include <set>
-#include <vector>
-#include <regex>
+#include <TList.h>
+#include <TMath.h>
+#include <TNamed.h>
 #include <TObjArray.h>
+#include <TObject.h>
+#include <TString.h>
 
 #include <fairlogger/Logger.h>
-#include "Framework/DataTypes.h"
+
+#include <Rtypes.h>
+
+#include <regex>
+#include <set>
+#include <vector>
 
 namespace o2
 {
diff --git a/.conflict-base-0/PWGCF/TwoParticleCorrelations/Core/TrackSelectionFilterAndAnalysis.cxx b/.conflict-base-0/PWGCF/TwoParticleCorrelations/Core/TrackSelectionFilterAndAnalysis.cxx
index 4b5708fdc90..859c6d04802 100644
--- a/.conflict-base-0/PWGCF/TwoParticleCorrelations/Core/TrackSelectionFilterAndAnalysis.cxx
+++ b/.conflict-base-0/PWGCF/TwoParticleCorrelations/Core/TrackSelectionFilterAndAnalysis.cxx
@@ -9,11 +9,12 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <boost/regex.hpp>
+#include "TrackSelectionFilterAndAnalysis.h"
+
 #include <TObjArray.h>
 
+#include <boost/regex.hpp>
 #include <fairlogger/Logger.h>
-#include "TrackSelectionFilterAndAnalysis.h"
 
 using namespace o2;
 using namespace o2::analysis::PWGCF;
diff --git a/.conflict-base-0/PWGCF/TwoParticleCorrelations/Core/TrackSelectionFilterAndAnalysis.h b/.conflict-base-0/PWGCF/TwoParticleCorrelations/Core/TrackSelectionFilterAndAnalysis.h
index 8c186a97109..cfb6e4524cd 100644
--- a/.conflict-base-0/PWGCF/TwoParticleCorrelations/Core/TrackSelectionFilterAndAnalysis.h
+++ b/.conflict-base-0/PWGCF/TwoParticleCorrelations/Core/TrackSelectionFilterAndAnalysis.h
@@ -11,15 +11,17 @@
 #ifndef TRACKSELECTIONFILTERANDANALYSIS_H
 #define TRACKSELECTIONFILTERANDANALYSIS_H
 
-#include <Rtypes.h>
-#include <TString.h>
-#include <TObject.h>
-#include <TNamed.h>
+#include "SelectionFilterAndAnalysis.h"
+#include "SkimmingConfigurableCuts.h"
+
 #include <TList.h>
+#include <TNamed.h>
+#include <TObject.h>
+#include <TString.h>
 
 #include <fairlogger/Logger.h>
-#include "SkimmingConfigurableCuts.h"
-#include "SelectionFilterAndAnalysis.h"
+
+#include <Rtypes.h>
 
 namespace o2
 {
diff --git a/.conflict-base-0/PWGCF/TwoParticleCorrelations/DataModel/TwoParticleCorrelationsFiltered.h b/.conflict-base-0/PWGCF/TwoParticleCorrelations/DataModel/TwoParticleCorrelationsFiltered.h
index ac35f064808..f0e48acab70 100644
--- a/.conflict-base-0/PWGCF/TwoParticleCorrelations/DataModel/TwoParticleCorrelationsFiltered.h
+++ b/.conflict-base-0/PWGCF/TwoParticleCorrelations/DataModel/TwoParticleCorrelationsFiltered.h
@@ -11,9 +11,10 @@
 #ifndef O2_ANALYSIS_TWOPARTFILTERED_H
 #define O2_ANALYSIS_TWOPARTFILTERED_H
 
+#include "TwoParticleCorrelationsSkimmed.h"
+
 #include "Framework/ASoA.h"
 #include "Framework/AnalysisDataModel.h"
-#include "TwoParticleCorrelationsSkimmed.h"
 
 namespace o2
 {
diff --git a/.conflict-base-0/PWGCF/TwoParticleCorrelations/DataModel/TwoParticleCorrelationsSkimmed.h b/.conflict-base-0/PWGCF/TwoParticleCorrelations/DataModel/TwoParticleCorrelationsSkimmed.h
index b032d89647f..c91c3d491d1 100644
--- a/.conflict-base-0/PWGCF/TwoParticleCorrelations/DataModel/TwoParticleCorrelationsSkimmed.h
+++ b/.conflict-base-0/PWGCF/TwoParticleCorrelations/DataModel/TwoParticleCorrelationsSkimmed.h
@@ -12,19 +12,22 @@
 #ifndef PWGCF_TWOPARTICLECORRELATIONS_DATAMODEL_TWOPARTICLECORRELATIONSSKIMMED_H_
 #define PWGCF_TWOPARTICLECORRELATIONS_DATAMODEL_TWOPARTICLECORRELATIONSSKIMMED_H_
 
-#include <vector>
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoA.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Centrality.h"
-#include "PWGCF/TwoParticleCorrelations/Core/SkimmingConfigurableCuts.h"
 #include "PWGCF/TwoParticleCorrelations/Core/EventSelectionFilterAndAnalysis.h"
-#include "PWGCF/TwoParticleCorrelations/Core/TrackSelectionFilterAndAnalysis.h"
 #include "PWGCF/TwoParticleCorrelations/Core/PIDSelectionFilterAndAnalysis.h"
+#include "PWGCF/TwoParticleCorrelations/Core/SkimmingConfigurableCuts.h"
+#include "PWGCF/TwoParticleCorrelations/Core/TrackSelectionFilterAndAnalysis.h"
+
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
 
+#include <vector>
+
 namespace o2
 {
 namespace aod
@@ -60,15 +63,15 @@ DECLARE_SOA_TABLE(CFMCCollMasks, "AOD", "CFMCCOLLMASK", //! Generated collision/
 using CFMCCollMask = CFMCCollMasks::iterator;
 namespace cfskim
 {
-DECLARE_SOA_INDEX_COLUMN(CFCollision, cfcollision);     //! Reconstructed collision/event
-DECLARE_SOA_INDEX_COLUMN(CFMCCollision, cfmccollision); //! Generated collision/event
-DECLARE_SOA_COLUMN(CFTrackFlags, trackflags, uint64_t); //! The skimming flags for track selection, B0 track/particle positive charge, B1 track/particle negative charge
+DECLARE_SOA_INDEX_COLUMN(CFCollision, cfcollision);         //! Reconstructed collision/event
+DECLARE_SOA_INDEX_COLUMN(CFMCCollision, cfmccollision);     //! Generated collision/event
+DECLARE_SOA_COLUMN(CFTrackFlags, trackflags, uint64_t);     //! The skimming flags for track selection, B0 track/particle positive charge, B1 track/particle negative charge
 DECLARE_SOA_COLUMN(CFMCTrackFlags, mctrackflags, uint64_t); //! The skimming flags for particle selection, B0 track/particle positive charge, B1 track/particle negative charge
 DECLARE_SOA_COLUMN(CFPidFlags, pidflags, uint64_t);         //! The PID skimming flags for track selection
-DECLARE_SOA_COLUMN(Pt, pt, float);                      //! The track transverse momentum
-DECLARE_SOA_COLUMN(Eta, eta, float);                    //! The track pseudorapidity
-DECLARE_SOA_COLUMN(Phi, phi, float);                    //! The track azimuthal angle
-DECLARE_SOA_DYNAMIC_COLUMN(Sign, sign,                  //! Charge: positive: 1, negative: -1
+DECLARE_SOA_COLUMN(Pt, pt, float);                          //! The track transverse momentum
+DECLARE_SOA_COLUMN(Eta, eta, float);                        //! The track pseudorapidity
+DECLARE_SOA_COLUMN(Phi, phi, float);                        //! The track azimuthal angle
+DECLARE_SOA_DYNAMIC_COLUMN(Sign, sign,                      //! Charge: positive: 1, negative: -1
                            [](uint64_t mask) -> int8_t { return ((mask & 0x1L) == 0x1L) ? 1 : ((mask & 0x2L) == 0x2L) ? -1
                                                                                                                       : 0; });
 
diff --git a/.conflict-base-0/PWGCF/TwoParticleCorrelations/TableProducer/Productions/skimmingconf_20221115.cxx b/.conflict-base-0/PWGCF/TwoParticleCorrelations/TableProducer/Productions/skimmingconf_20221115.cxx
index cd174dc8d86..0299ca49dcf 100644
--- a/.conflict-base-0/PWGCF/TwoParticleCorrelations/TableProducer/Productions/skimmingconf_20221115.cxx
+++ b/.conflict-base-0/PWGCF/TwoParticleCorrelations/TableProducer/Productions/skimmingconf_20221115.cxx
@@ -9,10 +9,11 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <vector>
-#include <string>
-#include "Framework/AnalysisTask.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+
+#include <string>
+#include <vector>
 
 struct : o2::framework::ConfigurableGroup {
   o2::framework::Configurable<std::vector<std::string>> bfield{"evtflt_bfield", {"positive-yes", "negative-yes"}, "B filed polarity cut: both 'yes' default, anything else alternative"};
diff --git a/.conflict-base-0/PWGCF/TwoParticleCorrelations/TableProducer/identifiedBfFilter.cxx b/.conflict-base-0/PWGCF/TwoParticleCorrelations/TableProducer/identifiedBfFilter.cxx
index 535dd77cce2..d55ee0c8e78 100644
--- a/.conflict-base-0/PWGCF/TwoParticleCorrelations/TableProducer/identifiedBfFilter.cxx
+++ b/.conflict-base-0/PWGCF/TwoParticleCorrelations/TableProducer/identifiedBfFilter.cxx
@@ -15,35 +15,38 @@
 
 #include "PWGCF/TwoParticleCorrelations/TableProducer/identifiedBfFilter.h"
 
-#include <cmath>
-#include <algorithm>
-#include <string>
-#include <vector>
+#include "PWGCF/Core/AnalysisConfigurableCuts.h"
+#include "PWGCF/TwoParticleCorrelations/DataModel/IdentifiedBfFiltered.h"
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/CollisionAssociationTables.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGCF/Core/AnalysisConfigurableCuts.h"
-#include "PWGCF/TwoParticleCorrelations/DataModel/IdentifiedBfFiltered.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/CollisionAssociationTables.h"
-#include "Framework/runDataProcessing.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include <TROOT.h>
-#include <TParameter.h>
-#include <TPDGCode.h>
-#include <TList.h>
+#include "Framework/runDataProcessing.h"
+
 #include <TDirectory.h>
 #include <TFolder.h>
 #include <TH1.h>
 #include <TH2.h>
 #include <TH3.h>
+#include <TList.h>
+#include <TPDGCode.h>
+#include <TParameter.h>
 #include <TProfile3D.h>
+#include <TROOT.h>
+
+#include <algorithm>
+#include <cmath>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
@@ -1843,8 +1846,8 @@ inline MatchRecoGenSpecies IdentifiedBfFilterTracks::identifyTrack(TrackObject c
     for (int sp = 0; (sp < kIdBfNoOfSpecies) && !doublematch; ++sp) { // iterate over all species while there's no double match and we're in the list
       if (sp != spMinNSigma) {                                        // for species not current minimum nsigma species
         // LOGF(info, "looking at Reject Range");
-        if (std::fabs(nsigmas[sp]) < rejectRange[spMinNSigma][sp]) {  // If secondary species is in rejection range
-          doublematch = true;                                         // Set double match true
+        if (std::fabs(nsigmas[sp]) < rejectRange[spMinNSigma][sp]) { // If secondary species is in rejection range
+          doublematch = true;                                        // Set double match true
           spDouble = MatchRecoGenSpecies(sp);
         }
       }
@@ -1921,11 +1924,11 @@ inline int8_t IdentifiedBfFilterTracks::acceptTrack(TrackObject const& track)
       if (!(sp < 0)) {
         fillTrackHistosAfterSelection(track, sp); //<Fill accepted track histo with PID
         if (track.sign() > 0) {                   // if positive
-          trkMultPos[sp]++; //<< Update Particle Multiplicity
+          trkMultPos[sp]++;                       //<< Update Particle Multiplicity
           return speciesChargeValue1[sp];
         }
         if (track.sign() < 0) { // if negative
-          trkMultNeg[sp]++; //<< Update Particle Multiplicity
+          trkMultNeg[sp]++;     //<< Update Particle Multiplicity
           return speciesChargeValue1[sp] + 1;
         }
       }
diff --git a/.conflict-base-0/PWGCF/TwoParticleCorrelations/TableProducer/identifiedBfFilter.h b/.conflict-base-0/PWGCF/TwoParticleCorrelations/TableProducer/identifiedBfFilter.h
index 7335b36c421..ea7f52553b6 100644
--- a/.conflict-base-0/PWGCF/TwoParticleCorrelations/TableProducer/identifiedBfFilter.h
+++ b/.conflict-base-0/PWGCF/TwoParticleCorrelations/TableProducer/identifiedBfFilter.h
@@ -16,23 +16,24 @@
 #ifndef PWGCF_TWOPARTICLECORRELATIONS_TABLEPRODUCER_IDENTIFIEDBFFILTER_H_
 #define PWGCF_TWOPARTICLECORRELATIONS_TABLEPRODUCER_IDENTIFIEDBFFILTER_H_
 
-#include <CCDB/BasicCCDBManager.h>
-
-#include <vector>
-#include <string>
+#include "PWGCF/Core/AnalysisConfigurableCuts.h"
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/O2DatabasePDGPlugin.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/Core/TrackSelectionDefaults.h"
-#include "PWGCF/Core/AnalysisConfigurableCuts.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 #include "MathUtils/Utils.h"
+#include <CCDB/BasicCCDBManager.h>
+
+#include <string>
+#include <vector>
 
 namespace o2
 
diff --git a/.conflict-base-0/PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsFiltering.cxx b/.conflict-base-0/PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsFiltering.cxx
index 7bdaddd053d..5d0108119f6 100644
--- a/.conflict-base-0/PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsFiltering.cxx
+++ b/.conflict-base-0/PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsFiltering.cxx
@@ -9,23 +9,25 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <cmath>
-
-#include "Framework/AnalysisTask.h"
 #include "PWGCF/TwoParticleCorrelations/Core/FilterAndAnalysisFramework.h"
-#include "PWGCF/TwoParticleCorrelations/DataModel/TwoParticleCorrelationsSkimmed.h"
 #include "PWGCF/TwoParticleCorrelations/DataModel/TwoParticleCorrelationsFiltered.h"
+#include "PWGCF/TwoParticleCorrelations/DataModel/TwoParticleCorrelationsSkimmed.h"
+
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include <TROOT.h>
+
 #include <TDatabasePDG.h>
-#include <TParameter.h>
-#include <TList.h>
 #include <TDirectory.h>
 #include <TFolder.h>
 #include <TH1.h>
 #include <TH2.h>
 #include <TH3.h>
+#include <TList.h>
+#include <TParameter.h>
 #include <TProfile3D.h>
+#include <TROOT.h>
+
+#include <cmath>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsFullSkimming.cxx b/.conflict-base-0/PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsFullSkimming.cxx
index 2dec74acf61..f4e8e9ac797 100644
--- a/.conflict-base-0/PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsFullSkimming.cxx
+++ b/.conflict-base-0/PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsFullSkimming.cxx
@@ -9,18 +9,20 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <CCDB/BasicCCDBManager.h>
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "PWGCF/TwoParticleCorrelations/Core/FilterAndAnalysisFramework.h"
+#include "PWGCF/TwoParticleCorrelations/DataModel/TwoParticleCorrelationsSkimmed.h"
+
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGCF/TwoParticleCorrelations/DataModel/TwoParticleCorrelationsSkimmed.h"
-#include "PWGCF/TwoParticleCorrelations/Core/FilterAndAnalysisFramework.h"
-#include "Framework/runDataProcessing.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include <CCDB/BasicCCDBManager.h>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsNotStoredSkimming.cxx b/.conflict-base-0/PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsNotStoredSkimming.cxx
index 3964b745b91..497371fea43 100644
--- a/.conflict-base-0/PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsNotStoredSkimming.cxx
+++ b/.conflict-base-0/PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsNotStoredSkimming.cxx
@@ -9,18 +9,20 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <CCDB/BasicCCDBManager.h>
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "PWGCF/TwoParticleCorrelations/Core/FilterAndAnalysisFramework.h"
+#include "PWGCF/TwoParticleCorrelations/DataModel/TwoParticleCorrelationsSkimmed.h"
+
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGCF/TwoParticleCorrelations/DataModel/TwoParticleCorrelationsSkimmed.h"
-#include "PWGCF/TwoParticleCorrelations/Core/FilterAndAnalysisFramework.h"
-#include "Framework/runDataProcessing.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include <CCDB/BasicCCDBManager.h>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsRegisterSkimming.cxx b/.conflict-base-0/PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsRegisterSkimming.cxx
index 20bbd90efbc..8fb759fec54 100644
--- a/.conflict-base-0/PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsRegisterSkimming.cxx
+++ b/.conflict-base-0/PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsRegisterSkimming.cxx
@@ -9,12 +9,13 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <CCDB/BasicCCDBManager.h>
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
 #include "PWGCF/TwoParticleCorrelations/Core/FilterAndAnalysisFramework.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
+#include <CCDB/BasicCCDBManager.h>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGCF/TwoParticleCorrelations/Tasks/corrSparse.cxx b/.conflict-base-0/PWGCF/TwoParticleCorrelations/Tasks/corrSparse.cxx
index 489c99bdbff..117457911da 100644
--- a/.conflict-base-0/PWGCF/TwoParticleCorrelations/Tasks/corrSparse.cxx
+++ b/.conflict-base-0/PWGCF/TwoParticleCorrelations/Tasks/corrSparse.cxx
@@ -13,30 +13,32 @@
 /// \brief Provides a sparse with usefull two particle correlation info
 /// \author Thor Jensen (thor.kjaersgaard.jensen@cern.ch)
 
-#include <CCDB/BasicCCDBManager.h>
-#include "TRandom3.h"
-#include <vector>
+#include "PWGCF/Core/CorrelationContainer.h"
+#include "PWGCF/Core/PairCuts.h"
+#include "PWGCF/DataModel/CorrelationsDerived.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/StepTHn.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "CommonConstants/MathConstants.h"
 #include "Common/Core/RecoDecay.h"
-
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/CollisionAssociationTables.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Centrality.h"
-#include "PWGCF/DataModel/CorrelationsDerived.h"
-#include "Common/DataModel/CollisionAssociationTables.h"
-#include "PWGCF/Core/CorrelationContainer.h"
-#include "PWGCF/Core/PairCuts.h"
-#include "DataFormatsParameters/GRPObject.h"
+
+#include "CommonConstants/MathConstants.h"
 #include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
+#include <CCDB/BasicCCDBManager.h>
+
+#include "TRandom3.h"
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGCF/TwoParticleCorrelations/Tasks/diHadronCor.cxx b/.conflict-base-0/PWGCF/TwoParticleCorrelations/Tasks/diHadronCor.cxx
index e3eb978e08f..498a1772882 100644
--- a/.conflict-base-0/PWGCF/TwoParticleCorrelations/Tasks/diHadronCor.cxx
+++ b/.conflict-base-0/PWGCF/TwoParticleCorrelations/Tasks/diHadronCor.cxx
@@ -14,39 +14,41 @@
 /// \author Zhiyong Lu (zhiyong.lu@cern.ch)
 /// \since  May/03/2025
 
-#include <CCDB/BasicCCDBManager.h>
-#include "TRandom3.h"
-#include "TF1.h"
-#include <vector>
-#include <string>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/StepTHn.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "CommonConstants/MathConstants.h"
-#include "Common/Core/RecoDecay.h"
-
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Centrality.h"
-#include "PWGCF/DataModel/CorrelationsDerived.h"
-#include "Common/DataModel/CollisionAssociationTables.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "PWGCF/Core/CorrelationContainer.h"
 #include "PWGCF/Core/PairCuts.h"
-#include "PWGCF/GenericFramework/Core/GFWPowerArray.h"
+#include "PWGCF/DataModel/CorrelationsDerived.h"
 #include "PWGCF/GenericFramework/Core/GFW.h"
 #include "PWGCF/GenericFramework/Core/GFWCumulant.h"
+#include "PWGCF/GenericFramework/Core/GFWPowerArray.h"
 #include "PWGCF/GenericFramework/Core/GFWWeights.h"
-#include "DataFormatsParameters/GRPObject.h"
+
+#include "Common/Core/RecoDecay.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/CollisionAssociationTables.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonConstants/MathConstants.h"
 #include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
+#include <CCDB/BasicCCDBManager.h>
+
+#include "TF1.h"
+#include "TRandom3.h"
 #include <TPDGCode.h>
 
+#include <string>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-base-0/PWGCF/TwoParticleCorrelations/Tasks/dptDptEfficiencyAndQc.cxx b/.conflict-base-0/PWGCF/TwoParticleCorrelations/Tasks/dptDptEfficiencyAndQc.cxx
index 0fdbca208bf..1bb717b98f8 100644
--- a/.conflict-base-0/PWGCF/TwoParticleCorrelations/Tasks/dptDptEfficiencyAndQc.cxx
+++ b/.conflict-base-0/PWGCF/TwoParticleCorrelations/Tasks/dptDptEfficiencyAndQc.cxx
@@ -13,35 +13,38 @@
 /// \brief Provides efficiency extraction and QC for track cuts and PID
 /// \author victor.gonzalez.sebastian@gmail.com
 
-#include <TH2F.h>
-#include <TProfile2D.h>
-#include <THnSparse.h>
-#include <TPDGCode.h>
-#include <TMCProcess.h>
-#include <CCDB/BasicCCDBManager.h>
-#include <vector>
-#include <algorithm>
-#include <cstdio>
-#include <memory>
-#include <string>
-#include "ReconstructionDataFormats/PID.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/Core/TableHelper.h"
+#include "PWGCF/Core/AnalysisConfigurableCuts.h"
+#include "PWGCF/DataModel/DptDptFiltered.h"
+#include "PWGCF/TableProducer/dptDptFilter.h"
+
 #include "Common/Core/RecoDecay.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/Core/TableHelper.h"
+#include "Common/Core/TrackSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoAHelpers.h"
-#include "Framework/Expressions.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
+#include "Framework/Expressions.h"
 #include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/PID.h"
+#include <CCDB/BasicCCDBManager.h>
+
 #include "Math/MatrixFunctions.h"
 #include "Math/SMatrix.h"
+#include <TH2F.h>
+#include <THnSparse.h>
+#include <TMCProcess.h>
+#include <TPDGCode.h>
+#include <TProfile2D.h>
 
-#include "PWGCF/Core/AnalysisConfigurableCuts.h"
-#include "PWGCF/DataModel/DptDptFiltered.h"
-#include "PWGCF/TableProducer/dptDptFilter.h"
+#include <algorithm>
+#include <cstdio>
+#include <memory>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGCF/TwoParticleCorrelations/Tasks/dptDptPerRunExtraQc.cxx b/.conflict-base-0/PWGCF/TwoParticleCorrelations/Tasks/dptDptPerRunExtraQc.cxx
index 8617a65de2f..c9304ec1ef9 100644
--- a/.conflict-base-0/PWGCF/TwoParticleCorrelations/Tasks/dptDptPerRunExtraQc.cxx
+++ b/.conflict-base-0/PWGCF/TwoParticleCorrelations/Tasks/dptDptPerRunExtraQc.cxx
@@ -13,18 +13,18 @@
 /// \brief basic per run check of the per analyzed species p vs TPC IW momentum
 /// \author victor.gonzalez.sebastian@gmail.com
 
-#include <array>
-#include <cmath>
-#include <unordered_map>
+#include "PWGCF/DataModel/DptDptFiltered.h"
+#include "PWGCF/TableProducer/dptDptFilter.h"
 
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
 
-#include "PWGCF/DataModel/DptDptFiltered.h"
-#include "PWGCF/TableProducer/dptDptFilter.h"
+#include <array>
+#include <cmath>
+#include <unordered_map>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGCF/TwoParticleCorrelations/Tasks/dptDptPerRunQc.cxx b/.conflict-base-0/PWGCF/TwoParticleCorrelations/Tasks/dptDptPerRunQc.cxx
index 598d3305539..286641391ea 100644
--- a/.conflict-base-0/PWGCF/TwoParticleCorrelations/Tasks/dptDptPerRunQc.cxx
+++ b/.conflict-base-0/PWGCF/TwoParticleCorrelations/Tasks/dptDptPerRunQc.cxx
@@ -13,29 +13,28 @@
 /// \brief basic per run check of the ITS dead chips and of the hadronic interaction rate
 /// \author victor.gonzalez.sebastian@gmail.com
 
-#include <array>
-#include <cmath>
-#include <unordered_map>
-#include <memory>
-#include <vector>
-#include <string>
+#include "PWGCF/DataModel/DptDptFiltered.h"
+#include "PWGCF/TableProducer/dptDptFilter.h"
 
-#include "CCDB/BasicCCDBManager.h"
 #include "Common/CCDB/ctpRateFetcher.h"
 
-#include "DataFormatsParameters/AggregatedRunInfo.h"
+#include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsITSMFT/NoiseMap.h" // missing include in TimeDeadMap.h
 #include "DataFormatsITSMFT/TimeDeadMap.h"
-#include "ITSMFTReconstruction/ChipMappingITS.h"
-
+#include "DataFormatsParameters/AggregatedRunInfo.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
+#include "ITSMFTReconstruction/ChipMappingITS.h"
 
-#include "PWGCF/DataModel/DptDptFiltered.h"
-#include "PWGCF/TableProducer/dptDptFilter.h"
+#include <array>
+#include <cmath>
+#include <memory>
+#include <string>
+#include <unordered_map>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGCF/TwoParticleCorrelations/Tasks/identifiedbf.cxx b/.conflict-base-0/PWGCF/TwoParticleCorrelations/Tasks/identifiedbf.cxx
index b357272c17c..100291176ec 100644
--- a/.conflict-base-0/PWGCF/TwoParticleCorrelations/Tasks/identifiedbf.cxx
+++ b/.conflict-base-0/PWGCF/TwoParticleCorrelations/Tasks/identifiedbf.cxx
@@ -12,7 +12,25 @@
 /// \file identifiedbf.cxx
 /// \brief Fills histograms with particles and tracks to calculate the Balance Function
 /// \author bghanley1995@gmail.com
+#include "PWGCF/Core/AnalysisConfigurableCuts.h"
+#include "PWGCF/Core/PairCuts.h"
+#include "PWGCF/TwoParticleCorrelations/DataModel/IdentifiedBfFiltered.h"
+#include "PWGCF/TwoParticleCorrelations/TableProducer/identifiedBfFilter.h"
+
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 #include <CCDB/BasicCCDBManager.h>
+
 #include <TDirectory.h>
 #include <TFolder.h>
 #include <TH1.h>
@@ -23,27 +41,12 @@
 #include <TProfile3D.h>
 #include <TROOT.h>
 #include <TVector2.h>
+
 #include <cmath>
+#include <cstdio>
 #include <ctime>
-#include <vector>
 #include <string>
-#include <cstdio>
-
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/Core/RecoDecay.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "PWGCF/Core/AnalysisConfigurableCuts.h"
-#include "PWGCF/Core/PairCuts.h"
-#include "PWGCF/TwoParticleCorrelations/DataModel/IdentifiedBfFiltered.h"
-#include "PWGCF/TwoParticleCorrelations/TableProducer/identifiedBfFilter.h"
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
@@ -93,24 +96,24 @@ struct IdentifiedbfTask {
     // The IdentifiedBfCorrelationsAnalysisTask output objects
     //============================================================================================
     /* histograms */
-    TH1F* fhVertexZA;                                                             //!<! the z vertex distribution for the current multiplicity/centrality class
-    std::vector<TH1F*> fhN1VsPt{nch, nullptr};                                    //!<! weighted single particle distribution vs \f$p_T\f$, for the different species
-    std::vector<TH2F*> fhN1VsEtaPhi{nch, nullptr};                                //!<! weighted single particle distribution vs \f$\eta,\;\phi\f$, for the different species
-    std::vector<TH2F*> fhSum1PtVsEtaPhi{nch, nullptr};                            //!<! accumulated sum of weighted \f$p_T\f$ vs \f$\eta,\;\phi\f$, for the different species
-    std::vector<TH3F*> fhN1VsZEtaPhiPt{nch + 1, nullptr};                         //!<! single particle distribution vs \f$\mbox{vtx}_z,\; \eta,\;\phi,\;p_T\f$, for the different species
-    std::vector<TH3F*> fhN1VsZEtaPhiPtPrimary{nch, nullptr};                      //!<! single particle distribution of primary particles vs \f$\mbox{vtx}_z,\; \eta,\;\phi,\;p_T\f$, for the different species
-    std::vector<TH3F*> fhN1VsZEtaPhiPtSecondary{nch, nullptr};                    //!<! single particle distribution of primary particles vs \f$\mbox{vtx}_z,\; \eta,\;\phi,\;p_T\f$, for the different species
-    std::vector<TH3F*> fhN1VsZEtaPhiPtPure{nch + 1, nullptr};                     //!<! single particle distribution of pure particles vs \f$\mbox{vtx}_z,\; \eta,\;\phi,\;p_T\f$, for the different species
-    std::vector<TH3F*> fhSum1PtVsZEtaPhiPt{nch, nullptr};                         //!<! accumulated sum of weighted \f$p_T\f$ vs \f$\mbox{vtx}_z,\; \eta,\;\phi,\;p_T\f$, for the different species
-    std::vector<TH3*> fhNuaNueVsZEtaPhiPt{nch, nullptr};                          //!<! NUA+NUE correction vs \f$\mbox{vtx}_z,\; \eta,\;\phi,\;p_T\f$, for the differents species
-    std::vector<TH2*> fhPtAvgVsEtaPhi{nch, nullptr};                              //!<! average \f$p_T\f$ vs \f$\eta,\;\phi\f$, for the different species
-    std::vector<std::vector<TH2F*>> fhN2VsPtPt{nch, {nch, nullptr}};              //!<! weighted two particle distribution vs \f${p_T}_1, {p_T}_2\f$ for the different species combinations
-    std::vector<std::vector<TH2F*>> fhN2VsDEtaDPhi{nch, {nch, nullptr}};          //!<! two-particle distribution vs \f$\Delta\eta,\;\Delta\phi\f$ for the different species combinations
-    std::vector<std::vector<TH2F*>> fhN2ContVsDEtaDPhi{nch, {nch, nullptr}};      //!<! two-particle distribution continuous vs \f$\Delta\eta,\;\Delta\phi\f$ for the different species combinations
-    std::vector<std::vector<TH2F*>> fhSum2PtPtVsDEtaDPhi{nch, {nch, nullptr}};    //!<! two-particle  \f$\sum {p_T}_1 {p_T}_2\f$ distribution vs \f$\Delta\eta,\;\Delta\phi\f$ for the different species combinations
-    std::vector<std::vector<TH2F*>> fhSum2DptDptVsDEtaDPhi{nch, {nch, nullptr}};  //!<! two-particle  \f$\sum ({p_T}_1- <{p_T}_1>) ({p_T}_2 - <{p_T}_2>) \f$ distribution vs \f$\Delta\eta,\;\Delta\phi\f$ for the different species combinations
-    std::vector<std::vector<TH2F*>> fhSupN1N1VsDEtaDPhi{nch, {nch, nullptr}};     //!<! suppressed n1n1 two-particle distribution vs \f$\Delta\eta,\;\Delta\phi\f$ for the different species combinations
-    std::vector<std::vector<TH2F*>> fhSupPt1Pt1VsDEtaDPhi{nch, {nch, nullptr}};   //!<! suppressed \f${p_T}_1 {p_T}_2\f$ two-particle distribution vs \f$\Delta\eta,\;\Delta\phi\f$ for the different species combinations
+    TH1F* fhVertexZA;                                                            //!<! the z vertex distribution for the current multiplicity/centrality class
+    std::vector<TH1F*> fhN1VsPt{nch, nullptr};                                   //!<! weighted single particle distribution vs \f$p_T\f$, for the different species
+    std::vector<TH2F*> fhN1VsEtaPhi{nch, nullptr};                               //!<! weighted single particle distribution vs \f$\eta,\;\phi\f$, for the different species
+    std::vector<TH2F*> fhSum1PtVsEtaPhi{nch, nullptr};                           //!<! accumulated sum of weighted \f$p_T\f$ vs \f$\eta,\;\phi\f$, for the different species
+    std::vector<TH3F*> fhN1VsZEtaPhiPt{nch + 1, nullptr};                        //!<! single particle distribution vs \f$\mbox{vtx}_z,\; \eta,\;\phi,\;p_T\f$, for the different species
+    std::vector<TH3F*> fhN1VsZEtaPhiPtPrimary{nch, nullptr};                     //!<! single particle distribution of primary particles vs \f$\mbox{vtx}_z,\; \eta,\;\phi,\;p_T\f$, for the different species
+    std::vector<TH3F*> fhN1VsZEtaPhiPtSecondary{nch, nullptr};                   //!<! single particle distribution of primary particles vs \f$\mbox{vtx}_z,\; \eta,\;\phi,\;p_T\f$, for the different species
+    std::vector<TH3F*> fhN1VsZEtaPhiPtPure{nch + 1, nullptr};                    //!<! single particle distribution of pure particles vs \f$\mbox{vtx}_z,\; \eta,\;\phi,\;p_T\f$, for the different species
+    std::vector<TH3F*> fhSum1PtVsZEtaPhiPt{nch, nullptr};                        //!<! accumulated sum of weighted \f$p_T\f$ vs \f$\mbox{vtx}_z,\; \eta,\;\phi,\;p_T\f$, for the different species
+    std::vector<TH3*> fhNuaNueVsZEtaPhiPt{nch, nullptr};                         //!<! NUA+NUE correction vs \f$\mbox{vtx}_z,\; \eta,\;\phi,\;p_T\f$, for the differents species
+    std::vector<TH2*> fhPtAvgVsEtaPhi{nch, nullptr};                             //!<! average \f$p_T\f$ vs \f$\eta,\;\phi\f$, for the different species
+    std::vector<std::vector<TH2F*>> fhN2VsPtPt{nch, {nch, nullptr}};             //!<! weighted two particle distribution vs \f${p_T}_1, {p_T}_2\f$ for the different species combinations
+    std::vector<std::vector<TH2F*>> fhN2VsDEtaDPhi{nch, {nch, nullptr}};         //!<! two-particle distribution vs \f$\Delta\eta,\;\Delta\phi\f$ for the different species combinations
+    std::vector<std::vector<TH2F*>> fhN2ContVsDEtaDPhi{nch, {nch, nullptr}};     //!<! two-particle distribution continuous vs \f$\Delta\eta,\;\Delta\phi\f$ for the different species combinations
+    std::vector<std::vector<TH2F*>> fhSum2PtPtVsDEtaDPhi{nch, {nch, nullptr}};   //!<! two-particle  \f$\sum {p_T}_1 {p_T}_2\f$ distribution vs \f$\Delta\eta,\;\Delta\phi\f$ for the different species combinations
+    std::vector<std::vector<TH2F*>> fhSum2DptDptVsDEtaDPhi{nch, {nch, nullptr}}; //!<! two-particle  \f$\sum ({p_T}_1- <{p_T}_1>) ({p_T}_2 - <{p_T}_2>) \f$ distribution vs \f$\Delta\eta,\;\Delta\phi\f$ for the different species combinations
+    std::vector<std::vector<TH2F*>> fhSupN1N1VsDEtaDPhi{nch, {nch, nullptr}};    //!<! suppressed n1n1 two-particle distribution vs \f$\Delta\eta,\;\Delta\phi\f$ for the different species combinations
+    std::vector<std::vector<TH2F*>> fhSupPt1Pt1VsDEtaDPhi{nch, {nch, nullptr}};  //!<! suppressed \f${p_T}_1 {p_T}_2\f$ two-particle distribution vs \f$\Delta\eta,\;\Delta\phi\f$ for the different species combinations
     /* versus centrality/multiplicity  profiles */
     std::vector<TProfile*> fhN1VsC{nch, nullptr};                               //!<! weighted single particle distribution vs event centrality/multiplicity, track 1 and 2
     std::vector<TProfile*> fhSum1PtVsC{nch, nullptr};                           //!<! accumulated sum of weighted \f$p_T\f$ vs event centrality/multiplicity, track 1 and 2
diff --git a/.conflict-base-0/PWGCF/TwoParticleCorrelations/Tasks/identifiedbfqa.cxx b/.conflict-base-0/PWGCF/TwoParticleCorrelations/Tasks/identifiedbfqa.cxx
index a52ff377832..f519dbf2eac 100644
--- a/.conflict-base-0/PWGCF/TwoParticleCorrelations/Tasks/identifiedbfqa.cxx
+++ b/.conflict-base-0/PWGCF/TwoParticleCorrelations/Tasks/identifiedbfqa.cxx
@@ -9,14 +9,15 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <cmath>
+#include "PWGCF/TwoParticleCorrelations/DataModel/IdentifiedBfFiltered.h"
+#include "PWGCF/TwoParticleCorrelations/TableProducer/identifiedBfFilter.h"
 
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGCF/TwoParticleCorrelations/DataModel/IdentifiedBfFiltered.h"
-#include "PWGCF/TwoParticleCorrelations/TableProducer/identifiedBfFilter.h"
+
+#include <cmath>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGCF/TwoParticleCorrelations/Tasks/longrangeCorrelation.cxx b/.conflict-base-0/PWGCF/TwoParticleCorrelations/Tasks/longrangeCorrelation.cxx
index 5fb1bc8e1c8..f4942e1515a 100644
--- a/.conflict-base-0/PWGCF/TwoParticleCorrelations/Tasks/longrangeCorrelation.cxx
+++ b/.conflict-base-0/PWGCF/TwoParticleCorrelations/Tasks/longrangeCorrelation.cxx
@@ -15,42 +15,44 @@
 /// \author Abhi Modak (abhi.modak@cern.ch) and Debojit sarkar (debojit.sarkar@cern.ch)
 /// \since April 22, 2025
 
-#include <TH1F.h>
-#include <chrono>
-#include <string>
-#include <vector>
-#include <TComplex.h>
-#include <TMath.h>
-#include <cstdio>
+#include "PWGCF/Core/CorrelationContainer.h"
+#include "PWGCF/Core/PairCuts.h"
+#include "PWGCF/DataModel/CorrelationsDerived.h"
 
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/StepTHn.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/DataModel/CollisionAssociationTables.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/Core/trackUtilities.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/TrackSelection.h"
-#include "Framework/ASoAHelpers.h"
 #include "Common/DataModel/FT0Corrected.h"
-#include "Common/Core/RecoDecay.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
 #include "CommonConstants/MathConstants.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "DetectorsCommonDataFormats/AlignParam.h"
 #include "FT0Base/Geometry.h"
 #include "FV0Base/Geometry.h"
-#include "PWGCF/DataModel/CorrelationsDerived.h"
-#include "Common/DataModel/CollisionAssociationTables.h"
-#include "PWGCF/Core/CorrelationContainer.h"
-#include "PWGCF/Core/PairCuts.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
-#include "CCDB/CcdbApi.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "DetectorsCommonDataFormats/AlignParam.h"
+#include <TComplex.h>
+#include <TH1F.h>
+#include <TMath.h>
+
+#include <chrono>
+#include <cstdio>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGCF/TwoParticleCorrelations/Tasks/neutronProtonCorrZdc.cxx b/.conflict-base-0/PWGCF/TwoParticleCorrelations/Tasks/neutronProtonCorrZdc.cxx
index 1870c66da80..39e6c3fda7c 100644
--- a/.conflict-base-0/PWGCF/TwoParticleCorrelations/Tasks/neutronProtonCorrZdc.cxx
+++ b/.conflict-base-0/PWGCF/TwoParticleCorrelations/Tasks/neutronProtonCorrZdc.cxx
@@ -13,15 +13,17 @@
 /// \brief Correlations between protons and neutrons in the ZDC
 /// \author Olaf Massen <olaf.massen@cern.ch>
 
-#include <string>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
+
+#include <string>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGCF/TwoParticleCorrelations/Tasks/r2p2-4-id.cxx b/.conflict-base-0/PWGCF/TwoParticleCorrelations/Tasks/r2p2-4-id.cxx
index e6c13fe1318..f12e1bdf044 100644
--- a/.conflict-base-0/PWGCF/TwoParticleCorrelations/Tasks/r2p2-4-id.cxx
+++ b/.conflict-base-0/PWGCF/TwoParticleCorrelations/Tasks/r2p2-4-id.cxx
@@ -9,14 +9,15 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <memory>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include <memory>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGCF/TwoParticleCorrelations/Tasks/twoParticleCorrelations.cxx b/.conflict-base-0/PWGCF/TwoParticleCorrelations/Tasks/twoParticleCorrelations.cxx
index a7a05beb310..135db8bb324 100644
--- a/.conflict-base-0/PWGCF/TwoParticleCorrelations/Tasks/twoParticleCorrelations.cxx
+++ b/.conflict-base-0/PWGCF/TwoParticleCorrelations/Tasks/twoParticleCorrelations.cxx
@@ -9,25 +9,27 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
+#include "PWGCF/Core/AnalysisConfigurableCuts.h"
+#include "PWGCF/Core/PairCuts.h"
+#include "PWGCF/TwoParticleCorrelations/Core/FilterAndAnalysisFramework.h"
+#include "PWGCF/TwoParticleCorrelations/DataModel/TwoParticleCorrelationsSkimmed.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 #include <DataFormatsParameters/GRPObject.h>
-#include <cmath>
-#include <TROOT.h>
+
 #include <TDatabasePDG.h>
-#include <TParameter.h>
-#include <TList.h>
 #include <TDirectory.h>
 #include <TFolder.h>
 #include <TH1.h>
 #include <TH2.h>
 #include <TH3.h>
+#include <TList.h>
+#include <TParameter.h>
 #include <TProfile3D.h>
+#include <TROOT.h>
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "PWGCF/Core/AnalysisConfigurableCuts.h"
-#include "PWGCF/TwoParticleCorrelations/Core/FilterAndAnalysisFramework.h"
-#include "PWGCF/TwoParticleCorrelations/DataModel/TwoParticleCorrelationsSkimmed.h"
-#include "PWGCF/Core/PairCuts.h"
+#include <cmath>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGDQ/Core/AnalysisCompositeCut.h b/.conflict-base-0/PWGDQ/Core/AnalysisCompositeCut.h
index f3d603909c4..692ba633638 100644
--- a/.conflict-base-0/PWGDQ/Core/AnalysisCompositeCut.h
+++ b/.conflict-base-0/PWGDQ/Core/AnalysisCompositeCut.h
@@ -18,6 +18,7 @@
 #define AnalysisCompositeCut_H
 
 #include "PWGDQ/Core/AnalysisCut.h"
+
 #include <vector>
 
 //_________________________________________________________________________
diff --git a/.conflict-base-0/PWGDQ/Core/AnalysisCut.h b/.conflict-base-0/PWGDQ/Core/AnalysisCut.h
index 6c7185b13ec..9457635798c 100644
--- a/.conflict-base-0/PWGDQ/Core/AnalysisCut.h
+++ b/.conflict-base-0/PWGDQ/Core/AnalysisCut.h
@@ -18,6 +18,7 @@
 #define AnalysisCut_H
 
 #include <TF1.h>
+
 #include <vector>
 
 //_________________________________________________________________________
diff --git a/.conflict-base-0/PWGDQ/Core/CutsLibrary.cxx b/.conflict-base-0/PWGDQ/Core/CutsLibrary.cxx
index 5cf99d6f22f..8d61904b7b8 100644
--- a/.conflict-base-0/PWGDQ/Core/CutsLibrary.cxx
+++ b/.conflict-base-0/PWGDQ/Core/CutsLibrary.cxx
@@ -12,14 +12,18 @@
 // Contact: iarsene@cern.ch, i.c.arsene@fys.uio.no
 //
 #include "PWGDQ/Core/CutsLibrary.h"
-#include <RtypesCore.h>
-#include <TF1.h>
-#include <vector>
-#include <string>
-#include <iostream>
+
 #include "AnalysisCompositeCut.h"
 #include "VarManager.h"
 
+#include <TF1.h>
+
+#include <RtypesCore.h>
+
+#include <iostream>
+#include <string>
+#include <vector>
+
 using std::cout;
 using std::endl;
 
diff --git a/.conflict-base-0/PWGDQ/Core/CutsLibrary.h b/.conflict-base-0/PWGDQ/Core/CutsLibrary.h
index c6ad4caded2..15ed07b1f11 100644
--- a/.conflict-base-0/PWGDQ/Core/CutsLibrary.h
+++ b/.conflict-base-0/PWGDQ/Core/CutsLibrary.h
@@ -15,12 +15,13 @@
 #ifndef PWGDQ_CORE_CUTSLIBRARY_H_
 #define PWGDQ_CORE_CUTSLIBRARY_H_
 
-#include <string>
-#include <vector>
-#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/AnalysisCompositeCut.h"
+#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/VarManager.h"
 
+#include <string>
+#include <vector>
+
 // ///////////////////////////////////////////////
 //   These are the Cuts used in the CEFP Task   //
 //   to select tracks in the event selection    //
diff --git a/.conflict-base-0/PWGDQ/Core/HistogramManager.cxx b/.conflict-base-0/PWGDQ/Core/HistogramManager.cxx
index fb5ce5f8d65..9133dede291 100644
--- a/.conflict-base-0/PWGDQ/Core/HistogramManager.cxx
+++ b/.conflict-base-0/PWGDQ/Core/HistogramManager.cxx
@@ -11,28 +11,29 @@
 
 #include "PWGDQ/Core/HistogramManager.h"
 
-#include <iostream>
-#include <memory>
+#include "Framework/Logger.h"
+
+#include <algorithm>
 #include <fstream>
+#include <iostream>
 #include <list>
+#include <memory>
 #include <vector>
-#include <algorithm>
-#include "Framework/Logger.h"
 using namespace std;
 
-#include <TObject.h>
-#include <TObjArray.h>
-#include <THashList.h>
+#include <TClass.h>
 #include <TH1F.h>
 #include <TH2F.h>
 #include <TH3F.h>
-#include <TProfile.h>
-#include <TProfile2D.h>
-#include <TProfile3D.h>
+#include <THashList.h>
 #include <THn.h>
 #include <THnSparse.h>
 #include <TIterator.h>
-#include <TClass.h>
+#include <TObjArray.h>
+#include <TObject.h>
+#include <TProfile.h>
+#include <TProfile2D.h>
+#include <TProfile3D.h>
 
 ClassImp(HistogramManager);
 
diff --git a/.conflict-base-0/PWGDQ/Core/HistogramManager.h b/.conflict-base-0/PWGDQ/Core/HistogramManager.h
index 4b1393b2eb7..1fc0cf858b8 100644
--- a/.conflict-base-0/PWGDQ/Core/HistogramManager.h
+++ b/.conflict-base-0/PWGDQ/Core/HistogramManager.h
@@ -17,17 +17,17 @@
 #ifndef PWGDQ_CORE_HISTOGRAMMANAGER_H_
 #define PWGDQ_CORE_HISTOGRAMMANAGER_H_
 
-#include <TString.h>
-#include <TNamed.h>
-#include <TList.h>
-#include <THashList.h>
-#include <TAxis.h>
 #include <TArrayD.h>
+#include <TAxis.h>
+#include <THashList.h>
+#include <TList.h>
+#include <TNamed.h>
+#include <TString.h>
 
-#include <string>
+#include <list>
 #include <map>
+#include <string>
 #include <vector>
-#include <list>
 
 class HistogramManager : public TNamed
 {
@@ -103,10 +103,10 @@ class HistogramManager : public TNamed
   std::map<std::string, std::list<std::vector<int>>> fVariablesMap; //!  map holding identifiers for all variables needed by histograms
 
   // various
-  bool fUseDefaultVariableNames;    //! toggle the usage of default variable names and units
-  uint64_t fBinsAllocated;          //! number of allocated bins
-  TString* fVariableNames;          //! variable names
-  TString* fVariableUnits;          //! variable units
+  bool fUseDefaultVariableNames; //! toggle the usage of default variable names and units
+  uint64_t fBinsAllocated;       //! number of allocated bins
+  TString* fVariableNames;       //! variable names
+  TString* fVariableUnits;       //! variable units
 
   void MakeAxisLabels(TAxis* ax, const char* labels);
 
diff --git a/.conflict-base-0/PWGDQ/Core/HistogramsLibrary.cxx b/.conflict-base-0/PWGDQ/Core/HistogramsLibrary.cxx
index 11c87e700de..5aca1c60acf 100644
--- a/.conflict-base-0/PWGDQ/Core/HistogramsLibrary.cxx
+++ b/.conflict-base-0/PWGDQ/Core/HistogramsLibrary.cxx
@@ -11,12 +11,15 @@
 //
 // Contact: iarsene@cern.ch, i.c.arsene@fys.uio.no
 //
-#include <vector>
-#include <algorithm>
 #include "PWGDQ/Core/HistogramsLibrary.h"
+
 #include "VarManager.h"
+
 #include "CommonConstants/MathConstants.h"
 
+#include <algorithm>
+#include <vector>
+
 void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* histClass, const char* groupName, const char* subGroupName)
 {
   //
diff --git a/.conflict-base-0/PWGDQ/Core/HistogramsLibrary.h b/.conflict-base-0/PWGDQ/Core/HistogramsLibrary.h
index 869fb3a85f3..6b7f6a09fc2 100644
--- a/.conflict-base-0/PWGDQ/Core/HistogramsLibrary.h
+++ b/.conflict-base-0/PWGDQ/Core/HistogramsLibrary.h
@@ -15,10 +15,13 @@
 #ifndef PWGDQ_CORE_HISTOGRAMSLIBRARY_H_
 #define PWGDQ_CORE_HISTOGRAMSLIBRARY_H_
 
-#include <TString.h>
 #include "PWGDQ/Core/HistogramManager.h"
 #include "PWGDQ/Core/VarManager.h"
+
 #include "CommonConstants/MathConstants.h"
+
+#include <TString.h>
+
 #include "rapidjson/document.h"
 
 namespace o2::aod
@@ -29,7 +32,7 @@ void DefineHistograms(HistogramManager* hm, const char* histClass, const char* g
 template <typename T>
 bool ValidateJSONHistogram(T hist);
 void AddHistogramsFromJSON(HistogramManager* hm, const char* json);
-}
+} // namespace dqhistograms
 } // namespace o2::aod
 
 #endif // PWGDQ_CORE_HISTOGRAMSLIBRARY_H_
diff --git a/.conflict-base-0/PWGDQ/Core/MCProng.cxx b/.conflict-base-0/PWGDQ/Core/MCProng.cxx
index 48f2c52ae36..925542fbe12 100644
--- a/.conflict-base-0/PWGDQ/Core/MCProng.cxx
+++ b/.conflict-base-0/PWGDQ/Core/MCProng.cxx
@@ -11,10 +11,10 @@
 
 #include "PWGDQ/Core/MCProng.h"
 
-#include <map>
-#include <vector>
 #include <cmath>
 #include <iostream>
+#include <map>
+#include <vector>
 
 ClassImp(MCProng);
 
diff --git a/.conflict-base-0/PWGDQ/Core/MCProng.h b/.conflict-base-0/PWGDQ/Core/MCProng.h
index cd42965d271..8e679db8bb8 100644
--- a/.conflict-base-0/PWGDQ/Core/MCProng.h
+++ b/.conflict-base-0/PWGDQ/Core/MCProng.h
@@ -60,9 +60,9 @@ A few non-existent PYTHIA codes are used to select more than one PYTHIA code.
 #include "TNamed.h"
 #include "TString.h"
 
-#include <vector>
 #include <iostream>
 #include <map>
+#include <vector>
 
 class MCProng
 {
diff --git a/.conflict-base-0/PWGDQ/Core/MCSignal.cxx b/.conflict-base-0/PWGDQ/Core/MCSignal.cxx
index 7a234b65088..ba62e86a6bd 100644
--- a/.conflict-base-0/PWGDQ/Core/MCSignal.cxx
+++ b/.conflict-base-0/PWGDQ/Core/MCSignal.cxx
@@ -9,11 +9,11 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <vector>
-#include <iostream>
-
 #include "PWGDQ/Core/MCSignal.h"
 
+#include <iostream>
+#include <vector>
+
 using std::cout;
 using std::endl;
 
diff --git a/.conflict-base-0/PWGDQ/Core/MCSignal.h b/.conflict-base-0/PWGDQ/Core/MCSignal.h
index 42fe0a0a050..534d6985da0 100644
--- a/.conflict-base-0/PWGDQ/Core/MCSignal.h
+++ b/.conflict-base-0/PWGDQ/Core/MCSignal.h
@@ -57,10 +57,11 @@ process(aod::McParticles const& mcTracks) {
 #define PWGDQ_CORE_MCSIGNAL_H_
 
 #include "MCProng.h"
+
 #include "TNamed.h"
 
-#include <vector>
 #include <iostream>
+#include <vector>
 
 class MCSignal : public TNamed
 {
diff --git a/.conflict-base-0/PWGDQ/Core/MCSignalLibrary.cxx b/.conflict-base-0/PWGDQ/Core/MCSignalLibrary.cxx
index 5e4f2ada1bb..4b953e2363a 100644
--- a/.conflict-base-0/PWGDQ/Core/MCSignalLibrary.cxx
+++ b/.conflict-base-0/PWGDQ/Core/MCSignalLibrary.cxx
@@ -15,11 +15,13 @@
 #include <vector>
 // #include <iostream>
 
-#include <TPDGCode.h>
-#include "CommonConstants/PhysicsConstants.h"
 #include "PWGDQ/Core/MCSignalLibrary.h"
+
+#include "CommonConstants/PhysicsConstants.h"
 #include "Framework/Logger.h"
 
+#include <TPDGCode.h>
+
 using namespace o2::constants::physics;
 // using std::cout;
 // using std::endl;
diff --git a/.conflict-base-0/PWGDQ/Core/MCSignalLibrary.h b/.conflict-base-0/PWGDQ/Core/MCSignalLibrary.h
index df01f60c978..f4c1c88e1df 100644
--- a/.conflict-base-0/PWGDQ/Core/MCSignalLibrary.h
+++ b/.conflict-base-0/PWGDQ/Core/MCSignalLibrary.h
@@ -15,11 +15,13 @@
 #ifndef PWGDQ_CORE_MCSIGNALLIBRARY_H_
 #define PWGDQ_CORE_MCSIGNALLIBRARY_H_
 
-#include <string>
-#include "rapidjson/document.h"
 #include "PWGDQ/Core/MCProng.h"
 #include "PWGDQ/Core/MCSignal.h"
 
+#include "rapidjson/document.h"
+
+#include <string>
+
 namespace o2::aod
 {
 namespace dqmcsignals
@@ -36,7 +38,7 @@ MCProng* ParseJSONMCProng(T prongJSON, const char* prongName);
 
 template <typename T>
 bool ValidateJSONMCProng(T prongJSON, const char* prongName);
-}
+} // namespace dqmcsignals
 } // namespace o2::aod
 
 #endif // PWGDQ_CORE_MCSIGNALLIBRARY_H_
diff --git a/.conflict-base-0/PWGDQ/Core/MixingHandler.cxx b/.conflict-base-0/PWGDQ/Core/MixingHandler.cxx
index 532b91ea9ac..d85c3181048 100644
--- a/.conflict-base-0/PWGDQ/Core/MixingHandler.cxx
+++ b/.conflict-base-0/PWGDQ/Core/MixingHandler.cxx
@@ -10,15 +10,16 @@
 // or submit itself to any jurisdiction.
 
 #include "PWGDQ/Core/MixingHandler.h"
+
 #include "PWGDQ/Core/VarManager.h"
 
-#include <iostream>
 #include <fstream>
+#include <iostream>
 using namespace std;
 
 #include <TMath.h>
-#include <TTimeStamp.h>
 #include <TRandom.h>
+#include <TTimeStamp.h>
 
 ClassImp(MixingHandler);
 
diff --git a/.conflict-base-0/PWGDQ/Core/MixingHandler.h b/.conflict-base-0/PWGDQ/Core/MixingHandler.h
index 0e38a89291e..f07f73fcef2 100644
--- a/.conflict-base-0/PWGDQ/Core/MixingHandler.h
+++ b/.conflict-base-0/PWGDQ/Core/MixingHandler.h
@@ -17,16 +17,16 @@
 #ifndef MixingHandler_H
 #define MixingHandler_H
 
-#include <TNamed.h>
+#include "PWGDQ/Core/HistogramManager.h"
+#include "PWGDQ/Core/VarManager.h"
+
 #include <TArrayF.h>
 #include <TArrayI.h>
 #include <TClonesArray.h>
 #include <TList.h>
+#include <TNamed.h>
 #include <TString.h>
 
-#include "PWGDQ/Core/HistogramManager.h"
-#include "PWGDQ/Core/VarManager.h"
-
 class MixingHandler : public TNamed
 {
 
diff --git a/.conflict-base-0/PWGDQ/Core/MixingLibrary.h b/.conflict-base-0/PWGDQ/Core/MixingLibrary.h
index db7f92583df..4c6a15eed73 100644
--- a/.conflict-base-0/PWGDQ/Core/MixingLibrary.h
+++ b/.conflict-base-0/PWGDQ/Core/MixingLibrary.h
@@ -11,10 +11,11 @@
 //
 // Contact: iarsene@cern.ch, i.c.arsene@fys.uio.no
 //
-#include <TString.h>
 #include "PWGDQ/Core/MixingHandler.h"
 #include "PWGDQ/Core/VarManager.h"
 
+#include <TString.h>
+
 namespace o2::aod
 {
 namespace dqmixing
diff --git a/.conflict-base-0/PWGDQ/Core/VarManager.cxx b/.conflict-base-0/PWGDQ/Core/VarManager.cxx
index 912dc06740a..999d5ef3cfe 100644
--- a/.conflict-base-0/PWGDQ/Core/VarManager.cxx
+++ b/.conflict-base-0/PWGDQ/Core/VarManager.cxx
@@ -8,12 +8,14 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
+#include "PWGDQ/Core/VarManager.h"
+
+#include "Tools/KFparticle/KFUtilities.h"
+
 #include <cmath>
 #include <iostream>
-#include <vector>
 #include <map>
-#include "PWGDQ/Core/VarManager.h"
-#include "Tools/KFparticle/KFUtilities.h"
+#include <vector>
 
 using std::cout;
 using std::endl;
@@ -28,7 +30,7 @@ bool VarManager::fgUsedVars[VarManager::kNVars] = {false};
 bool VarManager::fgUsedKF = false;
 float VarManager::fgMagField = 0.5;
 float VarManager::fgValues[VarManager::kNVars] = {0.0f};
-float VarManager::fgTPCInterSectorBoundary = 1.0;       // cm
+float VarManager::fgTPCInterSectorBoundary = 1.0; // cm
 int VarManager::fgITSROFbias = 0;
 int VarManager::fgITSROFlength = 100;
 int VarManager::fgITSROFBorderMarginLow = 0;
diff --git a/.conflict-base-0/PWGDQ/Core/VarManager.h b/.conflict-base-0/PWGDQ/Core/VarManager.h
index dfcba891bfc..7e885d342b8 100644
--- a/.conflict-base-0/PWGDQ/Core/VarManager.h
+++ b/.conflict-base-0/PWGDQ/Core/VarManager.h
@@ -18,7 +18,9 @@
 #define PWGDQ_CORE_VARMANAGER_H_
 
 #include <Framework/AnalysisDataModel.h>
+
 #include <Math/Vector4Dfwd.h>
+
 #include <cstdint>
 #ifndef HomogeneousField
 #define HomogeneousField
@@ -1189,15 +1191,15 @@ class VarManager : public TObject
   static void SetVariableDependencies(); // toggle those variables on which other used variables might depend
 
   static float fgMagField;
-  static float fgCenterOfMassEnergy;      // collision energy
-  static float fgMassofCollidingParticle; // mass of the colliding particle
-  static float fgTPCInterSectorBoundary;  // TPC inter-sector border size at the TPC outer radius, in cm
-  static int fgITSROFbias;                // ITS ROF bias (from ALPIDE parameters)
-  static int fgITSROFlength;              // ITS ROF length (from ALPIDE parameters)
-  static int fgITSROFBorderMarginLow;     // ITS ROF border low margin
-  static int fgITSROFBorderMarginHigh;    // ITS ROF border high margin
-  static uint64_t fgSOR;                  // Timestamp for start of run
-  static uint64_t fgEOR;                  // Timestamp for end of run
+  static float fgCenterOfMassEnergy;        // collision energy
+  static float fgMassofCollidingParticle;   // mass of the colliding particle
+  static float fgTPCInterSectorBoundary;    // TPC inter-sector border size at the TPC outer radius, in cm
+  static int fgITSROFbias;                  // ITS ROF bias (from ALPIDE parameters)
+  static int fgITSROFlength;                // ITS ROF length (from ALPIDE parameters)
+  static int fgITSROFBorderMarginLow;       // ITS ROF border low margin
+  static int fgITSROFBorderMarginHigh;      // ITS ROF border high margin
+  static uint64_t fgSOR;                    // Timestamp for start of run
+  static uint64_t fgEOR;                    // Timestamp for end of run
   static ROOT::Math::PxPyPzEVector fgBeamA; // beam from A-side 4-momentum vector
   static ROOT::Math::PxPyPzEVector fgBeamC; // beam from C-side 4-momentum vector
 
diff --git a/.conflict-base-0/PWGDQ/DataModel/ReducedInfoTables.h b/.conflict-base-0/PWGDQ/DataModel/ReducedInfoTables.h
index ae5fd853bf9..20e9298e908 100644
--- a/.conflict-base-0/PWGDQ/DataModel/ReducedInfoTables.h
+++ b/.conflict-base-0/PWGDQ/DataModel/ReducedInfoTables.h
@@ -752,7 +752,7 @@ DECLARE_SOA_COLUMN(CosThetaRM, costhetaRM, float);             //! Cosine in the
 DECLARE_SOA_COLUMN(CosThetaStarTPC, costhetaStarTPC, float);   //! global polarization, event plane reconstructed from TPC tracks
 DECLARE_SOA_COLUMN(CosThetaStarFT0A, costhetaStarFT0A, float); //! global polarization, event plane reconstructed from FT0A tracks
 DECLARE_SOA_COLUMN(CosThetaStarFT0C, costhetaStarFT0C, float); //! global polarization, event plane reconstructed from FT0C tracks
-DECLARE_SOA_DYNAMIC_COLUMN(Px, px, //!
+DECLARE_SOA_DYNAMIC_COLUMN(Px, px,                             //!
                            [](float pt, float phi) -> float { return pt * std::cos(phi); });
 DECLARE_SOA_DYNAMIC_COLUMN(Py, py, //!
                            [](float pt, float phi) -> float { return pt * std::sin(phi); });
diff --git a/.conflict-base-0/PWGDQ/Macros/configFit.json b/.conflict-base-0/PWGDQ/Macros/configFit.json
index 4fd44eee0ff..83d3d33efc8 100644
--- a/.conflict-base-0/PWGDQ/Macros/configFit.json
+++ b/.conflict-base-0/PWGDQ/Macros/configFit.json
@@ -1,186 +1,186 @@
 {
-  "input": {
-    "input_file_name": "tutorial.root",
-    "input_name": "histMass",
-    "pdf_dictionary": {
-      "pdf": [
-        "CB2",
-        "CB2",
-        "VWG",
-        "SUM"
-      ],
-      "pdfName": [
-        "Jpsi",
-        "Psi2s",
-        "Bkg",
-        "SUM"
-      ],
-      "pdfNameForLegend": [
-        "J/#psi",
-        "#psi(2S)",
-        "Background",
-        "Fit"
-      ],
-      "pdfColor": [
-        861,
-        417,
-        1
-      ],
-      "pdfStyle": [
-        1,
-        1,
-        2
-      ],
-      "parVal": [
-        [
-          3.096,
-          1.2e-01,
-          1.089,
-          3.393,
-          2.097,
-          8.694
-        ],
-        [
-          3.096,
-          1.2e-01,
-          1.089,
-          3.393,
-          2.097,
-          8.694
-        ],
-        [
-          1,
-          1,
-          1
-        ],
-        [
-          1000,
-          100,
-          100000
-        ]
-      ],
-      "parLimMin": [
-        [
-          2.9,
-          7.0e-02,
-          1.089,
-          3.393,
-          2.097,
-          8.694
-        ],
-        [
-          2.9,
-          7.0e-02,
-          1.089,
-          3.393,
-          2.097,
-          8.694
-        ],
-        [
-          -10,
-          0,
-          -100
-        ],
-        [
-          0,
-          0,
-          0
-        ]
-      ],
-      "parLimMax": [
-        [
-          3.5,
-          1.9e-01,
-          1.089,
-          3.393,
-          2.097,
-          8.694
-        ],
-        [
-          3.9,
-          1.9e-01,
-          1.089,
-          3.393,
-          2.097,
-          8.694
-        ],
-        [
-          10,
-          100,
-          100
-        ],
-        [
-          5000000,
-          5000000,
-          50000000
-        ]
-      ],
-      "parName": [
-        [
-          "mean_Jpsi",
-          "width_Jpsi",
-          "a_Jpsi",
-          "b_Jpsi",
-          "c_Jpsi",
-          "d_Jpsi"
-        ],
-        [
-          "sum::mean_Psi2s(mean_Jpsi,0.584)",
-          "prod::width_Psi2s(width_Jpsi,1.05)",
-          "a_Psi2s",
-          "b_Psi2s",
-          "c_Psi2s",
-          "d_Psi2s"
-        ],
-        [
-          "aa",
-          "bb",
-          "cc"
-        ],
-        [
-          "sig_Jpsi",
-          "sig_Psi2s",
-          "bkg"
-        ]
-      ],
-      "fitRangeMin": [
-        2,
-        2.1,
-        2.2
-      ],
-      "fitRangeMax": [
-        5,
-        4.9,
-        4.8
-      ],
-      "doPropagandaPlot": true,
-      "parForPropagandaPlot": [
-        "mean_Jpsi",
-        "width_Jpsi",
-        "sig_Jpsi",
-        "sig_Psi2s"
-      ],
-      "parNameForPropagandaPlot": [
-        "#mu_{J/#psi}",
-        "#sigma_{J/#psi}",
-        "#it{N}_{J/#psi}",
-        "#it{N}_{#psi(2S)}"
-      ],
-      "textForPropagandaPlot": [
-        [
-          0.20,
-          0.87,
-          "Simulation, toy MC"
-        ],
-        [
-          0.20,
-          0.80,
-          "2.5 < #it{y} < 4, J/#psi #rightarrow #mu^{+}#mu^{-}"
-        ]
-      ]
+    "input": {
+        "input_file_name": "tutorial.root",
+        "input_name": "histMass",
+        "pdf_dictionary": {
+            "pdf": [
+                "CB2",
+                "CB2",
+                "VWG",
+                "SUM"
+            ],
+            "pdfName": [
+                "Jpsi",
+                "Psi2s",
+                "Bkg",
+                "SUM"
+            ],
+            "pdfNameForLegend": [
+                "J/#psi",
+                "#psi(2S)",
+                "Background",
+                "Fit"
+            ],
+            "pdfColor": [
+                861,
+                417,
+                1
+            ],
+            "pdfStyle": [
+                1,
+                1,
+                2
+            ],
+            "parVal": [
+                [
+                    3.096,
+                    1.2e-01,
+                    1.089,
+                    3.393,
+                    2.097,
+                    8.694
+                ],
+                [
+                    3.096,
+                    1.2e-01,
+                    1.089,
+                    3.393,
+                    2.097,
+                    8.694
+                ],
+                [
+                    1,
+                    1,
+                    1
+                ],
+                [
+                    1000,
+                    100,
+                    100000
+                ]
+            ],
+            "parLimMin": [
+                [
+                    2.9,
+                    7.0e-02,
+                    1.089,
+                    3.393,
+                    2.097,
+                    8.694
+                ],
+                [
+                    2.9,
+                    7.0e-02,
+                    1.089,
+                    3.393,
+                    2.097,
+                    8.694
+                ],
+                [
+                    -10,
+                    0,
+                    -100
+                ],
+                [
+                    0,
+                    0,
+                    0
+                ]
+            ],
+            "parLimMax": [
+                [
+                    3.5,
+                    1.9e-01,
+                    1.089,
+                    3.393,
+                    2.097,
+                    8.694
+                ],
+                [
+                    3.9,
+                    1.9e-01,
+                    1.089,
+                    3.393,
+                    2.097,
+                    8.694
+                ],
+                [
+                    10,
+                    100,
+                    100
+                ],
+                [
+                    5000000,
+                    5000000,
+                    50000000
+                ]
+            ],
+            "parName": [
+                [
+                    "mean_Jpsi",
+                    "width_Jpsi",
+                    "a_Jpsi",
+                    "b_Jpsi",
+                    "c_Jpsi",
+                    "d_Jpsi"
+                ],
+                [
+                    "sum::mean_Psi2s(mean_Jpsi,0.584)",
+                    "prod::width_Psi2s(width_Jpsi,1.05)",
+                    "a_Psi2s",
+                    "b_Psi2s",
+                    "c_Psi2s",
+                    "d_Psi2s"
+                ],
+                [
+                    "aa",
+                    "bb",
+                    "cc"
+                ],
+                [
+                    "sig_Jpsi",
+                    "sig_Psi2s",
+                    "bkg"
+                ]
+            ],
+            "fitRangeMin": [
+                2,
+                2.1,
+                2.2
+            ],
+            "fitRangeMax": [
+                5,
+                4.9,
+                4.8
+            ],
+            "doPropagandaPlot": true,
+            "parForPropagandaPlot": [
+                "mean_Jpsi",
+                "width_Jpsi",
+                "sig_Jpsi",
+                "sig_Psi2s"
+            ],
+            "parNameForPropagandaPlot": [
+                "#mu_{J/#psi}",
+                "#sigma_{J/#psi}",
+                "#it{N}_{J/#psi}",
+                "#it{N}_{#psi(2S)}"
+            ],
+            "textForPropagandaPlot": [
+                [
+                    0.20,
+                    0.87,
+                    "Simulation, toy MC"
+                ],
+                [
+                    0.20,
+                    0.80,
+                    "2.5 < #it{y} < 4, J/#psi #rightarrow #mu^{+}#mu^{-}"
+                ]
+            ]
+        }
+    },
+    "output": {
+        "output_file_name": "output/"
     }
-  },
-  "output": {
-    "output_file_name": "output/"
-  }
-}
\ No newline at end of file
+}
diff --git a/.conflict-base-0/PWGDQ/Macros/dqFlowAccWeights.C b/.conflict-base-0/PWGDQ/Macros/dqFlowAccWeights.C
index 00cb5107d45..13695c9e799 100644
--- a/.conflict-base-0/PWGDQ/Macros/dqFlowAccWeights.C
+++ b/.conflict-base-0/PWGDQ/Macros/dqFlowAccWeights.C
@@ -14,18 +14,20 @@
 ///
 /// \author Chi ZHANG, CEA-Saclay, chi.zhang@cern.ch
 
-#include <gsl/span>
+#include "PWGCF/GenericFramework/Core/GFWWeights.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "Framework/Logger.h"
+
+#include <TFile.h>
+#include <TSystem.h>
+
 #include <cmath>
+#include <gsl/span>
+#include <iostream>
 #include <string>
 #include <unordered_map>
 #include <vector>
-#include <iostream>
-
-#include <TSystem.h>
-#include <TFile.h>
-#include "Framework/Logger.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "PWGCF/GenericFramework/Core/GFWWeights.h"
 
 using namespace o2;
 using namespace std;
diff --git a/.conflict-base-0/PWGDQ/Macros/evalMchTrackingEfficiency.cxx b/.conflict-base-0/PWGDQ/Macros/evalMchTrackingEfficiency.cxx
index 34610915850..e2c1ae796e3 100644
--- a/.conflict-base-0/PWGDQ/Macros/evalMchTrackingEfficiency.cxx
+++ b/.conflict-base-0/PWGDQ/Macros/evalMchTrackingEfficiency.cxx
@@ -14,17 +14,17 @@
 ///
 /// \author Zaida Conesa del Valle <zaida.conesa.del.valle@cern.ch>
 /// \author Andrea Tavira García <tavira-garcia@ijclab.in2p3.fr>
-#include <vector>
-
-#include "TFile.h"
+#include "TAxis.h"
+#include "TCanvas.h"
 #include "TDirectoryFile.h"
-#include "THn.h"
+#include "TFile.h"
 #include "TH1F.h"
 #include "TH2F.h"
-#include "TAxis.h"
-#include "TCanvas.h"
-#include "TStyle.h"
+#include "THn.h"
 #include "TLegend.h"
+#include "TStyle.h"
+
+#include <vector>
 
 double computeEfficiencyPerChamber(THnF* hnf, int iAxis, int iCh, double binLimits[2]);
 double computeEfficiencyPerChamber(THnF* hnf, const int iAxis[3], int iCh, double binLimits[3][2]);
diff --git a/.conflict-base-0/PWGDQ/Macros/fit_library/CB2Pdf.cxx b/.conflict-base-0/PWGDQ/Macros/fit_library/CB2Pdf.cxx
index 7f2501825e3..43fc0d0a613 100644
--- a/.conflict-base-0/PWGDQ/Macros/fit_library/CB2Pdf.cxx
+++ b/.conflict-base-0/PWGDQ/Macros/fit_library/CB2Pdf.cxx
@@ -11,14 +11,16 @@
 
 /// \author Luca Micheletti <luca.micheletti@cern.ch>, CERN
 
+#include "CB2Pdf.h"
+
 #include "Riostream.h"
 
-#include "CB2Pdf.h"
-#include "RooAbsReal.h"
 #include "RooAbsCategory.h"
-#include <math.h>
+#include "RooAbsReal.h"
 #include "TMath.h"
 
+#include <math.h>
+
 ClassImp(CB2Pdf);
 
 CB2Pdf::CB2Pdf(const char* name, const char* title,
diff --git a/.conflict-base-0/PWGDQ/Macros/fit_library/CB2Pdf.h b/.conflict-base-0/PWGDQ/Macros/fit_library/CB2Pdf.h
index a9e3a87409e..2415631b03b 100644
--- a/.conflict-base-0/PWGDQ/Macros/fit_library/CB2Pdf.h
+++ b/.conflict-base-0/PWGDQ/Macros/fit_library/CB2Pdf.h
@@ -14,11 +14,11 @@
 #ifndef CB2PDF
 #define CB2PDF
 
+#include "RooAbsCategory.h"
 #include "RooAbsPdf.h"
-#include "RooRealProxy.h"
-#include "RooCategoryProxy.h"
 #include "RooAbsReal.h"
-#include "RooAbsCategory.h"
+#include "RooCategoryProxy.h"
+#include "RooRealProxy.h"
 
 class CB2Pdf : public RooAbsPdf
 {
diff --git a/.conflict-base-0/PWGDQ/Macros/fit_library/ExpPdf.cxx b/.conflict-base-0/PWGDQ/Macros/fit_library/ExpPdf.cxx
index 1841ccd7cbb..9f07c07e07a 100755
--- a/.conflict-base-0/PWGDQ/Macros/fit_library/ExpPdf.cxx
+++ b/.conflict-base-0/PWGDQ/Macros/fit_library/ExpPdf.cxx
@@ -11,14 +11,16 @@
 
 /// \author Luca Micheletti <luca.micheletti@cern.ch>, CERN
 
+#include "ExpPdf.h"
+
 #include "Riostream.h"
 
-#include "ExpPdf.h"
-#include "RooAbsReal.h"
 #include "RooAbsCategory.h"
-#include <math.h>
+#include "RooAbsReal.h"
 #include "TMath.h"
 
+#include <math.h>
+
 ClassImp(ExpPdf);
 
 ExpPdf::ExpPdf(const char* name, const char* title,
diff --git a/.conflict-base-0/PWGDQ/Macros/fit_library/ExpPdf.h b/.conflict-base-0/PWGDQ/Macros/fit_library/ExpPdf.h
index 394c73c52e6..4756e5a7ad8 100755
--- a/.conflict-base-0/PWGDQ/Macros/fit_library/ExpPdf.h
+++ b/.conflict-base-0/PWGDQ/Macros/fit_library/ExpPdf.h
@@ -14,11 +14,11 @@
 #ifndef EXPPDF
 #define EXPPDF
 
+#include "RooAbsCategory.h"
 #include "RooAbsPdf.h"
-#include "RooRealProxy.h"
-#include "RooCategoryProxy.h"
 #include "RooAbsReal.h"
-#include "RooAbsCategory.h"
+#include "RooCategoryProxy.h"
+#include "RooRealProxy.h"
 
 class ExpPdf : public RooAbsPdf
 {
diff --git a/.conflict-base-0/PWGDQ/Macros/fit_library/GausPdf.cxx b/.conflict-base-0/PWGDQ/Macros/fit_library/GausPdf.cxx
index 84d303e3a2b..bdf7f88aa2f 100755
--- a/.conflict-base-0/PWGDQ/Macros/fit_library/GausPdf.cxx
+++ b/.conflict-base-0/PWGDQ/Macros/fit_library/GausPdf.cxx
@@ -11,14 +11,16 @@
 
 /// \author Luca Micheletti <luca.micheletti@cern.ch>, CERN
 
+#include "GausPdf.h"
+
 #include "Riostream.h"
 
-#include "GausPdf.h"
-#include "RooAbsReal.h"
 #include "RooAbsCategory.h"
-#include <math.h>
+#include "RooAbsReal.h"
 #include "TMath.h"
 
+#include <math.h>
+
 ClassImp(GausPdf);
 
 GausPdf::GausPdf(const char* name, const char* title,
diff --git a/.conflict-base-0/PWGDQ/Macros/fit_library/GausPdf.h b/.conflict-base-0/PWGDQ/Macros/fit_library/GausPdf.h
index 4edb19ff47c..0cdda519651 100755
--- a/.conflict-base-0/PWGDQ/Macros/fit_library/GausPdf.h
+++ b/.conflict-base-0/PWGDQ/Macros/fit_library/GausPdf.h
@@ -14,11 +14,11 @@
 #ifndef GAUSPDF
 #define GAUSPDF
 
+#include "RooAbsCategory.h"
 #include "RooAbsPdf.h"
-#include "RooRealProxy.h"
-#include "RooCategoryProxy.h"
 #include "RooAbsReal.h"
-#include "RooAbsCategory.h"
+#include "RooCategoryProxy.h"
+#include "RooRealProxy.h"
 
 class GausPdf : public RooAbsPdf
 {
diff --git a/.conflict-base-0/PWGDQ/Macros/fit_library/Pol4ExpPdf.cxx b/.conflict-base-0/PWGDQ/Macros/fit_library/Pol4ExpPdf.cxx
index 912406a3b0b..6ef59d327ee 100755
--- a/.conflict-base-0/PWGDQ/Macros/fit_library/Pol4ExpPdf.cxx
+++ b/.conflict-base-0/PWGDQ/Macros/fit_library/Pol4ExpPdf.cxx
@@ -11,14 +11,16 @@
 
 /// \author Luca Micheletti <luca.micheletti@cern.ch>, CERN
 
+#include "Pol4ExpPdf.h"
+
 #include "Riostream.h"
 
-#include "Pol4ExpPdf.h"
-#include "RooAbsReal.h"
 #include "RooAbsCategory.h"
-#include <math.h>
+#include "RooAbsReal.h"
 #include "TMath.h"
 
+#include <math.h>
+
 ClassImp(Pol4ExpPdf);
 
 Pol4ExpPdf::Pol4ExpPdf(const char* name, const char* title,
diff --git a/.conflict-base-0/PWGDQ/Macros/fit_library/Pol4ExpPdf.h b/.conflict-base-0/PWGDQ/Macros/fit_library/Pol4ExpPdf.h
index 13cd8696c6c..42a898a0493 100755
--- a/.conflict-base-0/PWGDQ/Macros/fit_library/Pol4ExpPdf.h
+++ b/.conflict-base-0/PWGDQ/Macros/fit_library/Pol4ExpPdf.h
@@ -14,11 +14,11 @@
 #ifndef POL4EXPPDF
 #define POL4EXPPDF
 
+#include "RooAbsCategory.h"
 #include "RooAbsPdf.h"
-#include "RooRealProxy.h"
-#include "RooCategoryProxy.h"
 #include "RooAbsReal.h"
-#include "RooAbsCategory.h"
+#include "RooCategoryProxy.h"
+#include "RooRealProxy.h"
 
 TString nameParameters[] = {"p0", "p1", "p2", "p3", "p4", "p5", "N_bkg", "N_sig", "mean", "width"};
 
diff --git a/.conflict-base-0/PWGDQ/Macros/fit_library/VWGPdf.cxx b/.conflict-base-0/PWGDQ/Macros/fit_library/VWGPdf.cxx
index 8cebc90b2f4..8cbcdd9be83 100644
--- a/.conflict-base-0/PWGDQ/Macros/fit_library/VWGPdf.cxx
+++ b/.conflict-base-0/PWGDQ/Macros/fit_library/VWGPdf.cxx
@@ -11,14 +11,16 @@
 
 /// \author Luca Micheletti <luca.micheletti@cern.ch>, CERN
 
+#include "VWGPdf.h"
+
 #include "Riostream.h"
 
-#include "VWGPdf.h"
-#include "RooAbsReal.h"
 #include "RooAbsCategory.h"
-#include <math.h>
+#include "RooAbsReal.h"
 #include "TMath.h"
 
+#include <math.h>
+
 ClassImp(VWGPdf);
 
 VWGPdf::VWGPdf(const char* name, const char* title,
diff --git a/.conflict-base-0/PWGDQ/Macros/fit_library/VWGPdf.h b/.conflict-base-0/PWGDQ/Macros/fit_library/VWGPdf.h
index 9077d43be71..5014c924773 100644
--- a/.conflict-base-0/PWGDQ/Macros/fit_library/VWGPdf.h
+++ b/.conflict-base-0/PWGDQ/Macros/fit_library/VWGPdf.h
@@ -14,11 +14,11 @@
 #ifndef VWGPDF
 #define VWGPDF
 
+#include "RooAbsCategory.h"
 #include "RooAbsPdf.h"
-#include "RooRealProxy.h"
-#include "RooCategoryProxy.h"
 #include "RooAbsReal.h"
-#include "RooAbsCategory.h"
+#include "RooCategoryProxy.h"
+#include "RooRealProxy.h"
 
 class VWGPdf : public RooAbsPdf
 {
diff --git a/.conflict-base-0/PWGDQ/TableProducer/generatedQuarkoniaMC.cxx b/.conflict-base-0/PWGDQ/TableProducer/generatedQuarkoniaMC.cxx
index 737faaaa6b2..a820a167a32 100644
--- a/.conflict-base-0/PWGDQ/TableProducer/generatedQuarkoniaMC.cxx
+++ b/.conflict-base-0/PWGDQ/TableProducer/generatedQuarkoniaMC.cxx
@@ -16,40 +16,42 @@
 // It is meant to help with providing auxiliary information
 // when dealing with derived data.
 
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <map>
-#include <iterator>
-#include <utility>
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+#include "PWGLF/DataModel/EPCalibrationTables.h"
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
 #include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/McCollisionExtra.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/Qvectors.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+#include "Common/TableProducer/PID/pidTOFBase.h"
+
 #include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/PhysicsConstants.h"
-#include "Common/TableProducer/PID/pidTOFBase.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Qvectors.h"
+#include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StaticFor.h"
-#include "Common/DataModel/McCollisionExtra.h"
-#include "PWGLF/DataModel/EPCalibrationTables.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <iterator>
+#include <map>
+#include <utility>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGDQ/TableProducer/tableMaker.cxx b/.conflict-base-0/PWGDQ/TableProducer/tableMaker.cxx
index 87d1183d385..f0b74e47974 100644
--- a/.conflict-base-0/PWGDQ/TableProducer/tableMaker.cxx
+++ b/.conflict-base-0/PWGDQ/TableProducer/tableMaker.cxx
@@ -24,45 +24,48 @@
 #include <string>
 #include <vector>
 // other includes
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/DataTypes.h"
-#include "Framework/runDataProcessing.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
+#include "PWGDQ/Core/AnalysisCompositeCut.h"
+#include "PWGDQ/Core/AnalysisCut.h"
+#include "PWGDQ/Core/CutsLibrary.h"
+#include "PWGDQ/Core/HistogramManager.h"
+#include "PWGDQ/Core/HistogramsLibrary.h"
+#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+
 #include "Common/CCDB/TriggerAliases.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/CollisionAssociationTables.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/FwdTrackReAlignTables.h"
+#include "Common/DataModel/MftmchMatchingML.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/MftmchMatchingML.h"
-#include "Common/DataModel/FwdTrackReAlignTables.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "PWGDQ/Core/VarManager.h"
-#include "PWGDQ/Core/HistogramManager.h"
-#include "PWGDQ/Core/AnalysisCut.h"
-#include "PWGDQ/Core/AnalysisCompositeCut.h"
-#include "PWGDQ/Core/HistogramsLibrary.h"
-#include "PWGDQ/Core/CutsLibrary.h"
-#include "DataFormatsGlobalTracking/RecoContainerCreateTracksVariadic.h"
-#include "DetectorsVertexing/VertexTrackMatcher.h"
-#include "ReconstructionDataFormats/PrimaryVertex.h"
-#include "ReconstructionDataFormats/VtxTrackIndex.h"
-#include "ReconstructionDataFormats/VtxTrackRef.h"
-#include "DataFormatsITSMFT/ROFRecord.h"
+#include "EventFiltering/Zorro.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "CommonDataFormat/InteractionRecord.h"
-#include "DetectorsVertexing/PVertexerParams.h"
-#include "MathUtils/Primitive2D.h"
 #include "DataFormatsGlobalTracking/RecoContainer.h"
-#include "Common/DataModel/CollisionAssociationTables.h"
+#include "DataFormatsGlobalTracking/RecoContainerCreateTracksVariadic.h"
+#include "DataFormatsITSMFT/ROFRecord.h"
 #include "DataFormatsParameters/GRPMagField.h"
 #include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "DetectorsVertexing/PVertexerParams.h"
+#include "DetectorsVertexing/VertexTrackMatcher.h"
 #include "Field/MagneticField.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/DataTypes.h"
+#include "Framework/runDataProcessing.h"
+#include "MathUtils/Primitive2D.h"
+#include "ReconstructionDataFormats/PrimaryVertex.h"
+#include "ReconstructionDataFormats/VtxTrackIndex.h"
+#include "ReconstructionDataFormats/VtxTrackRef.h"
+
 #include "TGeoGlobalMagField.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "EventFiltering/Zorro.h"
 
 using std::cout;
 using std::endl;
diff --git a/.conflict-base-0/PWGDQ/TableProducer/tableMakerJpsiHf.cxx b/.conflict-base-0/PWGDQ/TableProducer/tableMakerJpsiHf.cxx
index 7ae949c40d1..4700ce4be4f 100644
--- a/.conflict-base-0/PWGDQ/TableProducer/tableMakerJpsiHf.cxx
+++ b/.conflict-base-0/PWGDQ/TableProducer/tableMakerJpsiHf.cxx
@@ -14,23 +14,23 @@
 /// \author Luca Micheletti <luca.micheletti@to.infn.it>, INFN
 /// \author Fabrizio Grosa <fabrizio.grosa@cern.ch>, CERN
 
-#include <string>
-
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
-
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/AnalysisCompositeCut.h"
+#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/CutsLibrary.h"
 #include "PWGDQ/Core/HistogramManager.h"
 #include "PWGDQ/Core/HistogramsLibrary.h"
 #include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+#include "PWGHF/Core/HfHelper.h"
 #include "PWGHF/DataModel/CandidateReconstructionTables.h"
 #include "PWGHF/DataModel/CandidateSelectionTables.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+
+#include <string>
 
 using namespace o2;
 using namespace o2::analysis;
diff --git a/.conflict-base-0/PWGDQ/TableProducer/tableMakerMC.cxx b/.conflict-base-0/PWGDQ/TableProducer/tableMakerMC.cxx
index 1d43d196f9d..2edcef5717f 100644
--- a/.conflict-base-0/PWGDQ/TableProducer/tableMakerMC.cxx
+++ b/.conflict-base-0/PWGDQ/TableProducer/tableMakerMC.cxx
@@ -16,41 +16,45 @@
 //   The skimmed MC stack includes the MC truth particles corresponding to the list of user specified MC signals (see MCsignal.h)
 //    and the MC truth particles corresponding to the reconstructed tracks selected by the specified track cuts on reconstructed data.
 
-#include <iostream>
-#include <string>
-#include <map>
-#include <memory>
-#include <vector>
-#include "TList.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/ASoA.h"
-#include "Framework/DataTypes.h"
-#include "Framework/runDataProcessing.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/CCDB/TriggerAliases.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "PWGDQ/Core/VarManager.h"
-#include "PWGDQ/Core/HistogramManager.h"
-#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/AnalysisCompositeCut.h"
-#include "PWGDQ/Core/HistogramsLibrary.h"
+#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/CutsLibrary.h"
+#include "PWGDQ/Core/HistogramManager.h"
+#include "PWGDQ/Core/HistogramsLibrary.h"
 #include "PWGDQ/Core/MCSignal.h"
 #include "PWGDQ/Core/MCSignalLibrary.h"
+#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+
+#include "Common/CCDB/TriggerAliases.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/CollisionAssociationTables.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/CollisionAssociationTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsParameters/GRPMagField.h"
 #include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
 #include "Field/MagneticField.h"
+#include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/DataTypes.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TGeoGlobalMagField.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "CCDB/BasicCCDBManager.h"
+#include "TList.h"
+
+#include <iostream>
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
 
 using std::cout;
 using std::endl;
@@ -653,7 +657,7 @@ struct TableMakerMC {
                            track.c1PtY(), track.c1PtZ(), track.c1PtSnp(), track.c1PtTgl(), track.c1Pt21Pt2());
           }
         } // end loop over reconstructed tracks
-      }   // end if constexpr (static_cast<bool>(TTrackFillMap))
+      } // end if constexpr (static_cast<bool>(TTrackFillMap))
 
       // Maps for the MFT-muon matching index
       std::map<int, int> newMFTTableSize; // key : oldMFTIndex, value: size of the table-1 at step key
@@ -864,9 +868,9 @@ struct TableMakerMC {
               newMatchIndex[muon.index()] = newEntryNb[matchIdx];                                  // update the match for this muon to the updated entry of the match
               newMatchIndex[muon.index()] += muonBasic.lastIndex() + 1 - newEntryNb[muon.index()]; // adding the offset of muons, muonBasic.lastIndex() start at -1
 
-              if (static_cast<int>(muon.trackType()) == 0) {                                       // for now only do this to global tracks
-                newMatchIndex[matchIdx] = newEntryNb[muon.index()];                                // add the  updated index of this muon as a match to mch track
-                newMatchIndex[matchIdx] += muonBasic.lastIndex() + 1 - newEntryNb[muon.index()];   // adding the offset, muonBasic.lastIndex() start at -1
+              if (static_cast<int>(muon.trackType()) == 0) {                                     // for now only do this to global tracks
+                newMatchIndex[matchIdx] = newEntryNb[muon.index()];                              // add the  updated index of this muon as a match to mch track
+                newMatchIndex[matchIdx] += muonBasic.lastIndex() + 1 - newEntryNb[muon.index()]; // adding the offset, muonBasic.lastIndex() start at -1
               }
             } else {
               newMatchIndex[muon.index()] = -1;
@@ -915,7 +919,7 @@ struct TableMakerMC {
           muonLabels(fNewLabels.find(mctrack.index())->second, muon.mcMask(), mcflags);
         }
       } // end if constexpr (static_cast<bool>(TMuonFillMap))
-    }   // end loop over collisions
+    } // end loop over collisions
 
     // Loop over the label map, create the mother/daughter relationships if these exist and write the skimmed MC stack
     for (const auto& [newLabel, oldLabel] : fNewLabelsReversed) {
@@ -1276,7 +1280,7 @@ struct TableMakerMC {
                            track.c1PtY(), track.c1PtZ(), track.c1PtSnp(), track.c1PtTgl(), track.c1Pt21Pt2());
           }
         } // end loop over reconstructed tracks
-      }   // end if constexpr (static_cast<bool>(TTrackFillMap))
+      } // end if constexpr (static_cast<bool>(TTrackFillMap))
 
       if constexpr (static_cast<bool>(TMuonFillMap)) {
         // build the muon tables
@@ -1454,7 +1458,7 @@ struct TableMakerMC {
           muonLabels(fNewLabels.find(mctrack.index())->second, muon.mcMask(), mcflags);
         }
       } // end if constexpr (static_cast<bool>(TMuonFillMap))
-    }   // end loop over collisions
+    } // end loop over collisions
 
     // Loop over the label map, create the mother/daughter relationships if these exist and write the skimmed MC stack
     for (const auto& [newLabel, oldLabel] : fNewLabelsReversed) {
diff --git a/.conflict-base-0/PWGDQ/TableProducer/tableMakerMC_withAssoc.cxx b/.conflict-base-0/PWGDQ/TableProducer/tableMakerMC_withAssoc.cxx
index 7dc49516e8a..8fe5f479131 100644
--- a/.conflict-base-0/PWGDQ/TableProducer/tableMakerMC_withAssoc.cxx
+++ b/.conflict-base-0/PWGDQ/TableProducer/tableMakerMC_withAssoc.cxx
@@ -16,45 +16,49 @@
 //   The skimmed MC stack includes the MC truth particles corresponding to the list of user specified MC signals (see MCsignal.h)
 //    and the MC truth particles corresponding to the reconstructed tracks selected by the specified track cuts on reconstructed data.
 
-#include <cstdint>
-#include <iostream>
-#include <map>
-#include <string>
-#include <memory>
-#include <vector>
-#include <utility>
-#include <unordered_map>
-#include "TList.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/ASoA.h"
-#include "Framework/DataTypes.h"
-#include "Framework/runDataProcessing.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/CCDB/TriggerAliases.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "PWGDQ/Core/VarManager.h"
-#include "PWGDQ/Core/HistogramManager.h"
-#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/AnalysisCompositeCut.h"
-#include "PWGDQ/Core/HistogramsLibrary.h"
+#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/CutsLibrary.h"
+#include "PWGDQ/Core/HistogramManager.h"
+#include "PWGDQ/Core/HistogramsLibrary.h"
 #include "PWGDQ/Core/MCSignal.h"
 #include "PWGDQ/Core/MCSignalLibrary.h"
+#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+
+#include "Common/CCDB/TriggerAliases.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/CollisionAssociationTables.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/FwdTrackReAlignTables.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/FwdTrackReAlignTables.h"
-#include "Common/DataModel/CollisionAssociationTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsParameters/GRPMagField.h"
 #include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
 #include "Field/MagneticField.h"
+#include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/DataTypes.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TGeoGlobalMagField.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "CCDB/BasicCCDBManager.h"
+#include "TList.h"
+
+#include <cstdint>
+#include <iostream>
+#include <map>
+#include <memory>
+#include <string>
+#include <unordered_map>
+#include <utility>
+#include <vector>
 
 using std::cout;
 using std::endl;
diff --git a/.conflict-base-0/PWGDQ/TableProducer/tableMakerMuonMchTrkEfficiency.cxx b/.conflict-base-0/PWGDQ/TableProducer/tableMakerMuonMchTrkEfficiency.cxx
index 11634be2e0d..7474dd1740f 100644
--- a/.conflict-base-0/PWGDQ/TableProducer/tableMakerMuonMchTrkEfficiency.cxx
+++ b/.conflict-base-0/PWGDQ/TableProducer/tableMakerMuonMchTrkEfficiency.cxx
@@ -19,34 +19,35 @@
 /// \author Zaida Conesa del Valle <zaida.conesa.del.valle@cern.ch>
 ///
 
-#include <vector>
-#include <memory>
-#include <string>
-#include <algorithm>
+#include "TDatabasePDG.h"
 #include <TH1F.h>
 #include <TH3F.h>
 #include <THashList.h>
 #include <TList.h>
-#include <TString.h>
 #include <TLorentzVector.h>
-#include "TDatabasePDG.h"
+#include <TString.h>
+
+#include <algorithm>
+#include <memory>
+#include <string>
+#include <vector>
 //
 #include "Common/DataModel/TrackSelectionTables.h"
 //
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/ASoA.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/Logger.h"
 #include "Framework/runDataProcessing.h"
 //
-#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/AnalysisCompositeCut.h"
+#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/CutsLibrary.h"
 #include "PWGDQ/Core/VarManager.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
 #include "PWGDQ/DataModel/MchTrkEffTables.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-base-0/PWGDQ/TableProducer/tableMaker_withAssoc.cxx b/.conflict-base-0/PWGDQ/TableProducer/tableMaker_withAssoc.cxx
index 3b3d4c4e0af..7b35a84bd87 100644
--- a/.conflict-base-0/PWGDQ/TableProducer/tableMaker_withAssoc.cxx
+++ b/.conflict-base-0/PWGDQ/TableProducer/tableMaker_withAssoc.cxx
@@ -23,46 +23,49 @@
 #include <string>
 #include <vector>
 // other includes
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/DataTypes.h"
-#include "Framework/runDataProcessing.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
+#include "PWGDQ/Core/AnalysisCompositeCut.h"
+#include "PWGDQ/Core/AnalysisCut.h"
+#include "PWGDQ/Core/CutsLibrary.h"
+#include "PWGDQ/Core/HistogramManager.h"
+#include "PWGDQ/Core/HistogramsLibrary.h"
+#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+
 #include "Common/CCDB/TriggerAliases.h"
+#include "Common/Core/TableHelper.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/CollisionAssociationTables.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/FwdTrackReAlignTables.h"
+#include "Common/DataModel/MftmchMatchingML.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/MftmchMatchingML.h"
-#include "Common/DataModel/FwdTrackReAlignTables.h"
-#include "Common/Core/TableHelper.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "PWGDQ/Core/VarManager.h"
-#include "PWGDQ/Core/HistogramManager.h"
-#include "PWGDQ/Core/AnalysisCut.h"
-#include "PWGDQ/Core/AnalysisCompositeCut.h"
-#include "PWGDQ/Core/HistogramsLibrary.h"
-#include "PWGDQ/Core/CutsLibrary.h"
-#include "DataFormatsGlobalTracking/RecoContainerCreateTracksVariadic.h"
-#include "DetectorsVertexing/VertexTrackMatcher.h"
-#include "ReconstructionDataFormats/PrimaryVertex.h"
-#include "ReconstructionDataFormats/VtxTrackIndex.h"
-#include "ReconstructionDataFormats/VtxTrackRef.h"
-#include "DataFormatsITSMFT/ROFRecord.h"
+#include "EventFiltering/Zorro.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "CommonDataFormat/InteractionRecord.h"
-#include "DetectorsVertexing/PVertexerParams.h"
-#include "MathUtils/Primitive2D.h"
 #include "DataFormatsGlobalTracking/RecoContainer.h"
-#include "Common/DataModel/CollisionAssociationTables.h"
+#include "DataFormatsGlobalTracking/RecoContainerCreateTracksVariadic.h"
+#include "DataFormatsITSMFT/ROFRecord.h"
 #include "DataFormatsParameters/GRPMagField.h"
 #include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "DetectorsVertexing/PVertexerParams.h"
+#include "DetectorsVertexing/VertexTrackMatcher.h"
 #include "Field/MagneticField.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/DataTypes.h"
+#include "Framework/runDataProcessing.h"
+#include "MathUtils/Primitive2D.h"
+#include "ReconstructionDataFormats/PrimaryVertex.h"
+#include "ReconstructionDataFormats/VtxTrackIndex.h"
+#include "ReconstructionDataFormats/VtxTrackRef.h"
+
 #include "TGeoGlobalMagField.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "EventFiltering/Zorro.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGDQ/Tasks/DalitzSelection.cxx b/.conflict-base-0/PWGDQ/Tasks/DalitzSelection.cxx
index 6b285d4e04a..a19ab82ae65 100755
--- a/.conflict-base-0/PWGDQ/Tasks/DalitzSelection.cxx
+++ b/.conflict-base-0/PWGDQ/Tasks/DalitzSelection.cxx
@@ -13,26 +13,28 @@
 //        It can produce track and pair histograms for selected tracks
 //      It creates a bitmap with selections to be stored during skimming
 //
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/DataTypes.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
+#include "PWGDQ/Core/AnalysisCompositeCut.h"
+#include "PWGDQ/Core/AnalysisCut.h"
+#include "PWGDQ/Core/CutsLibrary.h"
+#include "PWGDQ/Core/HistogramManager.h"
+#include "PWGDQ/Core/HistogramsLibrary.h"
+#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+
 #include "Common/CCDB/TriggerAliases.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "PWGDQ/Core/VarManager.h"
-#include "PWGDQ/Core/HistogramManager.h"
-#include "PWGDQ/Core/AnalysisCut.h"
-#include "PWGDQ/Core/AnalysisCompositeCut.h"
-#include "PWGDQ/Core/HistogramsLibrary.h"
-#include "PWGDQ/Core/CutsLibrary.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsParameters/GRPMagField.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/DataTypes.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGDQ/Tasks/MIDefficiency.cxx b/.conflict-base-0/PWGDQ/Tasks/MIDefficiency.cxx
index 3dcbcc4d595..219489d9ab9 100644
--- a/.conflict-base-0/PWGDQ/Tasks/MIDefficiency.cxx
+++ b/.conflict-base-0/PWGDQ/Tasks/MIDefficiency.cxx
@@ -18,11 +18,12 @@
 ///
 /// \author Luca Quaglia <luca.quaglia@cern.ch
 
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/CallbackService.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
-#include "Framework/CallbackService.h"
-#include "Framework/ASoAHelpers.h"
+
 #include <iostream>
 
 // O2 physics classes
@@ -30,13 +31,12 @@
 
 // O2
 #include "DataFormatsMID/Track.h" //MID track from O2
-#include "Framework/Variant.h"
-#include "Framework/ConfigParamSpec.h"
 #include "Framework/CompletionPolicyHelpers.h"
-
-#include "MIDEfficiency/Efficiency.h"
+#include "Framework/ConfigParamSpec.h"
+#include "Framework/Variant.h"
 #include "MIDBase/DetectorParameters.h"
 #include "MIDBase/Mapping.h"
+#include "MIDEfficiency/Efficiency.h"
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-base-0/PWGDQ/Tasks/ModelConverterMultPv.cxx b/.conflict-base-0/PWGDQ/Tasks/ModelConverterMultPv.cxx
index 088590435b8..42b19de5191 100644
--- a/.conflict-base-0/PWGDQ/Tasks/ModelConverterMultPv.cxx
+++ b/.conflict-base-0/PWGDQ/Tasks/ModelConverterMultPv.cxx
@@ -15,15 +15,17 @@
 // the conflict with the old data model.
 
 // other includes
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 #include <THashList.h>
 #include <TList.h>
 #include <TString.h>
-#include "DataFormatsParameters/GRPObject.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGDQ/Tasks/dqCorrelation.cxx b/.conflict-base-0/PWGDQ/Tasks/dqCorrelation.cxx
index 950e82364cb..f3aed01c057 100644
--- a/.conflict-base-0/PWGDQ/Tasks/dqCorrelation.cxx
+++ b/.conflict-base-0/PWGDQ/Tasks/dqCorrelation.cxx
@@ -11,44 +11,45 @@
 /// @author  Victor Valencia
 // Contact: iarsene@cern.ch, i.c.arsene@fys.uio.no
 //
-#include <iostream>
-#include <vector>
-#include <algorithm>
-#include <TH1F.h>
-#include <TH3F.h>
-#include <THashList.h>
-#include <TList.h>
-#include <TString.h>
-#include <TRandom3.h>
-#include <cmath>
-
-#include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
 #include "PWGCF/GenericFramework/Core/FlowContainer.h"
-#include "PWGCF/GenericFramework/Core/GFWCumulant.h"
 #include "PWGCF/GenericFramework/Core/GFW.h"
+#include "PWGCF/GenericFramework/Core/GFWCumulant.h"
+#include "PWGCF/GenericFramework/Core/GFWPowerArray.h"
 #include "PWGCF/GenericFramework/Core/GFWWeights.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "PWGDQ/Core/VarManager.h"
-#include "PWGDQ/Core/HistogramManager.h"
-#include "PWGDQ/Core/MixingHandler.h"
-#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/AnalysisCompositeCut.h"
-#include "PWGDQ/Core/HistogramsLibrary.h"
+#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/CutsLibrary.h"
+#include "PWGDQ/Core/HistogramManager.h"
+#include "PWGDQ/Core/HistogramsLibrary.h"
+#include "PWGDQ/Core/MixingHandler.h"
 #include "PWGDQ/Core/MixingLibrary.h"
+#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include "Field/MagneticField.h"
-#include "TGeoGlobalMagField.h"
-#include "DetectorsBase/Propagator.h"
+#include "DataFormatsParameters/GRPObject.h"
 #include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Field/MagneticField.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
-#include "PWGCF/GenericFramework/Core/GFWPowerArray.h"
+#include "TGeoGlobalMagField.h"
 #include "TProfile.h"
+#include <TH1F.h>
+#include <TH3F.h>
+#include <THashList.h>
+#include <TList.h>
+#include <TRandom3.h>
+#include <TString.h>
+
+#include <algorithm>
+#include <cmath>
+#include <iostream>
+#include <vector>
 
 using std::cout;
 using std::endl;
diff --git a/.conflict-base-0/PWGDQ/Tasks/dqEfficiency.cxx b/.conflict-base-0/PWGDQ/Tasks/dqEfficiency.cxx
index 29f7b79392b..6083aa610c8 100644
--- a/.conflict-base-0/PWGDQ/Tasks/dqEfficiency.cxx
+++ b/.conflict-base-0/PWGDQ/Tasks/dqEfficiency.cxx
@@ -13,30 +13,33 @@
 //
 // Analysis task for processing O2::DQ MC skimmed AODs
 //
-#include <iostream>
-#include <vector>
-#include <TMath.h>
-#include <TH1F.h>
-#include <THashList.h>
-#include <TString.h>
-#include <cstdio>
-#include <string>
-#include <memory>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "PWGDQ/Core/VarManager.h"
-#include "PWGDQ/Core/HistogramManager.h"
-#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/AnalysisCompositeCut.h"
-#include "PWGDQ/Core/HistogramsLibrary.h"
+#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/CutsLibrary.h"
+#include "PWGDQ/Core/HistogramManager.h"
+#include "PWGDQ/Core/HistogramsLibrary.h"
 #include "PWGDQ/Core/MCSignal.h"
 #include "PWGDQ/Core/MCSignalLibrary.h"
+#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsParameters/GRPMagField.h"
 #include "DetectorsBase/GeometryManager.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include <TH1F.h>
+#include <THashList.h>
+#include <TMath.h>
+#include <TString.h>
+
+#include <cstdio>
+#include <iostream>
+#include <memory>
+#include <string>
+#include <vector>
 
 using std::cout;
 using std::endl;
diff --git a/.conflict-base-0/PWGDQ/Tasks/dqEfficiency_withAssoc.cxx b/.conflict-base-0/PWGDQ/Tasks/dqEfficiency_withAssoc.cxx
index e2a58ff5bf2..3d7e1613f44 100644
--- a/.conflict-base-0/PWGDQ/Tasks/dqEfficiency_withAssoc.cxx
+++ b/.conflict-base-0/PWGDQ/Tasks/dqEfficiency_withAssoc.cxx
@@ -12,43 +12,47 @@
 // Contact: iarsene@cern.ch, i.c.arsene@fys.uio.no
 //   Configurable workflow for running several DQ or other PWG analyses
 
-#include <iostream>
-#include <vector>
-#include <algorithm>
-#include <map>
-#include <string>
-#include <memory>
-#include <utility>
-#include <TH1F.h>
-#include <TH3F.h>
-#include <THashList.h>
-#include <TList.h>
-#include <TString.h>
-#include <TObjString.h>
-#include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/AnalysisHelpers.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "PWGDQ/Core/VarManager.h"
-#include "PWGDQ/Core/HistogramManager.h"
-#include "PWGDQ/Core/MixingHandler.h"
-#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/AnalysisCompositeCut.h"
-#include "PWGDQ/Core/HistogramsLibrary.h"
+#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/CutsLibrary.h"
-#include "PWGDQ/Core/MixingLibrary.h"
+#include "PWGDQ/Core/HistogramManager.h"
+#include "PWGDQ/Core/HistogramsLibrary.h"
 #include "PWGDQ/Core/MCSignal.h"
 #include "PWGDQ/Core/MCSignalLibrary.h"
+#include "PWGDQ/Core/MixingHandler.h"
+#include "PWGDQ/Core/MixingLibrary.h"
+#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+
+#include "Common/Core/TableHelper.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
 #include "Field/MagneticField.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TGeoGlobalMagField.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "Common/Core/TableHelper.h"
+#include <TH1F.h>
+#include <TH3F.h>
+#include <THashList.h>
+#include <TList.h>
+#include <TObjString.h>
+#include <TString.h>
+
+#include <algorithm>
+#include <iostream>
+#include <map>
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
 
 using std::cout;
 using std::endl;
@@ -534,7 +538,7 @@ struct AnalysisTrackSelection {
         DefineHistograms(fHistMan, "TrackBarrel_AmbiguityInBunch;TrackBarrel_AmbiguityOutOfBunch;", "ambiguity");
       }
       dqhistograms::AddHistogramsFromJSON(fHistMan, fConfigAddJSONHistograms.value.c_str()); // ad-hoc histograms via JSON
-      VarManager::SetUseVars(fHistMan->GetUsedVars()); // provide the list of required variables so that VarManager knows what to fill
+      VarManager::SetUseVars(fHistMan->GetUsedVars());                                       // provide the list of required variables so that VarManager knows what to fill
       fOutputList.setObject(fHistMan->GetMainHistogramList());
     }
 
@@ -856,9 +860,9 @@ struct AnalysisMuonSelection {
         histClasses += "Muon_AmbiguityInBunch;Muon_AmbiguityOutOfBunch;";
       }
 
-      DefineHistograms(fHistMan, histClasses.Data(), fConfigAddMuonHistogram.value.data()); // define all histograms
+      DefineHistograms(fHistMan, histClasses.Data(), fConfigAddMuonHistogram.value.data());  // define all histograms
       dqhistograms::AddHistogramsFromJSON(fHistMan, fConfigAddJSONHistograms.value.c_str()); // ad-hoc histograms via JSON
-      VarManager::SetUseVars(fHistMan->GetUsedVars());                                      // provide the list of required variables so that VarManager knows what to fill
+      VarManager::SetUseVars(fHistMan->GetUsedVars());                                       // provide the list of required variables so that VarManager knows what to fill
       fOutputList.setObject(fHistMan->GetMainHistogramList());
     }
 
@@ -1638,9 +1642,9 @@ struct AnalysisSameEventPairing {
 
     VarManager::SetCollisionSystem((TString)fConfigOptions.collisionSystem, fConfigOptions.centerMassEnergy); // set collision system and center of mass energy
 
-    DefineHistograms(fHistMan, histNames.Data(), fConfigAddSEPHistogram.value.data()); // define all histograms
+    DefineHistograms(fHistMan, histNames.Data(), fConfigAddSEPHistogram.value.data());     // define all histograms
     dqhistograms::AddHistogramsFromJSON(fHistMan, fConfigAddJSONHistograms.value.c_str()); // ad-hoc histograms via JSON
-    VarManager::SetUseVars(fHistMan->GetUsedVars());                                   // provide the list of required variables so that VarManager knows what to fill
+    VarManager::SetUseVars(fHistMan->GetUsedVars());                                       // provide the list of required variables so that VarManager knows what to fill
     fOutputList.setObject(fHistMan->GetMainHistogramList());
   }
 
@@ -2642,7 +2646,7 @@ struct AnalysisAsymmetricPairing {
     VarManager::SetupMatLUTFwdDCAFitter(fLUT);
 
     dqhistograms::AddHistogramsFromJSON(fHistMan, fConfigAddJSONHistograms.value.c_str()); // ad-hoc histograms via JSON
-    VarManager::SetUseVars(fHistMan->GetUsedVars());                                      // provide the list of required variables so that VarManager knows what to fill
+    VarManager::SetUseVars(fHistMan->GetUsedVars());                                       // provide the list of required variables so that VarManager knows what to fill
     fOutputList.setObject(fHistMan->GetMainHistogramList());
   }
 
@@ -2802,7 +2806,7 @@ struct AnalysisAsymmetricPairing {
         for (int icut = 0; icut < fNLegCuts; icut++) {
           if (twoTrackFilter & (static_cast<uint32_t>(1) << icut)) {
             isAmbi = (twoTrackFilter & (static_cast<uint32_t>(1) << 30)) || (twoTrackFilter & (static_cast<uint32_t>(1) << 31));
-            if (sign1 * sign2 < 0) {                                                    // +- pairs
+            if (sign1 * sign2 < 0) {                                                                                // +- pairs
               fHistMan->FillHistClass(Form("PairsBarrelSEPM_%s", fLegCutNames[icut].Data()), VarManager::fgValues); // reconstructed, unmatched
               if (isAmbi && fConfigQA) {
                 fHistMan->FillHistClass(Form("PairsBarrelSEPM_ambiguous_%s", fLegCutNames[icut].Data()), VarManager::fgValues);
diff --git a/.conflict-base-0/PWGDQ/Tasks/dqFlow.cxx b/.conflict-base-0/PWGDQ/Tasks/dqFlow.cxx
index 52e3ca8c29c..c3c0820030d 100644
--- a/.conflict-base-0/PWGDQ/Tasks/dqFlow.cxx
+++ b/.conflict-base-0/PWGDQ/Tasks/dqFlow.cxx
@@ -16,38 +16,42 @@
 ///       o2-analysis-timestamp --aod-file AO2D.root -b | o2-analysis-event-selection -b | o2-analysis-multiplicity-table -b | o2-analysis-centrality-table -b | o2-analysis-fdd-converter -b | o2-analysis-trackselection -b | o2-analysis-trackextension -b | o2-analysis-pid-tpc-full -b | o2-analysis-pid-tof-full -b | o2-analysis-pid-tof-base -b | o2-analysis-pid-tof-beta -b | o2-analysis-dq-flow -b
 ///       tested (June 2, 2022) on AO2D.root files from train production 242
 
-#include <iostream>
-#include <vector>
-#include <string>
-#include <memory>
-#include <TH1F.h>
-#include <THashList.h>
-#include <TString.h>
-#include <TRandom3.h>
-#include "CCDB/BasicCCDBManager.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "PWGDQ/Core/VarManager.h"
-#include "PWGDQ/Core/HistogramManager.h"
-#include "PWGDQ/Core/MixingHandler.h"
-#include "PWGDQ/Core/AnalysisCut.h"
-#include "PWGDQ/Core/AnalysisCompositeCut.h"
-#include "PWGDQ/Core/HistogramsLibrary.h"
-#include "PWGDQ/Core/CutsLibrary.h"
-#include "PWGDQ/Core/MixingLibrary.h"
+#include "PWGCF/GenericFramework/Core/FlowContainer.h"
 #include "PWGCF/GenericFramework/Core/GFW.h"
+#include "PWGCF/GenericFramework/Core/GFWConfig.h"
 #include "PWGCF/GenericFramework/Core/GFWCumulant.h"
-#include "PWGCF/GenericFramework/Core/FlowContainer.h"
 #include "PWGCF/GenericFramework/Core/GFWWeights.h"
-#include "PWGCF/GenericFramework/Core/GFWConfig.h"
-#include "Common/DataModel/EventSelection.h"
+#include "PWGDQ/Core/AnalysisCompositeCut.h"
+#include "PWGDQ/Core/AnalysisCut.h"
+#include "PWGDQ/Core/CutsLibrary.h"
+#include "PWGDQ/Core/HistogramManager.h"
+#include "PWGDQ/Core/HistogramsLibrary.h"
+#include "PWGDQ/Core/MixingHandler.h"
+#include "PWGDQ/Core/MixingLibrary.h"
+#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Qvectors.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include <TH1F.h>
+#include <THashList.h>
+#include <TRandom3.h>
+#include <TString.h>
+
+#include <iostream>
+#include <memory>
+#include <string>
+#include <vector>
 
 using std::complex;
 using std::cout;
diff --git a/.conflict-base-0/PWGDQ/Tasks/filterPP.cxx b/.conflict-base-0/PWGDQ/Tasks/filterPP.cxx
index c9239f8366d..0f5fd7b1b74 100644
--- a/.conflict-base-0/PWGDQ/Tasks/filterPP.cxx
+++ b/.conflict-base-0/PWGDQ/Tasks/filterPP.cxx
@@ -11,35 +11,39 @@
 //
 // Contact: iarsene@cern.ch, i.c.arsene@fys.uio.no
 //
-#include <iostream>
-#include <vector>
-#include <map>
-#include <string>
-#include <memory>
-#include <cstring>
-#include <TH1.h>
-#include <THashList.h>
-#include <TString.h>
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/DataTypes.h"
-#include "Framework/runDataProcessing.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
+#include "PWGDQ/Core/AnalysisCompositeCut.h"
+#include "PWGDQ/Core/AnalysisCut.h"
+#include "PWGDQ/Core/CutsLibrary.h"
+#include "PWGDQ/Core/HistogramManager.h"
+#include "PWGDQ/Core/HistogramsLibrary.h"
+#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+
 #include "Common/CCDB/TriggerAliases.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 #include "EventFiltering/filterTables.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "PWGDQ/Core/VarManager.h"
-#include "PWGDQ/Core/HistogramManager.h"
-#include "PWGDQ/Core/AnalysisCut.h"
-#include "PWGDQ/Core/AnalysisCompositeCut.h"
-#include "PWGDQ/Core/HistogramsLibrary.h"
-#include "PWGDQ/Core/CutsLibrary.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/DataTypes.h"
+#include "Framework/runDataProcessing.h"
+
+#include <TH1.h>
+#include <THashList.h>
+#include <TString.h>
+
+#include <cstring>
+#include <iostream>
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
 
 using std::cout;
 using std::endl;
diff --git a/.conflict-base-0/PWGDQ/Tasks/filterPPwithAssociation.cxx b/.conflict-base-0/PWGDQ/Tasks/filterPPwithAssociation.cxx
index 532482e641b..be139e0344b 100644
--- a/.conflict-base-0/PWGDQ/Tasks/filterPPwithAssociation.cxx
+++ b/.conflict-base-0/PWGDQ/Tasks/filterPPwithAssociation.cxx
@@ -11,44 +11,48 @@
 //
 // Contact: iarsene@cern.ch, i.c.arsene@fys.uio.no
 //
-#include <iostream>
-#include <vector>
-#include <map>
-#include <string>
-#include <memory>
-#include <cstring>
-#include <TH1.h>
-#include <THashList.h>
-#include <TString.h>
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/DataTypes.h"
-#include "Framework/runDataProcessing.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
+#include "PWGDQ/Core/AnalysisCompositeCut.h"
+#include "PWGDQ/Core/AnalysisCut.h"
+#include "PWGDQ/Core/CutsLibrary.h"
+#include "PWGDQ/Core/HistogramManager.h"
+#include "PWGDQ/Core/HistogramsLibrary.h"
+#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+
 #include "Common/CCDB/TriggerAliases.h"
+#include "Common/Core/CollisionAssociation.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/CollisionAssociationTables.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 #include "EventFiltering/filterTables.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "PWGDQ/Core/VarManager.h"
-#include "PWGDQ/Core/HistogramManager.h"
-#include "PWGDQ/Core/AnalysisCut.h"
-#include "PWGDQ/Core/AnalysisCompositeCut.h"
-#include "PWGDQ/Core/HistogramsLibrary.h"
-#include "PWGDQ/Core/CutsLibrary.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/LHCConstants.h"
-#include "Common/Core/CollisionAssociation.h"
-#include "Common/DataModel/CollisionAssociationTables.h"
 #include "DataFormatsParameters/GRPMagField.h"
 #include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
 #include "Field/MagneticField.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/DataTypes.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TGeoGlobalMagField.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
+#include <TH1.h>
+#include <THashList.h>
+#include <TString.h>
+
+#include <cstring>
+#include <iostream>
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
 
 using std::cout;
 using std::endl;
@@ -83,9 +87,9 @@ DECLARE_SOA_COLUMN(IsDQBarrelSelected, isDQBarrelSelected, uint32_t);
 DECLARE_SOA_COLUMN(IsDQMuonSelected, isDQMuonSelected, uint32_t);
 DECLARE_SOA_COLUMN(IsDQEMuBarrelSelected, isDQEMuBarrelSelected, uint32_t); // for electron-muon pair
 DECLARE_SOA_COLUMN(IsDQEMuMuonSelected, isDQEMuMuonSelected, uint32_t);     // for electron-muon pair
-DECLARE_SOA_INDEX_COLUMN(Collision, collision); //! Collision index
-DECLARE_SOA_INDEX_COLUMN(Track, track);         //! Track index
-DECLARE_SOA_INDEX_COLUMN(FwdTrack, fwdtrack);   //! FwdTrack index
+DECLARE_SOA_INDEX_COLUMN(Collision, collision);                             //! Collision index
+DECLARE_SOA_INDEX_COLUMN(Track, track);                                     //! Track index
+DECLARE_SOA_INDEX_COLUMN(FwdTrack, fwdtrack);                               //! FwdTrack index
 } // namespace dqppfilter
 
 DECLARE_SOA_TABLE(DQEventCuts, "AOD", "DQEVENTCUTS", dqppfilter::IsDQEventSelected);
@@ -160,7 +164,7 @@ struct DQEventSelectionTask {
       fHistMan->SetDefaultVarNames(VarManager::fgVariableNames, VarManager::fgVariableUnits);
 
       DefineHistograms(fHistMan, "Event_BeforeCuts;Event_AfterCuts;", fConfigHistClasses.value); // define all histograms
-      VarManager::SetUseVars(fHistMan->GetUsedVars());                 // provide the list of required variables so that VarManager knows what to fill
+      VarManager::SetUseVars(fHistMan->GetUsedVars());                                           // provide the list of required variables so that VarManager knows what to fill
       fOutputList.setObject(fHistMan->GetMainHistogramList());
     }
   }
@@ -266,7 +270,7 @@ struct DQBarrelTrackSelection {
       }
 
       DefineHistograms(fHistMan, cutNames.Data(), fConfigHistClasses.value); // define all histograms
-      VarManager::SetUseVars(fHistMan->GetUsedVars()); // provide the list of required variables so that VarManager knows what to fill
+      VarManager::SetUseVars(fHistMan->GetUsedVars());                       // provide the list of required variables so that VarManager knows what to fill
       fOutputList.setObject(fHistMan->GetMainHistogramList());
 
       // CCDB configuration
@@ -441,7 +445,7 @@ struct DQMuonsSelection {
       }
 
       DefineHistograms(fHistMan, cutNames.Data(), fConfigHistClasses.value); // define all histograms
-      VarManager::SetUseVars(fHistMan->GetUsedVars()); // provide the list of required variables so that VarManager knows what to fill
+      VarManager::SetUseVars(fHistMan->GetUsedVars());                       // provide the list of required variables so that VarManager knows what to fill
       fOutputList.setObject(fHistMan->GetMainHistogramList());
     }
   }
@@ -539,21 +543,21 @@ struct DQFilterPPTask {
 
   int fCurrentRun; // needed to detect if the run changed and trigger update of calibrations etc.
 
-  int fNBarrelCuts;                                    // number of barrel selections
-  int fNMuonCuts;                                      // number of muon selections
-  int fNElectronMuonCuts;                              // number of electron-muon selections
-  std::vector<bool> fBarrelRunPairing;                 // bit map on whether the selections require pairing (barrel)
-  std::vector<bool> fMuonRunPairing;                   // bit map on whether the selections require pairing (muon)
-  std::vector<bool> fElectronMuonRunPairing;           // bit map on whether the selections require pairing (e-mu)
-  std::vector<int> fBarrelNreqObjs;                    // minimal number of tracks/pairs required (barrel)
-  std::vector<int> fMuonNreqObjs;                      // minimal number of tracks/pairs required (muon)
-  std::vector<int> fElectronMuonNreqObjs;              // minimal number of electron-muon pairs required
-  std::map<int, AnalysisCompositeCut> fBarrelPairCuts; // map of barrel pair cuts
-  std::map<int, AnalysisCompositeCut> fMuonPairCuts;   // map of muon pair cuts
+  int fNBarrelCuts;                                          // number of barrel selections
+  int fNMuonCuts;                                            // number of muon selections
+  int fNElectronMuonCuts;                                    // number of electron-muon selections
+  std::vector<bool> fBarrelRunPairing;                       // bit map on whether the selections require pairing (barrel)
+  std::vector<bool> fMuonRunPairing;                         // bit map on whether the selections require pairing (muon)
+  std::vector<bool> fElectronMuonRunPairing;                 // bit map on whether the selections require pairing (e-mu)
+  std::vector<int> fBarrelNreqObjs;                          // minimal number of tracks/pairs required (barrel)
+  std::vector<int> fMuonNreqObjs;                            // minimal number of tracks/pairs required (muon)
+  std::vector<int> fElectronMuonNreqObjs;                    // minimal number of electron-muon pairs required
+  std::map<int, AnalysisCompositeCut> fBarrelPairCuts;       // map of barrel pair cuts
+  std::map<int, AnalysisCompositeCut> fMuonPairCuts;         // map of muon pair cuts
   std::map<int, AnalysisCompositeCut> fElectronMuonPairCuts; // map of electron-muon pair cuts
-  std::map<int, TString> fBarrelPairHistNames;         // map with names of the barrel pairing histogram directories
-  std::map<int, TString> fMuonPairHistNames;           // map with names of the muon pairing histogram directories
-  std::map<int, TString> fElectronMuonPairHistNames;   // map with names of the electron-muon pairing histogram directories
+  std::map<int, TString> fBarrelPairHistNames;               // map with names of the barrel pairing histogram directories
+  std::map<int, TString> fMuonPairHistNames;                 // map with names of the muon pairing histogram directories
+  std::map<int, TString> fElectronMuonPairHistNames;         // map with names of the electron-muon pairing histogram directories
 
   std::map<uint64_t, uint64_t> fFiltersMap;           // map of filters for events that passed at least one filter
   std::map<uint64_t, std::vector<bool>> fCEFPfilters; // map of CEFP filters for events that passed at least one filter
@@ -771,7 +775,7 @@ struct DQFilterPPTask {
           if (objCountersBarrel[i] > 1) { // pairing has to be enabled and at least two tracks are needed
             pairingMask |= (static_cast<uint32_t>(1) << i);
           }
-          objCountersBarrel[i] = 0; // reset counters for selections where pairing is needed (count pairs instead)
+          objCountersBarrel[i] = 0;    // reset counters for selections where pairing is needed (count pairs instead)
           taggedCollisions[i].clear(); // empty the list of tagged collisions if pairing is needed (so we count just events with pairs or containing selected pair legs)
         }
       }
@@ -848,7 +852,7 @@ struct DQFilterPPTask {
           if (objCountersMuon[i] > 1) {
             pairingMask |= (static_cast<uint32_t>(1) << i);
           }
-          objCountersMuon[i] = 0; // reset counters for selections where pairing is needed (count pairs instead)
+          objCountersMuon[i] = 0;                     // reset counters for selections where pairing is needed (count pairs instead)
           taggedCollisions[i + fNBarrelCuts].clear(); // empty the list of tagged collisions if pairing is needed (so we count just events with pairs or containing selected pair legs)
         }
       }
diff --git a/.conflict-base-0/PWGDQ/Tasks/filterPbPb.cxx b/.conflict-base-0/PWGDQ/Tasks/filterPbPb.cxx
index 1544ea14f21..155f7a0610b 100644
--- a/.conflict-base-0/PWGDQ/Tasks/filterPbPb.cxx
+++ b/.conflict-base-0/PWGDQ/Tasks/filterPbPb.cxx
@@ -9,16 +9,19 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 //
-#include <Framework/AnalysisDataModel.h>
-#include <fairlogger/Logger.h>
-#include <cstdint>
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
 #include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+#include "PWGUD/Core/SGSelector.h"
+
 #include "CommonConstants/LHCConstants.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Vertex.h"
-#include "PWGUD/Core/SGSelector.h"
+#include <Framework/AnalysisDataModel.h>
+
+#include <fairlogger/Logger.h>
+
+#include <cstdint>
 
 using namespace std;
 
diff --git a/.conflict-base-0/PWGDQ/Tasks/mchAlignRecord.cxx b/.conflict-base-0/PWGDQ/Tasks/mchAlignRecord.cxx
index 2f612493b6e..bd34e08496b 100644
--- a/.conflict-base-0/PWGDQ/Tasks/mchAlignRecord.cxx
+++ b/.conflict-base-0/PWGDQ/Tasks/mchAlignRecord.cxx
@@ -14,63 +14,61 @@
 ///
 /// \author Chi ZHANG, CEA-Saclay, chi.zhang@cern.ch
 
-#include <gsl/span>
-#include <cmath>
-#include <string>
-#include <unordered_map>
-#include <vector>
-#include <iostream>
-#include <memory>
+#include "PWGDQ/Core/VarManager.h"
+
+#include "Common/DataModel/EventSelection.h"
 
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonConstants/LHCConstants.h"
+#include "CommonUtils/NameConf.h"
+#include "DataFormatsMCH/Cluster.h"
+#include "DataFormatsMCH/TrackMCH.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GRPGeomHelper.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "DetectorsCommonDataFormats/AlignParam.h"
+#include "DetectorsCommonDataFormats/DetID.h"
+#include "DetectorsCommonDataFormats/DetectorNameConf.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/CallbackService.h"
+#include "Framework/Logger.h"
 #include "Framework/runDataProcessing.h"
+#include "MCHAlign/Aligner.h"
+#include "MCHBase/TrackerParam.h"
+#include "MCHGeometryTransformer/Transformations.h"
+#include "MCHTracking/Track.h"
+#include "MCHTracking/TrackExtrap.h"
+#include "MCHTracking/TrackFitter.h"
+#include "MCHTracking/TrackParam.h"
+#include "ReconstructionDataFormats/TrackMCHMID.h"
 
 #include <TCanvas.h>
+#include <TChain.h>
 #include <TDatabasePDG.h>
 #include <TF1.h>
 #include <TFile.h>
+#include <TGraph.h>
+#include <TGraphErrors.h>
 #include <TH1F.h>
 #include <TH2F.h>
 #include <TLegend.h>
+#include <TLine.h>
 #include <TMatrixD.h>
 #include <TParameter.h>
 #include <TSystem.h>
 #include <TTree.h>
 #include <TTreeReader.h>
 #include <TTreeReaderValue.h>
-#include <TChain.h>
-#include <TGraph.h>
-#include <TGraphErrors.h>
-#include <TLine.h>
-#include <TSystem.h>
-
-#include "CommonConstants/LHCConstants.h"
-#include "CommonUtils/NameConf.h"
-#include "Common/DataModel/EventSelection.h"
-#include "PWGDQ/Core/VarManager.h"
 
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DetectorsBase/GRPGeomHelper.h"
-#include "DetectorsBase/Propagator.h"
-#include "Framework/Logger.h"
-#include "Framework/CallbackService.h"
-#include "CCDB/BasicCCDBManager.h"
-
-#include "MCHGeometryTransformer/Transformations.h"
-#include "DataFormatsMCH/Cluster.h"
-#include "DataFormatsMCH/TrackMCH.h"
-#include "MCHTracking/Track.h"
-#include "MCHTracking/TrackExtrap.h"
-#include "MCHTracking/TrackParam.h"
-#include "MCHTracking/TrackFitter.h"
-#include "MCHBase/TrackerParam.h"
-#include "ReconstructionDataFormats/TrackMCHMID.h"
-#include "MCHAlign/Aligner.h"
-#include "DetectorsCommonDataFormats/AlignParam.h"
-#include "DetectorsCommonDataFormats/DetID.h"
-#include "DetectorsCommonDataFormats/DetectorNameConf.h"
+#include <cmath>
+#include <gsl/span>
+#include <iostream>
+#include <memory>
+#include <string>
+#include <unordered_map>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGDQ/Tasks/muonDCA.cxx b/.conflict-base-0/PWGDQ/Tasks/muonDCA.cxx
index b2031418d5c..9581efe62b5 100644
--- a/.conflict-base-0/PWGDQ/Tasks/muonDCA.cxx
+++ b/.conflict-base-0/PWGDQ/Tasks/muonDCA.cxx
@@ -13,14 +13,15 @@
 /// \brief Task to compute and evaluate DCA quantities
 /// \author Nicolas Bizé <nicolas.bize@cern.ch>, SUBATECH
 //
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "GlobalTracking/MatchGlobalFwd.h"
+#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "PWGDQ/Core/VarManager.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "GlobalTracking/MatchGlobalFwd.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGDQ/Tasks/quarkoniaToHyperons.cxx b/.conflict-base-0/PWGDQ/Tasks/quarkoniaToHyperons.cxx
index 6133ee4e090..accdde13a9d 100644
--- a/.conflict-base-0/PWGDQ/Tasks/quarkoniaToHyperons.cxx
+++ b/.conflict-base-0/PWGDQ/Tasks/quarkoniaToHyperons.cxx
@@ -29,44 +29,45 @@
 //    david.dobrigkeit.chinellato@cern.ch
 //
 
-#include <Math/Vector4D.h>
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <map>
-#include <string>
-#include <vector>
-
-#include <TFile.h>
-#include <TH2F.h>
-#include <TProfile.h>
-#include <TLorentzVector.h>
-#include <TPDGCode.h>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "PWGLF/DataModel/LFStrangenessMLTables.h"
 #include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGUD/Core/SGSelector.h"
+
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/Core/SGSelector.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+#include "EventFiltering/Zorro.h"
+#include "EventFiltering/ZorroSummary.h"
 #include "Tools/ML/MlResponse.h"
 #include "Tools/ML/model.h"
 
-#include "EventFiltering/Zorro.h"
-#include "EventFiltering/ZorroSummary.h"
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <Math/Vector4D.h>
+#include <TFile.h>
+#include <TH2F.h>
+#include <TLorentzVector.h>
+#include <TPDGCode.h>
+#include <TProfile.h>
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <map>
+#include <string>
+#include <vector>
 
 // constants
 const float ctauXiPDG = 4.91;     // Xi PDG lifetime
diff --git a/.conflict-base-0/PWGDQ/Tasks/tableReader.cxx b/.conflict-base-0/PWGDQ/Tasks/tableReader.cxx
index 22a8d82e2d8..a51d54c48f8 100644
--- a/.conflict-base-0/PWGDQ/Tasks/tableReader.cxx
+++ b/.conflict-base-0/PWGDQ/Tasks/tableReader.cxx
@@ -11,39 +11,43 @@
 //
 // Contact: iarsene@cern.ch, i.c.arsene@fys.uio.no
 //
-#include <iostream>
-#include <vector>
-#include <algorithm>
-#include <map>
-#include <string>
-#include <memory>
-#include <TH1F.h>
-#include <TH3F.h>
-#include <THashList.h>
-#include <TList.h>
-#include <TString.h>
-#include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "PWGDQ/Core/VarManager.h"
-#include "PWGDQ/Core/HistogramManager.h"
-#include "PWGDQ/Core/MixingHandler.h"
-#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/AnalysisCompositeCut.h"
-#include "PWGDQ/Core/HistogramsLibrary.h"
+#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/CutsLibrary.h"
+#include "PWGDQ/Core/HistogramManager.h"
+#include "PWGDQ/Core/HistogramsLibrary.h"
+#include "PWGDQ/Core/MixingHandler.h"
 #include "PWGDQ/Core/MixingLibrary.h"
+#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+
+#include "Common/CCDB/EventSelectionParams.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include "Field/MagneticField.h"
-#include "TGeoGlobalMagField.h"
-#include "DetectorsBase/Propagator.h"
+#include "DataFormatsParameters/GRPObject.h"
 #include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Field/MagneticField.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 #include "ITSMFTBase/DPLAlpideParam.h"
-#include "Common/CCDB/EventSelectionParams.h"
+
+#include "TGeoGlobalMagField.h"
+#include <TH1F.h>
+#include <TH3F.h>
+#include <THashList.h>
+#include <TList.h>
+#include <TString.h>
+
+#include <algorithm>
+#include <iostream>
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
 
 using std::cout;
 using std::endl;
diff --git a/.conflict-base-0/PWGDQ/Tasks/tableReader_withAssoc.cxx b/.conflict-base-0/PWGDQ/Tasks/tableReader_withAssoc.cxx
index d6b29b461d2..b08729dabdb 100644
--- a/.conflict-base-0/PWGDQ/Tasks/tableReader_withAssoc.cxx
+++ b/.conflict-base-0/PWGDQ/Tasks/tableReader_withAssoc.cxx
@@ -12,51 +12,54 @@
 // Contact: iarsene@cern.ch, i.c.arsene@fys.uio.no
 //   Configurable workflow for running several DQ or other PWG analyses
 
+#include "PWGDQ/Core/AnalysisCompositeCut.h"
+#include "PWGDQ/Core/AnalysisCut.h"
+#include "PWGDQ/Core/CutsLibrary.h"
+#include "PWGDQ/Core/HistogramManager.h"
+#include "PWGDQ/Core/HistogramsLibrary.h"
+#include "PWGDQ/Core/MixingHandler.h"
+#include "PWGDQ/Core/MixingLibrary.h"
+#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+
+#include "Common/CCDB/EventSelectionParams.h"
+#include "Common/Core/TableHelper.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Field/MagneticField.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/Configurable.h"
+#include "Framework/OutputObjHeader.h"
+#include "Framework/runDataProcessing.h"
+#include "ITSMFTBase/DPLAlpideParam.h"
+
+#include "TGeoGlobalMagField.h"
+#include <TH1F.h>
+#include <TH3F.h>
+#include <THashList.h>
+#include <TList.h>
+#include <TObjString.h>
+#include <TString.h>
+
+#include <algorithm>
 #include <cstdint>
 #include <cstdio>
 #include <cstring>
 #include <iostream>
+#include <map>
+#include <memory>
 #include <numeric>
-#include <vector>
-#include <algorithm>
-#include <utility>
 #include <set>
-#include <map>
 #include <string>
-#include <memory>
 #include <utility>
-#include <TH1F.h>
-#include <TH3F.h>
-#include <THashList.h>
-#include <TList.h>
-#include <TString.h>
-#include <TObjString.h>
-#include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "Framework/AnalysisHelpers.h"
-#include "Framework/Configurable.h"
-#include "Framework/OutputObjHeader.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "PWGDQ/Core/VarManager.h"
-#include "PWGDQ/Core/HistogramManager.h"
-#include "PWGDQ/Core/MixingHandler.h"
-#include "PWGDQ/Core/AnalysisCut.h"
-#include "PWGDQ/Core/AnalysisCompositeCut.h"
-#include "PWGDQ/Core/HistogramsLibrary.h"
-#include "PWGDQ/Core/CutsLibrary.h"
-#include "PWGDQ/Core/MixingLibrary.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "Field/MagneticField.h"
-#include "TGeoGlobalMagField.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "Common/Core/TableHelper.h"
-#include "ITSMFTBase/DPLAlpideParam.h"
-#include "Common/CCDB/EventSelectionParams.h"
+#include <vector>
 
 using std::cout;
 using std::endl;
diff --git a/.conflict-base-0/PWGDQ/Tasks/taskFwdTrackPid.cxx b/.conflict-base-0/PWGDQ/Tasks/taskFwdTrackPid.cxx
index cbe6e233630..52c2c3b908a 100644
--- a/.conflict-base-0/PWGDQ/Tasks/taskFwdTrackPid.cxx
+++ b/.conflict-base-0/PWGDQ/Tasks/taskFwdTrackPid.cxx
@@ -13,38 +13,42 @@
 /// \brief Task for the analysis of forward PID with MFT
 /// \author Luca Micheletti <luca.micheletti@to.infn.it>, INFN
 
-#include <iostream>
-#include <vector>
-#include <algorithm>
-#include <TH1F.h>
-#include <TH3F.h>
-#include <THashList.h>
-#include <TList.h>
-#include <TString.h>
-#include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/Core/AnalysisCompositeCut.h"
+#include "PWGDQ/Core/AnalysisCut.h"
+#include "PWGDQ/Core/CutsLibrary.h"
 #include "PWGDQ/Core/HistogramManager.h"
-#include "PWGDQ/Core/MixingHandler.h"
+#include "PWGDQ/Core/HistogramsLibrary.h"
 #include "PWGDQ/Core/MCSignal.h"
 #include "PWGDQ/Core/MCSignalLibrary.h"
-#include "PWGDQ/Core/AnalysisCut.h"
-#include "PWGDQ/Core/AnalysisCompositeCut.h"
-#include "PWGDQ/Core/HistogramsLibrary.h"
-#include "PWGDQ/Core/CutsLibrary.h"
+#include "PWGDQ/Core/MixingHandler.h"
 #include "PWGDQ/Core/MixingLibrary.h"
+#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+
+#include "Common/CCDB/EventSelectionParams.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include "Field/MagneticField.h"
-#include "TGeoGlobalMagField.h"
-#include "DetectorsBase/Propagator.h"
+#include "DataFormatsParameters/GRPObject.h"
 #include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Field/MagneticField.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 #include "ITSMFTBase/DPLAlpideParam.h"
-#include "Common/CCDB/EventSelectionParams.h"
+
+#include "TGeoGlobalMagField.h"
+#include <TH1F.h>
+#include <TH3F.h>
+#include <THashList.h>
+#include <TList.h>
+#include <TString.h>
+
+#include <algorithm>
+#include <iostream>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGDQ/Tasks/taskJpsiHf.cxx b/.conflict-base-0/PWGDQ/Tasks/taskJpsiHf.cxx
index 79d9348940a..d9cd1133472 100644
--- a/.conflict-base-0/PWGDQ/Tasks/taskJpsiHf.cxx
+++ b/.conflict-base-0/PWGDQ/Tasks/taskJpsiHf.cxx
@@ -14,20 +14,20 @@
 /// \author Luca Micheletti <luca.micheletti@to.infn.it>, INFN
 /// \author Fabrizio Grosa <fabrizio.grosa@cern.ch>, CERN
 
-#include <string>
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
+#include "PWGHF/Utils/utilsAnalysis.h"
+
+#include "Common/Core/RecoDecay.h"
 
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
 
-#include "Common/Core/RecoDecay.h"
-
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
-#include "PWGHF/Utils/utilsAnalysis.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
+#include <string>
 
 using namespace o2;
 using namespace o2::analysis;
diff --git a/.conflict-base-0/PWGDQ/Tasks/taskMuonMchTrkEfficiency.cxx b/.conflict-base-0/PWGDQ/Tasks/taskMuonMchTrkEfficiency.cxx
index 4914658ae81..7ff72350bd7 100644
--- a/.conflict-base-0/PWGDQ/Tasks/taskMuonMchTrkEfficiency.cxx
+++ b/.conflict-base-0/PWGDQ/Tasks/taskMuonMchTrkEfficiency.cxx
@@ -19,12 +19,12 @@
 /// \author Zaida Conesa del Valle <zaida.conesa.del.valle@cern.ch>
 ///
 
+#include "PWGDQ/DataModel/MchTrkEffTables.h"
+
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
 
-#include "PWGDQ/DataModel/MchTrkEffTables.h"
-
 using namespace o2;
 using namespace o2::aod;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGDQ/Tasks/v0selector.cxx b/.conflict-base-0/PWGDQ/Tasks/v0selector.cxx
index 0c970d80c91..378c2332b15 100644
--- a/.conflict-base-0/PWGDQ/Tasks/v0selector.cxx
+++ b/.conflict-base-0/PWGDQ/Tasks/v0selector.cxx
@@ -17,35 +17,39 @@
 //    Comments, questions, complaints, suggestions?
 //    Please write to: daiki.sekihata@cern.ch
 //
-#include <array>
-#include <map>
-#include <string>
-#include <memory>
-#include <vector>
-#include "Math/Vector4D.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/trackUtilities.h"
+#include "PWGDQ/Core/HistogramManager.h"
+#include "PWGDQ/Core/HistogramsLibrary.h"
+#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/RecoDecay.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "DCAFitter/DCAFitterN.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "PWGDQ/Core/VarManager.h"
-#include "PWGDQ/Core/HistogramManager.h"
-#include "PWGDQ/Core/HistogramsLibrary.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include "Math/Vector4D.h"
+
+#include <array>
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
@@ -574,7 +578,7 @@ struct trackPIDQA {
       }
 
     } // end of track loop
-  }   // end of process
+  } // end of process
 
   void DefineHistograms(TString histClasses)
   {
diff --git a/.conflict-base-0/PWGEM/Dilepton/TableProducer/eventSelection.cxx b/.conflict-base-0/PWGEM/Dilepton/TableProducer/eventSelection.cxx
index 65eb1a93d53..d5420a13225 100644
--- a/.conflict-base-0/PWGEM/Dilepton/TableProducer/eventSelection.cxx
+++ b/.conflict-base-0/PWGEM/Dilepton/TableProducer/eventSelection.cxx
@@ -14,14 +14,17 @@
 // This code produces event selection table for PWG-EM.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include <string>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/CCDB/RCTSelectionFlags.h"
 #include "PWGEM/Dilepton/DataModel/dileptonTables.h"
 
+#include "Common/CCDB/RCTSelectionFlags.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include <string>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-base-0/PWGEM/Dilepton/Tasks/Converters/electronConverter2.cxx b/.conflict-base-0/PWGEM/Dilepton/Tasks/Converters/electronConverter2.cxx
index 785272dcf3a..cde46f9cf7d 100644
--- a/.conflict-base-0/PWGEM/Dilepton/Tasks/Converters/electronConverter2.cxx
+++ b/.conflict-base-0/PWGEM/Dilepton/Tasks/Converters/electronConverter2.cxx
@@ -14,11 +14,12 @@
 // This code runs loop over ULS ee pars for virtual photon QC.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
 #include "PWGEM/Dilepton/DataModel/dileptonTables.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::aod;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGEM/Dilepton/Tasks/Converters/eventConverter2.cxx b/.conflict-base-0/PWGEM/Dilepton/Tasks/Converters/eventConverter2.cxx
index 568cb741d08..944f92e699f 100644
--- a/.conflict-base-0/PWGEM/Dilepton/Tasks/Converters/eventConverter2.cxx
+++ b/.conflict-base-0/PWGEM/Dilepton/Tasks/Converters/eventConverter2.cxx
@@ -14,11 +14,12 @@
 // This code runs loop over ULS ee pars for virtual photon QC.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
 #include "PWGEM/Dilepton/DataModel/dileptonTables.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::aod;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGEM/Dilepton/Tasks/MCtemplates.cxx b/.conflict-base-0/PWGEM/Dilepton/Tasks/MCtemplates.cxx
index 3288bd2745e..c7bf193aa61 100644
--- a/.conflict-base-0/PWGEM/Dilepton/Tasks/MCtemplates.cxx
+++ b/.conflict-base-0/PWGEM/Dilepton/Tasks/MCtemplates.cxx
@@ -13,27 +13,31 @@
 //
 // Analysis task to generate Monte Carlo templates of different heavy-flavour dielectron sources
 //
-#include <iostream>
-#include <vector>
-#include <TMath.h>
-#include <TH1F.h>
-#include <THashList.h>
-#include <TString.h>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "PWGDQ/Core/VarManager.h"
-#include "PWGDQ/Core/HistogramManager.h"
-#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/AnalysisCompositeCut.h"
-#include "PWGDQ/Core/HistogramsLibrary.h"
+#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/CutsLibrary.h"
+#include "PWGDQ/Core/HistogramManager.h"
+#include "PWGDQ/Core/HistogramsLibrary.h"
 #include "PWGDQ/Core/MCSignal.h"
 #include "PWGDQ/Core/MCSignalLibrary.h"
+#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+
 #include "Common/DataModel/TrackSelectionTables.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include <TH1F.h>
+#include <THashList.h>
+#include <TMath.h>
+#include <TString.h>
+
+#include <iostream>
+#include <vector>
+
 using std::cout;
 using std::endl;
 using std::string;
@@ -480,8 +484,8 @@ struct AnalysisSameEventPairing {
           }
           fBarrelHistNamesMCmatched.emplace_back(mcSigClasses);
         } // end loop over cuts
-      }   // end if(cutNames.IsNull())
-    }     // end if processBarrel
+      } // end if(cutNames.IsNull())
+    } // end if processBarrel
 
     // Add histogram classes for each specified MCsignal at the generator level
     // TODO: create a std::vector of hist classes to be used at Fill time, to avoid using Form in the process function
@@ -577,7 +581,7 @@ struct AnalysisSameEventPairing {
         }
       }
     } // end loop over barrel track pairs
-  }   // end runPairing
+  } // end runPairing
 
   template <typename TTracksMC>
   void runMCGenPair(TTracksMC const& groupedMCTracks)
@@ -609,7 +613,7 @@ struct AnalysisSameEventPairing {
         }
       }
     } // end of true pairing loop
-  }   // end runMCGen
+  } // end runMCGen
 
   // skimmed
   PresliceUnsorted<ReducedMCTracks> perReducedMcEvent = aod::reducedtrackMC::reducedMCeventId;
diff --git a/.conflict-base-0/PWGEM/Dilepton/Tasks/PhotonHBTEEEE.cxx b/.conflict-base-0/PWGEM/Dilepton/Tasks/PhotonHBTEEEE.cxx
index b26a40af6fc..59002430983 100644
--- a/.conflict-base-0/PWGEM/Dilepton/Tasks/PhotonHBTEEEE.cxx
+++ b/.conflict-base-0/PWGEM/Dilepton/Tasks/PhotonHBTEEEE.cxx
@@ -14,25 +14,25 @@
 // This code loops over v0 photons and makes pairs for photon HBT analysis.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include <cstring>
-#include <iterator>
+#include "PWGEM/Dilepton/Core/PhotonHBT.h"
 
-#include "TString.h"
-#include "Math/Vector4D.h"
-#include "Math/Vector3D.h"
-#include "Math/LorentzRotation.h"
-#include "Math/GenVector/Boost.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
+#include "Math/GenVector/Boost.h"
+#include "Math/LorentzRotation.h"
+#include "Math/Vector3D.h"
+#include "Math/Vector4D.h"
+#include "TString.h"
 
-#include "PWGEM/Dilepton/Core/PhotonHBT.h"
+#include <cstring>
+#include <iterator>
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-base-0/PWGEM/Dilepton/Tasks/PhotonHBTPCMEE.cxx b/.conflict-base-0/PWGEM/Dilepton/Tasks/PhotonHBTPCMEE.cxx
index 3e792f9d27a..bd8392fd75a 100644
--- a/.conflict-base-0/PWGEM/Dilepton/Tasks/PhotonHBTPCMEE.cxx
+++ b/.conflict-base-0/PWGEM/Dilepton/Tasks/PhotonHBTPCMEE.cxx
@@ -14,25 +14,25 @@
 // This code loops over v0 photons and makes pairs for photon HBT analysis.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include <cstring>
-#include <iterator>
+#include "PWGEM/Dilepton/Core/PhotonHBT.h"
 
-#include "TString.h"
-#include "Math/Vector4D.h"
-#include "Math/Vector3D.h"
-#include "Math/LorentzRotation.h"
-#include "Math/GenVector/Boost.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
+#include "Math/GenVector/Boost.h"
+#include "Math/LorentzRotation.h"
+#include "Math/Vector3D.h"
+#include "Math/Vector4D.h"
+#include "TString.h"
 
-#include "PWGEM/Dilepton/Core/PhotonHBT.h"
+#include <cstring>
+#include <iterator>
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-base-0/PWGEM/Dilepton/Tasks/PhotonHBTPCMPCM.cxx b/.conflict-base-0/PWGEM/Dilepton/Tasks/PhotonHBTPCMPCM.cxx
index ddcbe423eae..7c3abcd362d 100644
--- a/.conflict-base-0/PWGEM/Dilepton/Tasks/PhotonHBTPCMPCM.cxx
+++ b/.conflict-base-0/PWGEM/Dilepton/Tasks/PhotonHBTPCMPCM.cxx
@@ -14,25 +14,25 @@
 // This code loops over v0 photons and makes pairs for photon HBT analysis.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include <cstring>
-#include <iterator>
+#include "PWGEM/Dilepton/Core/PhotonHBT.h"
 
-#include "TString.h"
-#include "Math/Vector4D.h"
-#include "Math/Vector3D.h"
-#include "Math/LorentzRotation.h"
-#include "Math/GenVector/Boost.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
+#include "Math/GenVector/Boost.h"
+#include "Math/LorentzRotation.h"
+#include "Math/Vector3D.h"
+#include "Math/Vector4D.h"
+#include "TString.h"
 
-#include "PWGEM/Dilepton/Core/PhotonHBT.h"
+#include <cstring>
+#include <iterator>
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-base-0/PWGEM/Dilepton/Tasks/associateMCcollision.cxx b/.conflict-base-0/PWGEM/Dilepton/Tasks/associateMCcollision.cxx
index eb0e7d3bf5c..7f3c860e526 100644
--- a/.conflict-base-0/PWGEM/Dilepton/Tasks/associateMCcollision.cxx
+++ b/.conflict-base-0/PWGEM/Dilepton/Tasks/associateMCcollision.cxx
@@ -14,11 +14,12 @@
 // This code produces a table with an index between mc collision and rec. collision.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
 #include "PWGEM/Dilepton/DataModel/dileptonTables.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::aod;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGEM/Dilepton/Tasks/bcCounter.cxx b/.conflict-base-0/PWGEM/Dilepton/Tasks/bcCounter.cxx
index 1b16c88e89b..da462851aef 100644
--- a/.conflict-base-0/PWGEM/Dilepton/Tasks/bcCounter.cxx
+++ b/.conflict-base-0/PWGEM/Dilepton/Tasks/bcCounter.cxx
@@ -14,29 +14,32 @@
 // This code is for bc counter.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include <string>
-#include <vector>
-#include <algorithm>
-#include <type_traits>
-#include <optional>
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "TString.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
 #include "Common/Core/RecoDecay.h"
-#include "MathUtils/Utils.h"
-#include "Framework/AnalysisDataModel.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Qvectors.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/PIDResponseITS.h"
+#include "Common/DataModel/Qvectors.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "MathUtils/Utils.h"
+
+#include "TString.h"
+
+#include <algorithm>
+#include <optional>
+#include <string>
+#include <type_traits>
+#include <vector>
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-base-0/PWGEM/Dilepton/Tasks/dielectron.cxx b/.conflict-base-0/PWGEM/Dilepton/Tasks/dielectron.cxx
index c8fa31b0e3b..494d50b49b1 100644
--- a/.conflict-base-0/PWGEM/Dilepton/Tasks/dielectron.cxx
+++ b/.conflict-base-0/PWGEM/Dilepton/Tasks/dielectron.cxx
@@ -14,12 +14,12 @@
 // This code is for dielectron analyses.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-
 #include "PWGEM/Dilepton/Core/Dilepton.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
   return WorkflowSpec{
diff --git a/.conflict-base-0/PWGEM/Dilepton/Tasks/dielectronMC.cxx b/.conflict-base-0/PWGEM/Dilepton/Tasks/dielectronMC.cxx
index 3c525c29c6e..ff8e2f1bdca 100644
--- a/.conflict-base-0/PWGEM/Dilepton/Tasks/dielectronMC.cxx
+++ b/.conflict-base-0/PWGEM/Dilepton/Tasks/dielectronMC.cxx
@@ -14,12 +14,12 @@
 // This code runs loop over dalitz ee table for dalitz QC.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-
 #include "PWGEM/Dilepton/Core/DileptonMC.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
   return WorkflowSpec{
diff --git a/.conflict-base-0/PWGEM/Dilepton/Tasks/dimuon.cxx b/.conflict-base-0/PWGEM/Dilepton/Tasks/dimuon.cxx
index 51b92ab81b7..8cfa155b422 100644
--- a/.conflict-base-0/PWGEM/Dilepton/Tasks/dimuon.cxx
+++ b/.conflict-base-0/PWGEM/Dilepton/Tasks/dimuon.cxx
@@ -14,12 +14,12 @@
 // This code is for dimuon analyses.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-
 #include "PWGEM/Dilepton/Core/Dilepton.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
   return WorkflowSpec{
diff --git a/.conflict-base-0/PWGEM/Dilepton/Tasks/dimuonMC.cxx b/.conflict-base-0/PWGEM/Dilepton/Tasks/dimuonMC.cxx
index f505c073dc3..9c203ff4461 100644
--- a/.conflict-base-0/PWGEM/Dilepton/Tasks/dimuonMC.cxx
+++ b/.conflict-base-0/PWGEM/Dilepton/Tasks/dimuonMC.cxx
@@ -14,12 +14,12 @@
 // This code runs loop over dalitz ee table for dalitz QC.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-
 #include "PWGEM/Dilepton/Core/DileptonMC.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
   return WorkflowSpec{
diff --git a/.conflict-base-0/PWGEM/Dilepton/Tasks/emEfficiencyEE.cxx b/.conflict-base-0/PWGEM/Dilepton/Tasks/emEfficiencyEE.cxx
index 7cc41a190d2..a29cfc62359 100644
--- a/.conflict-base-0/PWGEM/Dilepton/Tasks/emEfficiencyEE.cxx
+++ b/.conflict-base-0/PWGEM/Dilepton/Tasks/emEfficiencyEE.cxx
@@ -12,41 +12,45 @@
 //
 // Analysis task for calculating single electron and dielectron efficiency
 //
-#include <iostream>
-#include <vector>
-#include <TMath.h>
-#include <TH1F.h>
-#include <THashList.h>
-#include <TLorentzVector.h>
-#include <TString.h>
-#include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/ASoA.h"
-#include "Framework/DataTypes.h"
-#include "Framework/HistogramRegistry.h"
-#include "PWGDQ/Core/VarManager.h"
-#include "PWGDQ/Core/HistogramManager.h"
-#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/AnalysisCompositeCut.h"
-#include "PWGDQ/Core/HistogramsLibrary.h"
+#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/CutsLibrary.h"
+#include "PWGDQ/Core/HistogramManager.h"
+#include "PWGDQ/Core/HistogramsLibrary.h"
 #include "PWGDQ/Core/MCSignal.h"
 #include "PWGDQ/Core/MCSignalLibrary.h"
+#include "PWGDQ/Core/VarManager.h"
 #include "PWGDQ/DataModel/ReducedInfoTables.h"
+#include "PWGEM/Dilepton/DataModel/dileptonTables.h"
+
+#include "Common/CCDB/TriggerAliases.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/CCDB/TriggerAliases.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
 #include "Field/MagneticField.h"
+#include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/DataTypes.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TGeoGlobalMagField.h"
-#include "PWGEM/Dilepton/DataModel/dileptonTables.h"
+#include <TH1F.h>
+#include <THashList.h>
+#include <TLorentzVector.h>
+#include <TMath.h>
+#include <TString.h>
+
+#include <iostream>
+#include <vector>
 
 using std::cout;
 using std::endl;
@@ -1027,8 +1031,8 @@ struct AnalysisTrackSelection {
               fHistManQA->FillHistClass(fHistNamesMCMatchedQA[j][i].Data(), VarManager::fgValues);
           }
         } // end loop over cuts
-      }   // end loop over MC signals
-    }     // end loop over reconstructed track belonging to the events
+      } // end loop over MC signals
+    } // end loop over reconstructed track belonging to the events
   }
 
   template <uint32_t TEventFillMap, uint32_t TTrackFillMap, typename TEvents, typename TEventsMC, typename TTracks, typename TTracksMC, typename TAmbigTracks>
@@ -1275,8 +1279,8 @@ struct AnalysisTrackSelection {
               fHistManQA->FillHistClass(fHistNamesMCMatchedQA[j][i].Data(), VarManager::fgValues);
           }
         } // end loop over cuts
-      }   // end loop over MC signals
-    }     // end loop over reconstructed track belonging to the events
+      } // end loop over MC signals
+    } // end loop over reconstructed track belonging to the events
   }
 
   void processSkimmed(soa::Filtered<MyEventsSelected> const& events, MyBarrelTracks const& tracks, ReducedMCEvents const& eventsMC, ReducedMCTracks const& tracksMC)
@@ -1601,7 +1605,7 @@ struct AnalysisSameEventPairing {
         runRecPair<TTrackFillMap>(groupedTracks, tracksMC);
       }
     } // end loop over reconstructed event
-  }   // end loop pairing function
+  } // end loop pairing function
 
   template <uint32_t TEventMCFillMap, uint32_t TTrackFillMap, typename TEventMC, typename TTracksMC>
   void runMCPairing(TEventMC const& /*eventMC*/, TTracksMC const& tracksMC)
@@ -1716,7 +1720,7 @@ struct AnalysisSameEventPairing {
         }
       }
     } // end of true pairing loop
-  }   // end runMCGen
+  } // end runMCGen
 
   template <uint32_t TTrackFillMap, typename TTracks, typename TTracksMC>
   void runRecPair(TTracks const& tracks, TTracksMC const& /*tracksMC*/)
diff --git a/.conflict-base-0/PWGEM/Dilepton/Tasks/lmeeHFCocktail.cxx b/.conflict-base-0/PWGEM/Dilepton/Tasks/lmeeHFCocktail.cxx
index d3bb410813f..776e51cffa5 100644
--- a/.conflict-base-0/PWGEM/Dilepton/Tasks/lmeeHFCocktail.cxx
+++ b/.conflict-base-0/PWGEM/Dilepton/Tasks/lmeeHFCocktail.cxx
@@ -15,16 +15,18 @@
 /// \author Daniel Samitz, <daniel.samitz@cern.ch>, SMI Vienna
 ///         Elisa Meninno, <elisa.meninno@cern.ch>, SMI Vienna
 
-#include <vector>
+#include "PWGEM/Dilepton/DataModel/dileptonTables.h"
+#include "PWGEM/Dilepton/Utils/MCUtilities.h"
 
-#include "Math/Vector4D.h"
-#include "MathUtils/Utils.h"
-#include "Framework/Task.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "PWGEM/Dilepton/Utils/MCUtilities.h"
-#include "PWGEM/Dilepton/DataModel/dileptonTables.h"
+#include "Framework/Task.h"
+#include "Framework/runDataProcessing.h"
+#include "MathUtils/Utils.h"
+
+#include "Math/Vector4D.h"
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGEM/Dilepton/Tasks/lmeeLFCocktail.cxx b/.conflict-base-0/PWGEM/Dilepton/Tasks/lmeeLFCocktail.cxx
index 1cac2727e98..a4120a48b03 100644
--- a/.conflict-base-0/PWGEM/Dilepton/Tasks/lmeeLFCocktail.cxx
+++ b/.conflict-base-0/PWGEM/Dilepton/Tasks/lmeeLFCocktail.cxx
@@ -14,16 +14,18 @@
 /// \analysis task for lmee light flavour cocktail
 /// \author Daniel Samitz, <daniel.samitz@cern.ch>, SMI Vienna
 
-#include <map>
-#include <vector>
-#include <string>
+#include "PWGEM/Dilepton/DataModel/dileptonTables.h"
+#include "PWGEM/Dilepton/Utils/PairUtilities.h"
 
-#include "Math/Vector4D.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "PWGEM/Dilepton/DataModel/dileptonTables.h"
-#include "PWGEM/Dilepton/Utils/PairUtilities.h"
+#include "Framework/runDataProcessing.h"
+
+#include "Math/Vector4D.h"
+
+#include <map>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGEM/Dilepton/Tasks/prefilterDielectron.cxx b/.conflict-base-0/PWGEM/Dilepton/Tasks/prefilterDielectron.cxx
index 75a92e03c9a..a407547ddbd 100644
--- a/.conflict-base-0/PWGEM/Dilepton/Tasks/prefilterDielectron.cxx
+++ b/.conflict-base-0/PWGEM/Dilepton/Tasks/prefilterDielectron.cxx
@@ -14,32 +14,33 @@
 // This code produces information on prefilter for dielectron.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include <string>
-#include <vector>
-#include <unordered_map>
-#include <map>
-#include <tuple>
+#include "PWGEM/Dilepton/Core/DielectronCut.h"
+#include "PWGEM/Dilepton/Core/EMEventCut.h"
+#include "PWGEM/Dilepton/DataModel/dileptonTables.h"
+#include "PWGEM/Dilepton/Utils/EMTrack.h"
+#include "PWGEM/Dilepton/Utils/EventHistograms.h"
+#include "PWGEM/Dilepton/Utils/PairUtilities.h"
 
-#include "TString.h"
-#include "Math/Vector4D.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
 #include "Common/Core/RecoDecay.h"
 #include "Common/Core/trackUtilities.h"
 
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
 #include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
-#include "PWGEM/Dilepton/DataModel/dileptonTables.h"
-#include "PWGEM/Dilepton/Core/DielectronCut.h"
-#include "PWGEM/Dilepton/Core/EMEventCut.h"
-#include "PWGEM/Dilepton/Utils/EMTrack.h"
-#include "PWGEM/Dilepton/Utils/EventHistograms.h"
-#include "PWGEM/Dilepton/Utils/PairUtilities.h"
+#include "Math/Vector4D.h"
+#include "TString.h"
+
+#include <map>
+#include <string>
+#include <tuple>
+#include <unordered_map>
+#include <vector>
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-base-0/PWGEM/Dilepton/Tasks/singleElectronQC.cxx b/.conflict-base-0/PWGEM/Dilepton/Tasks/singleElectronQC.cxx
index 4a687e82217..21d45ac9a8c 100644
--- a/.conflict-base-0/PWGEM/Dilepton/Tasks/singleElectronQC.cxx
+++ b/.conflict-base-0/PWGEM/Dilepton/Tasks/singleElectronQC.cxx
@@ -14,12 +14,12 @@
 // Analysis task for single electron QC
 //    Please write to: daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-
 #include "PWGEM/Dilepton/Core/SingleTrackQC.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
   return WorkflowSpec{
diff --git a/.conflict-base-0/PWGEM/Dilepton/Tasks/singleElectronQCMC.cxx b/.conflict-base-0/PWGEM/Dilepton/Tasks/singleElectronQCMC.cxx
index da2617158ec..3c9d030d50c 100644
--- a/.conflict-base-0/PWGEM/Dilepton/Tasks/singleElectronQCMC.cxx
+++ b/.conflict-base-0/PWGEM/Dilepton/Tasks/singleElectronQCMC.cxx
@@ -14,12 +14,12 @@
 // Analysis task for single electron QC in MC
 //    Please write to: daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-
 #include "PWGEM/Dilepton/Core/SingleTrackQCMC.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
   return WorkflowSpec{
diff --git a/.conflict-base-0/PWGEM/Dilepton/Tasks/singleMuonQC.cxx b/.conflict-base-0/PWGEM/Dilepton/Tasks/singleMuonQC.cxx
index b9ccb722ea3..a42d68f3d18 100644
--- a/.conflict-base-0/PWGEM/Dilepton/Tasks/singleMuonQC.cxx
+++ b/.conflict-base-0/PWGEM/Dilepton/Tasks/singleMuonQC.cxx
@@ -14,12 +14,12 @@
 // Analysis task for single muon QC
 //    Please write to: daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-
 #include "PWGEM/Dilepton/Core/SingleTrackQC.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
   return WorkflowSpec{
diff --git a/.conflict-base-0/PWGEM/Dilepton/Tasks/singleMuonQCMC.cxx b/.conflict-base-0/PWGEM/Dilepton/Tasks/singleMuonQCMC.cxx
index 7b7176238c1..51d70c187c2 100644
--- a/.conflict-base-0/PWGEM/Dilepton/Tasks/singleMuonQCMC.cxx
+++ b/.conflict-base-0/PWGEM/Dilepton/Tasks/singleMuonQCMC.cxx
@@ -14,12 +14,12 @@
 // Analysis task for single muon QC in MC
 //    Please write to: daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-
 #include "PWGEM/Dilepton/Core/SingleTrackQCMC.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
   return WorkflowSpec{
diff --git a/.conflict-base-0/PWGEM/Dilepton/Tasks/smearing.cxx b/.conflict-base-0/PWGEM/Dilepton/Tasks/smearing.cxx
index 7d2404645ca..59dbf6cc885 100644
--- a/.conflict-base-0/PWGEM/Dilepton/Tasks/smearing.cxx
+++ b/.conflict-base-0/PWGEM/Dilepton/Tasks/smearing.cxx
@@ -13,21 +13,21 @@
 // Analysis task to produce smeared pt, eta, phi for electrons/muons in dilepton analysis
 //    Please write to: daiki.sekihata@cern.ch
 
-#include <array>
-#include <string>
-#include <chrono>
-
 #include "CCDB/BasicCCDBManager.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/DataTypes.h"
 #include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+
+#include <array>
+#include <chrono>
+#include <string>
 // #include "PWGDQ/DataModel/ReducedInfoTables.h" // remove this later, because 2 data tables (covariant matrix) in this header confilict against EM tables.
-#include "PWGEM/Dilepton/Utils/MomentumSmearer.h"
 #include "PWGEM/Dilepton/DataModel/dileptonTables.h"
+#include "PWGEM/Dilepton/Utils/MomentumSmearer.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGEM/Dilepton/Tasks/studyMCTruth.cxx b/.conflict-base-0/PWGEM/Dilepton/Tasks/studyMCTruth.cxx
index 4204a95a9c4..17561e1c023 100644
--- a/.conflict-base-0/PWGEM/Dilepton/Tasks/studyMCTruth.cxx
+++ b/.conflict-base-0/PWGEM/Dilepton/Tasks/studyMCTruth.cxx
@@ -14,19 +14,22 @@
 // This code is to study MC truth. e.g. evet selection bias
 //    Please write to: daiki.sekihata@cern.ch
 
-#include <string>
-#include "Math/Vector4D.h"
+#include "PWGEM/Dilepton/DataModel/dileptonTables.h"
+#include "PWGEM/Dilepton/Utils/MCUtilities.h"
 
+#include "Common/Core/TableHelper.h"
+#include "Common/DataModel/EventSelection.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/StaticFor.h"
 #include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/TableHelper.h"
-#include "Common/DataModel/EventSelection.h"
-#include "PWGEM/Dilepton/DataModel/dileptonTables.h"
-#include "PWGEM/Dilepton/Utils/MCUtilities.h"
+
+#include "Math/Vector4D.h"
+
+#include <string>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGEM/Dilepton/Tasks/tableReaderBarrel.cxx b/.conflict-base-0/PWGEM/Dilepton/Tasks/tableReaderBarrel.cxx
index 819a85efe65..a2d5a465621 100644
--- a/.conflict-base-0/PWGEM/Dilepton/Tasks/tableReaderBarrel.cxx
+++ b/.conflict-base-0/PWGEM/Dilepton/Tasks/tableReaderBarrel.cxx
@@ -12,39 +12,43 @@
 // Contact: iarsene@cern.ch, i.c.arsene@fys.uio.no
 //
 
-#include <map>
-#include <string>
-#include <memory>
-#include <iostream>
-#include <vector>
-#include <algorithm>
-#include <TH1F.h>
-#include <TH3F.h>
-#include <THashList.h>
-#include <TList.h>
-#include <TString.h>
-#include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "PWGDQ/Core/VarManager.h"
-#include "PWGDQ/Core/HistogramManager.h"
-#include "PWGDQ/Core/MixingHandler.h"
-#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/AnalysisCompositeCut.h"
-#include "PWGDQ/Core/HistogramsLibrary.h"
+#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/CutsLibrary.h"
+#include "PWGDQ/Core/HistogramManager.h"
+#include "PWGDQ/Core/HistogramsLibrary.h"
+#include "PWGDQ/Core/MixingHandler.h"
 #include "PWGDQ/Core/MixingLibrary.h"
+#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+
+#include "Common/CCDB/EventSelectionParams.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include "Field/MagneticField.h"
-#include "TGeoGlobalMagField.h"
-#include "DetectorsBase/Propagator.h"
+#include "DataFormatsParameters/GRPObject.h"
 #include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Field/MagneticField.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 #include "ITSMFTBase/DPLAlpideParam.h"
-#include "Common/CCDB/EventSelectionParams.h"
+
+#include "TGeoGlobalMagField.h"
+#include <TH1F.h>
+#include <TH3F.h>
+#include <THashList.h>
+#include <TList.h>
+#include <TString.h>
+
+#include <algorithm>
+#include <iostream>
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
 
 using std::cout;
 using std::endl;
@@ -1072,7 +1076,7 @@ struct AnalysisSameEventPairing {
       }
     }
 
-    if (fConfigNbTrackCut > 0 && fConfigNbTrackCut < 31) {   // if track cuts
+    if (fConfigNbTrackCut > 0 && fConfigNbTrackCut < 31) {           // if track cuts
       for (std::size_t icut = 0; icut < fConfigNbTrackCut; ++icut) { // loop over track cuts
         fTwoTrackFilterMask |= (static_cast<uint32_t>(1) << icut);
         // no pair cuts
diff --git a/.conflict-base-0/PWGEM/Dilepton/Tasks/taggingHFE.cxx b/.conflict-base-0/PWGEM/Dilepton/Tasks/taggingHFE.cxx
index f843b20819a..cc1988e8f47 100644
--- a/.conflict-base-0/PWGEM/Dilepton/Tasks/taggingHFE.cxx
+++ b/.conflict-base-0/PWGEM/Dilepton/Tasks/taggingHFE.cxx
@@ -13,36 +13,38 @@
 /// \brief a task to study tagging e from charm hadron decays in MC
 /// \author daiki.sekihata@cern.ch
 
-#include <vector>
-#include <string>
-#include <array>
-#include <utility>
-#include <iostream>
-
-#include "Math/Vector4D.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "DataFormatsCalibration/MeanVertexObject.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "Common/Core/trackUtilities.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/TableHelper.h"
-#include "Common/Core/RecoDecay.h"
-#include "DCAFitter/DCAFitterN.h"
+#include "PWGEM/Dilepton/Utils/MCUtilities.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/TableHelper.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/CollisionAssociationTables.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGEM/Dilepton/Utils/MCUtilities.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsCalibration/MeanVertexObject.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "Math/Vector4D.h"
+
+#include <array>
+#include <iostream>
+#include <string>
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::soa;
diff --git a/.conflict-base-0/PWGEM/Dilepton/Utils/EMTrack.h b/.conflict-base-0/PWGEM/Dilepton/Utils/EMTrack.h
index 0f894d5b4dc..5042db6d622 100644
--- a/.conflict-base-0/PWGEM/Dilepton/Utils/EMTrack.h
+++ b/.conflict-base-0/PWGEM/Dilepton/Utils/EMTrack.h
@@ -15,9 +15,10 @@
 #ifndef PWGEM_DILEPTON_UTILS_EMTRACK_H_
 #define PWGEM_DILEPTON_UTILS_EMTRACK_H_
 
-#include <vector>
 #include "Math/Vector4D.h"
 
+#include <vector>
+
 namespace o2::aod::pwgem::dilepton::utils
 {
 class EMTrack
diff --git a/.conflict-base-0/PWGEM/Dilepton/Utils/MomentumSmearer.h b/.conflict-base-0/PWGEM/Dilepton/Utils/MomentumSmearer.h
index 7e36dcfed0f..45f491956de 100644
--- a/.conflict-base-0/PWGEM/Dilepton/Utils/MomentumSmearer.h
+++ b/.conflict-base-0/PWGEM/Dilepton/Utils/MomentumSmearer.h
@@ -15,19 +15,19 @@
 #ifndef PWGEM_DILEPTON_UTILS_MOMENTUMSMEARER_H_
 #define PWGEM_DILEPTON_UTILS_MOMENTUMSMEARER_H_
 
-#include <vector>
+#include "CCDB/BasicCCDBManager.h"
+#include "Framework/Logger.h"
 
+#include <TFile.h>
+#include <TGrid.h>
 #include <TH1.h>
 #include <TH2.h>
 #include <TH3.h>
 #include <THnSparse.h>
-#include <TString.h>
-#include <TGrid.h>
-#include <TFile.h>
 #include <TKey.h>
+#include <TString.h>
 
-#include "CCDB/BasicCCDBManager.h"
-#include "Framework/Logger.h"
+#include <vector>
 
 using namespace o2::framework;
 using namespace o2;
diff --git a/.conflict-base-0/PWGEM/PhotonMeson/Core/CutsLibrary.cxx b/.conflict-base-0/PWGEM/PhotonMeson/Core/CutsLibrary.cxx
index c2f313e6e62..44dfae30898 100644
--- a/.conflict-base-0/PWGEM/PhotonMeson/Core/CutsLibrary.cxx
+++ b/.conflict-base-0/PWGEM/PhotonMeson/Core/CutsLibrary.cxx
@@ -11,10 +11,11 @@
 //
 // Contact: daiki.sekihata@cern.ch
 //
+#include "PWGEM/PhotonMeson/Core/CutsLibrary.h"
+
+#include <regex>
 #include <string>
 #include <vector>
-#include <regex>
-#include "PWGEM/PhotonMeson/Core/CutsLibrary.h"
 
 //_______________________________________________
 int customAtoi(const std::string& str)
diff --git a/.conflict-base-0/PWGEM/PhotonMeson/Core/CutsLibrary.h b/.conflict-base-0/PWGEM/PhotonMeson/Core/CutsLibrary.h
index bf4fcfe7037..376ad652b63 100644
--- a/.conflict-base-0/PWGEM/PhotonMeson/Core/CutsLibrary.h
+++ b/.conflict-base-0/PWGEM/PhotonMeson/Core/CutsLibrary.h
@@ -15,13 +15,14 @@
 #ifndef PWGEM_PHOTONMESON_CORE_CUTSLIBRARY_H_
 #define PWGEM_PHOTONMESON_CORE_CUTSLIBRARY_H_
 
-#include <string>
-#include "PWGEM/PhotonMeson/Core/EMPhotonEventCut.h"
-#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
 #include "PWGEM/PhotonMeson/Core/DalitzEECut.h"
-#include "PWGEM/PhotonMeson/Core/PHOSPhotonCut.h"
 #include "PWGEM/PhotonMeson/Core/EMCPhotonCut.h"
+#include "PWGEM/PhotonMeson/Core/EMPhotonEventCut.h"
+#include "PWGEM/PhotonMeson/Core/PHOSPhotonCut.h"
 #include "PWGEM/PhotonMeson/Core/PairCut.h"
+#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
+
+#include <string>
 
 namespace o2::aod
 {
diff --git a/.conflict-base-0/PWGEM/PhotonMeson/Core/EMCPhotonCut.cxx b/.conflict-base-0/PWGEM/PhotonMeson/Core/EMCPhotonCut.cxx
index 582b9754057..0761921b765 100644
--- a/.conflict-base-0/PWGEM/PhotonMeson/Core/EMCPhotonCut.cxx
+++ b/.conflict-base-0/PWGEM/PhotonMeson/Core/EMCPhotonCut.cxx
@@ -13,11 +13,14 @@
 // Class for EMCal cluster selection
 //
 
-#include <string>
-#include "Framework/Logger.h"
 #include "PWGEM/PhotonMeson/Core/EMCPhotonCut.h"
+
 #include "PWGJE/DataModel/EMCALClusters.h"
 
+#include "Framework/Logger.h"
+
+#include <string>
+
 ClassImp(EMCPhotonCut);
 
 const char* EMCPhotonCut::mCutNames[static_cast<int>(EMCPhotonCut::EMCPhotonCuts::kNCuts)] = {"Definition", "Energy", "NCell", "M02", "Timing", "TrackMatching", "Exotic"};
diff --git a/.conflict-base-0/PWGEM/PhotonMeson/Core/EMCPhotonCut.h b/.conflict-base-0/PWGEM/PhotonMeson/Core/EMCPhotonCut.h
index 8bfd8ca630f..372eff52061 100644
--- a/.conflict-base-0/PWGEM/PhotonMeson/Core/EMCPhotonCut.h
+++ b/.conflict-base-0/PWGEM/PhotonMeson/Core/EMCPhotonCut.h
@@ -16,16 +16,19 @@
 #ifndef PWGEM_PHOTONMESON_CORE_EMCPHOTONCUT_H_
 #define PWGEM_PHOTONMESON_CORE_EMCPHOTONCUT_H_
 
-#include <set>
-#include <vector>
-#include <utility>
-#include <string>
-#include <optional>
-#include "Framework/Logger.h"
-#include "Framework/DataTypes.h"
 #include "Rtypes.h"
+
+#include "Framework/DataTypes.h"
+#include "Framework/Logger.h"
+
 #include "TNamed.h"
 
+#include <optional>
+#include <set>
+#include <string>
+#include <utility>
+#include <vector>
+
 class EMCPhotonCut : public TNamed
 {
  public:
diff --git a/.conflict-base-0/PWGEM/PhotonMeson/Core/EMPhotonEventCut.cxx b/.conflict-base-0/PWGEM/PhotonMeson/Core/EMPhotonEventCut.cxx
index 285bf50eba4..6526daa47c9 100644
--- a/.conflict-base-0/PWGEM/PhotonMeson/Core/EMPhotonEventCut.cxx
+++ b/.conflict-base-0/PWGEM/PhotonMeson/Core/EMPhotonEventCut.cxx
@@ -13,9 +13,10 @@
 // Class for em photon event selection
 //
 
-#include "Framework/Logger.h"
 #include "PWGEM/PhotonMeson/Core/EMPhotonEventCut.h"
 
+#include "Framework/Logger.h"
+
 ClassImp(EMPhotonEventCut);
 
 void EMPhotonEventCut::SetRequireEMCReadoutInMB(bool flag)
diff --git a/.conflict-base-0/PWGEM/PhotonMeson/Core/HistogramsLibrary.cxx b/.conflict-base-0/PWGEM/PhotonMeson/Core/HistogramsLibrary.cxx
index 50174ab9e08..59700cbb215 100644
--- a/.conflict-base-0/PWGEM/PhotonMeson/Core/HistogramsLibrary.cxx
+++ b/.conflict-base-0/PWGEM/PhotonMeson/Core/HistogramsLibrary.cxx
@@ -11,26 +11,28 @@
 //
 // Contact: daiki.sekihata@cern.ch
 //
+#include <fstream>
 #include <iostream>
 #include <memory>
-#include <fstream>
 using namespace std;
 
-#include <TObject.h>
-#include <TObjArray.h>
-#include <THashList.h>
+#include "PWGEM/PhotonMeson/Core/HistogramsLibrary.h"
+
+#include "Framework/Logger.h"
+
+#include <TClass.h>
 #include <TH1F.h>
 #include <TH2F.h>
 #include <TH3F.h>
-#include <TProfile.h>
-#include <TProfile2D.h>
-#include <TProfile3D.h>
+#include <THashList.h>
 #include <THn.h>
 #include <THnSparse.h>
 #include <TIterator.h>
-#include <TClass.h>
-#include "Framework/Logger.h"
-#include "PWGEM/PhotonMeson/Core/HistogramsLibrary.h"
+#include <TObjArray.h>
+#include <TObject.h>
+#include <TProfile.h>
+#include <TProfile2D.h>
+#include <TProfile3D.h>
 
 void o2::aod::pwgem::photon::histogram::DefineHistograms(THashList* list, const char* histClass, const char* subGroup)
 {
@@ -184,7 +186,7 @@ void o2::aod::pwgem::photon::histogram::DefineHistograms(THashList* list, const
       list->Add(new TH2F("hEtaRec_DeltaEta", "photon #eta resolution;#eta^{rec} of conversion point;#eta^{rec} - #eta^{gen}", 400, -2, +2, 400, -1.0f, 1.0f));
       list->Add(new TH2F("hEtaRec_DeltaPhi", "photon #varphi resolution;#eta^{rec} of conversion point;#varphi^{rec} - #varphi^{gen} (rad.)", 400, -2, +2, 400, -1.0f, 1.0f));
     } // end of mc
-  }   // end of V0
+  } // end of V0
 
   if (TString(histClass).Contains("Dalitz")) {
     THnSparseF* hs_dilepton_uls_same = nullptr;
@@ -576,7 +578,7 @@ void o2::aod::pwgem::photon::histogram::DefineHistograms(THashList* list, const
       hs_conv_point_mix->Sumw2();
       list->Add(hs_conv_point_mix);
     } // end of pair
-  }   // end of material budget study
+  } // end of material budget study
 
   if (TString(histClass) == "Generated") {
     list->Add(new TH1F("hCollisionCounter", "hCollisionCounter", 5, 0.5f, 5.5f));
diff --git a/.conflict-base-0/PWGEM/PhotonMeson/Core/HistogramsLibrary.h b/.conflict-base-0/PWGEM/PhotonMeson/Core/HistogramsLibrary.h
index 324718a663e..5307f5608a5 100644
--- a/.conflict-base-0/PWGEM/PhotonMeson/Core/HistogramsLibrary.h
+++ b/.conflict-base-0/PWGEM/PhotonMeson/Core/HistogramsLibrary.h
@@ -15,26 +15,27 @@
 #ifndef PWGEM_PHOTONMESON_CORE_HISTOGRAMSLIBRARY_H_
 #define PWGEM_PHOTONMESON_CORE_HISTOGRAMSLIBRARY_H_
 
-#include <iostream>
-#include <array>
-#include <TString.h>
-#include <THashList.h>
-#include <TObject.h>
-#include <TObjArray.h>
-#include <THashList.h>
-#include <TMath.h>
+#include "Common/CCDB/EventSelectionParams.h"
+#include "Common/Core/RecoDecay.h"
+
+#include <TClass.h>
 #include <TH1F.h>
 #include <TH2F.h>
 #include <TH3F.h>
-#include <TProfile.h>
-#include <TProfile2D.h>
-#include <TProfile3D.h>
+#include <THashList.h>
 #include <THn.h>
 #include <THnSparse.h>
 #include <TIterator.h>
-#include <TClass.h>
-#include "Common/CCDB/EventSelectionParams.h"
-#include "Common/Core/RecoDecay.h"
+#include <TMath.h>
+#include <TObjArray.h>
+#include <TObject.h>
+#include <TProfile.h>
+#include <TProfile2D.h>
+#include <TProfile3D.h>
+#include <TString.h>
+
+#include <array>
+#include <iostream>
 
 enum EMHistType {
   kEvent = 0,
diff --git a/.conflict-base-0/PWGEM/PhotonMeson/Core/PHOSPhotonCut.cxx b/.conflict-base-0/PWGEM/PhotonMeson/Core/PHOSPhotonCut.cxx
index 96db9e331b3..083d68078cc 100644
--- a/.conflict-base-0/PWGEM/PhotonMeson/Core/PHOSPhotonCut.cxx
+++ b/.conflict-base-0/PWGEM/PhotonMeson/Core/PHOSPhotonCut.cxx
@@ -13,9 +13,10 @@
 // Class for track selection
 //
 
-#include "Framework/Logger.h"
 #include "PWGEM/PhotonMeson/Core/PHOSPhotonCut.h"
 
+#include "Framework/Logger.h"
+
 ClassImp(PHOSPhotonCut);
 
 const char* PHOSPhotonCut::mCutNames[static_cast<int>(PHOSPhotonCut::PHOSPhotonCuts::kNCuts)] = {"Energy", "Dispersion", "CPV"};
diff --git a/.conflict-base-0/PWGEM/PhotonMeson/Core/PHOSPhotonCut.h b/.conflict-base-0/PWGEM/PhotonMeson/Core/PHOSPhotonCut.h
index c60944dd52b..d7f6ee64805 100644
--- a/.conflict-base-0/PWGEM/PhotonMeson/Core/PHOSPhotonCut.h
+++ b/.conflict-base-0/PWGEM/PhotonMeson/Core/PHOSPhotonCut.h
@@ -16,15 +16,18 @@
 #ifndef PWGEM_PHOTONMESON_CORE_PHOSPHOTONCUT_H_
 #define PWGEM_PHOTONMESON_CORE_PHOSPHOTONCUT_H_
 
-#include <set>
-#include <vector>
-#include <utility>
-#include <string>
-#include "Framework/Logger.h"
-#include "Framework/DataTypes.h"
 #include "Rtypes.h"
+
+#include "Framework/DataTypes.h"
+#include "Framework/Logger.h"
+
 #include "TNamed.h"
 
+#include <set>
+#include <string>
+#include <utility>
+#include <vector>
+
 class PHOSPhotonCut : public TNamed
 {
  public:
diff --git a/.conflict-base-0/PWGEM/PhotonMeson/Core/PairCut.cxx b/.conflict-base-0/PWGEM/PhotonMeson/Core/PairCut.cxx
index be8bee172c7..10161ba3dd4 100644
--- a/.conflict-base-0/PWGEM/PhotonMeson/Core/PairCut.cxx
+++ b/.conflict-base-0/PWGEM/PhotonMeson/Core/PairCut.cxx
@@ -13,9 +13,10 @@
 // Class for track selection
 //
 
-#include "Framework/Logger.h"
 #include "PWGEM/PhotonMeson/Core/PairCut.h"
 
+#include "Framework/Logger.h"
+
 ClassImp(PairCut);
 
 const char* PairCut::mCutNames[static_cast<int>(PairCut::PairCuts::kNCuts)] = {"Asym"};
diff --git a/.conflict-base-0/PWGEM/PhotonMeson/Core/PairCut.h b/.conflict-base-0/PWGEM/PhotonMeson/Core/PairCut.h
index 19ba27c79bf..b9cf1fe5cf0 100644
--- a/.conflict-base-0/PWGEM/PhotonMeson/Core/PairCut.h
+++ b/.conflict-base-0/PWGEM/PhotonMeson/Core/PairCut.h
@@ -16,15 +16,18 @@
 #ifndef PWGEM_PHOTONMESON_CORE_PAIRCUT_H_
 #define PWGEM_PHOTONMESON_CORE_PAIRCUT_H_
 
-#include <set>
-#include <vector>
-#include <utility>
-#include <string>
-#include "Framework/Logger.h"
-#include "Framework/DataTypes.h"
 #include "Rtypes.h"
-#include "TNamed.h"
+
+#include "Framework/DataTypes.h"
+#include "Framework/Logger.h"
+
 #include "TMath.h"
+#include "TNamed.h"
+
+#include <set>
+#include <string>
+#include <utility>
+#include <vector>
 
 class PairCut : public TNamed
 {
diff --git a/.conflict-base-0/PWGEM/PhotonMeson/Core/TaggingPi0.h b/.conflict-base-0/PWGEM/PhotonMeson/Core/TaggingPi0.h
index d74af2ceb0c..7e80b3d466d 100644
--- a/.conflict-base-0/PWGEM/PhotonMeson/Core/TaggingPi0.h
+++ b/.conflict-base-0/PWGEM/PhotonMeson/Core/TaggingPi0.h
@@ -19,40 +19,41 @@
 #ifndef PWGEM_PHOTONMESON_CORE_TAGGINGPI0_H_
 #define PWGEM_PHOTONMESON_CORE_TAGGINGPI0_H_
 
+#include "PWGEM/Dilepton/Utils/EMTrack.h"
+#include "PWGEM/Dilepton/Utils/EMTrackUtilities.h"
+#include "PWGEM/Dilepton/Utils/EventMixingHandler.h"
+#include "PWGEM/PhotonMeson/Core/DalitzEECut.h"
+#include "PWGEM/PhotonMeson/Core/EMCPhotonCut.h"
+#include "PWGEM/PhotonMeson/Core/EMPhotonEventCut.h"
+#include "PWGEM/PhotonMeson/Core/PHOSPhotonCut.h"
+#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+#include "PWGEM/PhotonMeson/Utils/EventHistograms.h"
+#include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
+
+#include "Common/Core/RecoDecay.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "Math/Vector4D.h"
+#include "TString.h"
+
+#include <algorithm>
+#include <array>
 #include <cstring>
 #include <iterator>
-#include <string>
 #include <map>
-#include <vector>
+#include <string>
 #include <tuple>
 #include <utility>
-#include <array>
-#include <algorithm>
-
-#include "TString.h"
-#include "Math/Vector4D.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
-
-#include "Common/Core/RecoDecay.h"
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/DalitzEECut.h"
-#include "PWGEM/PhotonMeson/Core/PHOSPhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/EMCPhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/EMPhotonEventCut.h"
-#include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
-#include "PWGEM/Dilepton/Utils/EMTrack.h"
-#include "PWGEM/Dilepton/Utils/EventMixingHandler.h"
-#include "PWGEM/PhotonMeson/Utils/EventHistograms.h"
-#include "PWGEM/Dilepton/Utils/EMTrackUtilities.h"
+#include <vector>
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-base-0/PWGEM/PhotonMeson/Core/TaggingPi0MC.h b/.conflict-base-0/PWGEM/PhotonMeson/Core/TaggingPi0MC.h
index 56c6274a141..04fe0cadd9c 100644
--- a/.conflict-base-0/PWGEM/PhotonMeson/Core/TaggingPi0MC.h
+++ b/.conflict-base-0/PWGEM/PhotonMeson/Core/TaggingPi0MC.h
@@ -17,35 +17,36 @@
 #ifndef PWGEM_PHOTONMESON_CORE_TAGGINGPI0MC_H_
 #define PWGEM_PHOTONMESON_CORE_TAGGINGPI0MC_H_
 
-#include <string>
-#include <map>
-#include <vector>
+#include "PWGEM/Dilepton/Utils/MCUtilities.h"
+#include "PWGEM/PhotonMeson/Core/DalitzEECut.h"
+#include "PWGEM/PhotonMeson/Core/EMCPhotonCut.h"
+#include "PWGEM/PhotonMeson/Core/EMPhotonEventCut.h"
+#include "PWGEM/PhotonMeson/Core/PHOSPhotonCut.h"
+#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+#include "PWGEM/PhotonMeson/Utils/EventHistograms.h"
+#include "PWGEM/PhotonMeson/Utils/MCUtilities.h"
+#include "PWGEM/PhotonMeson/Utils/NMHistograms.h"
+#include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
 
-#include "TF1.h"
-#include "TString.h"
-#include "Math/Vector4D.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
+#include "Common/Core/RecoDecay.h"
 
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
 #include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
-#include "Common/Core/RecoDecay.h"
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
-#include "PWGEM/PhotonMeson/Utils/MCUtilities.h"
-#include "PWGEM/PhotonMeson/Utils/EventHistograms.h"
-#include "PWGEM/PhotonMeson/Utils/NMHistograms.h"
-#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/DalitzEECut.h"
-#include "PWGEM/PhotonMeson/Core/PHOSPhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/EMCPhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/EMPhotonEventCut.h"
-#include "PWGEM/Dilepton/Utils/MCUtilities.h"
+#include "Math/Vector4D.h"
+#include "TF1.h"
+#include "TString.h"
+
+#include <map>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-base-0/PWGEM/PhotonMeson/Core/V0PhotonCut.cxx b/.conflict-base-0/PWGEM/PhotonMeson/Core/V0PhotonCut.cxx
index 07d805fa291..493565011ff 100644
--- a/.conflict-base-0/PWGEM/PhotonMeson/Core/V0PhotonCut.cxx
+++ b/.conflict-base-0/PWGEM/PhotonMeson/Core/V0PhotonCut.cxx
@@ -13,11 +13,12 @@
 // Class for v0 photon selection
 //
 
-#include <set>
-#include <utility>
+#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
 
 #include "Framework/Logger.h"
-#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
+
+#include <set>
+#include <utility>
 
 ClassImp(V0PhotonCut);
 
diff --git a/.conflict-base-0/PWGEM/PhotonMeson/Core/V0PhotonCut.h b/.conflict-base-0/PWGEM/PhotonMeson/Core/V0PhotonCut.h
index d6064ab8786..c908acb5acd 100644
--- a/.conflict-base-0/PWGEM/PhotonMeson/Core/V0PhotonCut.h
+++ b/.conflict-base-0/PWGEM/PhotonMeson/Core/V0PhotonCut.h
@@ -16,16 +16,18 @@
 #ifndef PWGEM_PHOTONMESON_CORE_V0PHOTONCUT_H_
 #define PWGEM_PHOTONMESON_CORE_V0PHOTONCUT_H_
 
-#include <algorithm>
-#include <set>
-#include <vector>
-#include <utility>
-#include <string>
 #include "Rtypes.h"
-#include "TNamed.h"
-#include "TMath.h"
 
 #include "PWGEM/PhotonMeson/Utils/TrackSelection.h"
+
+#include "TMath.h"
+#include "TNamed.h"
+
+#include <algorithm>
+#include <set>
+#include <string>
+#include <utility>
+#include <vector>
 using namespace o2::pwgem::photonmeson;
 
 class V0PhotonCut : public TNamed
diff --git a/.conflict-base-0/PWGEM/PhotonMeson/DataModel/bcWiseTables.h b/.conflict-base-0/PWGEM/PhotonMeson/DataModel/bcWiseTables.h
index a306d5645ce..1ca1c78b683 100644
--- a/.conflict-base-0/PWGEM/PhotonMeson/DataModel/bcWiseTables.h
+++ b/.conflict-base-0/PWGEM/PhotonMeson/DataModel/bcWiseTables.h
@@ -73,9 +73,9 @@ DECLARE_SOA_COLUMN(StoredFT0MAmplitude, storedFT0MAmplitude, uint16_t); //! ft0a
 DECLARE_SOA_COLUMN(StoredMu, storedMu, uint16_t);                       //! probability of TVX collision per BC (x1000)
 DECLARE_SOA_COLUMN(StoredTimeSinceSOF, storedTimeSinceSOF, uint16_t);   //! time since decreation of ADJUST in seconds (x2)
 
-DECLARE_SOA_DYNAMIC_COLUMN(Centrality, centrality, [](uint8_t storedcentrality) -> float { return std::nextafter(storedcentrality / emdownscaling::downscalingFactors[emdownscaling::kFT0MCent], std::numeric_limits<float>::infinity()); });           //! Centrality (0-100)
-DECLARE_SOA_DYNAMIC_COLUMN(FT0MAmplitude, ft0Amplitude, [](uint16_t storedFT0MAmplitude) -> float { return std::nextafter(storedFT0MAmplitude / emdownscaling::downscalingFactors[emdownscaling::kFT0Amp], std::numeric_limits<float>::infinity()); }); //! FT0M amplitude
-DECLARE_SOA_DYNAMIC_COLUMN(Mu, mu, [](uint16_t storedMu) -> float { return std::nextafter(storedMu / emdownscaling::downscalingFactors[emdownscaling::kMu], std::numeric_limits<float>::infinity()); });                                                //! probability of TVX collision per BC
+DECLARE_SOA_DYNAMIC_COLUMN(Centrality, centrality, [](uint8_t storedcentrality) -> float { return std::nextafter(storedcentrality / emdownscaling::downscalingFactors[emdownscaling::kFT0MCent], std::numeric_limits<float>::infinity()); });              //! Centrality (0-100)
+DECLARE_SOA_DYNAMIC_COLUMN(FT0MAmplitude, ft0Amplitude, [](uint16_t storedFT0MAmplitude) -> float { return std::nextafter(storedFT0MAmplitude / emdownscaling::downscalingFactors[emdownscaling::kFT0Amp], std::numeric_limits<float>::infinity()); });    //! FT0M amplitude
+DECLARE_SOA_DYNAMIC_COLUMN(Mu, mu, [](uint16_t storedMu) -> float { return std::nextafter(storedMu / emdownscaling::downscalingFactors[emdownscaling::kMu], std::numeric_limits<float>::infinity()); });                                                   //! probability of TVX collision per BC
 DECLARE_SOA_DYNAMIC_COLUMN(TimeSinceSOF, timeSinceSOF, [](uint16_t storedTimeSinceSOF) -> float { return std::nextafter(storedTimeSinceSOF / emdownscaling::downscalingFactors[emdownscaling::kTimeSinceSOF], std::numeric_limits<float>::infinity()); }); //! probability of TVX collision per BC
 } // namespace bcwisebc
 DECLARE_SOA_TABLE(BCWiseBCs, "AOD", "BCWISEBC", //! table of bc wise centrality estimation and event selection input
diff --git a/.conflict-base-0/PWGEM/PhotonMeson/DataModel/gammaTables.h b/.conflict-base-0/PWGEM/PhotonMeson/DataModel/gammaTables.h
index 0abbc3bfe76..d73ddcc3f16 100644
--- a/.conflict-base-0/PWGEM/PhotonMeson/DataModel/gammaTables.h
+++ b/.conflict-base-0/PWGEM/PhotonMeson/DataModel/gammaTables.h
@@ -9,15 +9,15 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <vector>
-#include <TMath.h>
+#include "PWGEM/Dilepton/DataModel/dileptonTables.h"
+#include "PWGJE/DataModel/EMCALClusters.h"
 
 #include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/CaloClusters.h"
 
-#include "PWGEM/Dilepton/DataModel/dileptonTables.h"
+#include <TMath.h>
 
-#include "PWGJE/DataModel/EMCALClusters.h"
+#include <vector>
 
 #ifndef PWGEM_PHOTONMESON_DATAMODEL_GAMMATABLES_H_
 #define PWGEM_PHOTONMESON_DATAMODEL_GAMMATABLES_H_
diff --git a/.conflict-base-0/PWGEM/PhotonMeson/TableProducer/associateMCinfoPhoton.cxx b/.conflict-base-0/PWGEM/PhotonMeson/TableProducer/associateMCinfoPhoton.cxx
index 2fafc5118e3..90b97762131 100644
--- a/.conflict-base-0/PWGEM/PhotonMeson/TableProducer/associateMCinfoPhoton.cxx
+++ b/.conflict-base-0/PWGEM/PhotonMeson/TableProducer/associateMCinfoPhoton.cxx
@@ -16,16 +16,17 @@
 /// \author Daiki Sekihata (daiki.sekihata@cern.ch)
 ///
 
-#include <map>
-#include <vector>
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+#include "PWGEM/PhotonMeson/Utils/MCUtilities.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/PhotonMeson/Utils/MCUtilities.h"
+
+#include <map>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGEM/PhotonMeson/TableProducer/createEMEventPhoton.cxx b/.conflict-base-0/PWGEM/PhotonMeson/TableProducer/createEMEventPhoton.cxx
index fc155fe5502..3e08ed6e33f 100644
--- a/.conflict-base-0/PWGEM/PhotonMeson/TableProducer/createEMEventPhoton.cxx
+++ b/.conflict-base-0/PWGEM/PhotonMeson/TableProducer/createEMEventPhoton.cxx
@@ -14,23 +14,22 @@
 ///
 /// \author Daiki Sekihata, daiki.sekihata@cern.ch
 
-#include <string>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+#include "PWGJE/DataModel/Jet.h"
 
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
 #include "Common/CCDB/TriggerAliases.h"
 
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+#include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
-#include "PWGJE/DataModel/Jet.h"
+#include <string>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGEM/PhotonMeson/TableProducer/createPCM.cxx b/.conflict-base-0/PWGEM/PhotonMeson/TableProducer/createPCM.cxx
index 4ca74633e1b..4862ccba420 100644
--- a/.conflict-base-0/PWGEM/PhotonMeson/TableProducer/createPCM.cxx
+++ b/.conflict-base-0/PWGEM/PhotonMeson/TableProducer/createPCM.cxx
@@ -14,26 +14,29 @@
 // This code produces photon data tables.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include <array>
-#include <vector>
-#include <algorithm>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/Core/trackUtilities.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+#include "PWGEM/PhotonMeson/Utils/PCMUtilities.h"
+#include "PWGEM/PhotonMeson/Utils/TrackSelection.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "Common/Core/RecoDecay.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/CollisionAssociationTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "DCAFitter/DCAFitterN.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGEM/PhotonMeson/Utils/PCMUtilities.h"
-#include "PWGEM/PhotonMeson/Utils/TrackSelection.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include <algorithm>
+#include <array>
+#include <vector>
 
 using namespace o2;
 using namespace o2::soa;
@@ -443,9 +446,9 @@ struct createPCM {
               //     collision_in_sw.globalIndex(), ele.collisionId(), pos.collisionId(), ele.globalIndex(), pos.globalIndex());
               fillV0Table(collision_in_sw, ele, pos, false);
             } // end of searching window loop
-          }   // end of pairing loop
-        }     // end of pos track loop in sw
-      }       // end of pos track loop in sw
+          } // end of pairing loop
+        } // end of pos track loop in sw
+      } // end of pos track loop in sw
 
       // LOGF(info, "possible number of V0 = %d", cospa_map.size());
       std::map<std::pair<uint32_t, uint32_t>, bool> used_pair_map;
@@ -550,7 +553,7 @@ struct createPCM {
         }
       }
     } // end of collision loop
-  }   // end of process
+  } // end of process
   PROCESS_SWITCH(createPCM, processTrkCollAsso, "create V0s with track-to-collision associator", false);
 };
 
diff --git a/.conflict-base-0/PWGEM/PhotonMeson/TableProducer/gammaSelection.cxx b/.conflict-base-0/PWGEM/PhotonMeson/TableProducer/gammaSelection.cxx
index 7a3708d480b..ea98a8f255c 100644
--- a/.conflict-base-0/PWGEM/PhotonMeson/TableProducer/gammaSelection.cxx
+++ b/.conflict-base-0/PWGEM/PhotonMeson/TableProducer/gammaSelection.cxx
@@ -14,22 +14,22 @@
 /// \author marvin.hemmer@cern.ch
 
 // TODO: add PCM table
-#include <typeinfo>
-
 #include "PWGEM/PhotonMeson/Utils/gammaSelectionCuts.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
-// includes for the R recalculation
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "CCDB/BasicCCDBManager.h"
+#include <typeinfo>
 
+// includes for the R recalculation
 #include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
 #include "PWGEM/PhotonMeson/Utils/emcalHistoDefinitions.h"
 
+#include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-base-0/PWGEM/PhotonMeson/TableProducer/photonconversionbuilder.cxx b/.conflict-base-0/PWGEM/PhotonMeson/TableProducer/photonconversionbuilder.cxx
index 8f8e795edfb..67e11f24e16 100644
--- a/.conflict-base-0/PWGEM/PhotonMeson/TableProducer/photonconversionbuilder.cxx
+++ b/.conflict-base-0/PWGEM/PhotonMeson/TableProducer/photonconversionbuilder.cxx
@@ -15,43 +15,43 @@
 //
 // \author Daiki Sekihata <daiki.sekihata@cern.ch>, Tokyo
 
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <map>
-#include <iterator>
-#include <utility>
-#include <string>
-#include <set>
-#include <algorithm>
-#include <vector>
-#include <unordered_map>
-
-#include "Math/Vector4D.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+#include "PWGEM/PhotonMeson/Utils/PCMUtilities.h"
+#include "PWGEM/PhotonMeson/Utils/TrackSelection.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
+#include "Common/Core/TPCVDriftManager.h"
+#include "Common/Core/TableHelper.h"
 #include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+#include "Tools/KFparticle/KFUtilities.h"
+
 #include "CCDB/BasicCCDBManager.h"
-#include "Common/Core/TableHelper.h"
-#include "Common/Core/TPCVDriftManager.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
-#include "Tools/KFparticle/KFUtilities.h"
+#include "Math/Vector4D.h"
 
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/PhotonMeson/Utils/PCMUtilities.h"
-#include "PWGEM/PhotonMeson/Utils/TrackSelection.h"
+#include <algorithm>
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <iterator>
+#include <map>
+#include <set>
+#include <string>
+#include <unordered_map>
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::soa;
diff --git a/.conflict-base-0/PWGEM/PhotonMeson/TableProducer/produceMesonCalo.cxx b/.conflict-base-0/PWGEM/PhotonMeson/TableProducer/produceMesonCalo.cxx
index 7fd19416d3d..face43fb3e4 100644
--- a/.conflict-base-0/PWGEM/PhotonMeson/TableProducer/produceMesonCalo.cxx
+++ b/.conflict-base-0/PWGEM/PhotonMeson/TableProducer/produceMesonCalo.cxx
@@ -21,9 +21,9 @@
 #include "Framework/runDataProcessing.h"
 
 // includes for the R recalculation
+#include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsParameters/GRPObject.h"
 #include "DetectorsBase/GeometryManager.h"
-#include "CCDB/BasicCCDBManager.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGEM/PhotonMeson/TableProducer/skimmerDalitzEE.cxx b/.conflict-base-0/PWGEM/PhotonMeson/TableProducer/skimmerDalitzEE.cxx
index 5eb1bfeb069..b7e5049ebed 100644
--- a/.conflict-base-0/PWGEM/PhotonMeson/TableProducer/skimmerDalitzEE.cxx
+++ b/.conflict-base-0/PWGEM/PhotonMeson/TableProducer/skimmerDalitzEE.cxx
@@ -12,19 +12,19 @@
 /// \brief write relevant information for dalitz ee analysis to an AO2D.root file. This file is then the only necessary input to perform pcm analysis.
 /// \author daiki.sekihata@cern.ch
 
-#include "Math/Vector4D.h"
+#include "PWGEM/Dilepton/Utils/PairUtilities.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
 
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
 #include "CCDB/BasicCCDBManager.h"
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "CommonConstants/PhysicsConstants.h"
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/Dilepton/Utils/PairUtilities.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "Math/Vector4D.h"
 
 using namespace o2;
 using namespace o2::soa;
@@ -290,7 +290,7 @@ struct skimmerDalitzEE {
 
         fRegistry.fill(HIST("hNpairs"), static_cast<int>(pairtype));
         npair++;
-      }      // end of pairing loop
+      } // end of pairing loop
     } else { // LS
       for (auto& [t1, t2] : combinations(CombinationsStrictlyUpperIndexPolicy(tracks1, tracks2))) {
         if (!checkTrack(t1) || !checkTrack(t2)) {
diff --git a/.conflict-base-0/PWGEM/PhotonMeson/TableProducer/skimmerGammaConversion.cxx b/.conflict-base-0/PWGEM/PhotonMeson/TableProducer/skimmerGammaConversion.cxx
index 6a39aea8881..80572200a12 100644
--- a/.conflict-base-0/PWGEM/PhotonMeson/TableProducer/skimmerGammaConversion.cxx
+++ b/.conflict-base-0/PWGEM/PhotonMeson/TableProducer/skimmerGammaConversion.cxx
@@ -23,38 +23,37 @@
 
 // runme like: o2-analysis-trackselection -b --aod-file ${sourceFile} --aod-writer-json ${writerFile} | o2-analysis-timestamp -b | o2-analysis-trackextension -b | o2-analysis-lf-lambdakzerobuilder -b | o2-analysis-pid-tpc -b | o2-analysis-em-skimmermc -b
 
-#include <memory>
 #include <map>
+#include <memory>
 #include <string>
 #include <vector>
 
 // todo: remove reduantant information in GammaConversionsInfoTrue
 #include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/PhotonMeson/Utils/gammaConvDefinitions.h"
 #include "PWGEM/PhotonMeson/Utils/PCMUtilities.h"
+#include "PWGEM/PhotonMeson/Utils/gammaConvDefinitions.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 // includes for the R recalculation
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
+#include "Common/Core/trackUtilities.h"
+#include "Tools/KFparticle/KFUtilities.h"
 
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonConstants/PhysicsConstants.h"
 #include "DCAFitter/HelixHelper.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
 #include "ReconstructionDataFormats/TrackFwd.h"
-#include "Common/Core/trackUtilities.h"
-#include "CommonConstants/PhysicsConstants.h"
 
+#include "Math/Vector4D.h"
 #include <TMath.h>
 #include <TVector2.h>
-#include "Math/Vector4D.h"
-
-#include "Tools/KFparticle/KFUtilities.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGEM/PhotonMeson/TableProducer/skimmerGammaConversionTruthOnlyMc.cxx b/.conflict-base-0/PWGEM/PhotonMeson/TableProducer/skimmerGammaConversionTruthOnlyMc.cxx
index 509a949b0dd..08a90fcf351 100644
--- a/.conflict-base-0/PWGEM/PhotonMeson/TableProducer/skimmerGammaConversionTruthOnlyMc.cxx
+++ b/.conflict-base-0/PWGEM/PhotonMeson/TableProducer/skimmerGammaConversionTruthOnlyMc.cxx
@@ -20,11 +20,11 @@
 #include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
 #include "PWGEM/PhotonMeson/Utils/gammaConvDefinitions.h"
 
-#include "TVector3.h"
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TVector3.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGEM/PhotonMeson/TableProducer/skimmerPHOS.cxx b/.conflict-base-0/PWGEM/PhotonMeson/TableProducer/skimmerPHOS.cxx
index ef825ca5578..f205d74ec78 100644
--- a/.conflict-base-0/PWGEM/PhotonMeson/TableProducer/skimmerPHOS.cxx
+++ b/.conflict-base-0/PWGEM/PhotonMeson/TableProducer/skimmerPHOS.cxx
@@ -13,12 +13,14 @@
 /// dependencies: o2-analysis-calo-cluster
 /// \author daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+
 #include "Common/DataModel/CaloClusters.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 #include "PHOSBase/Geometry.h"
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGEM/PhotonMeson/Tasks/CheckMCV0.cxx b/.conflict-base-0/PWGEM/PhotonMeson/Tasks/CheckMCV0.cxx
index 912e2ffc07a..cfd83f6abe7 100644
--- a/.conflict-base-0/PWGEM/PhotonMeson/Tasks/CheckMCV0.cxx
+++ b/.conflict-base-0/PWGEM/PhotonMeson/Tasks/CheckMCV0.cxx
@@ -13,23 +13,25 @@
 /// \dependencies: o2-analysis-lf-lambdakzeromcfinder
 /// \author daiki.sekihata@cern.ch felix.schlepper@cern.ch
 
-#include "TDatabasePDG.h"
-#include "TMath.h"
+#include "PWGEM/PhotonMeson/DataModel/mcV0Tables.h"
+#include "PWGEM/PhotonMeson/Utils/TrackSelection.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonConstants/LHCConstants.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DetectorsBase/Propagator.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "DetectorsBase/Propagator.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "PWGEM/PhotonMeson/Utils/TrackSelection.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGEM/PhotonMeson/DataModel/mcV0Tables.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "CommonConstants/LHCConstants.h"
+
+#include "TDatabasePDG.h"
+#include "TMath.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGEM/PhotonMeson/Tasks/HeavyNeutralMeson.cxx b/.conflict-base-0/PWGEM/PhotonMeson/Tasks/HeavyNeutralMeson.cxx
index b416f173480..7e8f8250370 100644
--- a/.conflict-base-0/PWGEM/PhotonMeson/Tasks/HeavyNeutralMeson.cxx
+++ b/.conflict-base-0/PWGEM/PhotonMeson/Tasks/HeavyNeutralMeson.cxx
@@ -16,32 +16,34 @@
 /// \author Nicolas Strangmann (nicolas.strangmann@cern.ch) - Goethe University Frankfurt
 ///
 
-#include <vector>
-#include <iterator>
-#include <string>
-
-#include "Math/GenVector/Boost.h"
-#include "Math/Vector4D.h"
-#include "TMath.h"
-#include "TRandom3.h"
-
 #include "PWGEM/PhotonMeson/Utils/HNMUtilities.h"
 #include "PWGJE/DataModel/EMCALMatchedCollisions.h"
 
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/PIDResponseITS.h"
-#include "fairlogger/Logger.h"
-#include "Framework/Configurable.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonConstants/MathConstants.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/Configurable.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
-#include "CommonConstants/MathConstants.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
+
+#include "Math/GenVector/Boost.h"
+#include "Math/Vector4D.h"
+#include "TMath.h"
+#include "TRandom3.h"
+
+#include "fairlogger/Logger.h"
+
+#include <iterator>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGEM/PhotonMeson/Tasks/MaterialBudget.cxx b/.conflict-base-0/PWGEM/PhotonMeson/Tasks/MaterialBudget.cxx
index b5c1a5d8fde..d2f48e3e1ea 100644
--- a/.conflict-base-0/PWGEM/PhotonMeson/Tasks/MaterialBudget.cxx
+++ b/.conflict-base-0/PWGEM/PhotonMeson/Tasks/MaterialBudget.cxx
@@ -14,27 +14,30 @@
 // This code loops over v0 photons for studying material budget.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include <cstring>
-#include <iterator>
+#include "PWGEM/PhotonMeson/Core/CutsLibrary.h"
+#include "PWGEM/PhotonMeson/Core/HistogramsLibrary.h"
+#include "PWGEM/PhotonMeson/Core/PairCut.h"
+#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+#include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
 
-#include "TString.h"
-#include "Math/Vector4D.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/RecoDecay.h"
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
-#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/PairCut.h"
-#include "PWGEM/PhotonMeson/Core/CutsLibrary.h"
-#include "PWGEM/PhotonMeson/Core/HistogramsLibrary.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include "Math/Vector4D.h"
+#include "TString.h"
+
+#include <cstring>
+#include <iterator>
 
 using namespace o2;
 using namespace o2::aod;
@@ -112,8 +115,8 @@ struct MaterialBudget {
           THashList* list_pair_subsys_paircut = reinterpret_cast<THashList*>(list_pair_subsys_photoncut->FindObject(pair_cut_name.data()));
           o2::aod::pwgem::photon::histogram::DefineHistograms(list_pair_subsys_paircut, "material_budget_study", "Pair");
         } // end of cut3 loop pair cut
-      }   // end of cut2 loop
-    }     // end of cut1 loop
+      } // end of cut2 loop
+    } // end of cut1 loop
   }
 
   static constexpr std::string_view pairnames[9] = {"PCMPCM", "PHOSPHOS", "EMCEMC", "PCMPHOS", "PCMEMC", "PCMDalitzEE", "PCMDalitzMuMu", "PHOSEMC", "DalitzEEDalitzEE"};
@@ -245,7 +248,7 @@ struct MaterialBudget {
           reinterpret_cast<THnSparseF*>(list_v0->FindObject(cut.GetName())->FindObject("hs_conv_point"))->Fill(value);
 
         } // end of photon loop
-      }   // end of cut loop
+      } // end of cut loop
 
     } // end of collision loop
   }
@@ -298,11 +301,11 @@ struct MaterialBudget {
                 value[5] = eta_cp2;
                 reinterpret_cast<THnSparseF*>(list_pair_ss->FindObject(Form("%s_%s", tagcut.GetName(), probecut.GetName()))->FindObject(paircut.GetName())->FindObject("hs_conv_point_same"))->Fill(value);
               } // end of pair cut loop
-            }   // end of g2 loop
-          }     // end of g1 loop
-        }       // end of probecut loop
-      }         // end of tagcut loop
-    }           // end of collision loop
+            } // end of g2 loop
+          } // end of g1 loop
+        } // end of probecut loop
+      } // end of tagcut loop
+    } // end of collision loop
   }
 
   Configurable<int> ndepth{"ndepth", 10, "depth for event mixing"};
@@ -368,11 +371,11 @@ struct MaterialBudget {
                 reinterpret_cast<THnSparseF*>(list_pair_ss->FindObject(Form("%s_%s", tagcut.GetName(), probecut.GetName()))->FindObject(paircut.GetName())->FindObject("hs_conv_point_mix"))->Fill(value);
 
               } // end of pair cut loop
-            }   // end of g2 loop
-          }     // end of g1 loop
-        }       // end of probecut loop
-      }         // end of tagcut loop
-    }           // end of different collision combinations
+            } // end of g2 loop
+          } // end of g1 loop
+        } // end of probecut loop
+      } // end of tagcut loop
+    } // end of different collision combinations
   }
 
   Partition<MyCollisions> grouped_collisions = cfgCentMin < o2::aod::cent::centFT0M && o2::aod::cent::centFT0M < cfgCentMax; // this goes to same event.
diff --git a/.conflict-base-0/PWGEM/PhotonMeson/Tasks/MaterialBudgetMC.cxx b/.conflict-base-0/PWGEM/PhotonMeson/Tasks/MaterialBudgetMC.cxx
index 3fe51c1ff7c..57d34165ce8 100644
--- a/.conflict-base-0/PWGEM/PhotonMeson/Tasks/MaterialBudgetMC.cxx
+++ b/.conflict-base-0/PWGEM/PhotonMeson/Tasks/MaterialBudgetMC.cxx
@@ -14,29 +14,32 @@
 // This code loops over v0 photons for studying material budget.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include <cstring>
-#include <iterator>
+#include "PWGEM/Dilepton/Utils/MCUtilities.h"
+#include "PWGEM/PhotonMeson/Core/CutsLibrary.h"
+#include "PWGEM/PhotonMeson/Core/HistogramsLibrary.h"
+#include "PWGEM/PhotonMeson/Core/PairCut.h"
+#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+#include "PWGEM/PhotonMeson/Utils/MCUtilities.h"
+#include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
 
-#include "TString.h"
-#include "Math/Vector4D.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/RecoDecay.h"
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
-#include "PWGEM/PhotonMeson/Utils/MCUtilities.h"
-#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/PairCut.h"
-#include "PWGEM/PhotonMeson/Core/CutsLibrary.h"
-#include "PWGEM/PhotonMeson/Core/HistogramsLibrary.h"
-#include "PWGEM/Dilepton/Utils/MCUtilities.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include "Math/Vector4D.h"
+#include "TString.h"
+
+#include <cstring>
+#include <iterator>
 
 using namespace o2;
 using namespace o2::aod;
@@ -127,8 +130,8 @@ struct MaterialBudgetMC {
           THashList* list_pair_subsys_paircut = reinterpret_cast<THashList*>(list_pair_subsys_photoncut->FindObject(pair_cut_name.data()));
           o2::aod::pwgem::photon::histogram::DefineHistograms(list_pair_subsys_paircut, "material_budget_study", "Pair");
         } // end of cut3 loop pair cut
-      }   // end of probecut loop
-    }     // end of tagcut loop
+      } // end of probecut loop
+    } // end of tagcut loop
   }
 
   static constexpr std::string_view pairnames[9] = {"PCMPCM", "PHOSPHOS", "EMCEMC", "PCMPHOS", "PCMEMC", "PCMDalitzEE", "PCMDalitzMuMu", "PHOSEMC", "DalitzEEDalitzEE"};
@@ -280,7 +283,7 @@ struct MaterialBudgetMC {
           reinterpret_cast<THnSparseF*>(list_v0->FindObject(cut.GetName())->FindObject("hs_conv_point"))->Fill(value);
 
         } // end of photon loop
-      }   // end of cut loop
+      } // end of cut loop
 
     } // end of collision loop
   }
@@ -372,11 +375,11 @@ struct MaterialBudgetMC {
                 value[5] = eta_cp2;
                 reinterpret_cast<THnSparseF*>(list_pair_ss->FindObject(Form("%s_%s", tagcut.GetName(), probecut.GetName()))->FindObject(paircut.GetName())->FindObject("hs_conv_point_same"))->Fill(value);
               } // end of pair cut loop
-            }   // end of g2 loop
-          }     // end of g1 loop
-        }       // end of probecut loop
-      }         // end of tagcut loop
-    }           // end of collision loop
+            } // end of g2 loop
+          } // end of g1 loop
+        } // end of probecut loop
+      } // end of tagcut loop
+    } // end of collision loop
   }
 
   Partition<MyCollisions> grouped_collisions = cfgCentMin < o2::aod::cent::centFT0M && o2::aod::cent::centFT0M < cfgCentMax; // this goes to same event.
diff --git a/.conflict-base-0/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaEMCEMC.cxx b/.conflict-base-0/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaEMCEMC.cxx
index 3b7893f7373..3ea65c53fbd 100644
--- a/.conflict-base-0/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaEMCEMC.cxx
+++ b/.conflict-base-0/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaEMCEMC.cxx
@@ -14,14 +14,14 @@
 // This code loops over photons and makes pairs for neutral mesons analyses.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-
+#include "PWGEM/PhotonMeson/Core/Pi0EtaToGammaGamma.h"
 #include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
 #include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
-#include "PWGEM/PhotonMeson/Core/Pi0EtaToGammaGamma.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-base-0/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaMCEMCEMC.cxx b/.conflict-base-0/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaMCEMCEMC.cxx
index 7cd7ba3c492..cc91949c4a7 100644
--- a/.conflict-base-0/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaMCEMCEMC.cxx
+++ b/.conflict-base-0/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaMCEMCEMC.cxx
@@ -14,14 +14,14 @@
 // This code loops over photons and makes pairs for neutral mesons analyses.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-
+#include "PWGEM/PhotonMeson/Core/Pi0EtaToGammaGammaMC.h"
 #include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
 #include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
-#include "PWGEM/PhotonMeson/Core/Pi0EtaToGammaGammaMC.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-base-0/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaMCPCMDalitzEE.cxx b/.conflict-base-0/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaMCPCMDalitzEE.cxx
index 2d929f1a82a..d4d4e45cecc 100644
--- a/.conflict-base-0/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaMCPCMDalitzEE.cxx
+++ b/.conflict-base-0/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaMCPCMDalitzEE.cxx
@@ -14,14 +14,14 @@
 // This code loops over photons and makes pairs for neutral mesons analyses.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-
+#include "PWGEM/PhotonMeson/Core/Pi0EtaToGammaGammaMC.h"
 #include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
 #include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
-#include "PWGEM/PhotonMeson/Core/Pi0EtaToGammaGammaMC.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-base-0/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaMCPCMPCM.cxx b/.conflict-base-0/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaMCPCMPCM.cxx
index 9b79891739c..12fc3ea5067 100644
--- a/.conflict-base-0/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaMCPCMPCM.cxx
+++ b/.conflict-base-0/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaMCPCMPCM.cxx
@@ -14,14 +14,14 @@
 // This code loops over photons and makes pairs for neutral mesons analyses.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-
+#include "PWGEM/PhotonMeson/Core/Pi0EtaToGammaGammaMC.h"
 #include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
 #include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
-#include "PWGEM/PhotonMeson/Core/Pi0EtaToGammaGammaMC.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-base-0/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaPCMDalitzEE.cxx b/.conflict-base-0/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaPCMDalitzEE.cxx
index 15ccbe72bd4..bbe380442c5 100644
--- a/.conflict-base-0/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaPCMDalitzEE.cxx
+++ b/.conflict-base-0/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaPCMDalitzEE.cxx
@@ -14,15 +14,16 @@
 // This code loops over photons and makes pairs for neutral mesons analyses.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-
-#include "Common/Core/RecoDecay.h"
+#include "PWGEM/PhotonMeson/Core/Pi0EtaToGammaGamma.h"
 #include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
 #include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
-#include "PWGEM/PhotonMeson/Core/Pi0EtaToGammaGamma.h"
+
+#include "Common/Core/RecoDecay.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-base-0/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaPCMPCM.cxx b/.conflict-base-0/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaPCMPCM.cxx
index 24557c828a7..739beddd277 100644
--- a/.conflict-base-0/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaPCMPCM.cxx
+++ b/.conflict-base-0/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaPCMPCM.cxx
@@ -14,14 +14,14 @@
 // This code loops over photons and makes pairs for neutral mesons analyses.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-
+#include "PWGEM/PhotonMeson/Core/Pi0EtaToGammaGamma.h"
 #include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
 #include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
-#include "PWGEM/PhotonMeson/Core/Pi0EtaToGammaGamma.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-base-0/PWGEM/PhotonMeson/Tasks/SinglePhoton.cxx b/.conflict-base-0/PWGEM/PhotonMeson/Tasks/SinglePhoton.cxx
index 9c82fa7b09a..b0e127e5f7a 100644
--- a/.conflict-base-0/PWGEM/PhotonMeson/Tasks/SinglePhoton.cxx
+++ b/.conflict-base-0/PWGEM/PhotonMeson/Tasks/SinglePhoton.cxx
@@ -14,29 +14,32 @@
 // This code loops over photon candidate and fill histograms
 //    Please write to: daiki.sekihata@cern.ch
 
-#include <cstring>
-#include <iterator>
+#include "PWGEM/PhotonMeson/Core/CutsLibrary.h"
+#include "PWGEM/PhotonMeson/Core/EMCPhotonCut.h"
+#include "PWGEM/PhotonMeson/Core/HistogramsLibrary.h"
+#include "PWGEM/PhotonMeson/Core/PHOSPhotonCut.h"
+#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
 
-#include "TString.h"
-#include "Math/Vector4D.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/trackUtilities.h"
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/RecoDecay.h"
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/PHOSPhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/EMCPhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/CutsLibrary.h"
-#include "PWGEM/PhotonMeson/Core/HistogramsLibrary.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include "Math/Vector4D.h"
+#include "TString.h"
+
+#include <cstring>
+#include <iterator>
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-base-0/PWGEM/PhotonMeson/Tasks/SinglePhotonMC.cxx b/.conflict-base-0/PWGEM/PhotonMeson/Tasks/SinglePhotonMC.cxx
index ccb33db7f3a..5e6eded4e78 100644
--- a/.conflict-base-0/PWGEM/PhotonMeson/Tasks/SinglePhotonMC.cxx
+++ b/.conflict-base-0/PWGEM/PhotonMeson/Tasks/SinglePhotonMC.cxx
@@ -14,32 +14,35 @@
 // This code loops over photon candidate and fill histograms
 //    Please write to: daiki.sekihata@cern.ch
 
-#include <cstring>
-#include <iterator>
+#include "PWGEM/Dilepton/Utils/MCUtilities.h"
+#include "PWGEM/PhotonMeson/Core/CutsLibrary.h"
+#include "PWGEM/PhotonMeson/Core/EMCPhotonCut.h"
+#include "PWGEM/PhotonMeson/Core/HistogramsLibrary.h"
+#include "PWGEM/PhotonMeson/Core/PHOSPhotonCut.h"
+#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+#include "PWGEM/PhotonMeson/Utils/MCUtilities.h"
 
-#include "TString.h"
-#include "TMath.h"
-#include "Math/Vector4D.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/trackUtilities.h"
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/RecoDecay.h"
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/PhotonMeson/Utils/MCUtilities.h"
-#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/PHOSPhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/EMCPhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/CutsLibrary.h"
-#include "PWGEM/PhotonMeson/Core/HistogramsLibrary.h"
-#include "PWGEM/Dilepton/Utils/MCUtilities.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include "Math/Vector4D.h"
+#include "TMath.h"
+#include "TString.h"
+
+#include <cstring>
+#include <iterator>
 
 using namespace o2;
 using namespace o2::aod;
@@ -351,8 +354,8 @@ struct SinglePhotonMC {
           }
 
         } // end of photon loop
-      }   // end of cut loop
-    }     // end of collision loop
+      } // end of cut loop
+    } // end of collision loop
   }
 
   Partition<MyCollisions> grouped_collisions = (cfgCentMin < o2::aod::cent::centFT0M && o2::aod::cent::centFT0M < cfgCentMax) || (cfgCentMin < o2::aod::cent::centFT0A && o2::aod::cent::centFT0A < cfgCentMax) || (cfgCentMin < o2::aod::cent::centFT0C && o2::aod::cent::centFT0C < cfgCentMax); // this goes to same event.
diff --git a/.conflict-base-0/PWGEM/PhotonMeson/Tasks/TagAndProbe.cxx b/.conflict-base-0/PWGEM/PhotonMeson/Tasks/TagAndProbe.cxx
index 2f91a62dc43..b305a76228e 100644
--- a/.conflict-base-0/PWGEM/PhotonMeson/Tasks/TagAndProbe.cxx
+++ b/.conflict-base-0/PWGEM/PhotonMeson/Tasks/TagAndProbe.cxx
@@ -14,28 +14,31 @@
 // This code is for data-driven efficiency for photon analyses. tag and probe method
 //    Please write to: daiki.sekihata@cern.ch
 
-#include <cstring>
-#include <iterator>
+#include "PWGEM/PhotonMeson/Core/CutsLibrary.h"
+#include "PWGEM/PhotonMeson/Core/EMCPhotonCut.h"
+#include "PWGEM/PhotonMeson/Core/HistogramsLibrary.h"
+#include "PWGEM/PhotonMeson/Core/PHOSPhotonCut.h"
+#include "PWGEM/PhotonMeson/Core/PairCut.h"
+#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+#include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
 
-#include "TString.h"
-#include "Math/Vector4D.h"
-#include "Math/Vector3D.h"
+#include "Common/Core/RecoDecay.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "Math/AxisAngle.h"
 #include "Math/LorentzRotation.h"
 #include "Math/Rotation3D.h"
-#include "Math/AxisAngle.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/Core/RecoDecay.h"
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
-#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/PHOSPhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/EMCPhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/PairCut.h"
-#include "PWGEM/PhotonMeson/Core/CutsLibrary.h"
-#include "PWGEM/PhotonMeson/Core/HistogramsLibrary.h"
+#include "Math/Vector3D.h"
+#include "Math/Vector4D.h"
+#include "TString.h"
+
+#include <cstring>
+#include <iterator>
 
 using namespace o2;
 using namespace o2::aod;
@@ -126,7 +129,7 @@ struct TagAndProbe {
         THashList* list_pair_subsys_paircut = reinterpret_cast<THashList*>(list_pair_subsys_photoncut->FindObject(pair_cut_name.data()));
         o2::aod::pwgem::photon::histogram::DefineHistograms(list_pair_subsys_paircut, "tag_and_probe", pairname.data());
       } // end of cut3 loop pair cut
-    }   // end of cut2 loop
+    } // end of cut2 loop
   }
 
   static constexpr std::string_view pairnames[6] = {"PCMPCM", "PHOSPHOS", "EMCEMC", "PCMPHOS", "PCMEMC", "PHOSEMC"};
@@ -318,10 +321,10 @@ struct TagAndProbe {
                 RotationBackground<aod::SkimEMCClusters>(v12, v1, v2, photons2_coll, g1.globalIndex(), g2.globalIndex(), probecut, paircut, emcmatchedtracks);
               }
             } // end of probe cut loop
-          }   // end of pair cut loop
-        }     // end of g2 loop
-      }       // end of g1 loop
-    }         // end of collision loop
+          } // end of pair cut loop
+        } // end of g2 loop
+      } // end of g1 loop
+    } // end of collision loop
   }
 
   Configurable<int> ndepth{"ndepth", 10, "depth for event mixing"};
@@ -406,10 +409,10 @@ struct TagAndProbe {
               reinterpret_cast<TH2F*>(list_pair_ss->FindObject(Form("%s_%s", tagcut.GetName(), probecut.GetName()))->FindObject(paircut.GetName())->FindObject("hMggPt_PassingProbe_Mixed"))->Fill(v12.M(), v2.Pt());
 
             } // end of probe cut loop
-          }   // end of pair cut loop
-        }     // end of g2 loop
-      }       // end of g1 loop
-    }         // end of different collision combinations
+          } // end of pair cut loop
+        } // end of g2 loop
+      } // end of g1 loop
+    } // end of different collision combinations
   }
 
   /// \brief Calculate background (using rotation background method only for EMCal!)
diff --git a/.conflict-base-0/PWGEM/PhotonMeson/Tasks/TaggingPi0MCPCMDalitzEE.cxx b/.conflict-base-0/PWGEM/PhotonMeson/Tasks/TaggingPi0MCPCMDalitzEE.cxx
index ccdc4184568..22dfbe45376 100644
--- a/.conflict-base-0/PWGEM/PhotonMeson/Tasks/TaggingPi0MCPCMDalitzEE.cxx
+++ b/.conflict-base-0/PWGEM/PhotonMeson/Tasks/TaggingPi0MCPCMDalitzEE.cxx
@@ -14,10 +14,11 @@
 // This code loops over photons and makes pairs for neutral mesons analyses.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "PWGEM/PhotonMeson/Core/TaggingPi0MC.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::aod;
 
diff --git a/.conflict-base-0/PWGEM/PhotonMeson/Tasks/TaggingPi0PCMDalitzEE.cxx b/.conflict-base-0/PWGEM/PhotonMeson/Tasks/TaggingPi0PCMDalitzEE.cxx
index 2292faef120..ce583e23b5f 100644
--- a/.conflict-base-0/PWGEM/PhotonMeson/Tasks/TaggingPi0PCMDalitzEE.cxx
+++ b/.conflict-base-0/PWGEM/PhotonMeson/Tasks/TaggingPi0PCMDalitzEE.cxx
@@ -14,10 +14,11 @@
 // This code loops over photons and makes pairs for neutral mesons analyses.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "PWGEM/PhotonMeson/Core/TaggingPi0.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::aod;
 
diff --git a/.conflict-base-0/PWGEM/PhotonMeson/Tasks/emcalPi0QC.cxx b/.conflict-base-0/PWGEM/PhotonMeson/Tasks/emcalPi0QC.cxx
index 509e74402b5..743e4a67f25 100644
--- a/.conflict-base-0/PWGEM/PhotonMeson/Tasks/emcalPi0QC.cxx
+++ b/.conflict-base-0/PWGEM/PhotonMeson/Tasks/emcalPi0QC.cxx
@@ -9,36 +9,35 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <climits>
-#include <cstdlib>
-#include <map>
-#include <memory>
-#include <sstream>
-#include <string>
-#include <vector>
-#include <cmath>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoA.h"
-#include "Framework/HistogramRegistry.h"
+#include "PWGJE/DataModel/EMCALClusters.h"
+#include "PWGJE/DataModel/EMCALMatchedCollisions.h"
 
-#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 
-#include "EMCALBase/Geometry.h"
-#include "PWGJE/DataModel/EMCALClusters.h"
-#include "PWGJE/DataModel/EMCALMatchedCollisions.h"
+#include "CommonDataFormat/InteractionRecord.h"
+#include "DataFormatsEMCAL/AnalysisCluster.h"
 #include "DataFormatsEMCAL/Cell.h"
 #include "DataFormatsEMCAL/Constants.h"
-#include "DataFormatsEMCAL/AnalysisCluster.h"
-
-#include "CommonDataFormat/InteractionRecord.h"
+#include "EMCALBase/Geometry.h"
+#include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 
 #include "TLorentzVector.h"
 #include "TVector3.h"
 
+#include <climits>
+#include <cmath>
+#include <cstdlib>
+#include <map>
+#include <memory>
+#include <sstream>
+#include <string>
+#include <vector>
+
 // \struct Pi0QCTask
 /// \brief Simple monitoring task for EMCal clusters
 /// \author Joshua Koenig <joshua.konig@cern.ch>, Goethe University Frankfurt
diff --git a/.conflict-base-0/PWGEM/PhotonMeson/Tasks/emcalQC.cxx b/.conflict-base-0/PWGEM/PhotonMeson/Tasks/emcalQC.cxx
index 4173c26eccf..91b558cb609 100644
--- a/.conflict-base-0/PWGEM/PhotonMeson/Tasks/emcalQC.cxx
+++ b/.conflict-base-0/PWGEM/PhotonMeson/Tasks/emcalQC.cxx
@@ -18,28 +18,32 @@
 /// \author Nicolas Strangmann (nicolas.strangmann@cern.ch) Goethe University Frankfurt
 ///
 
-#include <string>
-#include <vector>
-#include <array>
-#include "TString.h"
-#include "THashList.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/trackUtilities.h"
+#include "PWGEM/PhotonMeson/Core/CutsLibrary.h"
+#include "PWGEM/PhotonMeson/Core/EMCPhotonCut.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+#include "PWGEM/PhotonMeson/Utils/ClusterHistograms.h"
+#include "PWGEM/PhotonMeson/Utils/EventHistograms.h"
+
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/RecoDecay.h"
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/PhotonMeson/Core/EMCPhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/CutsLibrary.h"
-#include "PWGEM/PhotonMeson/Utils/EventHistograms.h"
-#include "PWGEM/PhotonMeson/Utils/ClusterHistograms.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include "THashList.h"
+#include "TString.h"
+
+#include <array>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-base-0/PWGEM/PhotonMeson/Tasks/gammaConversions.cxx b/.conflict-base-0/PWGEM/PhotonMeson/Tasks/gammaConversions.cxx
index 37e4bf4dde1..933dd12944f 100644
--- a/.conflict-base-0/PWGEM/PhotonMeson/Tasks/gammaConversions.cxx
+++ b/.conflict-base-0/PWGEM/PhotonMeson/Tasks/gammaConversions.cxx
@@ -15,21 +15,22 @@
 
 #include "PWGEM/PhotonMeson/Tasks/gammaConversions.h"
 
-#include <map>
-#include <vector>
-#include <string>
-#include <memory>
-
 #include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
 #include "PWGEM/PhotonMeson/Utils/gammaConvDefinitions.h"
 
-#include "Framework/AnalysisTask.h"
+#include "Common/Core/RecoDecay.h"
+
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "Common/Core/RecoDecay.h"
 
-#include <TVector3.h>
 #include <TMath.h> // for ATan2, Cos, Sin, Sqrt
+#include <TVector3.h>
+
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGEM/PhotonMeson/Tasks/gammaConversions.h b/.conflict-base-0/PWGEM/PhotonMeson/Tasks/gammaConversions.h
index 9e1c9ebe7db..a09121baf36 100644
--- a/.conflict-base-0/PWGEM/PhotonMeson/Tasks/gammaConversions.h
+++ b/.conflict-base-0/PWGEM/PhotonMeson/Tasks/gammaConversions.h
@@ -162,4 +162,5 @@ struct tHistoRegistry {
   tHistoFolderCTV mCollision{mPath + "Collision/"};
   tHistoFolderCTV mTrack{mPath + "Track/"};
   tHistoFolderCTV mV0{mPath + "V0/"};
-};
\ No newline at end of file
+};
+  
\ No newline at end of file
diff --git a/.conflict-base-0/PWGEM/PhotonMeson/Tasks/gammaConversionsTruthOnlyMc.cxx b/.conflict-base-0/PWGEM/PhotonMeson/Tasks/gammaConversionsTruthOnlyMc.cxx
index 259a53cd037..89c094c530b 100644
--- a/.conflict-base-0/PWGEM/PhotonMeson/Tasks/gammaConversionsTruthOnlyMc.cxx
+++ b/.conflict-base-0/PWGEM/PhotonMeson/Tasks/gammaConversionsTruthOnlyMc.cxx
@@ -17,12 +17,12 @@
 #include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
 #include "PWGEM/PhotonMeson/Utils/gammaConvDefinitions.h"
 
-#include "TVector3.h"
-
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
 
+#include "TVector3.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
@@ -163,4 +163,5 @@ struct gammaConversionsTruthOnlyMc {
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
   return WorkflowSpec{adaptAnalysisTask<gammaConversionsTruthOnlyMc>(cfgc)};
-}
\ No newline at end of file
+}
+ 
\ No newline at end of file
diff --git a/.conflict-base-0/PWGEM/PhotonMeson/Tasks/mcGeneratorStudies.cxx b/.conflict-base-0/PWGEM/PhotonMeson/Tasks/mcGeneratorStudies.cxx
index 889858359ed..d7c5aafb298 100644
--- a/.conflict-base-0/PWGEM/PhotonMeson/Tasks/mcGeneratorStudies.cxx
+++ b/.conflict-base-0/PWGEM/PhotonMeson/Tasks/mcGeneratorStudies.cxx
@@ -16,11 +16,11 @@
 /// \author Nicolas Strangmann (nicolas.strangmann@cern.ch) - Goethe University Frankfurt
 ///
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 
 #include "TDatabasePDG.h"
 
diff --git a/.conflict-base-0/PWGEM/PhotonMeson/Tasks/pcmQC.cxx b/.conflict-base-0/PWGEM/PhotonMeson/Tasks/pcmQC.cxx
index 077a1be9f7d..9c621c62745 100644
--- a/.conflict-base-0/PWGEM/PhotonMeson/Tasks/pcmQC.cxx
+++ b/.conflict-base-0/PWGEM/PhotonMeson/Tasks/pcmQC.cxx
@@ -14,18 +14,18 @@
 // This code runs loop over v0 photons for PCM QC.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include <string>
-#include <vector>
+#include "PWGEM/PhotonMeson/Core/EMPhotonEventCut.h"
+#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+#include "PWGEM/PhotonMeson/Utils/PCMUtilities.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
-#include "PWGEM/PhotonMeson/Utils/PCMUtilities.h"
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/EMPhotonEventCut.h"
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-base-0/PWGEM/PhotonMeson/Tasks/pcmQCMC.cxx b/.conflict-base-0/PWGEM/PhotonMeson/Tasks/pcmQCMC.cxx
index 0587fe75138..694941112ba 100644
--- a/.conflict-base-0/PWGEM/PhotonMeson/Tasks/pcmQCMC.cxx
+++ b/.conflict-base-0/PWGEM/PhotonMeson/Tasks/pcmQCMC.cxx
@@ -14,20 +14,20 @@
 // This code runs loop over v0 photons for PCM QC.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include <string>
-#include <vector>
+#include "PWGEM/Dilepton/Utils/MCUtilities.h"
+#include "PWGEM/PhotonMeson/Core/EMPhotonEventCut.h"
+#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+#include "PWGEM/PhotonMeson/Utils/MCUtilities.h"
+#include "PWGEM/PhotonMeson/Utils/PCMUtilities.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/PhotonMeson/Utils/PCMUtilities.h"
-#include "PWGEM/PhotonMeson/Utils/MCUtilities.h"
-#include "PWGEM/Dilepton/Utils/MCUtilities.h"
-#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/EMPhotonEventCut.h"
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-base-0/PWGEM/PhotonMeson/Tasks/phosQC.cxx b/.conflict-base-0/PWGEM/PhotonMeson/Tasks/phosQC.cxx
index e7009b94f05..074a517122f 100644
--- a/.conflict-base-0/PWGEM/PhotonMeson/Tasks/phosQC.cxx
+++ b/.conflict-base-0/PWGEM/PhotonMeson/Tasks/phosQC.cxx
@@ -14,25 +14,29 @@
 // This code runs loop over PHOS clusters for PHOS QC.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include <array>
-#include "TString.h"
-#include "THashList.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/trackUtilities.h"
+#include "PWGEM/PhotonMeson/Core/CutsLibrary.h"
+#include "PWGEM/PhotonMeson/Core/HistogramsLibrary.h"
+#include "PWGEM/PhotonMeson/Core/PHOSPhotonCut.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/RecoDecay.h"
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/PhotonMeson/Core/PHOSPhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/CutsLibrary.h"
-#include "PWGEM/PhotonMeson/Core/HistogramsLibrary.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include "THashList.h"
+#include "TString.h"
+
+#include <array>
 
 using namespace o2;
 using namespace o2::aod;
@@ -148,8 +152,8 @@ struct phosQC {
         } // end of v0 loop
         reinterpret_cast<TH1F*>(fMainList->FindObject("Cluster")->FindObject(cut.GetName())->FindObject("hNgamma"))->Fill(ng);
       } // end of cut loop
-    }   // end of collision loop
-  }     // end of process
+    } // end of collision loop
+  } // end of process
 
   void processDummy(MyCollisions const&) {}
 
diff --git a/.conflict-base-0/PWGEM/PhotonMeson/Tasks/prefilterPhoton.cxx b/.conflict-base-0/PWGEM/PhotonMeson/Tasks/prefilterPhoton.cxx
index 4b0ce098f6c..41975a0a9c6 100644
--- a/.conflict-base-0/PWGEM/PhotonMeson/Tasks/prefilterPhoton.cxx
+++ b/.conflict-base-0/PWGEM/PhotonMeson/Tasks/prefilterPhoton.cxx
@@ -14,32 +14,33 @@
 // This code produces information on prefilter for photon.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include <string>
-#include <vector>
-#include <unordered_map>
 #include <map>
+#include <string>
 #include <tuple>
+#include <unordered_map>
+#include <vector>
 
 // #include "TString.h"
-#include "Math/Vector4D.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "Math/Vector4D.h"
 // #include "Common/Core/RecoDecay.h"
+#include "PWGEM/Dilepton/Utils/PairUtilities.h"
+#include "PWGEM/PhotonMeson/Core/DalitzEECut.h"
+#include "PWGEM/PhotonMeson/Core/EMPhotonEventCut.h"
+#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+#include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
+
 #include "Common/Core/trackUtilities.h"
 
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
 #include "CCDB/BasicCCDBManager.h"
-
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
-#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/EMPhotonEventCut.h"
-#include "PWGEM/PhotonMeson/Core/DalitzEECut.h"
-#include "PWGEM/Dilepton/Utils/PairUtilities.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-base-0/PWGEM/PhotonMeson/Tasks/taskPi0FlowEMC.cxx b/.conflict-base-0/PWGEM/PhotonMeson/Tasks/taskPi0FlowEMC.cxx
index 2e64bd6ebe2..b2eb97a3ac4 100644
--- a/.conflict-base-0/PWGEM/PhotonMeson/Tasks/taskPi0FlowEMC.cxx
+++ b/.conflict-base-0/PWGEM/PhotonMeson/Tasks/taskPi0FlowEMC.cxx
@@ -14,47 +14,46 @@
 ///
 /// \author M. Hemmer, marvin.hemmer@cern.ch
 
-#include <numbers>
-#include <iterator>
-#include <array>
-#include <string>
-#include <map>
-#include <algorithm>
-#include <vector>
-#include <tuple>
-#include <utility>
-#include <cmath>
-
-#include "Math/Vector4D.h"
-#include "Math/Vector3D.h"
-#include "Math/LorentzRotation.h"
-#include "Math/Rotation3D.h"
-#include "Math/AxisAngle.h"
-
-#include "CCDB/BasicCCDBManager.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
+#include "PWGEM/Dilepton/Utils/EMTrackUtilities.h"
+#include "PWGEM/PhotonMeson/Core/EMCPhotonCut.h"
+#include "PWGEM/PhotonMeson/Core/EMPhotonEventCut.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+#include "PWGEM/PhotonMeson/Utils/EventHistograms.h"
+#include "PWGEM/PhotonMeson/Utils/NMHistograms.h"
+#include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
+#include "PWGEM/PhotonMeson/Utils/emcalHistoDefinitions.h"
 
 #include "Common/Core/EventPlaneHelper.h"
 #include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/Qvectors.h"
-#include "CommonConstants/MathConstants.h"
 
-#include "DetectorsBase/GeometryManager.h"
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonConstants/MathConstants.h"
 #include "DataFormatsEMCAL/Constants.h"
+#include "DetectorsBase/GeometryManager.h"
 #include "EMCALBase/Geometry.h"
 #include "EMCALCalib/BadChannelMap.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 
-#include "PWGEM/Dilepton/Utils/EMTrackUtilities.h"
-#include "PWGEM/PhotonMeson/Core/EMCPhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/EMPhotonEventCut.h"
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/PhotonMeson/Utils/emcalHistoDefinitions.h"
-#include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
-#include "PWGEM/PhotonMeson/Utils/EventHistograms.h"
-#include "PWGEM/PhotonMeson/Utils/NMHistograms.h"
+#include "Math/AxisAngle.h"
+#include "Math/LorentzRotation.h"
+#include "Math/Rotation3D.h"
+#include "Math/Vector3D.h"
+#include "Math/Vector4D.h"
+
+#include <algorithm>
+#include <array>
+#include <cmath>
+#include <iterator>
+#include <map>
+#include <numbers>
+#include <string>
+#include <tuple>
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-base-0/PWGEM/PhotonMeson/Utils/HNMUtilities.h b/.conflict-base-0/PWGEM/PhotonMeson/Utils/HNMUtilities.h
index bb985686285..24472e677d4 100644
--- a/.conflict-base-0/PWGEM/PhotonMeson/Utils/HNMUtilities.h
+++ b/.conflict-base-0/PWGEM/PhotonMeson/Utils/HNMUtilities.h
@@ -19,23 +19,26 @@
 #ifndef PWGEM_PHOTONMESON_UTILS_HNMUTILITIES_H_
 #define PWGEM_PHOTONMESON_UTILS_HNMUTILITIES_H_
 
-#include <CommonConstants/MathConstants.h>
-#include <CommonConstants/PhysicsConstants.h>
-#include <vector>
-#include "TVector3.h"
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Common/DataModel/EventSelection.h"
-#include "EMCALBase/Geometry.h"
-#include "PWGJE/DataModel/EMCALClusters.h"
 #include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
 #include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
+#include "PWGJE/DataModel/EMCALClusters.h"
+
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 #include "EventFiltering/filterTables.h"
 
+#include "EMCALBase/Geometry.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include <CommonConstants/MathConstants.h>
+#include <CommonConstants/PhysicsConstants.h>
+
+#include "TVector3.h"
+
+#include <vector>
+
 namespace o2::aod::pwgem::photonmeson::hnmutilities
 {
 // -------> Struct to store photons from EMC clusters or V0s
diff --git a/.conflict-base-0/PWGEM/PhotonMeson/Utils/PCMUtilities.h b/.conflict-base-0/PWGEM/PhotonMeson/Utils/PCMUtilities.h
index e82d580cfcd..03c3b366e58 100644
--- a/.conflict-base-0/PWGEM/PhotonMeson/Utils/PCMUtilities.h
+++ b/.conflict-base-0/PWGEM/PhotonMeson/Utils/PCMUtilities.h
@@ -15,11 +15,13 @@
 #ifndef PWGEM_PHOTONMESON_UTILS_PCMUTILITIES_H_
 #define PWGEM_PHOTONMESON_UTILS_PCMUTILITIES_H_
 
-#include <TVector2.h>
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/trackUtilities.h"
+
 #include "DCAFitter/HelixHelper.h"
 #include "DetectorsBase/Propagator.h"
-#include "Common/Core/trackUtilities.h"
-#include "Common/Core/RecoDecay.h"
+
+#include <TVector2.h>
 
 //_______________________________________________________________________
 inline bool checkAP(const float alpha, const float qt, const float alpha_max = 0.95, const float qt_max = 0.05)
diff --git a/.conflict-base-0/PWGEM/PhotonMeson/Utils/PairUtilities.h b/.conflict-base-0/PWGEM/PhotonMeson/Utils/PairUtilities.h
index 86ac4f0eb16..3fa44f1c735 100644
--- a/.conflict-base-0/PWGEM/PhotonMeson/Utils/PairUtilities.h
+++ b/.conflict-base-0/PWGEM/PhotonMeson/Utils/PairUtilities.h
@@ -16,6 +16,7 @@
 #define PWGEM_PHOTONMESON_UTILS_PAIRUTILITIES_H_
 
 #include <TVector2.h>
+
 #include <cmath>
 
 namespace o2::aod::pwgem::photonmeson::utils::pairutil
diff --git a/.conflict-base-0/PWGEM/PhotonMeson/Utils/emcalHistoDefinitions.h b/.conflict-base-0/PWGEM/PhotonMeson/Utils/emcalHistoDefinitions.h
index 6ce678e9c35..2540064309a 100644
--- a/.conflict-base-0/PWGEM/PhotonMeson/Utils/emcalHistoDefinitions.h
+++ b/.conflict-base-0/PWGEM/PhotonMeson/Utils/emcalHistoDefinitions.h
@@ -12,10 +12,10 @@
 /// \brief commonly used histogram (axis) definitions for emcal in PWGEM
 /// \author marvin.hemmer@cern.ch
 
-#include <vector>
-
 #include "Framework/AnalysisTask.h"
 
+#include <vector>
+
 #ifndef PWGEM_PHOTONMESON_UTILS_EMCALHISTODEFINITIONS_H_
 #define PWGEM_PHOTONMESON_UTILS_EMCALHISTODEFINITIONS_H_
 
diff --git a/.conflict-base-0/PWGEM/PhotonMeson/Utils/gammaSelectionCuts.h b/.conflict-base-0/PWGEM/PhotonMeson/Utils/gammaSelectionCuts.h
index 341a6c95e38..8fe140ef92d 100644
--- a/.conflict-base-0/PWGEM/PhotonMeson/Utils/gammaSelectionCuts.h
+++ b/.conflict-base-0/PWGEM/PhotonMeson/Utils/gammaSelectionCuts.h
@@ -12,10 +12,11 @@
 /// \brief cut selection and cut functions for photon candidates
 /// \author marvin.hemmer@cern.ch
 
-#include <vector>
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
 
 #include "Framework/AnalysisTask.h"
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+
+#include <vector>
 
 #ifndef PWGEM_PHOTONMESON_UTILS_GAMMASELECTIONCUTS_H_
 #define PWGEM_PHOTONMESON_UTILS_GAMMASELECTIONCUTS_H_
diff --git a/.conflict-base-0/PWGEM/Tasks/phosAlign.cxx b/.conflict-base-0/PWGEM/Tasks/phosAlign.cxx
index d63d77b84e5..e628250a670 100644
--- a/.conflict-base-0/PWGEM/Tasks/phosAlign.cxx
+++ b/.conflict-base-0/PWGEM/Tasks/phosAlign.cxx
@@ -9,35 +9,35 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <climits>
-#include <cstdlib>
-#include <map>
-#include <memory>
-#include <vector>
-#include "Common/Core/trackUtilities.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/CaloClusters.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "ReconstructionDataFormats/TrackParametrization.h"
 
-#include "Framework/ConfigParamSpec.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonDataFormat/InteractionRecord.h"
+#include "DataFormatsParameters/GRPLHCIFData.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DetectorsBase/Propagator.h"
 #include "Framework/ASoA.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/ConfigParamSpec.h"
 #include "Framework/HistogramRegistry.h"
-
+#include "Framework/runDataProcessing.h"
 #include "PHOSBase/Geometry.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CommonDataFormat/InteractionRecord.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPLHCIFData.h"
-#include "DetectorsBase/Propagator.h"
+#include "ReconstructionDataFormats/TrackParametrization.h"
+
+#include <climits>
+#include <cstdlib>
+#include <map>
+#include <memory>
+#include <vector>
 
 /// \struct PHOS pi0 analysis
 /// \brief Monitoring task for PHOS related quantities
diff --git a/.conflict-base-0/PWGEM/Tasks/phosCalibration.cxx b/.conflict-base-0/PWGEM/Tasks/phosCalibration.cxx
index 1116f47f0f2..59b6c295be2 100644
--- a/.conflict-base-0/PWGEM/Tasks/phosCalibration.cxx
+++ b/.conflict-base-0/PWGEM/Tasks/phosCalibration.cxx
@@ -9,35 +9,35 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <climits>
-#include <cstdlib>
-#include <map>
-#include <memory>
-#include <vector>
-#include "TFile.h"
-#include "TGrid.h"
-#include "TLorentzVector.h"
-
-#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/CaloClusters.h"
+#include "Common/DataModel/EventSelection.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonDataFormat/InteractionRecord.h"
+#include "CommonUtils/NameConf.h"
+#include "DataFormatsPHOS/BadChannelsMap.h"
+#include "DataFormatsPHOS/CalibParams.h"
 #include "DataFormatsPHOS/Cell.h"
 #include "DataFormatsPHOS/Cluster.h"
 #include "DataFormatsPHOS/TriggerRecord.h"
-#include "DataFormatsPHOS/BadChannelsMap.h"
-#include "DataFormatsPHOS/CalibParams.h"
+#include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/ConfigParamSpec.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 #include "PHOSBase/Geometry.h"
 #include "PHOSReconstruction/Clusterer.h"
 
-#include "Framework/ConfigParamSpec.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoA.h"
-#include "Framework/HistogramRegistry.h"
-#include "CommonUtils/NameConf.h"
-#include "CCDB/BasicCCDBManager.h"
+#include "TFile.h"
+#include "TGrid.h"
+#include "TLorentzVector.h"
 
-#include "CommonDataFormat/InteractionRecord.h"
+#include <climits>
+#include <cstdlib>
+#include <map>
+#include <memory>
+#include <vector>
 
 using namespace o2;
 using namespace o2::aod::evsel;
diff --git a/.conflict-base-0/PWGEM/Tasks/phosCellQA.cxx b/.conflict-base-0/PWGEM/Tasks/phosCellQA.cxx
index 710244c1a6d..26a627830ca 100644
--- a/.conflict-base-0/PWGEM/Tasks/phosCellQA.cxx
+++ b/.conflict-base-0/PWGEM/Tasks/phosCellQA.cxx
@@ -9,26 +9,26 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <climits>
-#include <cstdlib>
-#include <map>
-#include <memory>
-#include <vector>
-#include <string>
+#include "Common/DataModel/EventSelection.h"
 
 #include "CCDB/BasicCCDBManager.h"
-#include "Common/DataModel/EventSelection.h"
-#include "DataFormatsPHOS/Cell.h"
+#include "CommonDataFormat/InteractionRecord.h"
 #include "DataFormatsPHOS/CalibParams.h"
-#include "Framework/ConfigParamSpec.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "DataFormatsPHOS/Cell.h"
 #include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/ConfigParamSpec.h"
 #include "Framework/HistogramRegistry.h"
-
+#include "Framework/runDataProcessing.h"
 #include "PHOSBase/Geometry.h"
-#include "CommonDataFormat/InteractionRecord.h"
+
+#include <climits>
+#include <cstdlib>
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
 
 /// \struct PHOS QA
 /// \brief Monitoring task for PHOS related quantities
diff --git a/.conflict-base-0/PWGEM/Tasks/phosCluQA.cxx b/.conflict-base-0/PWGEM/Tasks/phosCluQA.cxx
index e563dc3aebe..6ccf4f2ed3c 100644
--- a/.conflict-base-0/PWGEM/Tasks/phosCluQA.cxx
+++ b/.conflict-base-0/PWGEM/Tasks/phosCluQA.cxx
@@ -9,26 +9,26 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <climits>
-#include <cstdlib>
-#include <map>
-#include <memory>
-#include <vector>
 #include "Common/DataModel/CaloClusters.h"
 #include "Common/DataModel/EventSelection.h"
 
-#include "Framework/ConfigParamSpec.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoA.h"
-#include "Framework/HistogramRegistry.h"
-#include "CommonUtils/NameConf.h"
 #include "CCDB/BasicCCDBManager.h"
+#include "CommonDataFormat/InteractionRecord.h"
+#include "CommonUtils/NameConf.h"
 #include "DataFormatsParameters/GRPLHCIFData.h"
-
+#include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/ConfigParamSpec.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 #include "PHOSBase/Geometry.h"
-#include "CommonDataFormat/InteractionRecord.h"
+
+#include <climits>
+#include <cstdlib>
+#include <map>
+#include <memory>
+#include <vector>
 
 /// \struct PHOS QA
 /// \brief Monitoring task for PHOS related quantities
diff --git a/.conflict-base-0/PWGEM/Tasks/phosElId.cxx b/.conflict-base-0/PWGEM/Tasks/phosElId.cxx
index 23e09da288f..2734e57e1dd 100644
--- a/.conflict-base-0/PWGEM/Tasks/phosElId.cxx
+++ b/.conflict-base-0/PWGEM/Tasks/phosElId.cxx
@@ -16,37 +16,40 @@
 /// \author Yeghishe Hambardzumyan, MIPT
 /// \since Apr, 2024
 
-#include <climits>
-#include <cstdlib>
-#include <map>
-#include <memory>
-#include <vector>
-#include "Common/Core/trackUtilities.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/CaloClusters.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/FT0Corrected.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "ReconstructionDataFormats/TrackParametrization.h"
-#include "Framework/ConfigParamSpec.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonDataFormat/InteractionRecord.h"
+#include "DataFormatsParameters/GRPLHCIFData.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DetectorsBase/Propagator.h"
 #include "Framework/ASoA.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/ConfigParamSpec.h"
 #include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 #include "PHOSBase/Geometry.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CommonDataFormat/InteractionRecord.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPLHCIFData.h"
-#include "DetectorsBase/Propagator.h"
+#include "ReconstructionDataFormats/TrackParametrization.h"
+
 #include "TF1.h"
 
+#include <climits>
+#include <cstdlib>
+#include <map>
+#include <memory>
+#include <vector>
+
 using namespace o2;
 using namespace o2::soa;
 using namespace o2::aod::evsel;
diff --git a/.conflict-base-0/PWGEM/Tasks/phosNbar.cxx b/.conflict-base-0/PWGEM/Tasks/phosNbar.cxx
index 7cd2e4387a7..31e35368a6b 100644
--- a/.conflict-base-0/PWGEM/Tasks/phosNbar.cxx
+++ b/.conflict-base-0/PWGEM/Tasks/phosNbar.cxx
@@ -8,30 +8,30 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include <queue>
-#include "TRandom.h"
-
 #include "Common/Core/trackUtilities.h"
-#include "Framework/ConfigParamSpec.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoA.h"
-#include "Framework/HistogramRegistry.h"
-#include "CommonUtils/NameConf.h"
+#include "Common/DataModel/CaloClusters.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "CommonDataFormat/InteractionRecord.h"
+#include "CommonUtils/NameConf.h"
 #include "DataFormatsParameters/GRPLHCIFData.h"
 #include "DataFormatsParameters/GRPMagField.h"
 #include "DetectorsBase/Propagator.h"
-
+#include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/ConfigParamSpec.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include "PHOSBase/Geometry.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/CaloClusters.h"
 
-#include "PHOSBase/Geometry.h"
-#include "CommonDataFormat/InteractionRecord.h"
+#include "TRandom.h"
+
+#include <queue>
 
 /// \struct phosNbar
 /// \brief account Nbar who's clusters appeared within PHOS
diff --git a/.conflict-base-0/PWGEM/Tasks/phosNonlin.cxx b/.conflict-base-0/PWGEM/Tasks/phosNonlin.cxx
index f25043c5f0c..4cbb9e11219 100644
--- a/.conflict-base-0/PWGEM/Tasks/phosNonlin.cxx
+++ b/.conflict-base-0/PWGEM/Tasks/phosNonlin.cxx
@@ -14,15 +14,6 @@
 /// \author Dmitri Peresunko <Dmitri.Peresunko@cern.ch>
 ///
 
-#include <array>
-#include <climits>
-#include <cstdlib>
-#include <map>
-#include <memory>
-#include <string>
-#include <vector>
-
-#include <TLorentzVector.h>
 #include "Common/DataModel/CaloClusters.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
@@ -30,18 +21,27 @@
 #include "EventFiltering/Zorro.h"
 #include "EventFiltering/ZorroSummary.h"
 
-#include "Framework/ConfigParamSpec.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonDataFormat/InteractionRecord.h"
+#include "DataFormatsParameters/GRPLHCIFData.h"
 #include "Framework/ASoA.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/ConfigParamSpec.h"
 #include "Framework/HistogramRegistry.h"
-
+#include "Framework/runDataProcessing.h"
 #include "PHOSBase/Geometry.h"
-#include "CommonDataFormat/InteractionRecord.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPLHCIFData.h"
+
+#include <TLorentzVector.h>
+
+#include <array>
+#include <climits>
+#include <cstdlib>
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::aod::evsel;
diff --git a/.conflict-base-0/PWGEM/Tasks/phosPi0.cxx b/.conflict-base-0/PWGEM/Tasks/phosPi0.cxx
index a47aaa0d485..cccae5045aa 100644
--- a/.conflict-base-0/PWGEM/Tasks/phosPi0.cxx
+++ b/.conflict-base-0/PWGEM/Tasks/phosPi0.cxx
@@ -14,34 +14,32 @@
 /// \author Dmitri Peresunko <Dmitri.Peresunko@cern.ch>
 ///
 
-#include <algorithm>
-#include <climits>
-#include <cstdlib>
-#include <map>
-#include <memory>
-#include <string>
-#include <vector>
-
 #include "Common/DataModel/CaloClusters.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-
-#include "Framework/ConfigParamSpec.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoA.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/HistogramRegistry.h"
-
 #include "EventFiltering/Zorro.h"
 #include "EventFiltering/ZorroSummary.h"
 
-#include "PHOSBase/Geometry.h"
-#include "CommonDataFormat/InteractionRecord.h"
 #include "CCDB/BasicCCDBManager.h"
+#include "CommonDataFormat/InteractionRecord.h"
 #include "DataFormatsParameters/GRPLHCIFData.h"
+#include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/ConfigParamSpec.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include "PHOSBase/Geometry.h"
+
+#include <algorithm>
+#include <climits>
+#include <cstdlib>
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::aod::evsel;
diff --git a/.conflict-base-0/PWGEM/Tasks/phosTrigQA.cxx b/.conflict-base-0/PWGEM/Tasks/phosTrigQA.cxx
index b0b0949cfb5..c7dab6e4e7a 100644
--- a/.conflict-base-0/PWGEM/Tasks/phosTrigQA.cxx
+++ b/.conflict-base-0/PWGEM/Tasks/phosTrigQA.cxx
@@ -9,28 +9,28 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <climits>
-#include <cstdlib>
-#include <map>
-#include <memory>
-#include <vector>
 #include "Common/DataModel/CaloClusters.h"
 #include "Common/DataModel/EventSelection.h"
+#include "EventFiltering/filterTables.h"
 
-#include "Framework/ConfigParamSpec.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonDataFormat/InteractionRecord.h"
+#include "CommonUtils/NameConf.h"
+#include "DataFormatsParameters/GRPLHCIFData.h"
 #include "Framework/ASoA.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/ConfigParamSpec.h"
 #include "Framework/HistogramRegistry.h"
-#include "CommonUtils/NameConf.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPLHCIFData.h"
-
+#include "Framework/runDataProcessing.h"
 #include "PHOSBase/Geometry.h"
-#include "CommonDataFormat/InteractionRecord.h"
-#include "EventFiltering/filterTables.h"
+
+#include <climits>
+#include <cstdlib>
+#include <map>
+#include <memory>
+#include <vector>
 
 /// \struct PHOS trigger QA
 /// \brief Monitoring task for PHOS related quantities
diff --git a/.conflict-base-0/PWGHF/ALICE3/TableProducer/candidateCreatorChic.cxx b/.conflict-base-0/PWGHF/ALICE3/TableProducer/candidateCreatorChic.cxx
index e01b4fe0a6a..e34932fcdea 100644
--- a/.conflict-base-0/PWGHF/ALICE3/TableProducer/candidateCreatorChic.cxx
+++ b/.conflict-base-0/PWGHF/ALICE3/TableProducer/candidateCreatorChic.cxx
@@ -15,8 +15,12 @@
 ///
 /// \author Alessandro De Falco <alessandro.de.falco@ca.infn.it>, Cagliari University
 
-#include <utility>
-#include <vector>
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
+
+#include "ALICE3/DataModel/ECAL.h"
+#include "Common/Core/trackUtilities.h"
 
 #include "CommonConstants/PhysicsConstants.h"
 #include "DCAFitter/DCAFitterN.h"
@@ -24,12 +28,8 @@
 #include "ReconstructionDataFormats/DCA.h"
 #include "ReconstructionDataFormats/V0.h"
 
-#include "ALICE3/DataModel/ECAL.h"
-#include "Common/Core/trackUtilities.h"
-
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis;
@@ -201,9 +201,9 @@ struct HfCandidateCreatorChic {
           hMassChicToJpsiToMuMuGamma->Fill(massJpsiGamma);
         }
       } // ecal loop
-    }   // Jpsi loop
-  }     // process
-};      // struct
+    } // Jpsi loop
+  } // process
+}; // struct
 
 /// Extends the base table with expression columns.
 struct HfCandidateCreatorChicExpressions {
@@ -299,8 +299,8 @@ struct HfCandidateCreatorChicMc {
 
       rowMcMatchGen(flag, origin, channel);
     } // candidate loop
-  }   // process
-};    // struct
+  } // process
+}; // struct
 
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
diff --git a/.conflict-base-0/PWGHF/ALICE3/TableProducer/candidateCreatorX.cxx b/.conflict-base-0/PWGHF/ALICE3/TableProducer/candidateCreatorX.cxx
index 2e3477dab99..02e5939ec32 100644
--- a/.conflict-base-0/PWGHF/ALICE3/TableProducer/candidateCreatorX.cxx
+++ b/.conflict-base-0/PWGHF/ALICE3/TableProducer/candidateCreatorX.cxx
@@ -16,8 +16,11 @@
 /// \author Rik Spijkers <r.spijkers@students.uu.nl>, Utrecht University
 /// \author Luca Micheletti <luca.micheletti@to.infn.it>, INFN
 
-#include <utility>
-#include <vector>
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
+
+#include "Common/Core/trackUtilities.h"
 
 #include "CommonConstants/PhysicsConstants.h"
 #include "DCAFitter/DCAFitterN.h"
@@ -25,11 +28,8 @@
 #include "ReconstructionDataFormats/DCA.h"
 #include "ReconstructionDataFormats/V0.h"
 
-#include "Common/Core/trackUtilities.h"
-
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis;
@@ -255,10 +255,10 @@ struct HfCandidateCreatorX {
             hMassXToJpsiToMuMuPiPi->Fill(massJpsiPiPi);
           }
         } // pi- loop
-      }   // pi+ loop
-    }     // Jpsi loop
-  }       // process
-};        // struct
+      } // pi+ loop
+    } // Jpsi loop
+  } // process
+}; // struct
 
 /// Extends the base table with expression columns.
 struct HfCandidateCreatorXExpressions {
@@ -363,8 +363,8 @@ struct HfCandidateCreatorXMc {
 
       rowMcMatchGen(flag, origin, channel);
     } // candidate loop
-  }   // process
-};    // struct
+  } // process
+}; // struct
 
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
diff --git a/.conflict-base-0/PWGHF/ALICE3/TableProducer/candidateSelectorChicToJpsiGamma.cxx b/.conflict-base-0/PWGHF/ALICE3/TableProducer/candidateSelectorChicToJpsiGamma.cxx
index 5160a2ba99c..bcd3c25cbe7 100644
--- a/.conflict-base-0/PWGHF/ALICE3/TableProducer/candidateSelectorChicToJpsiGamma.cxx
+++ b/.conflict-base-0/PWGHF/ALICE3/TableProducer/candidateSelectorChicToJpsiGamma.cxx
@@ -15,16 +15,16 @@
 ///
 /// \author Alessandro De Falco <alessandro.de.falco@ca.infn.it>, Università/INFN Cagliari
 
-#include <vector>
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/Core/SelectorCuts.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
 
 #include "CommonConstants/PhysicsConstants.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
 
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/Core/SelectorCuts.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
+#include <vector>
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-base-0/PWGHF/ALICE3/TableProducer/candidateSelectorD0Alice3Barrel.cxx b/.conflict-base-0/PWGHF/ALICE3/TableProducer/candidateSelectorD0Alice3Barrel.cxx
index 705deeeaff2..64a74907928 100644
--- a/.conflict-base-0/PWGHF/ALICE3/TableProducer/candidateSelectorD0Alice3Barrel.cxx
+++ b/.conflict-base-0/PWGHF/ALICE3/TableProducer/candidateSelectorD0Alice3Barrel.cxx
@@ -15,18 +15,18 @@
 /// \author Nima Zardoshti <nima.zardoshti@cern.ch>, CERN
 /// \author Vít Kučera <vit.kucera@cern.ch>, CERN
 
-#include <vector>
-#include <algorithm>
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
+
+#include "ALICE3/DataModel/RICH.h"
 
 #include "CommonConstants/PhysicsConstants.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
 
-#include "ALICE3/DataModel/RICH.h"
-
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
+#include <algorithm>
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis;
diff --git a/.conflict-base-0/PWGHF/ALICE3/TableProducer/candidateSelectorD0Alice3Forward.cxx b/.conflict-base-0/PWGHF/ALICE3/TableProducer/candidateSelectorD0Alice3Forward.cxx
index a213c3edd04..adc59d03ed9 100644
--- a/.conflict-base-0/PWGHF/ALICE3/TableProducer/candidateSelectorD0Alice3Forward.cxx
+++ b/.conflict-base-0/PWGHF/ALICE3/TableProducer/candidateSelectorD0Alice3Forward.cxx
@@ -15,18 +15,18 @@
 /// \author Nima Zardoshti <nima.zardoshti@cern.ch>, CERN
 /// \author Vít Kučera <vit.kucera@cern.ch>, CERN
 
-#include <vector>
-#include <algorithm>
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
+
+#include "ALICE3/DataModel/RICH.h"
 
 #include "CommonConstants/PhysicsConstants.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
 
-#include "ALICE3/DataModel/RICH.h"
-
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
+#include <algorithm>
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis;
diff --git a/.conflict-base-0/PWGHF/ALICE3/TableProducer/candidateSelectorD0ParametrizedPid.cxx b/.conflict-base-0/PWGHF/ALICE3/TableProducer/candidateSelectorD0ParametrizedPid.cxx
index 6a46231b0c2..1ae60aa64b9 100644
--- a/.conflict-base-0/PWGHF/ALICE3/TableProducer/candidateSelectorD0ParametrizedPid.cxx
+++ b/.conflict-base-0/PWGHF/ALICE3/TableProducer/candidateSelectorD0ParametrizedPid.cxx
@@ -15,18 +15,18 @@
 /// \author Nima Zardoshti <nima.zardoshti@cern.ch>, CERN
 /// \author Vít Kučera <vit.kucera@cern.ch>, CERN
 
-#include <vector>
-#include <algorithm>
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
+
+#include "ALICE3/DataModel/RICH.h"
 
 #include "CommonConstants/PhysicsConstants.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
 
-#include "ALICE3/DataModel/RICH.h"
-
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
+#include <algorithm>
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis;
diff --git a/.conflict-base-0/PWGHF/ALICE3/TableProducer/candidateSelectorJpsi.cxx b/.conflict-base-0/PWGHF/ALICE3/TableProducer/candidateSelectorJpsi.cxx
index 391aba49da0..a04b064b1b1 100644
--- a/.conflict-base-0/PWGHF/ALICE3/TableProducer/candidateSelectorJpsi.cxx
+++ b/.conflict-base-0/PWGHF/ALICE3/TableProducer/candidateSelectorJpsi.cxx
@@ -16,18 +16,18 @@
 /// \author Nima Zardoshti <nima.zardoshti@cern.ch>, CERN
 /// \author Vít Kučera <vit.kucera@cern.ch>, CERN
 
-#include <vector>
-
-#include "CommonConstants/PhysicsConstants.h"
-#include "Framework/AnalysisTask.h"
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
 
 #include "ALICE3/DataModel/MID.h"
 #include "ALICE3/DataModel/RICH.h"
 #include "Common/Core/TrackSelectorPID.h"
 
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/AnalysisTask.h"
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis;
diff --git a/.conflict-base-0/PWGHF/ALICE3/TableProducer/candidateSelectorLcAlice3.cxx b/.conflict-base-0/PWGHF/ALICE3/TableProducer/candidateSelectorLcAlice3.cxx
index c9abeedad39..0703dbcaf89 100644
--- a/.conflict-base-0/PWGHF/ALICE3/TableProducer/candidateSelectorLcAlice3.cxx
+++ b/.conflict-base-0/PWGHF/ALICE3/TableProducer/candidateSelectorLcAlice3.cxx
@@ -16,17 +16,17 @@
 /// \author Nima Zardoshti <nima.zardoshti@cern.ch>, CERN
 /// \author Vít Kučera <vit.kucera@cern.ch>, CERN
 
-#include <vector>
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
+
+#include "ALICE3/DataModel/RICH.h"
 
 #include "CommonConstants/PhysicsConstants.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
 
-#include "ALICE3/DataModel/RICH.h"
-
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis;
diff --git a/.conflict-base-0/PWGHF/ALICE3/TableProducer/candidateSelectorLcParametrizedPid.cxx b/.conflict-base-0/PWGHF/ALICE3/TableProducer/candidateSelectorLcParametrizedPid.cxx
index 0a3210a63f6..4b5ab4feaea 100644
--- a/.conflict-base-0/PWGHF/ALICE3/TableProducer/candidateSelectorLcParametrizedPid.cxx
+++ b/.conflict-base-0/PWGHF/ALICE3/TableProducer/candidateSelectorLcParametrizedPid.cxx
@@ -16,17 +16,17 @@
 /// \author Nima Zardoshti <nima.zardoshti@cern.ch>, CERN
 /// \author Vít Kučera <vit.kucera@cern.ch>, CERN
 
-#include <vector>
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
+
+#include "ALICE3/DataModel/RICH.h"
 
 #include "CommonConstants/PhysicsConstants.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
 
-#include "ALICE3/DataModel/RICH.h"
-
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis;
diff --git a/.conflict-base-0/PWGHF/ALICE3/TableProducer/candidateSelectorXToJpsiPiPi.cxx b/.conflict-base-0/PWGHF/ALICE3/TableProducer/candidateSelectorXToJpsiPiPi.cxx
index bff87d84e70..bc1f5da2f7a 100644
--- a/.conflict-base-0/PWGHF/ALICE3/TableProducer/candidateSelectorXToJpsiPiPi.cxx
+++ b/.conflict-base-0/PWGHF/ALICE3/TableProducer/candidateSelectorXToJpsiPiPi.cxx
@@ -16,16 +16,16 @@
 /// \author Rik Spijkers <r.spijkers@students.uu.nl>, Utrecht University
 /// \author Luca Micheletti <luca.micheletti@to.infn.it>, INFN
 
-#include <vector>
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/Core/SelectorCuts.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
 
 #include "CommonConstants/PhysicsConstants.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
 
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/Core/SelectorCuts.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
+#include <vector>
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-base-0/PWGHF/ALICE3/TableProducer/treeCreatorChicToJpsiGamma.cxx b/.conflict-base-0/PWGHF/ALICE3/TableProducer/treeCreatorChicToJpsiGamma.cxx
index 1b164a0fc0e..29019da1884 100644
--- a/.conflict-base-0/PWGHF/ALICE3/TableProducer/treeCreatorChicToJpsiGamma.cxx
+++ b/.conflict-base-0/PWGHF/ALICE3/TableProducer/treeCreatorChicToJpsiGamma.cxx
@@ -18,14 +18,14 @@
 /// \author Alessandro De Falco <alessandro.de.falco@ca.infn.it>, Università/INFN Cagliari
 /// \author Luca Micheletti <luca.micheletti@to.infn.it>, INFN
 
-#include "CommonConstants/PhysicsConstants.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-
 #include "PWGHF/Core/HfHelper.h"
 #include "PWGHF/DataModel/CandidateReconstructionTables.h"
 #include "PWGHF/DataModel/CandidateSelectionTables.h"
 
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::aod;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGHF/ALICE3/TableProducer/treeCreatorXToJpsiPiPi.cxx b/.conflict-base-0/PWGHF/ALICE3/TableProducer/treeCreatorXToJpsiPiPi.cxx
index 7a981b35798..d6cb0c8a83d 100644
--- a/.conflict-base-0/PWGHF/ALICE3/TableProducer/treeCreatorXToJpsiPiPi.cxx
+++ b/.conflict-base-0/PWGHF/ALICE3/TableProducer/treeCreatorXToJpsiPiPi.cxx
@@ -17,13 +17,13 @@
 ///
 /// \author Luca Micheletti <luca.micheletti@to.infn.it>, INFN
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-
 #include "PWGHF/Core/HfHelper.h"
 #include "PWGHF/DataModel/CandidateReconstructionTables.h"
 #include "PWGHF/DataModel/CandidateSelectionTables.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::aod;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGHF/ALICE3/Tasks/taskChic.cxx b/.conflict-base-0/PWGHF/ALICE3/Tasks/taskChic.cxx
index f8cb85454a1..5a7adab7404 100644
--- a/.conflict-base-0/PWGHF/ALICE3/Tasks/taskChic.cxx
+++ b/.conflict-base-0/PWGHF/ALICE3/Tasks/taskChic.cxx
@@ -15,16 +15,16 @@
 /// \author Gian Michele Innocenti <gian.michele.innocenti@cern.ch>, CERN
 /// \author Alessandro De Falco <alessandro.de.falco@ca.infn.it>, Cagliari University
 
-#include <vector>
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/Core/SelectorCuts.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
 
 #include "CommonConstants/PhysicsConstants.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/Core/SelectorCuts.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
+#include <vector>
 
 using namespace o2;
 using namespace o2::aod;
@@ -101,8 +101,8 @@ struct HfTaskChic {
       registry.fill(HIST("hDecLenXYErr"), candidate.errorDecayLengthXY(), candidate.pt());
       //      registry.fill(HIST("hEGamma"), candidate.prong1().e());
     } // candidate loop
-  }   // process
-};    // struct
+  } // process
+}; // struct
 
 struct HfTaskChicMc {
   Configurable<int> selectionFlagChic{"selectionFlagChic", 1, "Selection Flag for Chic"};
@@ -225,8 +225,8 @@ struct HfTaskChicMc {
         registry.fill(HIST("hPtProng1Gen"), ptProngs[1], particle.pt());
       }
     } // gen
-  }   // process
-};    // struct
+  } // process
+}; // struct
 
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
diff --git a/.conflict-base-0/PWGHF/ALICE3/Tasks/taskD0Alice3Barrel.cxx b/.conflict-base-0/PWGHF/ALICE3/Tasks/taskD0Alice3Barrel.cxx
index da86e77a06b..481c85248b0 100644
--- a/.conflict-base-0/PWGHF/ALICE3/Tasks/taskD0Alice3Barrel.cxx
+++ b/.conflict-base-0/PWGHF/ALICE3/Tasks/taskD0Alice3Barrel.cxx
@@ -15,15 +15,15 @@
 /// \author Gian Michele Innocenti <gian.michele.innocenti@cern.ch>, CERN
 /// \author Vít Kučera <vit.kucera@cern.ch>, CERN
 
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
+
 #include "CommonConstants/PhysicsConstants.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
 
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-base-0/PWGHF/ALICE3/Tasks/taskD0Alice3Forward.cxx b/.conflict-base-0/PWGHF/ALICE3/Tasks/taskD0Alice3Forward.cxx
index dea53a20d70..0b4afc24583 100644
--- a/.conflict-base-0/PWGHF/ALICE3/Tasks/taskD0Alice3Forward.cxx
+++ b/.conflict-base-0/PWGHF/ALICE3/Tasks/taskD0Alice3Forward.cxx
@@ -15,15 +15,15 @@
 /// \author Gian Michele Innocenti <gian.michele.innocenti@cern.ch>, CERN
 /// \author Vít Kučera <vit.kucera@cern.ch>, CERN
 
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
+
 #include "CommonConstants/PhysicsConstants.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
 
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-base-0/PWGHF/ALICE3/Tasks/taskD0ParametrizedPid.cxx b/.conflict-base-0/PWGHF/ALICE3/Tasks/taskD0ParametrizedPid.cxx
index 3fe2487b2f3..a0df06fd12c 100644
--- a/.conflict-base-0/PWGHF/ALICE3/Tasks/taskD0ParametrizedPid.cxx
+++ b/.conflict-base-0/PWGHF/ALICE3/Tasks/taskD0ParametrizedPid.cxx
@@ -15,15 +15,15 @@
 /// \author Gian Michele Innocenti <gian.michele.innocenti@cern.ch>, CERN
 /// \author Vít Kučera <vit.kucera@cern.ch>, CERN
 
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
+
 #include "CommonConstants/PhysicsConstants.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
 
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-base-0/PWGHF/ALICE3/Tasks/taskJpsi.cxx b/.conflict-base-0/PWGHF/ALICE3/Tasks/taskJpsi.cxx
index a9210ccca86..d231b55c3d4 100644
--- a/.conflict-base-0/PWGHF/ALICE3/Tasks/taskJpsi.cxx
+++ b/.conflict-base-0/PWGHF/ALICE3/Tasks/taskJpsi.cxx
@@ -16,15 +16,15 @@
 /// \author Vít Kučera <vit.kucera@cern.ch>, CERN
 /// \author Biao Zhang <biao.zhang@cern.ch>, CCNU
 
-#include <vector>
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
 
 #include "CommonConstants/PhysicsConstants.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis;
diff --git a/.conflict-base-0/PWGHF/ALICE3/Tasks/taskLcAlice3.cxx b/.conflict-base-0/PWGHF/ALICE3/Tasks/taskLcAlice3.cxx
index 9bbfdaf91e5..4889ac7d5b3 100644
--- a/.conflict-base-0/PWGHF/ALICE3/Tasks/taskLcAlice3.cxx
+++ b/.conflict-base-0/PWGHF/ALICE3/Tasks/taskLcAlice3.cxx
@@ -15,15 +15,15 @@
 /// \author Gian Michele Innocenti <gian.michele.innocenti@cern.ch>, CERN
 /// \author Vít Kučera <vit.kucera@cern.ch>, CERN
 
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
+
 #include "CommonConstants/PhysicsConstants.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
 
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-base-0/PWGHF/ALICE3/Tasks/taskLcParametrizedPid.cxx b/.conflict-base-0/PWGHF/ALICE3/Tasks/taskLcParametrizedPid.cxx
index 8936c56e2c1..2457f7a6e88 100644
--- a/.conflict-base-0/PWGHF/ALICE3/Tasks/taskLcParametrizedPid.cxx
+++ b/.conflict-base-0/PWGHF/ALICE3/Tasks/taskLcParametrizedPid.cxx
@@ -15,15 +15,15 @@
 /// \author Gian Michele Innocenti <gian.michele.innocenti@cern.ch>, CERN
 /// \author Vít Kučera <vit.kucera@cern.ch>, CERN
 
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
+
 #include "CommonConstants/PhysicsConstants.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
 
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-base-0/PWGHF/ALICE3/Tasks/taskQaPidRejection.cxx b/.conflict-base-0/PWGHF/ALICE3/Tasks/taskQaPidRejection.cxx
index f0e819e3086..82156ed8e3f 100644
--- a/.conflict-base-0/PWGHF/ALICE3/Tasks/taskQaPidRejection.cxx
+++ b/.conflict-base-0/PWGHF/ALICE3/Tasks/taskQaPidRejection.cxx
@@ -16,16 +16,7 @@
 /// \author Henrique J C Zanoli <henrique.zanoli@cern.ch>, Utrecht University
 /// \author Nicolo' Jacazio <nicolo.jacazio@cern.ch>, CERN
 
-#include <utility>
-#include <vector>
-
-#include <TEfficiency.h>
-#include <TList.h>
-#include <TPDGCode.h>
-
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "ReconstructionDataFormats/DCA.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
 
 #include "ALICE3/DataModel/MID.h"
 #include "ALICE3/DataModel/RICH.h"
@@ -33,7 +24,16 @@
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "ReconstructionDataFormats/DCA.h"
+
+#include <TEfficiency.h>
+#include <TList.h>
+#include <TPDGCode.h>
+
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGHF/ALICE3/Tasks/taskX.cxx b/.conflict-base-0/PWGHF/ALICE3/Tasks/taskX.cxx
index f090eb57876..295d7517787 100644
--- a/.conflict-base-0/PWGHF/ALICE3/Tasks/taskX.cxx
+++ b/.conflict-base-0/PWGHF/ALICE3/Tasks/taskX.cxx
@@ -16,16 +16,16 @@
 /// \author Rik Spijkers <r.spijkers@students.uu.nl>, Utrecht University
 /// \author Luca Micheletti <luca.micheletti@to.infn.it>, INFN
 
-#include <vector>
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/Core/SelectorCuts.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
 
 #include "CommonConstants/PhysicsConstants.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/Core/SelectorCuts.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
+#include <vector>
 
 using namespace o2;
 using namespace o2::aod;
@@ -102,8 +102,8 @@ struct HfTaskX {
       registry.fill(HIST("hDecLenErr"), candidate.errorDecayLength(), candidate.pt());
       registry.fill(HIST("hDecLenXYErr"), candidate.errorDecayLengthXY(), candidate.pt());
     } // candidate loop
-  }   // process
-};    // struct
+  } // process
+}; // struct
 
 struct HfTaskXMc {
   Configurable<int> selectionFlagX{"selectionFlagX", 1, "Selection Flag for X"};
@@ -230,8 +230,8 @@ struct HfTaskXMc {
         registry.fill(HIST("hPtGenProng2"), ptProngs[2], particle.pt());
       }
     } // gen
-  }   // process
-};    // struct
+  } // process
+}; // struct
 
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
diff --git a/.conflict-base-0/PWGHF/D2H/DataModel/ReducedDataModel.h b/.conflict-base-0/PWGHF/D2H/DataModel/ReducedDataModel.h
index e5a776c02c4..34f844cdc3e 100644
--- a/.conflict-base-0/PWGHF/D2H/DataModel/ReducedDataModel.h
+++ b/.conflict-base-0/PWGHF/D2H/DataModel/ReducedDataModel.h
@@ -1165,7 +1165,7 @@ DECLARE_SOA_COLUMN(Sign, sign, int8_t);                                      //!
 DECLARE_SOA_COLUMN(ItsNClsSoftPi, itsNClsSoftPi, int);                       //! minimum value of number of ITS clusters for the decay daughter tracks
 DECLARE_SOA_COLUMN(TpcNClsCrossedRowsSoftPi, tpcNClsCrossedRowsSoftPi, int); //! minimum value of number of TPC crossed rows for the decay daughter tracks
 DECLARE_SOA_COLUMN(TpcChi2NClSoftPi, tpcChi2NClSoftPi, float);               //! maximum value of TPC chi2 for the decay daughter tracks
-DECLARE_SOA_DYNAMIC_COLUMN(Px, px, //!
+DECLARE_SOA_DYNAMIC_COLUMN(Px, px,                                           //!
                            [](float pxProng0, float pxProng1, float pxProng2) -> float { return 1.f * pxProng0 + 1.f * pxProng1 + 1.f * pxProng2; });
 DECLARE_SOA_DYNAMIC_COLUMN(Py, py, //!
                            [](float pyProng0, float pyProng1, float pyProng2) -> float { return 1.f * pyProng0 + 1.f * pyProng1 + 1.f * pyProng2; });
@@ -1376,16 +1376,16 @@ DECLARE_SOA_COLUMN(InvMassProng1, invMassProng1, float); //! Invariant Mass of V
 DECLARE_SOA_COLUMN(Sign, sign, int8_t);                  //! Sign of the Resonance candidate
 DECLARE_SOA_COLUMN(IsWrongSign, isWrongSign, int8_t);    //! Flag for wrong sign of the Resonance candidate, 1 = wrong sign, 0 = right sign
 
-DECLARE_SOA_COLUMN(FlagMcMatchRec, flagMcMatchRec, int8_t);               // flag for resonance decay channel classification reconstruction level
-DECLARE_SOA_COLUMN(FlagMcMatchRecD, flagMcMatchRecD, int8_t);             // flag for D meson bachelor decay channel classification reconstruction level
-DECLARE_SOA_COLUMN(FlagMcMatchChanD, flagMcMatchChanD, int8_t);           // flag for D meson resonant channel classification reconstruction level
-DECLARE_SOA_COLUMN(FlagMcMatchGen, flagMcMatchGen, int8_t);               // flag for decay channel classification generator level
-DECLARE_SOA_COLUMN(DebugMcRec, debugMcRec, uint16_t);                     // debug flag for mis-association at reconstruction level
-DECLARE_SOA_COLUMN(Origin, origin, int8_t);                               // Flag for origin of MC particle 1=promt, 2=FD
-DECLARE_SOA_COLUMN(SignD0, signD0, int8_t);                               // Sign of the D0 in the channels with D* -> D0 pi, needed in case of non-matched D*
-DECLARE_SOA_COLUMN(PtGen, ptGen, float);                                  // Pt at generation level in GeV/c
-DECLARE_SOA_COLUMN(InvMassGen, invMassGen, float);                        //! Invariant mass at generation level in GeV/c2
-DECLARE_SOA_DYNAMIC_COLUMN(Pt, pt,                                        //!
+DECLARE_SOA_COLUMN(FlagMcMatchRec, flagMcMatchRec, int8_t);     // flag for resonance decay channel classification reconstruction level
+DECLARE_SOA_COLUMN(FlagMcMatchRecD, flagMcMatchRecD, int8_t);   // flag for D meson bachelor decay channel classification reconstruction level
+DECLARE_SOA_COLUMN(FlagMcMatchChanD, flagMcMatchChanD, int8_t); // flag for D meson resonant channel classification reconstruction level
+DECLARE_SOA_COLUMN(FlagMcMatchGen, flagMcMatchGen, int8_t);     // flag for decay channel classification generator level
+DECLARE_SOA_COLUMN(DebugMcRec, debugMcRec, uint16_t);           // debug flag for mis-association at reconstruction level
+DECLARE_SOA_COLUMN(Origin, origin, int8_t);                     // Flag for origin of MC particle 1=promt, 2=FD
+DECLARE_SOA_COLUMN(SignD0, signD0, int8_t);                     // Sign of the D0 in the channels with D* -> D0 pi, needed in case of non-matched D*
+DECLARE_SOA_COLUMN(PtGen, ptGen, float);                        // Pt at generation level in GeV/c
+DECLARE_SOA_COLUMN(InvMassGen, invMassGen, float);              //! Invariant mass at generation level in GeV/c2
+DECLARE_SOA_DYNAMIC_COLUMN(Pt, pt,                              //!
                            [](float pxProng0, float pxProng1, float pyProng0, float pyProng1) -> float { return RecoDecay::pt((1.f * pxProng0 + 1.f * pxProng1), (1.f * pyProng0 + 1.f * pyProng1)); });
 DECLARE_SOA_DYNAMIC_COLUMN(PtProng0, ptProng0, //!
                            [](float pxProng0, float pyProng0) -> float { return RecoDecay::pt(pxProng0, pyProng0); });
diff --git a/.conflict-base-0/PWGHF/HFC/Macros/DhCorrelationExtraction.h b/.conflict-base-0/PWGHF/HFC/Macros/DhCorrelationExtraction.h
index 73b07c61e83..ddfe205372c 100644
--- a/.conflict-base-0/PWGHF/HFC/Macros/DhCorrelationExtraction.h
+++ b/.conflict-base-0/PWGHF/HFC/Macros/DhCorrelationExtraction.h
@@ -17,8 +17,6 @@
 #ifndef PWGHF_HFC_MACROS_DHCORRELATIONEXTRACTION_H_
 #define PWGHF_HFC_MACROS_DHCORRELATIONEXTRACTION_H_
 
-#include <Rtypes.h>
-#include <RtypesCore.h>
 #include <TAttMarker.h>
 #include <TDirectoryFile.h>
 #include <TFile.h>
@@ -28,6 +26,9 @@
 #include <TObject.h>
 #include <TString.h>
 
+#include <Rtypes.h>
+#include <RtypesCore.h>
+
 class DhCorrelationExtraction : public TObject
 {
 
diff --git a/.conflict-base-0/PWGHF/HFC/Macros/DhCorrelationFitter.h b/.conflict-base-0/PWGHF/HFC/Macros/DhCorrelationFitter.h
index a4bdf3c3bb1..e2354624bf2 100644
--- a/.conflict-base-0/PWGHF/HFC/Macros/DhCorrelationFitter.h
+++ b/.conflict-base-0/PWGHF/HFC/Macros/DhCorrelationFitter.h
@@ -17,12 +17,13 @@
 #ifndef PWGHF_HFC_MACROS_DHCORRELATIONFITTER_H_
 #define PWGHF_HFC_MACROS_DHCORRELATIONFITTER_H_
 
-#include <cstdio>
-
-#include <RtypesCore.h>
 #include <TF1.h>
 #include <TH1.h>
 
+#include <RtypesCore.h>
+
+#include <cstdio>
+
 class DhCorrelationFitter
 {
 
diff --git a/.conflict-base-0/PWGHF/HFC/Macros/ExtractOutputCorrel.C b/.conflict-base-0/PWGHF/HFC/Macros/ExtractOutputCorrel.C
index 301434f66e2..872093701ff 100644
--- a/.conflict-base-0/PWGHF/HFC/Macros/ExtractOutputCorrel.C
+++ b/.conflict-base-0/PWGHF/HFC/Macros/ExtractOutputCorrel.C
@@ -16,12 +16,14 @@
 /// \author Samuele Cattaruzzi <samuele.cattaruzzi@cern.ch>
 /// \author Swapnesh Santosh Khade <swapnesh.santosh.khade@cern.ch>
 
+#include "DhCorrelationExtraction.h"
 #include "Riostream.h"
+
 #include <TROOT.h>
 #include <TStyle.h>
+
 #include <rapidjson/document.h>
 #include <rapidjson/filereadstream.h>
-#include "DhCorrelationExtraction.h"
 
 using namespace rapidjson;
 
diff --git a/.conflict-base-0/PWGHF/HFC/Macros/FitCorrel.C b/.conflict-base-0/PWGHF/HFC/Macros/FitCorrel.C
index 37b36a5e1b3..3e15eda604a 100644
--- a/.conflict-base-0/PWGHF/HFC/Macros/FitCorrel.C
+++ b/.conflict-base-0/PWGHF/HFC/Macros/FitCorrel.C
@@ -16,17 +16,19 @@
 /// \author Samuele Cattaruzzi <samuele.cattaruzzi@cern.ch>
 /// \author Swapnesh Santosh Khade <swapnesh.santosh.khade@cern.ch>
 
+#include "DhCorrelationFitter.h"
 #include "Riostream.h"
-#include <TROOT.h>
+
 #include <TF1.h>
 #include <TH1D.h>
 #include <TMath.h>
 #include <TPaveText.h>
-#include <TSystem.h>
+#include <TROOT.h>
 #include <TStyle.h>
+#include <TSystem.h>
+
 #include <rapidjson/document.h>
 #include <rapidjson/filereadstream.h>
-#include "DhCorrelationFitter.h"
 
 using namespace rapidjson;
 
diff --git a/.conflict-base-0/PWGJE/Core/MlResponseHfTagging.h b/.conflict-base-0/PWGJE/Core/MlResponseHfTagging.h
index 2b07e1c1c25..186575205b9 100644
--- a/.conflict-base-0/PWGJE/Core/MlResponseHfTagging.h
+++ b/.conflict-base-0/PWGJE/Core/MlResponseHfTagging.h
@@ -18,11 +18,10 @@
 
 #include "Tools/ML/MlResponse.h"
 
-#include <onnxruntime_cxx_api.h>
-
 #include <Framework/Logger.h>
 
 #include <onnxruntime_c_api.h>
+#include <onnxruntime_cxx_api.h>
 
 #include <cstddef>
 #include <cstdint>
@@ -330,6 +329,7 @@ class TensorAllocator
 {
  protected:
   Ort::MemoryInfo memInfo;
+
  public:
   TensorAllocator()
     : memInfo(Ort::MemoryInfo::CreateCpu(OrtAllocatorType::OrtArenaAllocator, OrtMemType::OrtMemTypeDefault))
diff --git a/.conflict-base-0/PWGJE/DataModel/PhotonChargedTriggerCorrelation.h b/.conflict-base-0/PWGJE/DataModel/PhotonChargedTriggerCorrelation.h
index 53f5e581d82..36806e1f4c0 100644
--- a/.conflict-base-0/PWGJE/DataModel/PhotonChargedTriggerCorrelation.h
+++ b/.conflict-base-0/PWGJE/DataModel/PhotonChargedTriggerCorrelation.h
@@ -18,11 +18,12 @@
 #ifndef PWGJE_DATAMODEL_PHOTONCHARGEDTRIGGERCORRELATION_H_
 #define PWGJE_DATAMODEL_PHOTONCHARGEDTRIGGERCORRELATION_H_
 
-#include "Framework/AnalysisDataModel.h"
-#include "PWGJE/Core/JetDerivedDataUtilities.h"
-#include "PWGJE/DataModel/Jet.h"
 #include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
 #include "PWGEM/PhotonMeson/Utils/PCMUtilities.h"
+#include "PWGJE/Core/JetDerivedDataUtilities.h"
+#include "PWGJE/DataModel/Jet.h"
+
+#include "Framework/AnalysisDataModel.h"
 
 namespace o2::aod
 {
diff --git a/.conflict-base-0/PWGJE/Tasks/photonChargedTriggerCorrelation.cxx b/.conflict-base-0/PWGJE/Tasks/photonChargedTriggerCorrelation.cxx
index 8c62845a145..57d72df74ab 100644
--- a/.conflict-base-0/PWGJE/Tasks/photonChargedTriggerCorrelation.cxx
+++ b/.conflict-base-0/PWGJE/Tasks/photonChargedTriggerCorrelation.cxx
@@ -18,36 +18,37 @@
 /// Also contains checks and monte-carlo (efficiency, purity, mc-true correlation,...)
 /// End goal of studying correlations between direct photons and jets
 
-#include <cmath>
-#include <deque>
-#include <string>
-#include <vector>
-#include <algorithm>
-#include <chrono>
-#include <memory>
-#include <random>
+#include "PWGJE/DataModel/PhotonChargedTriggerCorrelation.h"
 
-#include "TMath.h"
-#include "Math/Vector4D.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+#include "PWGEM/PhotonMeson/Utils/PCMUtilities.h"
+#include "PWGJE/DataModel/Jet.h"
+
+#include "Common/Core/TableHelper.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
 #include "CCDB/BasicCCDBManager.h"
 #include "Framework/ASoAHelpers.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/TableHelper.h"
+#include "Framework/runDataProcessing.h"
 
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/PhotonMeson/Utils/PCMUtilities.h"
+#include "Math/Vector4D.h"
+#include "TMath.h"
 
-#include "PWGJE/DataModel/Jet.h"
-#include "PWGJE/DataModel/PhotonChargedTriggerCorrelation.h"
+#include <algorithm>
+#include <chrono>
+#include <cmath>
+#include <deque>
+#include <memory>
+#include <random>
+#include <string>
+#include <vector>
 
 const double absEtaMax = 0.8;
 #define DPHI_SCALE constants::math::TwoPI - constants::math::PIHalf
diff --git a/.conflict-base-0/PWGJE/Tasks/statPromptPhoton.cxx b/.conflict-base-0/PWGJE/Tasks/statPromptPhoton.cxx
index 977b94741c5..f23bb34df88 100644
--- a/.conflict-base-0/PWGJE/Tasks/statPromptPhoton.cxx
+++ b/.conflict-base-0/PWGJE/Tasks/statPromptPhoton.cxx
@@ -1114,9 +1114,9 @@ struct statPromptPhoton {
 
     histos.fill(HIST("DATA_nEvents"), 2.5);
 
-      if (!jetderiveddatautilities::selectTrigger(collision, triggerMaskBits)) {
-        return;
-      }
+    if (!jetderiveddatautilities::selectTrigger(collision, triggerMaskBits)) {
+      return;
+    }
 
     histos.fill(HIST("DATA_nEvents"), 3.5);
 
diff --git a/.conflict-base-0/PWGJE/Tasks/trackEfficiency.cxx b/.conflict-base-0/PWGJE/Tasks/trackEfficiency.cxx
index bb2683b0918..564e3bf10d0 100644
--- a/.conflict-base-0/PWGJE/Tasks/trackEfficiency.cxx
+++ b/.conflict-base-0/PWGJE/Tasks/trackEfficiency.cxx
@@ -554,7 +554,7 @@ struct TrackEfficiency {
 
       registry.fill(HIST("h3_particle_pt_high_particle_eta_particle_phi_mcpartofinterest"), jMcParticle.pt(), jMcParticle.eta(), jMcParticle.phi(), mcCollEventWeight);
 
-      if ((std::abs(jMcParticle.eta()) < trackEtaAcceptanceCountQA)) { // removed from actual cuts for now because all the histograms have an eta axis
+      if ((std::abs(jMcParticle.eta()) < trackEtaAcceptanceCountQA)) {       // removed from actual cuts for now because all the histograms have an eta axis
         registry.fill(HIST("hMcPartCutsCounts"), 3.5, mcCollision.weight()); // etaAccept // not actually applied here but it will give an idea of what will be done in the post processing
       }
     }
diff --git a/.conflict-base-0/PWGLF/DataModel/EPCalibrationTables.h b/.conflict-base-0/PWGLF/DataModel/EPCalibrationTables.h
index 8954ccd1c9e..a00acd94353 100644
--- a/.conflict-base-0/PWGLF/DataModel/EPCalibrationTables.h
+++ b/.conflict-base-0/PWGLF/DataModel/EPCalibrationTables.h
@@ -16,13 +16,14 @@
 #ifndef PWGLF_DATAMODEL_EPCALIBRATIONTABLES_H_
 #define PWGLF_DATAMODEL_EPCALIBRATIONTABLES_H_
 
-#include <cmath>
-
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/Core/RecoDecay.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/AnalysisDataModel.h"
 
+#include <cmath>
+
 namespace o2::aod
 {
 namespace epcalibrationtable
diff --git a/.conflict-base-0/PWGLF/DataModel/FilterF1ProtonTables.h b/.conflict-base-0/PWGLF/DataModel/FilterF1ProtonTables.h
index 0475e7cebb5..dff0c1c0d00 100644
--- a/.conflict-base-0/PWGLF/DataModel/FilterF1ProtonTables.h
+++ b/.conflict-base-0/PWGLF/DataModel/FilterF1ProtonTables.h
@@ -16,13 +16,14 @@
 #ifndef PWGLF_DATAMODEL_FILTERF1PROTONTABLES_H_
 #define PWGLF_DATAMODEL_FILTERF1PROTONTABLES_H_
 
-#include <cmath>
-
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/Core/RecoDecay.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/AnalysisDataModel.h"
 
+#include <cmath>
+
 namespace o2::aod
 {
 namespace filtering
diff --git a/.conflict-base-0/PWGLF/DataModel/LFClusterStudiesTable.h b/.conflict-base-0/PWGLF/DataModel/LFClusterStudiesTable.h
index 88ca35a85d3..edb9d77edf5 100644
--- a/.conflict-base-0/PWGLF/DataModel/LFClusterStudiesTable.h
+++ b/.conflict-base-0/PWGLF/DataModel/LFClusterStudiesTable.h
@@ -11,8 +11,8 @@
 //
 // Author: Giorgio Alberto Lucia
 
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
 
 #ifndef PWGLF_DATAMODEL_LFCLUSTERSTUDIESTABLE_H_
 #define PWGLF_DATAMODEL_LFCLUSTERSTUDIESTABLE_H_
diff --git a/.conflict-base-0/PWGLF/DataModel/LFDoubleCascTables.h b/.conflict-base-0/PWGLF/DataModel/LFDoubleCascTables.h
index 49e3b6604de..ec17c6a9864 100644
--- a/.conflict-base-0/PWGLF/DataModel/LFDoubleCascTables.h
+++ b/.conflict-base-0/PWGLF/DataModel/LFDoubleCascTables.h
@@ -9,8 +9,8 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
 
 #ifndef PWGLF_DATAMODEL_LFDOUBLECASCTABLES_H_
 #define PWGLF_DATAMODEL_LFDOUBLECASCTABLES_H_
diff --git a/.conflict-base-0/PWGLF/DataModel/LFEbyeTables.h b/.conflict-base-0/PWGLF/DataModel/LFEbyeTables.h
index 59876ae59c1..16d1982f69c 100644
--- a/.conflict-base-0/PWGLF/DataModel/LFEbyeTables.h
+++ b/.conflict-base-0/PWGLF/DataModel/LFEbyeTables.h
@@ -9,8 +9,8 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
 
 #ifndef PWGLF_DATAMODEL_LFEBYETABLES_H_
 #define PWGLF_DATAMODEL_LFEBYETABLES_H_
diff --git a/.conflict-base-0/PWGLF/DataModel/LFF1Tables.h b/.conflict-base-0/PWGLF/DataModel/LFF1Tables.h
index 947e9f0c3a8..a38dc30ea97 100644
--- a/.conflict-base-0/PWGLF/DataModel/LFF1Tables.h
+++ b/.conflict-base-0/PWGLF/DataModel/LFF1Tables.h
@@ -16,13 +16,14 @@
 #ifndef PWGLF_DATAMODEL_LFF1TABLES_H_
 #define PWGLF_DATAMODEL_LFF1TABLES_H_
 
-#include <cmath>
-
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/Core/RecoDecay.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/AnalysisDataModel.h"
 
+#include <cmath>
+
 namespace o2::aod
 {
 /// F1 Collisions
diff --git a/.conflict-base-0/PWGLF/DataModel/LFHyperhelium4Tables.h b/.conflict-base-0/PWGLF/DataModel/LFHyperhelium4Tables.h
index 8d7d5f4d379..256229876ce 100644
--- a/.conflict-base-0/PWGLF/DataModel/LFHyperhelium4Tables.h
+++ b/.conflict-base-0/PWGLF/DataModel/LFHyperhelium4Tables.h
@@ -11,10 +11,12 @@
 #ifndef PWGLF_DATAMODEL_LFHYHEFOURTABLES_H_
 #define PWGLF_DATAMODEL_LFHYHEFOURTABLES_H_
 
-#include <cmath>
-#include "Framework/AnalysisDataModel.h"
 #include "Common/Core/RecoDecay.h"
+
 #include "CommonConstants/PhysicsConstants.h"
+#include "Framework/AnalysisDataModel.h"
+
+#include <cmath>
 
 //===========================================================================
 // For aiding in building: tag those candidates that are interesting
diff --git a/.conflict-base-0/PWGLF/DataModel/LFHypernucleiKfTables.h b/.conflict-base-0/PWGLF/DataModel/LFHypernucleiKfTables.h
index 0e2424f3bb5..5e8ab65ce91 100644
--- a/.conflict-base-0/PWGLF/DataModel/LFHypernucleiKfTables.h
+++ b/.conflict-base-0/PWGLF/DataModel/LFHypernucleiKfTables.h
@@ -16,11 +16,13 @@
 #ifndef PWGLF_DATAMODEL_LFHYPERNUCLEIKFTABLES_H_
 #define PWGLF_DATAMODEL_LFHYPERNUCLEIKFTABLES_H_
 
-#include <cmath>
+#include "Common/Core/RecoDecay.h"
+#include "Common/DataModel/Centrality.h"
+
 #include "Framework/ASoA.h"
 #include "Framework/AnalysisDataModel.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/Core/RecoDecay.h"
+
+#include <cmath>
 
 namespace o2::aod
 {
diff --git a/.conflict-base-0/PWGLF/DataModel/LFHypernucleiTables.h b/.conflict-base-0/PWGLF/DataModel/LFHypernucleiTables.h
index f144daccba6..b04e24a26a2 100644
--- a/.conflict-base-0/PWGLF/DataModel/LFHypernucleiTables.h
+++ b/.conflict-base-0/PWGLF/DataModel/LFHypernucleiTables.h
@@ -14,8 +14,8 @@
 /// \brief Slim hypernuclei tables
 ///
 
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
 
 #ifndef PWGLF_DATAMODEL_LFHYPERNUCLEITABLES_H_
 #define PWGLF_DATAMODEL_LFHYPERNUCLEITABLES_H_
diff --git a/.conflict-base-0/PWGLF/DataModel/LFLithium4Tables.h b/.conflict-base-0/PWGLF/DataModel/LFLithium4Tables.h
index 486e44575ee..95d8a26ef05 100644
--- a/.conflict-base-0/PWGLF/DataModel/LFLithium4Tables.h
+++ b/.conflict-base-0/PWGLF/DataModel/LFLithium4Tables.h
@@ -14,8 +14,8 @@
 /// \brief Slim tables for Lithium4
 ///
 
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
 
 #ifndef PWGLF_DATAMODEL_LFLITHIUM4TABLES_H_
 #define PWGLF_DATAMODEL_LFLITHIUM4TABLES_H_
diff --git a/.conflict-base-0/PWGLF/DataModel/LFLnnTables.h b/.conflict-base-0/PWGLF/DataModel/LFLnnTables.h
index f9ab7fe3989..613d37931d4 100644
--- a/.conflict-base-0/PWGLF/DataModel/LFLnnTables.h
+++ b/.conflict-base-0/PWGLF/DataModel/LFLnnTables.h
@@ -14,8 +14,8 @@
 /// \brief Slim lnn tables
 ///
 
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
 
 #ifndef PWGLF_DATAMODEL_LFLNNTABLES_H_
 #define PWGLF_DATAMODEL_LFLNNTABLES_H_
diff --git a/.conflict-base-0/PWGLF/DataModel/LFNonPromptCascadeTables.h b/.conflict-base-0/PWGLF/DataModel/LFNonPromptCascadeTables.h
index b698164abd4..0651a38eb68 100644
--- a/.conflict-base-0/PWGLF/DataModel/LFNonPromptCascadeTables.h
+++ b/.conflict-base-0/PWGLF/DataModel/LFNonPromptCascadeTables.h
@@ -14,8 +14,8 @@
 /// \brief Non prompt cascade tables
 ///
 
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
 
 #ifndef PWGLF_DATAMODEL_LFNONPROMPTCASCADETABLES_H_
 #define PWGLF_DATAMODEL_LFNONPROMPTCASCADETABLES_H_
diff --git a/.conflict-base-0/PWGLF/DataModel/LFNucleiTables.h b/.conflict-base-0/PWGLF/DataModel/LFNucleiTables.h
index 1cd9ba76c93..be19614fc9b 100644
--- a/.conflict-base-0/PWGLF/DataModel/LFNucleiTables.h
+++ b/.conflict-base-0/PWGLF/DataModel/LFNucleiTables.h
@@ -16,8 +16,9 @@
 ///
 
 #include "Common/CCDB/EventSelectionParams.h"
-#include "Framework/AnalysisDataModel.h"
+
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
 
 #ifndef PWGLF_DATAMODEL_LFNUCLEITABLES_H_
 #define PWGLF_DATAMODEL_LFNUCLEITABLES_H_
diff --git a/.conflict-base-0/PWGLF/DataModel/LFParticleIdentification.h b/.conflict-base-0/PWGLF/DataModel/LFParticleIdentification.h
index 5a688e4c97c..a3c6cf52581 100644
--- a/.conflict-base-0/PWGLF/DataModel/LFParticleIdentification.h
+++ b/.conflict-base-0/PWGLF/DataModel/LFParticleIdentification.h
@@ -20,11 +20,12 @@
 #define PWGLF_DATAMODEL_LFPARTICLEIDENTIFICATION_H_
 
 // O2 includes
+#include "Common/DataModel/PIDResponse.h"
+
 #include "Framework/ASoA.h"
 #include "Framework/AnalysisDataModel.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "ReconstructionDataFormats/PID.h"
 #include "Framework/Logger.h"
+#include "ReconstructionDataFormats/PID.h"
 
 namespace o2::aod
 {
diff --git a/.conflict-base-0/PWGLF/DataModel/LFResonanceTables.h b/.conflict-base-0/PWGLF/DataModel/LFResonanceTables.h
index 67e1fb013c5..fd8cd3b938b 100644
--- a/.conflict-base-0/PWGLF/DataModel/LFResonanceTables.h
+++ b/.conflict-base-0/PWGLF/DataModel/LFResonanceTables.h
@@ -22,15 +22,17 @@
 #ifndef PWGLF_DATAMODEL_LFRESONANCETABLES_H_
 #define PWGLF_DATAMODEL_LFRESONANCETABLES_H_
 
-#include <cmath>
-#include <algorithm>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/Core/RecoDecay.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/AnalysisDataModel.h"
-#include "Common/DataModel/Multiplicity.h"
+
+#include <algorithm>
+#include <cmath>
 
 namespace o2::aod
 {
diff --git a/.conflict-base-0/PWGLF/DataModel/LFSigmaTables.h b/.conflict-base-0/PWGLF/DataModel/LFSigmaTables.h
index bd808cef106..8eb7706f563 100644
--- a/.conflict-base-0/PWGLF/DataModel/LFSigmaTables.h
+++ b/.conflict-base-0/PWGLF/DataModel/LFSigmaTables.h
@@ -9,15 +9,17 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <cmath>
-#include <vector>
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/Qvectors.h"
+
 #include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+
+#include <cmath>
+#include <vector>
 
 #ifndef PWGLF_DATAMODEL_LFSIGMATABLES_H_
 #define PWGLF_DATAMODEL_LFSIGMATABLES_H_
diff --git a/.conflict-base-0/PWGLF/DataModel/LFSlimStrangeTables.h b/.conflict-base-0/PWGLF/DataModel/LFSlimStrangeTables.h
index 423a412bb6d..87d5d53957a 100644
--- a/.conflict-base-0/PWGLF/DataModel/LFSlimStrangeTables.h
+++ b/.conflict-base-0/PWGLF/DataModel/LFSlimStrangeTables.h
@@ -9,8 +9,8 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
 
 #ifndef PWGLF_DATAMODEL_LFSLIMSTRANGETABLES_H_
 #define PWGLF_DATAMODEL_LFSLIMSTRANGETABLES_H_
diff --git a/.conflict-base-0/PWGLF/DataModel/LFStrangenessFinderTables.h b/.conflict-base-0/PWGLF/DataModel/LFStrangenessFinderTables.h
index 6bff37f12fd..b0a8325c25e 100644
--- a/.conflict-base-0/PWGLF/DataModel/LFStrangenessFinderTables.h
+++ b/.conflict-base-0/PWGLF/DataModel/LFStrangenessFinderTables.h
@@ -16,9 +16,11 @@
 #ifndef O2_ANALYSIS_STRANGENESSFINDERTABLES_H_
 #define O2_ANALYSIS_STRANGENESSFINDERTABLES_H_
 
-#include "Framework/AnalysisDataModel.h"
 #include "Common/Core/RecoDecay.h"
+
 #include "CommonConstants/PhysicsConstants.h"
+#include "Framework/AnalysisDataModel.h"
+
 #include <cmath>
 
 // V0 auxiliary tables
diff --git a/.conflict-base-0/PWGLF/DataModel/LFStrangenessMLTables.h b/.conflict-base-0/PWGLF/DataModel/LFStrangenessMLTables.h
index abae8814856..c3a1b8a83b7 100644
--- a/.conflict-base-0/PWGLF/DataModel/LFStrangenessMLTables.h
+++ b/.conflict-base-0/PWGLF/DataModel/LFStrangenessMLTables.h
@@ -9,11 +9,13 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <cmath>
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
 #include "Common/Core/RecoDecay.h"
+
 #include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+
+#include <cmath>
 
 #ifndef PWGLF_DATAMODEL_LFSTRANGENESSMLTABLES_H_
 #define PWGLF_DATAMODEL_LFSTRANGENESSMLTABLES_H_
diff --git a/.conflict-base-0/PWGLF/DataModel/LFStrangenessPIDTables.h b/.conflict-base-0/PWGLF/DataModel/LFStrangenessPIDTables.h
index e689dc28141..8dc320d8b55 100644
--- a/.conflict-base-0/PWGLF/DataModel/LFStrangenessPIDTables.h
+++ b/.conflict-base-0/PWGLF/DataModel/LFStrangenessPIDTables.h
@@ -15,10 +15,12 @@
 #ifndef PWGLF_DATAMODEL_LFSTRANGENESSPIDTABLES_H_
 #define PWGLF_DATAMODEL_LFSTRANGENESSPIDTABLES_H_
 
-#include <cmath>
-#include "Framework/AnalysisDataModel.h"
 #include "Common/Core/RecoDecay.h"
+
 #include "CommonConstants/PhysicsConstants.h"
+#include "Framework/AnalysisDataModel.h"
+
+#include <cmath>
 
 namespace o2::aod
 {
@@ -55,8 +57,8 @@ DECLARE_SOA_COLUMN(PosTOFSignal, posTOFSignal, float);         //! positive trac
 DECLARE_SOA_COLUMN(NegTOFSignal, negTOFSignal, float);         //! negative track signal
 DECLARE_SOA_COLUMN(PosTOFEventTime, posTOFEventTime, float);   //! positive track event time
 DECLARE_SOA_COLUMN(NegTOFEventTime, negTOFEventTime, float);   //! negative track event time
-DECLARE_SOA_COLUMN(PosTOFLength, posTOFLength, float); //! positive track length, recalculated
-DECLARE_SOA_COLUMN(NegTOFLength, negTOFLength, float); //! negative track length, recalculated
+DECLARE_SOA_COLUMN(PosTOFLength, posTOFLength, float);         //! positive track length, recalculated
+DECLARE_SOA_COLUMN(NegTOFLength, negTOFLength, float);         //! negative track length, recalculated
 
 // delta-times
 DECLARE_SOA_COLUMN(PosTOFDeltaTLaPi, posTOFDeltaTLaPi, float); //! positive track TOFDeltaT from pion <- lambda expectation
diff --git a/.conflict-base-0/PWGLF/DataModel/LFhe3HadronTables.h b/.conflict-base-0/PWGLF/DataModel/LFhe3HadronTables.h
index f0dbc5cc3dd..ba37e73eba2 100644
--- a/.conflict-base-0/PWGLF/DataModel/LFhe3HadronTables.h
+++ b/.conflict-base-0/PWGLF/DataModel/LFhe3HadronTables.h
@@ -14,8 +14,8 @@
 /// \brief Slim tables for he3Hadron
 ///
 
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
 
 #ifndef PWGLF_DATAMODEL_LFHE3HADRONTABLES_H_
 #define PWGLF_DATAMODEL_LFHE3HADRONTABLES_H_
diff --git a/.conflict-base-0/PWGLF/DataModel/LFzdcSPtables.h b/.conflict-base-0/PWGLF/DataModel/LFzdcSPtables.h
index d5e09d5f9b7..0cdd6234e97 100644
--- a/.conflict-base-0/PWGLF/DataModel/LFzdcSPtables.h
+++ b/.conflict-base-0/PWGLF/DataModel/LFzdcSPtables.h
@@ -12,10 +12,11 @@
 #ifndef PWGLF_DATAMODEL_LFZDCSPTABLES_H_
 #define PWGLF_DATAMODEL_LFZDCSPTABLES_H_
 
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
 #include "Common/DataModel/Centrality.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+
 namespace o2::aod
 {
 namespace ZdcSPTableNS
diff --git a/.conflict-base-0/PWGLF/DataModel/QC/strangenessTablesQC.h b/.conflict-base-0/PWGLF/DataModel/QC/strangenessTablesQC.h
index ccf1724dc4b..e1b2bede6fa 100644
--- a/.conflict-base-0/PWGLF/DataModel/QC/strangenessTablesQC.h
+++ b/.conflict-base-0/PWGLF/DataModel/QC/strangenessTablesQC.h
@@ -16,8 +16,8 @@
 #ifndef PWGLF_DATAMODEL_QC_STRANGENESSTABLESQC_H_
 #define PWGLF_DATAMODEL_QC_STRANGENESSTABLESQC_H_
 
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
 
 namespace o2::aod
 {
diff --git a/.conflict-base-0/PWGLF/DataModel/Reduced3BodyTables.h b/.conflict-base-0/PWGLF/DataModel/Reduced3BodyTables.h
index 3b221d17539..0837e1d72f6 100644
--- a/.conflict-base-0/PWGLF/DataModel/Reduced3BodyTables.h
+++ b/.conflict-base-0/PWGLF/DataModel/Reduced3BodyTables.h
@@ -17,13 +17,16 @@
 #ifndef PWGLF_DATAMODEL_REDUCED3BODYTABLES_H_
 #define PWGLF_DATAMODEL_REDUCED3BODYTABLES_H_
 
-#include <cmath>
-#include "Framework/AnalysisDataModel.h"
+#include "PWGLF/DataModel/Vtx3BodyTables.h"
+
 #include "Common/Core/RecoDecay.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/Centrality.h"
-#include "PWGLF/DataModel/Vtx3BodyTables.h"
+#include "Common/DataModel/Multiplicity.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/AnalysisDataModel.h"
+
+#include <cmath>
 
 namespace o2::aod
 {
diff --git a/.conflict-base-0/PWGLF/DataModel/ReducedDoublePhiTables.h b/.conflict-base-0/PWGLF/DataModel/ReducedDoublePhiTables.h
index 76cc65312a7..cd858b2da95 100644
--- a/.conflict-base-0/PWGLF/DataModel/ReducedDoublePhiTables.h
+++ b/.conflict-base-0/PWGLF/DataModel/ReducedDoublePhiTables.h
@@ -15,15 +15,16 @@
 #ifndef PWGLF_DATAMODEL_REDUCEDDOUBLEPHITABLES_H_
 #define PWGLF_DATAMODEL_REDUCEDDOUBLEPHITABLES_H_
 
-#include <cmath>
-
+#include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Framework/AnalysisDataModel.h"
+
 #include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+
+#include <cmath>
 
 namespace o2::aod
 {
diff --git a/.conflict-base-0/PWGLF/DataModel/ReducedF1ProtonTables.h b/.conflict-base-0/PWGLF/DataModel/ReducedF1ProtonTables.h
index 2f806c4bd1b..bb79ffb87c0 100644
--- a/.conflict-base-0/PWGLF/DataModel/ReducedF1ProtonTables.h
+++ b/.conflict-base-0/PWGLF/DataModel/ReducedF1ProtonTables.h
@@ -16,15 +16,16 @@
 #ifndef PWGLF_DATAMODEL_REDUCEDF1PROTONTABLES_H_
 #define PWGLF_DATAMODEL_REDUCEDF1PROTONTABLES_H_
 
-#include <cmath>
-
+#include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Framework/AnalysisDataModel.h"
+
 #include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+
+#include <cmath>
 
 namespace o2::aod
 {
diff --git a/.conflict-base-0/PWGLF/DataModel/ReducedHeptaQuarkTables.h b/.conflict-base-0/PWGLF/DataModel/ReducedHeptaQuarkTables.h
index a8dd487fe9c..f35d088f71c 100644
--- a/.conflict-base-0/PWGLF/DataModel/ReducedHeptaQuarkTables.h
+++ b/.conflict-base-0/PWGLF/DataModel/ReducedHeptaQuarkTables.h
@@ -15,22 +15,23 @@
 #ifndef PWGLF_DATAMODEL_REDUCEDHEPTAQUARKTABLES_H_
 #define PWGLF_DATAMODEL_REDUCEDHEPTAQUARKTABLES_H_
 
-#include <cmath>
-
+#include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Framework/AnalysisDataModel.h"
+
 #include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+
+#include <cmath>
 
 namespace o2::aod
 {
 namespace redhqevent
 {
-DECLARE_SOA_COLUMN(NumPhi, numPhi, int);       //! Number of negative K
-DECLARE_SOA_COLUMN(NumLambda, numLambda, int); //! Number of lambda
+DECLARE_SOA_COLUMN(NumPhi, numPhi, int);           //! Number of negative K
+DECLARE_SOA_COLUMN(NumLambda, numLambda, int);     //! Number of lambda
 DECLARE_SOA_COLUMN(Centrality, centrality, float); //!
 } // namespace redhqevent
 DECLARE_SOA_TABLE(RedHQEvents, "AOD", "REDHQEVENT",
diff --git a/.conflict-base-0/PWGLF/DataModel/ReducedLambdaLambdaTables.h b/.conflict-base-0/PWGLF/DataModel/ReducedLambdaLambdaTables.h
index 88ea8fb0530..ec2d0b27098 100644
--- a/.conflict-base-0/PWGLF/DataModel/ReducedLambdaLambdaTables.h
+++ b/.conflict-base-0/PWGLF/DataModel/ReducedLambdaLambdaTables.h
@@ -15,15 +15,16 @@
 #ifndef PWGLF_DATAMODEL_REDUCEDLAMBDALAMBDATABLES_H_
 #define PWGLF_DATAMODEL_REDUCEDLAMBDALAMBDATABLES_H_
 
-#include <cmath>
-
+#include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Framework/AnalysisDataModel.h"
+
 #include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+
+#include <cmath>
 
 namespace o2::aod
 {
diff --git a/.conflict-base-0/PWGLF/DataModel/SPCalibrationTables.h b/.conflict-base-0/PWGLF/DataModel/SPCalibrationTables.h
index 2b417ce8758..07bef14d8f8 100644
--- a/.conflict-base-0/PWGLF/DataModel/SPCalibrationTables.h
+++ b/.conflict-base-0/PWGLF/DataModel/SPCalibrationTables.h
@@ -17,13 +17,14 @@
 #ifndef PWGLF_DATAMODEL_SPCALIBRATIONTABLES_H_
 #define PWGLF_DATAMODEL_SPCALIBRATIONTABLES_H_
 
-#include <cmath>
-
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/Core/RecoDecay.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/AnalysisDataModel.h"
 
+#include <cmath>
+
 namespace o2::aod
 {
 namespace spcalibrationtable
diff --git a/.conflict-base-0/PWGLF/DataModel/V0SelectorTables.h b/.conflict-base-0/PWGLF/DataModel/V0SelectorTables.h
index 1283c754819..d47b0bf3462 100644
--- a/.conflict-base-0/PWGLF/DataModel/V0SelectorTables.h
+++ b/.conflict-base-0/PWGLF/DataModel/V0SelectorTables.h
@@ -11,8 +11,9 @@
 #ifndef PWGLF_DATAMODEL_V0SELECTORTABLES_H_
 #define PWGLF_DATAMODEL_V0SELECTORTABLES_H_
 
-#include <cstdint>
 #include <Framework/ASoA.h>
+
+#include <cstdint>
 namespace o2::aod
 {
 
diff --git a/.conflict-base-0/PWGLF/DataModel/cascqaanalysis.h b/.conflict-base-0/PWGLF/DataModel/cascqaanalysis.h
index efe98908517..e734afd3ba1 100644
--- a/.conflict-base-0/PWGLF/DataModel/cascqaanalysis.h
+++ b/.conflict-base-0/PWGLF/DataModel/cascqaanalysis.h
@@ -16,17 +16,20 @@
 #ifndef PWGLF_DATAMODEL_CASCQAANALYSIS_H_
 #define PWGLF_DATAMODEL_CASCQAANALYSIS_H_
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "TRandom.h"
-#include "Math/Vector4D.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 #include "Math/Boost.h"
+#include "Math/Vector4D.h"
+#include "TRandom.h"
 
 namespace o2::aod
 {
diff --git a/.conflict-base-0/PWGLF/DataModel/kfStrangenessStudy.h b/.conflict-base-0/PWGLF/DataModel/kfStrangenessStudy.h
index 120b3cf62f1..5f27acfe89b 100755
--- a/.conflict-base-0/PWGLF/DataModel/kfStrangenessStudy.h
+++ b/.conflict-base-0/PWGLF/DataModel/kfStrangenessStudy.h
@@ -14,10 +14,11 @@
 #ifndef PWGLF_DATAMODEL_KFSTRANGENESSSTUDY_H_
 #define PWGLF_DATAMODEL_KFSTRANGENESSSTUDY_H_
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Common/Core/trackUtilities.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+
 namespace o2::aod
 {
 namespace kfStrangenessStudy
diff --git a/.conflict-base-0/PWGLF/DataModel/lambdaJetpolarization.h b/.conflict-base-0/PWGLF/DataModel/lambdaJetpolarization.h
index 41bd7e26b15..cd1f4b96449 100644
--- a/.conflict-base-0/PWGLF/DataModel/lambdaJetpolarization.h
+++ b/.conflict-base-0/PWGLF/DataModel/lambdaJetpolarization.h
@@ -16,17 +16,20 @@
 #ifndef PWGLF_DATAMODEL_LAMBDAJETPOLARIZATION_H_
 #define PWGLF_DATAMODEL_LAMBDAJETPOLARIZATION_H_
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "TRandom.h"
-#include "Math/Vector4D.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 #include "Math/Boost.h"
+#include "Math/Vector4D.h"
+#include "TRandom.h"
 
 namespace o2::aod
 {
diff --git a/.conflict-base-0/PWGLF/DataModel/mcCentrality.h b/.conflict-base-0/PWGLF/DataModel/mcCentrality.h
index 86e97eb8c33..fdbe1426e52 100644
--- a/.conflict-base-0/PWGLF/DataModel/mcCentrality.h
+++ b/.conflict-base-0/PWGLF/DataModel/mcCentrality.h
@@ -21,9 +21,10 @@
 #define PWGLF_DATAMODEL_MCCENTRALITY_H_
 
 // O2 includes
+#include "Common/DataModel/Centrality.h"
+
 #include "Framework/ASoA.h"
 #include "Framework/AnalysisDataModel.h"
-#include "Common/DataModel/Centrality.h"
 #include "Framework/Logger.h"
 
 namespace o2::aod
diff --git a/.conflict-base-0/PWGLF/DataModel/pidTOFGeneric.h b/.conflict-base-0/PWGLF/DataModel/pidTOFGeneric.h
index a0d287a7643..1942dbecd3d 100644
--- a/.conflict-base-0/PWGLF/DataModel/pidTOFGeneric.h
+++ b/.conflict-base-0/PWGLF/DataModel/pidTOFGeneric.h
@@ -11,9 +11,10 @@
 
 #ifndef PWGLF_DATAMODEL_PIDTOFGENERIC_H_
 #define PWGLF_DATAMODEL_PIDTOFGENERIC_H_
-#include "CommonDataFormat/InteractionRecord.h"
 #include "Common/Core/PID/PIDTOF.h"
 
+#include "CommonDataFormat/InteractionRecord.h"
+
 namespace o2::aod
 {
 namespace evtime
diff --git a/.conflict-base-0/PWGLF/DataModel/spectraTOF.h b/.conflict-base-0/PWGLF/DataModel/spectraTOF.h
index 9cf4b789295..4ae259d171f 100644
--- a/.conflict-base-0/PWGLF/DataModel/spectraTOF.h
+++ b/.conflict-base-0/PWGLF/DataModel/spectraTOF.h
@@ -22,21 +22,23 @@
 #include <memory>
 
 // O2 includes
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/runDataProcessing.h"
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/FT0Corrected.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/StaticFor.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/FT0Corrected.h"
-#include "Common/Core/TrackSelectionDefaults.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
 #include "TPDGCode.h"
 
diff --git a/.conflict-base-0/PWGLF/TableProducer/Common/epvector.cxx b/.conflict-base-0/PWGLF/TableProducer/Common/epvector.cxx
index a662b20bd0b..61996521fdd 100644
--- a/.conflict-base-0/PWGLF/TableProducer/Common/epvector.cxx
+++ b/.conflict-base-0/PWGLF/TableProducer/Common/epvector.cxx
@@ -19,42 +19,46 @@
 ///
 
 // C++/ROOT includes.
+#include <TComplex.h>
 #include <TH1F.h>
+#include <TMath.h>
+
 #include <chrono>
+#include <cstdio>
 #include <string>
 #include <vector>
-#include <TComplex.h>
-#include <TMath.h>
-#include <cstdio>
 
 // o2Physics includes.
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/StepTHn.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
+#include "PWGLF/DataModel/EPCalibrationTables.h"
+
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/Core/trackUtilities.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/TrackSelection.h"
-#include "Framework/ASoAHelpers.h"
 #include "Common/DataModel/FT0Corrected.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonConstants/PhysicsConstants.h"
 #include "FT0Base/Geometry.h"
 #include "FV0Base/Geometry.h"
-#include "PWGLF/DataModel/EPCalibrationTables.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
 #include "TF1.h"
 
 // #include "Common/Core/EventPlaneHelper.h"
 // #include "Common/DataModel/Qvectors.h"
 
 // o2 includes.
-#include "CCDB/CcdbApi.h"
 #include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
 #include "DetectorsCommonDataFormats/AlignParam.h"
 
 using namespace o2;
diff --git a/.conflict-base-0/PWGLF/TableProducer/Common/lfTPCPID.cxx b/.conflict-base-0/PWGLF/TableProducer/Common/lfTPCPID.cxx
index e812633a604..74d0d56c257 100644
--- a/.conflict-base-0/PWGLF/TableProducer/Common/lfTPCPID.cxx
+++ b/.conflict-base-0/PWGLF/TableProducer/Common/lfTPCPID.cxx
@@ -17,26 +17,29 @@
 ///
 
 // ROOT includes
-#include "TFile.h"
-#include "TSystem.h"
 #include "TF1.h"
+#include "TFile.h"
 #include "TGraph.h"
 #include "TList.h"
+#include "TSystem.h"
 
 // O2 includes
-#include "CCDB/BasicCCDBManager.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "CCDB/CcdbApi.h"
+#include "TableHelper.h"
+
 #include "PWGLF/DataModel/LFParticleIdentification.h"
+
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Framework/AnalysisTask.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
+#include "DataFormatsTPC/BetheBlochAleph.h"
 #include "Framework/AnalysisDataModel.h"
-#include "Framework/runDataProcessing.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StaticFor.h"
-#include "DataFormatsTPC/BetheBlochAleph.h"
-#include "TableHelper.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/TableProducer/Common/mcCentrality.cxx b/.conflict-base-0/PWGLF/TableProducer/Common/mcCentrality.cxx
index 690d049af4d..4a55503ada8 100644
--- a/.conflict-base-0/PWGLF/TableProducer/Common/mcCentrality.cxx
+++ b/.conflict-base-0/PWGLF/TableProducer/Common/mcCentrality.cxx
@@ -18,21 +18,25 @@
 ///
 
 // O2 includes
+#include "PWGLF/DataModel/mcCentrality.h"
+
+#include "TableHelper.h"
+
+#include "PWGLF/Utils/inelGt.h"
+
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "CCDB/CcdbApi.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
-#include "Framework/runDataProcessing.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StaticFor.h"
-#include "TableHelper.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "Common/DataModel/Centrality.h"
-#include "PWGLF/DataModel/mcCentrality.h"
-#include "PWGLF/Utils/inelGt.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/TableProducer/Common/zdcSP.cxx b/.conflict-base-0/PWGLF/TableProducer/Common/zdcSP.cxx
index 783526e1400..c10ac4804d0 100644
--- a/.conflict-base-0/PWGLF/TableProducer/Common/zdcSP.cxx
+++ b/.conflict-base-0/PWGLF/TableProducer/Common/zdcSP.cxx
@@ -12,43 +12,39 @@
 // Minimal example to run this task:
 // o2-analysis-centrality-table -b --configuration json://configuration.json | o2-analysis-timestamp -b --configuration json://configuration.json | o2-analysis-event-selection -b --configuration json://configuration.json | o2-analysis-multiplicity-table -b --configuration json://configuration.json | o2-analysis-lf-zdcsp -b --configuration json://configuration.json --aod-file @input_data.txt --aod-writer-json OutputDirector.json
 
-#include <array>
-#include <cmath>
-
-#include "Math/Vector4D.h"
-
-#include "CCDB/BasicCCDBManager.h"
+#include "PWGLF/DataModel/LFzdcSPtables.h"
 
+#include "Common/CCDB/ctpRateFetcher.h"
+#include "Common/Core/EventPlaneHelper.h"
+#include "Common/Core/PID/PIDTOF.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/Qvectors.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/Core/PID/PIDTOF.h"
 #include "Common/TableProducer/PID/pidTOFBase.h"
-#include "Common/Core/EventPlaneHelper.h"
-#include "Common/DataModel/Qvectors.h"
-#include "Common/CCDB/ctpRateFetcher.h"
 
+#include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsParameters/GRPMagField.h"
 #include "DataFormatsParameters/GRPObject.h"
 #include "DataFormatsTPC/BetheBlochAleph.h"
 #include "DetectorsBase/GeometryManager.h"
 #include "DetectorsBase/Propagator.h"
-
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
-
 #include "ReconstructionDataFormats/Track.h"
 
-#include "PWGLF/DataModel/LFzdcSPtables.h"
-
+#include "Math/Vector4D.h"
 #include "TRandom3.h"
 
+#include <array>
+#include <cmath>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-base-0/PWGLF/TableProducer/Nuspex/LFTreeCreatorClusterStudies.cxx b/.conflict-base-0/PWGLF/TableProducer/Nuspex/LFTreeCreatorClusterStudies.cxx
index d8df6f0bbf6..c05fcddfb61 100644
--- a/.conflict-base-0/PWGLF/TableProducer/Nuspex/LFTreeCreatorClusterStudies.cxx
+++ b/.conflict-base-0/PWGLF/TableProducer/Nuspex/LFTreeCreatorClusterStudies.cxx
@@ -14,45 +14,45 @@
 //
 // Author: Giorgio Alberto Lucia
 
-#include <vector>
-#include <utility>
-#include <random>
-#include <cstdint>
-#include <cstring>
-#include <unordered_map>
-#include <numeric>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "Common/DataModel/EventSelection.h"
+#include "PWGLF/DataModel/LFClusterStudiesTable.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
 
 #include "Common/Core/PID/PIDTOF.h"
-#include "Common/TableProducer/PID/pidTOFBase.h"
 #include "Common/Core/PID/TPCPIDResponse.h"
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/PIDResponseITS.h"
-#include "DCAFitter/DCAFitterN.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/TableProducer/PID/pidTOFBase.h"
 
-#include "PWGLF/DataModel/LFClusterStudiesTable.h"
+#include "CCDB/BasicCCDBManager.h"
+#include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
 #include "TDatabasePDG.h"
 #include "TPDGCode.h"
 
+#include <cstdint>
+#include <cstring>
+#include <numeric>
+#include <random>
+#include <unordered_map>
+#include <utility>
+#include <vector>
+
 using namespace ::o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-base-0/PWGLF/TableProducer/Nuspex/he3HadronFemto.cxx b/.conflict-base-0/PWGLF/TableProducer/Nuspex/he3HadronFemto.cxx
index 547d4b08c3b..1afb97fe35c 100644
--- a/.conflict-base-0/PWGLF/TableProducer/Nuspex/he3HadronFemto.cxx
+++ b/.conflict-base-0/PWGLF/TableProducer/Nuspex/he3HadronFemto.cxx
@@ -15,30 +15,9 @@
 /// \author Your Name (your.email@cern.ch)
 /// \since April 2025
 
-#include <TH1F.h>
-#include <TDirectory.h>
-#include <THn.h>
-#include <TMath.h>
-#include <TObjArray.h>
-#include <TFile.h>
-#include <TH2F.h>
-#include <TPDGCode.h>
-#include <TDatabasePDG.h>
-
-#include <cmath>
-#include <string>
-#include <algorithm>
-#include <vector>
-#include <array>
-#include <cstdlib>
-#include <iterator> // std::prev
-
-#include "Framework/ASoAHelpers.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/StepTHn.h"
+#include "PWGLF/DataModel/EPCalibrationTables.h"
+#include "PWGLF/DataModel/LFhe3HadronTables.h"
+#include "PWGLF/Utils/svPoolCreator.h"
 
 #include "Common/Core/PID/PIDTOF.h"
 #include "Common/Core/PID/TPCPIDResponse.h"
@@ -52,21 +31,40 @@
 #include "Common/DataModel/PIDResponseITS.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/TableProducer/PID/pidTOFBase.h"
-
 #include "EventFiltering/Zorro.h"
 #include "EventFiltering/ZorroSummary.h"
 
 #include "CCDB/BasicCCDBManager.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsTPC/BetheBlochAleph.h"
-#include "DataFormatsParameters/GRPObject.h"
 #include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DataFormatsTPC/BetheBlochAleph.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
 
-#include "PWGLF/DataModel/EPCalibrationTables.h"
-#include "PWGLF/DataModel/LFhe3HadronTables.h"
-#include "PWGLF/Utils/svPoolCreator.h"
+#include <TDatabasePDG.h>
+#include <TDirectory.h>
+#include <TFile.h>
+#include <TH1F.h>
+#include <TH2F.h>
+#include <THn.h>
+#include <TMath.h>
+#include <TObjArray.h>
+#include <TPDGCode.h>
+
+#include <algorithm>
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <iterator> // std::prev
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/TableProducer/Nuspex/hyhe4builder.cxx b/.conflict-base-0/PWGLF/TableProducer/Nuspex/hyhe4builder.cxx
index 66fe812f7a2..1c56cff15dd 100644
--- a/.conflict-base-0/PWGLF/TableProducer/Nuspex/hyhe4builder.cxx
+++ b/.conflict-base-0/PWGLF/TableProducer/Nuspex/hyhe4builder.cxx
@@ -19,32 +19,34 @@
 // --- kumar.lokesh@cern.ch
 // --- david.dobrigkeit.chinellato@cern.ch
 
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <map>
-#include <iterator>
-#include <utility>
+#include "PWGLF/DataModel/LFHyperhelium4Tables.h"
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
 #include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+
 #include "CCDB/BasicCCDBManager.h"
-#include "PWGLF/DataModel/LFHyperhelium4Tables.h"
+#include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <iterator>
+#include <map>
+#include <utility>
 
 using namespace std;
 using namespace o2;
diff --git a/.conflict-base-0/PWGLF/TableProducer/Nuspex/hypKfRecoTask.cxx b/.conflict-base-0/PWGLF/TableProducer/Nuspex/hypKfRecoTask.cxx
index 160310d5bd8..f36a2c7b362 100644
--- a/.conflict-base-0/PWGLF/TableProducer/Nuspex/hypKfRecoTask.cxx
+++ b/.conflict-base-0/PWGLF/TableProducer/Nuspex/hypKfRecoTask.cxx
@@ -13,45 +13,50 @@
 /// \brief Hypernuclei rconstruction using KFParticle package
 /// \author Janik Ditzel <jditzel@cern.ch> and Michael Hartung <mhartung@cern.ch>
 
-#include <limits>
-#include <vector>
-#include <string>
-#include <map>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
+#include "MetadataHelper.h"
+
+#include "PWGLF/DataModel/LFHypernucleiKfTables.h"
+
+#include "Common/Core/PID/TPCPIDResponse.h"
 #include "Common/Core/RecoDecay.h"
 #include "Common/Core/trackUtilities.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Centrality.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+#include "Common/DataModel/CollisionAssociationTables.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/PIDResponseTPC.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/TableProducer/PID/pidTPCBase.h"
+
 #include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/PID/TPCPIDResponse.h"
-#include "DataFormatsTPC/BetheBlochAleph.h"
 #include "DCAFitter/DCAFitterN.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGLF/DataModel/LFHypernucleiKfTables.h"
-#include "TRandom3.h"
-#include "Common/DataModel/CollisionAssociationTables.h"
-#include "Common/TableProducer/PID/pidTPCBase.h"
-#include "Common/DataModel/PIDResponseTPC.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DataFormatsTPC/BetheBlochAleph.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/PID.h"
-#include "MetadataHelper.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include "TRandom3.h"
+
+#include <limits>
+#include <map>
+#include <string>
+#include <vector>
 
 // KFParticle
 #ifndef HomogeneousField
 #define HomogeneousField // o2-linter: disable=name/macro (Name is defined in KFParticle package)
 #endif
-#include "KFParticle.h"
 #include "KFPTrack.h"
 #include "KFPVertex.h"
+#include "KFParticle.h"
 #include "KFParticleBase.h"
 #include "KFVertex.h"
 
diff --git a/.conflict-base-0/PWGLF/TableProducer/Nuspex/hypKfTreeCreator.cxx b/.conflict-base-0/PWGLF/TableProducer/Nuspex/hypKfTreeCreator.cxx
index 246a67f57d6..90295290025 100644
--- a/.conflict-base-0/PWGLF/TableProducer/Nuspex/hypKfTreeCreator.cxx
+++ b/.conflict-base-0/PWGLF/TableProducer/Nuspex/hypKfTreeCreator.cxx
@@ -13,28 +13,31 @@
 /// \brief Creates flat tree for ML analysis
 /// \author Janik Ditzel <jditzel@cern.ch> and Michael Hartung <mhartung@cern.ch>
 
-#include <vector>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
+#include "PWGLF/DataModel/LFHypernucleiKfTables.h"
+
+#include "Common/Core/PID/TPCPIDResponse.h"
 #include "Common/Core/RecoDecay.h"
 #include "Common/Core/trackUtilities.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Centrality.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/PID/TPCPIDResponse.h"
-#include "DataFormatsTPC/BetheBlochAleph.h"
 #include "DCAFitter/DCAFitterN.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGLF/DataModel/LFHypernucleiKfTables.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DataFormatsTPC/BetheBlochAleph.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/TableProducer/Nuspex/lnnRecoTask.cxx b/.conflict-base-0/PWGLF/TableProducer/Nuspex/lnnRecoTask.cxx
index e607057e5c6..88db18c376f 100644
--- a/.conflict-base-0/PWGLF/TableProducer/Nuspex/lnnRecoTask.cxx
+++ b/.conflict-base-0/PWGLF/TableProducer/Nuspex/lnnRecoTask.cxx
@@ -11,43 +11,40 @@
 //
 // Build \Lambda-n-n candidates from V0s and tracks
 // ==============================================================================
-#include <array>
-#include <memory>
-#include <string>
-#include <vector>
-#include <algorithm>
-
-#include <TLorentzVector.h>
+#include "PWGLF/DataModel/EPCalibrationTables.h"
+#include "PWGLF/DataModel/LFLnnTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
+#include "Common/Core/PID/PIDTOF.h"
+#include "Common/Core/PID/TPCPIDResponse.h"
 #include "Common/Core/RecoDecay.h"
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "PWGLF/DataModel/EPCalibrationTables.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
-
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/TableProducer/PID/pidTOFBase.h"
 
-#include "Common/Core/PID/TPCPIDResponse.h"
-#include "DataFormatsTPC/BetheBlochAleph.h"
+#include "CCDB/BasicCCDBManager.h"
 #include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DataFormatsTPC/BetheBlochAleph.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
-#include "Common/DataModel/TrackSelectionTables.h"
-
-#include "Common/Core/PID/PIDTOF.h"
-#include "Common/TableProducer/PID/pidTOFBase.h"
+#include <TLorentzVector.h>
 
-#include "PWGLF/DataModel/LFLnnTables.h"
+#include <algorithm>
+#include <array>
+#include <memory>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/TableProducer/Nuspex/nucleiFlowTree.cxx b/.conflict-base-0/PWGLF/TableProducer/Nuspex/nucleiFlowTree.cxx
index 14192166fae..238cf021cfd 100644
--- a/.conflict-base-0/PWGLF/TableProducer/Nuspex/nucleiFlowTree.cxx
+++ b/.conflict-base-0/PWGLF/TableProducer/Nuspex/nucleiFlowTree.cxx
@@ -19,54 +19,49 @@
 // o2-analysis-pid-tof-base, o2-analysis-multiplicity-table, o2-analysis-event-selection
 // (to add flow: o2-analysis-qvector-table, o2-analysis-centrality-table)
 
-#include <algorithm>
-#include <cmath>
-#include <memory>
-#include <string>
-#include <vector>
-
-#include "Math/Vector4D.h"
+#include "nucleiUtils.h"
 
-#include "CCDB/BasicCCDBManager.h"
+#include "PWGLF/DataModel/EPCalibrationTables.h"
+#include "PWGLF/DataModel/LFSlimNucleiTables.h"
 
+#include "Common/Core/EventPlaneHelper.h"
+#include "Common/Core/PID/PIDTOF.h"
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/PIDResponseITS.h"
+#include "Common/DataModel/Qvectors.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/Core/PID/PIDTOF.h"
 #include "Common/TableProducer/PID/pidTOFBase.h"
-#include "Common/Core/EventPlaneHelper.h"
-#include "Common/DataModel/Qvectors.h"
 #include "Common/Tools/TrackTuner.h"
-#include "Common/Core/RecoDecay.h"
+#include "EventFiltering/Zorro.h"
+#include "EventFiltering/ZorroSummary.h"
 
+#include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsParameters/GRPMagField.h"
 #include "DataFormatsParameters/GRPObject.h"
 #include "DataFormatsTPC/BetheBlochAleph.h"
 #include "DetectorsBase/GeometryManager.h"
 #include "DetectorsBase/Propagator.h"
-
-#include "EventFiltering/Zorro.h"
-#include "EventFiltering/ZorroSummary.h"
-
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
-
 #include "ReconstructionDataFormats/Track.h"
 
-#include "PWGLF/DataModel/EPCalibrationTables.h"
-#include "PWGLF/DataModel/LFSlimNucleiTables.h"
-
+#include "Math/Vector4D.h"
 #include "TRandom3.h"
 
-#include "nucleiUtils.h"
+#include <algorithm>
+#include <cmath>
+#include <memory>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/TableProducer/Nuspex/pidTOFGeneric.cxx b/.conflict-base-0/PWGLF/TableProducer/Nuspex/pidTOFGeneric.cxx
index 9997d4d27c8..5e934fec44e 100644
--- a/.conflict-base-0/PWGLF/TableProducer/Nuspex/pidTOFGeneric.cxx
+++ b/.conflict-base-0/PWGLF/TableProducer/Nuspex/pidTOFGeneric.cxx
@@ -16,28 +16,30 @@
 ///         In order to redo TOF PID for tracks which are linked to wrong collisions
 ///
 
+#include <string>
 #include <utility>
 #include <vector>
-#include <string>
 
 // O2 includes
 #include "CCDB/BasicCCDBManager.h"
-#include "TOFBase/EventTimeMaker.h"
 #include "Framework/AnalysisTask.h"
 #include "ReconstructionDataFormats/Track.h"
+#include "TOFBase/EventTimeMaker.h"
 
 // O2Physics includes
+#include "PWGLF/DataModel/pidTOFGeneric.h"
+
 #include "Common/Core/TableHelper.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/FT0Corrected.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
-#include "PID/ParamBase.h"
 #include "PID/PIDTOF.h"
-#include "PWGLF/DataModel/pidTOFGeneric.h"
+#include "PID/ParamBase.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/TableProducer/Nuspex/spectraDerivedMaker.cxx b/.conflict-base-0/PWGLF/TableProducer/Nuspex/spectraDerivedMaker.cxx
index bce0c9153d1..4e7de3c2821 100644
--- a/.conflict-base-0/PWGLF/TableProducer/Nuspex/spectraDerivedMaker.cxx
+++ b/.conflict-base-0/PWGLF/TableProducer/Nuspex/spectraDerivedMaker.cxx
@@ -18,20 +18,22 @@
 ///
 
 // O2 includes
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/spectraTOF.h"
+
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
 #include "Framework/StaticFor.h"
-#include "Common/Core/TrackSelectionDefaults.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
-#include "PWGLF/DataModel/spectraTOF.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
 #include "TPDGCode.h"
 
diff --git a/.conflict-base-0/PWGLF/TableProducer/Nuspex/threebodymcfinder.cxx b/.conflict-base-0/PWGLF/TableProducer/Nuspex/threebodymcfinder.cxx
index 875128758b8..a10510153bc 100644
--- a/.conflict-base-0/PWGLF/TableProducer/Nuspex/threebodymcfinder.cxx
+++ b/.conflict-base-0/PWGLF/TableProducer/Nuspex/threebodymcfinder.cxx
@@ -25,36 +25,38 @@
 //    david.dobrigkeit.chinellato@cern.ch
 //
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "ReconstructionDataFormats/Track.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/McCollisionExtra.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "Common/Core/TrackSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
+#include <Math/Vector4D.h>
+#include <TDatabasePDG.h>
 #include <TFile.h>
-#include <TLorentzVector.h>
 #include <TH1F.h>
 #include <TH2F.h>
-#include <TProfile.h>
-#include <Math/Vector4D.h>
+#include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
-#include <cmath>
+#include <TProfile.h>
+
 #include <array>
+#include <cmath>
 #include <cstdlib>
 
 using namespace o2;
diff --git a/.conflict-base-0/PWGLF/TableProducer/Nuspex/trHeAnalysis.cxx b/.conflict-base-0/PWGLF/TableProducer/Nuspex/trHeAnalysis.cxx
index 40378ba6df4..2f06f165046 100644
--- a/.conflict-base-0/PWGLF/TableProducer/Nuspex/trHeAnalysis.cxx
+++ b/.conflict-base-0/PWGLF/TableProducer/Nuspex/trHeAnalysis.cxx
@@ -16,8 +16,10 @@
 ///
 /// \author Matthias Herzer <matthias.herzer@cern.ch>, Goethe University Frankfurt
 ///
-#include <string>
-#include <vector>
+#include "PWGLF/DataModel/LFNucleiTables.h"
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/pidTOFGeneric.h"
+
 #include "Common/CCDB/EventSelectionParams.h"
 #include "Common/Core/PID/TPCPIDResponse.h"
 #include "Common/Core/trackUtilities.h"
@@ -26,18 +28,20 @@
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFNucleiTables.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
 #include "ReconstructionDataFormats/PID.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "PWGLF/DataModel/pidTOFGeneric.h"
+
 #include <TF1.h>
 
+#include <string>
+#include <vector>
+
 namespace o2::aod
 {
 namespace h3_data
diff --git a/.conflict-base-0/PWGLF/TableProducer/QC/strangenessQC.cxx b/.conflict-base-0/PWGLF/TableProducer/QC/strangenessQC.cxx
index f35ad82899c..9452899f913 100644
--- a/.conflict-base-0/PWGLF/TableProducer/QC/strangenessQC.cxx
+++ b/.conflict-base-0/PWGLF/TableProducer/QC/strangenessQC.cxx
@@ -14,15 +14,17 @@
 /// In case of questions please write to:
 /// \author Roman Nepeivoda (roman.nepeivoda@cern.ch)
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "PWGLF/DataModel/QC/strangenessTablesQC.h"
 
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-base-0/PWGLF/TableProducer/Resonances/HeptaQuarktable.cxx b/.conflict-base-0/PWGLF/TableProducer/Resonances/HeptaQuarktable.cxx
index ccb0c61465f..36765795b05 100644
--- a/.conflict-base-0/PWGLF/TableProducer/Resonances/HeptaQuarktable.cxx
+++ b/.conflict-base-0/PWGLF/TableProducer/Resonances/HeptaQuarktable.cxx
@@ -14,39 +14,38 @@
 ///
 /// \author Junlee Kim, (junlee.kim@cern.ch)
 
-#include <Framework/Configurable.h>
-#include <Math/GenVector/Boost.h>
-#include <Math/Vector4D.h>
-#include <TMath.h>
-#include <fairlogger/Logger.h>
-
-#include <iostream>
-#include <iterator>
-#include <string>
-#include <vector>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/DataModel/ReducedHeptaQuarkTables.h"
 
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/PIDResponseITS.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 #include "EventFiltering/Zorro.h"
 #include "EventFiltering/ZorroSummary.h"
 
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
+#include "CommonConstants/MathConstants.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
+#include <Framework/Configurable.h>
 
-#include "CommonConstants/MathConstants.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/PIDResponseITS.h"
+#include <Math/GenVector/Boost.h>
+#include <Math/Vector4D.h>
+#include <TMath.h>
 
-#include "CCDB/BasicCCDBManager.h"
-#include "CCDB/CcdbApi.h"
+#include <fairlogger/Logger.h>
 
-#include "PWGLF/DataModel/ReducedHeptaQuarkTables.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include <iostream>
+#include <iterator>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/TableProducer/Resonances/doublephitable.cxx b/.conflict-base-0/PWGLF/TableProducer/Resonances/doublephitable.cxx
index d02ab3d3734..4279cff1c02 100644
--- a/.conflict-base-0/PWGLF/TableProducer/Resonances/doublephitable.cxx
+++ b/.conflict-base-0/PWGLF/TableProducer/Resonances/doublephitable.cxx
@@ -14,39 +14,41 @@
 ///
 /// \author Sourav Kundu, sourav.kundu@cern.ch
 
+#include "PWGLF/DataModel/ReducedDoublePhiTables.h"
+
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/PIDResponseITS.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+#include "EventFiltering/Zorro.h"
+#include "EventFiltering/ZorroSummary.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
+#include "CommonConstants/MathConstants.h"
+#include "DataFormatsTPC/BetheBlochAleph.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 #include <Framework/Configurable.h>
+
 #include <Math/GenVector/Boost.h>
 #include <Math/Vector4D.h>
+#include <TDatabasePDG.h> // FIXME
 #include <TMath.h>
+#include <TPDGCode.h> // FIXME
+
 #include <fairlogger/Logger.h>
-#include <TDatabasePDG.h> // FIXME
-#include <TPDGCode.h>     // FIXME
 
 #include <iostream>
 #include <iterator>
 #include <string>
 #include <vector>
 
-#include "EventFiltering/Zorro.h"
-#include "EventFiltering/ZorroSummary.h"
-
-#include "PWGLF/DataModel/ReducedDoublePhiTables.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
-#include "CommonConstants/MathConstants.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "DataFormatsTPC/BetheBlochAleph.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "CCDB/CcdbApi.h"
-#include "Common/DataModel/PIDResponseITS.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-base-0/PWGLF/TableProducer/Resonances/f1protonInitializer.cxx b/.conflict-base-0/PWGLF/TableProducer/Resonances/f1protonInitializer.cxx
index e7240c72f90..a6db6759a68 100644
--- a/.conflict-base-0/PWGLF/TableProducer/Resonances/f1protonInitializer.cxx
+++ b/.conflict-base-0/PWGLF/TableProducer/Resonances/f1protonInitializer.cxx
@@ -12,39 +12,40 @@
 /// \file f1protonInitializer.cxx
 /// check if the event have f1-p candidate
 /// \author Sourav Kundu <sourav.kundu@cern.ch>
-#include <TH1F.h>
-#include <TDirectory.h>
-#include <THn.h>
-#include <TLorentzVector.h>
-#include <TMath.h>
-#include <TObjArray.h>
-#include <TFile.h>
-#include <TH2F.h>
-#include <TLorentzVector.h>
-#include <TPDGCode.h>
-#include <TDatabasePDG.h>
-
-#include <cmath>
-#include <array>
-#include <cstdlib>
+#include "PWGLF/DataModel/LFF1Tables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/Utils/collisionCuts.h"
 
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Multiplicity.h"
 #include "Common/Core/trackUtilities.h"
-#include "CommonConstants/PhysicsConstants.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonConstants/PhysicsConstants.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFF1Tables.h"
-#include "PWGLF/Utils/collisionCuts.h"
 #include "ReconstructionDataFormats/Track.h"
 
+#include <TDatabasePDG.h>
+#include <TDirectory.h>
+#include <TFile.h>
+#include <TH1F.h>
+#include <TH2F.h>
+#include <THn.h>
+#include <TLorentzVector.h>
+#include <TMath.h>
+#include <TObjArray.h>
+#include <TPDGCode.h>
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-base-0/PWGLF/TableProducer/Resonances/f1protonreducedtable.cxx b/.conflict-base-0/PWGLF/TableProducer/Resonances/f1protonreducedtable.cxx
index ce0cdcf3af5..4a3959ab776 100644
--- a/.conflict-base-0/PWGLF/TableProducer/Resonances/f1protonreducedtable.cxx
+++ b/.conflict-base-0/PWGLF/TableProducer/Resonances/f1protonreducedtable.cxx
@@ -14,40 +14,42 @@
 ///
 /// \author Sourav Kundu, sourav.kundu@cern.ch
 
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/DataModel/ReducedF1ProtonTables.h"
+
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/PIDResponseITS.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+#include "EventFiltering/Zorro.h"
+#include "EventFiltering/ZorroSummary.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
+#include "CommonConstants/MathConstants.h"
+#include "DataFormatsTPC/BetheBlochAleph.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 #include <Framework/Configurable.h>
+
 #include <Math/GenVector/Boost.h>
 #include <Math/Vector4D.h>
+#include <TDatabasePDG.h> // FIXME
 #include <TMath.h>
+#include <TPDGCode.h> // FIXME
+
 #include <fairlogger/Logger.h>
-#include <TDatabasePDG.h> // FIXME
-#include <TPDGCode.h>     // FIXME
 
 #include <iostream>
 #include <iterator>
 #include <string>
 #include <vector>
 
-#include "EventFiltering/Zorro.h"
-#include "EventFiltering/ZorroSummary.h"
-
-#include "PWGLF/DataModel/ReducedF1ProtonTables.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
-#include "CommonConstants/MathConstants.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "DataFormatsTPC/BetheBlochAleph.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "CCDB/CcdbApi.h"
-#include "Common/DataModel/PIDResponseITS.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
@@ -767,10 +769,10 @@ struct f1protonreducedtable {
                 F1KaonIndex.push_back(KaonIndex.at(i2));
                 F1KshortDaughterPositiveIndex.push_back(KshortPosDaughIndex.at(i3));
                 F1KshortDaughterNegativeIndex.push_back(KshortNegDaughIndex.at(i3));
-                PionTOFHitFinal.push_back(PionTOFHit.at(i1)); // Pion TOF Hit
-                KaonTOFHitFinal.push_back(KaonTOFHit.at(i2)); // Kaon TOF Hit
-                PionTPCFinal.push_back(PionTPC.at(i1));       // Pion TPC
-                KaonTPCFinal.push_back(KaonTPC.at(i2));       // Kaon TPC
+                PionTOFHitFinal.push_back(PionTOFHit.at(i1));           // Pion TOF Hit
+                KaonTOFHitFinal.push_back(KaonTOFHit.at(i2));           // Kaon TOF Hit
+                PionTPCFinal.push_back(PionTPC.at(i1));                 // Pion TPC
+                KaonTPCFinal.push_back(KaonTPC.at(i2));                 // Kaon TPC
                 KaonTPCPionHypoFinal.push_back(KaonTPCPionHypo.at(i2)); // Kaon TPC
                 if (pairsign == 1) {
                   qaRegistry.fill(HIST("hInvMassf1"), F1Vector.M(), F1Vector.Pt());
diff --git a/.conflict-base-0/PWGLF/TableProducer/Resonances/filterf1proton.cxx b/.conflict-base-0/PWGLF/TableProducer/Resonances/filterf1proton.cxx
index 831209b0905..df684770709 100644
--- a/.conflict-base-0/PWGLF/TableProducer/Resonances/filterf1proton.cxx
+++ b/.conflict-base-0/PWGLF/TableProducer/Resonances/filterf1proton.cxx
@@ -14,32 +14,36 @@
 ///
 /// \author Sourav Kundu, sourav.kundu@cern.ch
 
-#include <Framework/Configurable.h>
-#include <Math/GenVector/Boost.h>
-#include <Math/Vector4D.h>
-#include <TMath.h>
-#include <fairlogger/Logger.h>
-#include <iostream>
-#include <iterator>
-#include <string>
-
 #include "PWGLF/DataModel/FilterF1ProtonTables.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
-#include "CommonConstants/MathConstants.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "DataFormatsTPC/BetheBlochAleph.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
 #include "CCDB/CcdbApi.h"
+#include "CommonConstants/MathConstants.h"
 #include "CommonConstants/PhysicsConstants.h"
+#include "DataFormatsTPC/BetheBlochAleph.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include <Framework/Configurable.h>
+
+#include <Math/GenVector/Boost.h>
+#include <Math/Vector4D.h>
+#include <TMath.h>
+
+#include <fairlogger/Logger.h>
+
+#include <iostream>
+#include <iterator>
+#include <string>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/TableProducer/Resonances/resonanceInitializer.cxx b/.conflict-base-0/PWGLF/TableProducer/Resonances/resonanceInitializer.cxx
index c318d1d57d9..23d4b0df3ae 100644
--- a/.conflict-base-0/PWGLF/TableProducer/Resonances/resonanceInitializer.cxx
+++ b/.conflict-base-0/PWGLF/TableProducer/Resonances/resonanceInitializer.cxx
@@ -14,32 +14,35 @@
 /// \author Bong-Hwi Lim <bong-hwi.lim@cern.ch>
 ///
 
-#include <string>
-#include <vector>
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/Centrality.h"
+#include "PWGLF/DataModel/LFResonanceTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/Utils/collisionCuts.h"
+
+#include "Common/Core/EventPlaneHelper.h"
 #include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/Qvectors.h"
-#include "Common/Core/EventPlaneHelper.h"
-#include "Framework/ASoAHelpers.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonConstants/MathConstants.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
 #include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
-#include "PWGLF/Utils/collisionCuts.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "CommonConstants/MathConstants.h"
+
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/TableProducer/Resonances/resonanceMergeDF.cxx b/.conflict-base-0/PWGLF/TableProducer/Resonances/resonanceMergeDF.cxx
index 99ba4ec391d..c94d5940ff2 100644
--- a/.conflict-base-0/PWGLF/TableProducer/Resonances/resonanceMergeDF.cxx
+++ b/.conflict-base-0/PWGLF/TableProducer/Resonances/resonanceMergeDF.cxx
@@ -26,31 +26,33 @@
 /// \author Bong-Hwi Lim <bong-hwi.lim@cern.ch>
 ///         Nasir Mehdi Malik <nasir.mehdi.malik@cern.ch>
 ///         Min-jae Kim <minjae.kim@cern.ch>
-#include <vector>
+#include "PWGLF/DataModel/LFResonanceTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/Utils/collisionCuts.h"
 
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Multiplicity.h"
+#include "Common/Core/EventPlaneHelper.h"
 #include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/Qvectors.h"
-#include "Common/Core/EventPlaneHelper.h"
-#include "Framework/ASoAHelpers.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
 #include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
-#include "PWGLF/Utils/collisionCuts.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/TableProducer/Resonances/resonanceModuleInitializer.cxx b/.conflict-base-0/PWGLF/TableProducer/Resonances/resonanceModuleInitializer.cxx
index 54d2533b05a..d369995d3fd 100644
--- a/.conflict-base-0/PWGLF/TableProducer/Resonances/resonanceModuleInitializer.cxx
+++ b/.conflict-base-0/PWGLF/TableProducer/Resonances/resonanceModuleInitializer.cxx
@@ -14,34 +14,37 @@
 ///
 /// \author Bong-Hwi Lim <bong-hwi.lim@cern.ch>
 
-#include <string>
-#include <vector>
-#include "CCDB/BasicCCDBManager.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/Centrality.h"
+#include "PWGLF/DataModel/LFResonanceTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/DataModel/mcCentrality.h"
+#include "PWGLF/Utils/collisionCuts.h"
+
+#include "Common/Core/EventPlaneHelper.h"
 #include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/Qvectors.h"
-#include "Common/Core/EventPlaneHelper.h"
-#include "CommonConstants/PhysicsConstants.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/MathConstants.h"
-#include "DataFormatsParameters/GRPObject.h"
+#include "CommonConstants/PhysicsConstants.h"
 #include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
 #include "DetectorsBase/Propagator.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
-#include "PWGLF/DataModel/mcCentrality.h"
-#include "PWGLF/Utils/collisionCuts.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
 
+#include <string>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-base-0/PWGLF/TableProducer/Strangeness/Converters/stracentconverter.cxx b/.conflict-base-0/PWGLF/TableProducer/Strangeness/Converters/stracentconverter.cxx
index 74a786101e9..150b3734301 100644
--- a/.conflict-base-0/PWGLF/TableProducer/Strangeness/Converters/stracentconverter.cxx
+++ b/.conflict-base-0/PWGLF/TableProducer/Strangeness/Converters/stracentconverter.cxx
@@ -8,11 +8,12 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-base-0/PWGLF/TableProducer/Strangeness/Converters/stradautracksconverter.cxx b/.conflict-base-0/PWGLF/TableProducer/Strangeness/Converters/stradautracksconverter.cxx
index 5fe25abb572..e5b4533350e 100644
--- a/.conflict-base-0/PWGLF/TableProducer/Strangeness/Converters/stradautracksconverter.cxx
+++ b/.conflict-base-0/PWGLF/TableProducer/Strangeness/Converters/stradautracksconverter.cxx
@@ -8,11 +8,12 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/TableProducer/Strangeness/Converters/stradautracksextraconverter.cxx b/.conflict-base-0/PWGLF/TableProducer/Strangeness/Converters/stradautracksextraconverter.cxx
index ad436f4dfee..e40250a1ab3 100644
--- a/.conflict-base-0/PWGLF/TableProducer/Strangeness/Converters/stradautracksextraconverter.cxx
+++ b/.conflict-base-0/PWGLF/TableProducer/Strangeness/Converters/stradautracksextraconverter.cxx
@@ -8,11 +8,12 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
@@ -37,4 +38,5 @@ WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
   return WorkflowSpec{
     adaptAnalysisTask<stradautracksextraconverter>(cfgc)};
-}
\ No newline at end of file
+}
+ 
\ No newline at end of file
diff --git a/.conflict-base-0/PWGLF/TableProducer/Strangeness/Converters/stradautracksextraconverter2.cxx b/.conflict-base-0/PWGLF/TableProducer/Strangeness/Converters/stradautracksextraconverter2.cxx
index 22c9fc7eea4..e9c2f78c407 100644
--- a/.conflict-base-0/PWGLF/TableProducer/Strangeness/Converters/stradautracksextraconverter2.cxx
+++ b/.conflict-base-0/PWGLF/TableProducer/Strangeness/Converters/stradautracksextraconverter2.cxx
@@ -8,11 +8,12 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/TableProducer/Strangeness/Converters/stradautracksextraconverter3.cxx b/.conflict-base-0/PWGLF/TableProducer/Strangeness/Converters/stradautracksextraconverter3.cxx
index a4144c1ee9a..9f4d341ff39 100644
--- a/.conflict-base-0/PWGLF/TableProducer/Strangeness/Converters/stradautracksextraconverter3.cxx
+++ b/.conflict-base-0/PWGLF/TableProducer/Strangeness/Converters/stradautracksextraconverter3.cxx
@@ -8,11 +8,12 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/TableProducer/Strangeness/Converters/stradautrackstofpidconverter.cxx b/.conflict-base-0/PWGLF/TableProducer/Strangeness/Converters/stradautrackstofpidconverter.cxx
index 8731939ca53..063b318657f 100644
--- a/.conflict-base-0/PWGLF/TableProducer/Strangeness/Converters/stradautrackstofpidconverter.cxx
+++ b/.conflict-base-0/PWGLF/TableProducer/Strangeness/Converters/stradautrackstofpidconverter.cxx
@@ -8,11 +8,12 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
@@ -62,4 +63,5 @@ WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
   return WorkflowSpec{
     adaptAnalysisTask<stradautrackstofpidconverter>(cfgc)};
-}
\ No newline at end of file
+}
+ 
\ No newline at end of file
diff --git a/.conflict-base-0/PWGLF/TableProducer/Strangeness/Converters/straevselsconverter.cxx b/.conflict-base-0/PWGLF/TableProducer/Strangeness/Converters/straevselsconverter.cxx
index 9806e15abfc..8cadcdacd2a 100644
--- a/.conflict-base-0/PWGLF/TableProducer/Strangeness/Converters/straevselsconverter.cxx
+++ b/.conflict-base-0/PWGLF/TableProducer/Strangeness/Converters/straevselsconverter.cxx
@@ -8,11 +8,12 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-base-0/PWGLF/TableProducer/Strangeness/Converters/straevselsconverter2rawcents.cxx b/.conflict-base-0/PWGLF/TableProducer/Strangeness/Converters/straevselsconverter2rawcents.cxx
index deeafa8eeca..90ce25774c7 100644
--- a/.conflict-base-0/PWGLF/TableProducer/Strangeness/Converters/straevselsconverter2rawcents.cxx
+++ b/.conflict-base-0/PWGLF/TableProducer/Strangeness/Converters/straevselsconverter2rawcents.cxx
@@ -8,11 +8,12 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-base-0/PWGLF/TableProducer/Strangeness/Converters/straevselsconverter2rawcents2.cxx b/.conflict-base-0/PWGLF/TableProducer/Strangeness/Converters/straevselsconverter2rawcents2.cxx
index ffed58e9072..fa3a2ba8e48 100644
--- a/.conflict-base-0/PWGLF/TableProducer/Strangeness/Converters/straevselsconverter2rawcents2.cxx
+++ b/.conflict-base-0/PWGLF/TableProducer/Strangeness/Converters/straevselsconverter2rawcents2.cxx
@@ -8,11 +8,12 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-base-0/PWGLF/TableProducer/Strangeness/Converters/straevselsconverter2rawcents3.cxx b/.conflict-base-0/PWGLF/TableProducer/Strangeness/Converters/straevselsconverter2rawcents3.cxx
index 8d92146d6f7..0a5e98462ce 100644
--- a/.conflict-base-0/PWGLF/TableProducer/Strangeness/Converters/straevselsconverter2rawcents3.cxx
+++ b/.conflict-base-0/PWGLF/TableProducer/Strangeness/Converters/straevselsconverter2rawcents3.cxx
@@ -8,11 +8,12 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-base-0/PWGLF/TableProducer/Strangeness/Converters/stramccollisionconverter.cxx b/.conflict-base-0/PWGLF/TableProducer/Strangeness/Converters/stramccollisionconverter.cxx
index 8c7950dc4fd..c29ad673dbc 100644
--- a/.conflict-base-0/PWGLF/TableProducer/Strangeness/Converters/stramccollisionconverter.cxx
+++ b/.conflict-base-0/PWGLF/TableProducer/Strangeness/Converters/stramccollisionconverter.cxx
@@ -8,11 +8,12 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-base-0/PWGLF/TableProducer/Strangeness/Converters/stramccollisionconverter2.cxx b/.conflict-base-0/PWGLF/TableProducer/Strangeness/Converters/stramccollisionconverter2.cxx
index c821c6fb5fe..2f330820509 100644
--- a/.conflict-base-0/PWGLF/TableProducer/Strangeness/Converters/stramccollisionconverter2.cxx
+++ b/.conflict-base-0/PWGLF/TableProducer/Strangeness/Converters/stramccollisionconverter2.cxx
@@ -16,11 +16,12 @@
 /// \author Romain Schotter <romain.schotter@cern.ch>, Austrian Academy of Sciences & SMI
 //
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-base-0/PWGLF/TableProducer/Strangeness/Converters/stramccollmultconverter.cxx b/.conflict-base-0/PWGLF/TableProducer/Strangeness/Converters/stramccollmultconverter.cxx
index 411e3c15da5..2b25192cce1 100644
--- a/.conflict-base-0/PWGLF/TableProducer/Strangeness/Converters/stramccollmultconverter.cxx
+++ b/.conflict-base-0/PWGLF/TableProducer/Strangeness/Converters/stramccollmultconverter.cxx
@@ -8,11 +8,12 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-base-0/PWGLF/TableProducer/Strangeness/Converters/strarawcentsconverter.cxx b/.conflict-base-0/PWGLF/TableProducer/Strangeness/Converters/strarawcentsconverter.cxx
index e912c724870..7986a02ca1e 100644
--- a/.conflict-base-0/PWGLF/TableProducer/Strangeness/Converters/strarawcentsconverter.cxx
+++ b/.conflict-base-0/PWGLF/TableProducer/Strangeness/Converters/strarawcentsconverter.cxx
@@ -8,11 +8,12 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-base-0/PWGLF/TableProducer/Strangeness/Converters/strarawcentsconverter2v4.cxx b/.conflict-base-0/PWGLF/TableProducer/Strangeness/Converters/strarawcentsconverter2v4.cxx
index c94227e31cd..1eeb4b20ec9 100644
--- a/.conflict-base-0/PWGLF/TableProducer/Strangeness/Converters/strarawcentsconverter2v4.cxx
+++ b/.conflict-base-0/PWGLF/TableProducer/Strangeness/Converters/strarawcentsconverter2v4.cxx
@@ -8,11 +8,12 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-base-0/PWGLF/TableProducer/Strangeness/Converters/strastampsconverter.cxx b/.conflict-base-0/PWGLF/TableProducer/Strangeness/Converters/strastampsconverter.cxx
index 7f5f129d623..8a6ee0c52d0 100644
--- a/.conflict-base-0/PWGLF/TableProducer/Strangeness/Converters/strastampsconverter.cxx
+++ b/.conflict-base-0/PWGLF/TableProducer/Strangeness/Converters/strastampsconverter.cxx
@@ -8,11 +8,12 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-base-0/PWGLF/TableProducer/Strangeness/Converters/v0coresconverter.cxx b/.conflict-base-0/PWGLF/TableProducer/Strangeness/Converters/v0coresconverter.cxx
index 06fafc1cc1a..9fa5142bc6d 100644
--- a/.conflict-base-0/PWGLF/TableProducer/Strangeness/Converters/v0coresconverter.cxx
+++ b/.conflict-base-0/PWGLF/TableProducer/Strangeness/Converters/v0coresconverter.cxx
@@ -8,11 +8,12 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-base-0/PWGLF/TableProducer/Strangeness/Converters/v0coresconverter2.cxx b/.conflict-base-0/PWGLF/TableProducer/Strangeness/Converters/v0coresconverter2.cxx
index c918f227525..66cafa8eeb6 100644
--- a/.conflict-base-0/PWGLF/TableProducer/Strangeness/Converters/v0coresconverter2.cxx
+++ b/.conflict-base-0/PWGLF/TableProducer/Strangeness/Converters/v0coresconverter2.cxx
@@ -8,11 +8,12 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-base-0/PWGLF/TableProducer/Strangeness/Converters/v0mlscoresconverter.cxx b/.conflict-base-0/PWGLF/TableProducer/Strangeness/Converters/v0mlscoresconverter.cxx
index 9f2020bf20d..6cc3f4536fb 100644
--- a/.conflict-base-0/PWGLF/TableProducer/Strangeness/Converters/v0mlscoresconverter.cxx
+++ b/.conflict-base-0/PWGLF/TableProducer/Strangeness/Converters/v0mlscoresconverter.cxx
@@ -8,11 +8,12 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "PWGLF/DataModel/LFStrangenessMLTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/TableProducer/Strangeness/Converters/zdcneutronsconverter.cxx b/.conflict-base-0/PWGLF/TableProducer/Strangeness/Converters/zdcneutronsconverter.cxx
index ad081a43052..7ee0c368480 100644
--- a/.conflict-base-0/PWGLF/TableProducer/Strangeness/Converters/zdcneutronsconverter.cxx
+++ b/.conflict-base-0/PWGLF/TableProducer/Strangeness/Converters/zdcneutronsconverter.cxx
@@ -8,11 +8,12 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "PWGLF/DataModel/LFStrangenessMLTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/TableProducer/Strangeness/LambdaLambdatable.cxx b/.conflict-base-0/PWGLF/TableProducer/Strangeness/LambdaLambdatable.cxx
index 778f39ed442..bb7c517e1e7 100644
--- a/.conflict-base-0/PWGLF/TableProducer/Strangeness/LambdaLambdatable.cxx
+++ b/.conflict-base-0/PWGLF/TableProducer/Strangeness/LambdaLambdatable.cxx
@@ -11,38 +11,37 @@
 ///
 /// \author Junlee Kim, (junlee.kim@cern.ch)
 
-#include <Framework/Configurable.h>
-#include <Math/GenVector/Boost.h>
-#include <Math/Vector4D.h>
-#include <TMath.h>
-#include <fairlogger/Logger.h>
-
-#include <iostream>
-#include <iterator>
-#include <string>
-#include <vector>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/DataModel/ReducedLambdaLambdaTables.h"
 
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 #include "EventFiltering/Zorro.h"
 #include "EventFiltering/ZorroSummary.h"
 
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
+#include "CommonConstants/MathConstants.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
+#include <Framework/Configurable.h>
 
-#include "CommonConstants/MathConstants.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/PIDResponse.h"
+#include <Math/GenVector/Boost.h>
+#include <Math/Vector4D.h>
+#include <TMath.h>
 
-#include "CCDB/BasicCCDBManager.h"
-#include "CCDB/CcdbApi.h"
+#include <fairlogger/Logger.h>
 
-#include "PWGLF/DataModel/ReducedLambdaLambdaTables.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include <iostream>
+#include <iterator>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/TableProducer/Strangeness/cascadeMLSelectionTreeCreator.cxx b/.conflict-base-0/PWGLF/TableProducer/Strangeness/cascadeMLSelectionTreeCreator.cxx
index f3bfc813c89..9eefdea0c8a 100644
--- a/.conflict-base-0/PWGLF/TableProducer/Strangeness/cascadeMLSelectionTreeCreator.cxx
+++ b/.conflict-base-0/PWGLF/TableProducer/Strangeness/cascadeMLSelectionTreeCreator.cxx
@@ -23,37 +23,40 @@
 //    david.dobrigkeit.chinellato@cern.ch
 //
 
-#include <Math/Vector4D.h> // C system
-#include <cmath>           // C++ system
-#include <array>           // C++ system
-#include <cstdlib>         // C++ system
+#include "PWGLF/DataModel/LFStrangenessMLTables.h"
+#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/ASoA.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
-#include "PWGLF/DataModel/LFStrangenessMLTables.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/TableProducer/PID/pidTOFBase.h"
+
 #include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/PhysicsConstants.h"
-#include "Common/TableProducer/PID/pidTOFBase.h"
+#include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <Math/Vector4D.h> // C system
+#include <TDatabasePDG.h>
 #include <TFile.h>
 #include <TH2F.h>
-#include <TProfile.h>
 #include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
+#include <TProfile.h>
+
+#include <array>   // C++ system
+#include <cmath>   // C++ system
+#include <cstdlib> // C++ system
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/TableProducer/Strangeness/cascadebuilder.cxx b/.conflict-base-0/PWGLF/TableProducer/Strangeness/cascadebuilder.cxx
index b4a19e6660b..607445f0fda 100644
--- a/.conflict-base-0/PWGLF/TableProducer/Strangeness/cascadebuilder.cxx
+++ b/.conflict-base-0/PWGLF/TableProducer/Strangeness/cascadebuilder.cxx
@@ -36,47 +36,47 @@
 //    david.dobrigkeit.chinellato@cern.ch
 //
 
-#include <string>
-#include <vector>
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <map>
-#include <iterator>
-#include <utility>
-#include <string>
-#include <vector>
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/LFStrangenessMLTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFStrangenessMLTables.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
 #include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
 #include "Tools/ML/MlResponse.h"
 #include "Tools/ML/model.h"
 
+#include "CCDB/BasicCCDBManager.h"
+#include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <iterator>
+#include <map>
+#include <string>
+#include <utility>
+#include <vector>
+
 #ifndef HomogeneousField
 #define HomogeneousField
 #endif
 
 /// includes KFParticle
-#include "KFParticle.h"
 #include "KFPTrack.h"
 #include "KFPVertex.h"
+#include "KFParticle.h"
 #include "KFParticleBase.h"
 #include "KFVertex.h"
 
@@ -2202,11 +2202,11 @@ struct cascadePreselector {
                   }
                 }
               } // end conditional V0-bach pair
-            }   // end neg = pos mother conditional
+            } // end neg = pos mother conditional
           }
         } // end loop neg/pos mothers
-      }   // end conditional of mothers existing
-    }     // end association check
+      } // end conditional of mothers existing
+    } // end association check
     // Construct tag table (note: this will be joinable with CascDatas)
     if (lPDG == 3312)
       bitset(maskElement, bitTrueXiMinus);
diff --git a/.conflict-base-0/PWGLF/TableProducer/Strangeness/cascadefinder.cxx b/.conflict-base-0/PWGLF/TableProducer/Strangeness/cascadefinder.cxx
index 3901d3f14c3..4d6de573b2a 100644
--- a/.conflict-base-0/PWGLF/TableProducer/Strangeness/cascadefinder.cxx
+++ b/.conflict-base-0/PWGLF/TableProducer/Strangeness/cascadefinder.cxx
@@ -28,33 +28,36 @@
 //    david.dobrigkeit.chinellato@cern.ch
 //
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
 #include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "ReconstructionDataFormats/Track.h"
+#include "PWGLF/DataModel/LFStrangenessFinderTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFStrangenessFinderTables.h"
-#include "Common/Core/TrackSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
 
+#include "DCAFitter/DCAFitterN.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <Math/Vector4D.h>
+#include <TDatabasePDG.h>
 #include <TFile.h>
-#include <TLorentzVector.h>
 #include <TH1F.h>
 #include <TH2F.h>
-#include <TProfile.h>
-#include <Math/Vector4D.h>
+#include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
-#include <cmath>
+#include <TProfile.h>
+
 #include <array>
+#include <cmath>
 #include <cstdlib>
 
 using namespace o2;
@@ -270,9 +273,9 @@ struct cascadefinder {
                      t0id.dcaXY(),
                      dcaInfo[0], dcaInfo[1]);
           } // end if cascade recoed
-        }   // end loop over bachelor
-      }     // end if v0 recoed
-    }       // end loop over cascades
+        } // end loop over bachelor
+      } // end if v0 recoed
+    } // end loop over cascades
 
     // Anticascades
     for (auto& v0id : antiLambdas) {
@@ -361,9 +364,9 @@ struct cascadefinder {
                      t0id.dcaXY(),
                      dcaInfo[0], dcaInfo[1]);
           } // end if cascade recoed
-        }   // end loop over bachelor
-      }     // end if v0 recoed
-    }       // end loop over anticascades
+        } // end loop over bachelor
+      } // end if v0 recoed
+    } // end loop over anticascades
 
     hCandPerEvent->Fill(lNCand);
   }
diff --git a/.conflict-base-0/PWGLF/TableProducer/Strangeness/cascadeflow.cxx b/.conflict-base-0/PWGLF/TableProducer/Strangeness/cascadeflow.cxx
index c66a1db16fd..a8135e5c1b5 100644
--- a/.conflict-base-0/PWGLF/TableProducer/Strangeness/cascadeflow.cxx
+++ b/.conflict-base-0/PWGLF/TableProducer/Strangeness/cascadeflow.cxx
@@ -12,25 +12,29 @@
 /// \brief Task to create derived data for cascade flow analyses
 /// \authors: Chiara De Martin (chiara.de.martin@cern.ch), Maximiliano Puccio (maximiliano.puccio@cern.ch)
 
-#include <vector>
-#include <string>
-#include <memory>
-#include "Math/Vector3D.h"
-#include "TRandom3.h"
+#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/DataModel/cascqaanalysis.h"
+
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Framework/AnalysisTask.h"
+#include "Tools/ML/MlResponse.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/cascqaanalysis.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
-#include "Tools/ML/MlResponse.h"
-#include "CCDB/BasicCCDBManager.h"
+
+#include "Math/Vector3D.h"
+#include "TRandom3.h"
+
+#include <memory>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/TableProducer/Strangeness/cascademcbuilder.cxx b/.conflict-base-0/PWGLF/TableProducer/Strangeness/cascademcbuilder.cxx
index 3d4a5642004..384707d3d57 100644
--- a/.conflict-base-0/PWGLF/TableProducer/Strangeness/cascademcbuilder.cxx
+++ b/.conflict-base-0/PWGLF/TableProducer/Strangeness/cascademcbuilder.cxx
@@ -18,23 +18,25 @@
 //    david.dobrigkeit.chinellato@cern.ch
 //
 
-#include <cmath>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/trackUtilities.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
 #include <array>
+#include <cmath>
 #include <cstdlib>
-#include <map>
 #include <iterator>
+#include <map>
 #include <utility>
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
@@ -45,11 +47,11 @@ using LabeledTracks = soa::Join<aod::Tracks, aod::McTrackLabels>;
 
 //*+-+*+-+*+-+*+-+*+-+*+-+*+-+*+-+*+-+*+-+*
 struct cascademcbuilder {
-  Produces<aod::McCascLabels> casclabels;       // MC labels for cascades
-  Produces<aod::McKFCascLabels> kfcasclabels;   // MC labels for tracked cascades
-  Produces<aod::McTraCascLabels> tracasclabels; // MC labels for tracked cascades
-  Produces<aod::McCascBBTags> bbtags;           // bb tags (inv structure tagging)
-  Produces<aod::CascMCCores> cascmccores;       // optionally aggregate information from MC side for posterior analysis (derived data)
+  Produces<aod::McCascLabels> casclabels;           // MC labels for cascades
+  Produces<aod::McKFCascLabels> kfcasclabels;       // MC labels for tracked cascades
+  Produces<aod::McTraCascLabels> tracasclabels;     // MC labels for tracked cascades
+  Produces<aod::McCascBBTags> bbtags;               // bb tags (inv structure tagging)
+  Produces<aod::CascMCCores> cascmccores;           // optionally aggregate information from MC side for posterior analysis (derived data)
   Produces<aod::CascCoreMCLabels> cascCoreMClabels; // optionally aggregate information from MC side for posterior analysis (derived data)
   Produces<aod::CascMCCollRefs> cascmccollrefs;     // references MC collisions from MC cascades
 
@@ -225,7 +227,7 @@ struct cascademcbuilder {
             } // end v0 mother loop
           } // end has_mothers check for V0
         } // end conditional of pos/neg originating being the same
-      }     // end association check
+      } // end association check
       // Construct label table (note: this will be joinable with CascDatas)
       casclabels(
         thisInfo.label, thisInfo.motherLabel);
@@ -421,11 +423,11 @@ struct cascademcbuilder {
                     }
                   }
                 } // end conditional V0-bach pair
-              }   // end neg = pos mother conditional
+              } // end neg = pos mother conditional
             }
           } // end loop neg/pos mothers
-        }   // end conditional of mothers existing
-      }     // end association check
+        } // end conditional of mothers existing
+      } // end association check
       // Construct label table (note: this will be joinable with CascDatas)
       kfcasclabels(
         lLabel);
@@ -464,11 +466,11 @@ struct cascademcbuilder {
                     }
                   }
                 } // end conditional V0-bach pair
-              }   // end neg = pos mother conditional
+              } // end neg = pos mother conditional
             }
           } // end loop neg/pos mothers
-        }   // end conditional of mothers existing
-      }     // end association check
+        } // end conditional of mothers existing
+      } // end association check
       // Construct label table (note: this will be joinable with CascDatas)
       tracasclabels(
         lLabel);
@@ -505,7 +507,7 @@ struct cascademcbuilder {
               }
             }
           }
-        }                                         // end if-pion
+        } // end if-pion
         if (bachelorParticle.pdgCode() == -211) { // pi-, look for proton in positive prong
           if (lNegTrack.has_mcParticle()) {
             auto baryonParticle = lPosTrack.mcParticle_as<aod::McParticles>();
@@ -520,7 +522,7 @@ struct cascademcbuilder {
             }
           }
         } // end if-pion
-      }   // end bachelor has mcparticle
+      } // end bachelor has mcparticle
       // Construct label table (note: this will be joinable with CascDatas)
       bbtags(bbTag);
     } // end casctable loop
diff --git a/.conflict-base-0/PWGLF/TableProducer/Strangeness/cascademcfinder.cxx b/.conflict-base-0/PWGLF/TableProducer/Strangeness/cascademcfinder.cxx
index 8d26f0ea33c..41bb2863a47 100644
--- a/.conflict-base-0/PWGLF/TableProducer/Strangeness/cascademcfinder.cxx
+++ b/.conflict-base-0/PWGLF/TableProducer/Strangeness/cascademcfinder.cxx
@@ -24,37 +24,39 @@
 //    david.dobrigkeit.chinellato@cern.ch
 //
 
-#include <Math/Vector4D.h>
-#include <cmath>
-#include <array>
-#include <cstdlib>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/McCollisionExtra.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "Common/Core/TrackSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
+#include <Math/Vector4D.h>
+#include <TDatabasePDG.h>
 #include <TFile.h>
-#include <TLorentzVector.h>
 #include <TH1F.h>
 #include <TH2F.h>
-#include <TProfile.h>
+#include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
+#include <TProfile.h>
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/TableProducer/Strangeness/cascademlselection.cxx b/.conflict-base-0/PWGLF/TableProducer/Strangeness/cascademlselection.cxx
index 6da4bc669e4..f8710e5e3ff 100644
--- a/.conflict-base-0/PWGLF/TableProducer/Strangeness/cascademlselection.cxx
+++ b/.conflict-base-0/PWGLF/TableProducer/Strangeness/cascademlselection.cxx
@@ -20,37 +20,40 @@
 //    david.dobrigkeit.chinellato@cern.ch
 //
 
-#include <Math/Vector4D.h>
-#include <cmath>
-#include <array>
-#include <cstdlib>
+#include "PWGLF/DataModel/LFStrangenessMLTables.h"
+#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/ASoA.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
-#include "PWGLF/DataModel/LFStrangenessMLTables.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+#include "Tools/ML/MlResponse.h"
+#include "Tools/ML/model.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <Math/Vector4D.h>
+#include <TDatabasePDG.h>
 #include <TFile.h>
 #include <TH2F.h>
-#include <TProfile.h>
 #include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
-#include "Tools/ML/MlResponse.h"
-#include "Tools/ML/model.h"
+#include <TProfile.h>
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
 
 using namespace o2;
 using namespace o2::analysis;
diff --git a/.conflict-base-0/PWGLF/TableProducer/Strangeness/cascadepid.cxx b/.conflict-base-0/PWGLF/TableProducer/Strangeness/cascadepid.cxx
index 3c7c82dacdd..830d5ca1577 100644
--- a/.conflict-base-0/PWGLF/TableProducer/Strangeness/cascadepid.cxx
+++ b/.conflict-base-0/PWGLF/TableProducer/Strangeness/cascadepid.cxx
@@ -23,35 +23,37 @@
 // (strange, weakly-decaying) particle. This task is meant to be a test, as
 // it hasn't been fully tested yet! Use at your own peril for now :-)
 
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <map>
-#include <iterator>
-#include <utility>
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
 #include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+#include "Common/TableProducer/PID/pidTOFBase.h"
+
 #include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/PhysicsConstants.h"
-#include "Common/TableProducer/PID/pidTOFBase.h"
-#include "Common/DataModel/PIDResponse.h"
+#include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <iterator>
+#include <map>
+#include <utility>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/TableProducer/Strangeness/cascadespawner.cxx b/.conflict-base-0/PWGLF/TableProducer/Strangeness/cascadespawner.cxx
index ab3f4cb7c3d..3b10901349b 100644
--- a/.conflict-base-0/PWGLF/TableProducer/Strangeness/cascadespawner.cxx
+++ b/.conflict-base-0/PWGLF/TableProducer/Strangeness/cascadespawner.cxx
@@ -16,19 +16,20 @@
 //  Creates Cascade extension tables for derived data.
 //  A minimal task that saves a lot of disk space.
 
-#include <cmath>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+
 #include <array>
+#include <cmath>
 #include <cstdlib>
 #include <iterator>
 #include <utility>
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-base-0/PWGLF/TableProducer/Strangeness/cascqaanalysis.cxx b/.conflict-base-0/PWGLF/TableProducer/Strangeness/cascqaanalysis.cxx
index 6a3310d316f..e051501d18f 100644
--- a/.conflict-base-0/PWGLF/TableProducer/Strangeness/cascqaanalysis.cxx
+++ b/.conflict-base-0/PWGLF/TableProducer/Strangeness/cascqaanalysis.cxx
@@ -13,23 +13,27 @@
 /// \brief Analysis of cascades in pp collisions
 /// \author Roman Nepeivoda (roman.nepeivoda@cern.ch)
 
-#include <algorithm>
-#include <vector>
-#include <TPDGCode.h>
+#include "PWGLF/DataModel/cascqaanalysis.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/DataModel/mcCentrality.h"
+#include "PWGLF/Utils/inelGt.h"
+
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "PWGLF/DataModel/cascqaanalysis.h"
-#include "TRandom2.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "PWGLF/Utils/inelGt.h"
-#include "PWGLF/DataModel/mcCentrality.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TRandom2.h"
+#include <TPDGCode.h>
+
+#include <algorithm>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/TableProducer/Strangeness/doubleCascTreeCreator.cxx b/.conflict-base-0/PWGLF/TableProducer/Strangeness/doubleCascTreeCreator.cxx
index 5ecffca742f..80b95b1c34a 100644
--- a/.conflict-base-0/PWGLF/TableProducer/Strangeness/doubleCascTreeCreator.cxx
+++ b/.conflict-base-0/PWGLF/TableProducer/Strangeness/doubleCascTreeCreator.cxx
@@ -9,38 +9,38 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <vector>
-#include <utility>
-#include <random>
+#include "PWGLF/DataModel/LFDoubleCascTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Multiplicity.h"
+#include "Common/Core/PID/TPCPIDResponse.h"
 #include "Common/Core/RecoDecay.h"
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
-
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 #include "EventFiltering/Zorro.h"
 #include "EventFiltering/ZorroSummary.h"
 
-#include "Common/Core/PID/TPCPIDResponse.h"
-#include "Common/DataModel/PIDResponse.h"
+#include "CCDB/BasicCCDBManager.h"
 #include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
-#include "PWGLF/DataModel/LFDoubleCascTables.h"
 #include "TDatabasePDG.h"
 
+#include <random>
+#include <utility>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-base-0/PWGLF/TableProducer/Strangeness/hStrangeCorrelationFilter.cxx b/.conflict-base-0/PWGLF/TableProducer/Strangeness/hStrangeCorrelationFilter.cxx
index 61f9e2f5086..6bb0ac92517 100644
--- a/.conflict-base-0/PWGLF/TableProducer/Strangeness/hStrangeCorrelationFilter.cxx
+++ b/.conflict-base-0/PWGLF/TableProducer/Strangeness/hStrangeCorrelationFilter.cxx
@@ -18,23 +18,26 @@
 /// \author David Dobrigkeit Chinellato (david.dobrigkeit.chinellato@cern.ch)
 /// \author Zhongbao Yin (Zhong-Bao.Yin@cern.ch)
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "PWGLF/DataModel/LFHStrangeCorrelationTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Framework/ASoAHelpers.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+#include "EventFiltering/Zorro.h"
+#include "EventFiltering/ZorroSummary.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TF1.h"
-#include <string>
 #include <TPDGCode.h>
 
-#include "EventFiltering/Zorro.h"
-#include "EventFiltering/ZorroSummary.h"
+#include <string>
 
 using namespace o2;
 using namespace o2::constants::math;
diff --git a/.conflict-base-0/PWGLF/TableProducer/Strangeness/lambdaJetpolarizationbuilder.cxx b/.conflict-base-0/PWGLF/TableProducer/Strangeness/lambdaJetpolarizationbuilder.cxx
index cc21c8def05..579177eecf2 100644
--- a/.conflict-base-0/PWGLF/TableProducer/Strangeness/lambdaJetpolarizationbuilder.cxx
+++ b/.conflict-base-0/PWGLF/TableProducer/Strangeness/lambdaJetpolarizationbuilder.cxx
@@ -12,25 +12,29 @@
 
 /// \author Youpeng Su (yousu@cern.ch)
 
-#include <iostream>
-#include <string>
-#include <vector>
-#include <cmath>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/EventSelection.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Framework/O2DatabasePDGPlugin.h"
 #include "PWGJE/Core/JetDerivedDataUtilities.h"
 #include "PWGJE/DataModel/Jet.h"
-#include <TLorentzVector.h>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/DataModel/lambdaJetpolarization.h"
+
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+
 #include "Framework/ASoA.h"
 #include "Framework/AnalysisDataModel.h"
-#include <TTree.h>
+#include "Framework/AnalysisTask.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
 #include <TFile.h>
+#include <TLorentzVector.h>
 #include <TMatrixD.h>
-#include "PWGLF/DataModel/lambdaJetpolarization.h"
+#include <TTree.h>
+
+#include <cmath>
+#include <iostream>
+#include <string>
+#include <vector>
 
 using std::cout;
 using std::endl;
diff --git a/.conflict-base-0/PWGLF/TableProducer/Strangeness/lambdakzeroMLSelectionTreeCreator.cxx b/.conflict-base-0/PWGLF/TableProducer/Strangeness/lambdakzeroMLSelectionTreeCreator.cxx
index d70552c4c71..d965f6490b9 100644
--- a/.conflict-base-0/PWGLF/TableProducer/Strangeness/lambdakzeroMLSelectionTreeCreator.cxx
+++ b/.conflict-base-0/PWGLF/TableProducer/Strangeness/lambdakzeroMLSelectionTreeCreator.cxx
@@ -24,37 +24,40 @@
 //    david.dobrigkeit.chinellato@cern.ch
 //
 
-#include <Math/Vector4D.h> // C system
-#include <cmath>           // C++ system
-#include <array>           // C++ system
-#include <cstdlib>         // C++ system
+#include "PWGLF/DataModel/LFStrangenessMLTables.h"
+#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/ASoA.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
-#include "PWGLF/DataModel/LFStrangenessMLTables.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/TableProducer/PID/pidTOFBase.h"
+
 #include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/PhysicsConstants.h"
-#include "Common/TableProducer/PID/pidTOFBase.h"
+#include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <Math/Vector4D.h> // C system
+#include <TDatabasePDG.h>
 #include <TFile.h>
 #include <TH2F.h>
-#include <TProfile.h>
 #include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
+#include <TProfile.h>
+
+#include <array>   // C++ system
+#include <cmath>   // C++ system
+#include <cstdlib> // C++ system
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/TableProducer/Strangeness/lambdakzerobuilder.cxx b/.conflict-base-0/PWGLF/TableProducer/Strangeness/lambdakzerobuilder.cxx
index 7b898bfa98e..912a64e6176 100644
--- a/.conflict-base-0/PWGLF/TableProducer/Strangeness/lambdakzerobuilder.cxx
+++ b/.conflict-base-0/PWGLF/TableProducer/Strangeness/lambdakzerobuilder.cxx
@@ -36,40 +36,44 @@
 //    david.dobrigkeit.chinellato@cern.ch
 //
 
-#include <string>
-#include <vector>
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <map>
-#include <iterator>
-#include <utility>
+#include "TableHelper.h"
 
-#include "TRandom3.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFStrangenessMLTables.h"
 #include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/LFStrangenessMLTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsCalibration/MeanVertexObject.h"
-#include "TableHelper.h"
 #include "Tools/ML/MlResponse.h"
 #include "Tools/ML/model.h"
 
+#include "CCDB/BasicCCDBManager.h"
+#include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsCalibration/MeanVertexObject.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include "TRandom3.h"
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <iterator>
+#include <map>
+#include <string>
+#include <utility>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-base-0/PWGLF/TableProducer/Strangeness/lambdakzerofinder.cxx b/.conflict-base-0/PWGLF/TableProducer/Strangeness/lambdakzerofinder.cxx
index e75c72c77f4..9be2f0238ae 100644
--- a/.conflict-base-0/PWGLF/TableProducer/Strangeness/lambdakzerofinder.cxx
+++ b/.conflict-base-0/PWGLF/TableProducer/Strangeness/lambdakzerofinder.cxx
@@ -28,37 +28,39 @@
 //    david.dobrigkeit.chinellato@cern.ch
 //
 
-#include <Math/Vector4D.h>
-#include <cmath>
-#include <array>
-#include <cstdlib>
-
-#include <TFile.h>
-#include <TLorentzVector.h>
-#include <TH1F.h>
-#include <TH2F.h>
-#include <TProfile.h>
-#include <TPDGCode.h>
-#include <TDatabasePDG.h>
+#include "PWGLF/DataModel/LFStrangenessFinderTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFStrangenessFinderTables.h"
-#include "Common/Core/TrackSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <Math/Vector4D.h>
+#include <TDatabasePDG.h>
+#include <TFile.h>
+#include <TH1F.h>
+#include <TH2F.h>
+#include <TLorentzVector.h>
+#include <TPDGCode.h>
+#include <TProfile.h>
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/TableProducer/Strangeness/lambdakzeromcbuilder.cxx b/.conflict-base-0/PWGLF/TableProducer/Strangeness/lambdakzeromcbuilder.cxx
index 1d7b1c29490..51c3045cca2 100644
--- a/.conflict-base-0/PWGLF/TableProducer/Strangeness/lambdakzeromcbuilder.cxx
+++ b/.conflict-base-0/PWGLF/TableProducer/Strangeness/lambdakzeromcbuilder.cxx
@@ -18,23 +18,25 @@
 //    david.dobrigkeit.chinellato@cern.ch
 //
 
-#include <cmath>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/trackUtilities.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
 #include <array>
+#include <cmath>
 #include <cstdlib>
-#include <map>
 #include <iterator>
+#include <map>
 #include <utility>
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
@@ -42,8 +44,8 @@ using std::array;
 
 //*+-+*+-+*+-+*+-+*+-+*+-+*+-+*+-+*+-+*+-+*
 struct lambdakzeromcbuilder {
-  Produces<aod::McV0Labels> v0labels; // MC labels for V0s
-  Produces<aod::V0MCCores> v0mccores; // optionally aggregate information from MC side for posterior analysis (derived data)
+  Produces<aod::McV0Labels> v0labels;           // MC labels for V0s
+  Produces<aod::V0MCCores> v0mccores;           // optionally aggregate information from MC side for posterior analysis (derived data)
   Produces<aod::V0CoreMCLabels> v0CoreMCLabels; // interlink V0Cores -> V0MCCores in asymmetric mode
   Produces<aod::V0MCCollRefs> v0mccollref;      // references collisions from V0MCCores
 
@@ -152,7 +154,7 @@ struct lambdakzeromcbuilder {
   void process(aod::V0Datas const& v0table, aod::McTrackLabels const&, aod::McParticles const& mcParticles)
   {
     // to be used if using the populateV0MCCoresAsymmetric mode, kept empty otherwise
-    std::vector<mcV0info> mcV0infos; // V0MCCore information
+    std::vector<mcV0info> mcV0infos;                               // V0MCCore information
     std::vector<bool> mcParticleIsReco(mcParticles.size(), false); // mc Particle not recoed by V0s
 
     for (auto& v0 : v0table) {
diff --git a/.conflict-base-0/PWGLF/TableProducer/Strangeness/lambdakzeromcfinder.cxx b/.conflict-base-0/PWGLF/TableProducer/Strangeness/lambdakzeromcfinder.cxx
index 0a0db73ea6d..db38d03437a 100644
--- a/.conflict-base-0/PWGLF/TableProducer/Strangeness/lambdakzeromcfinder.cxx
+++ b/.conflict-base-0/PWGLF/TableProducer/Strangeness/lambdakzeromcfinder.cxx
@@ -24,39 +24,41 @@
 //    david.dobrigkeit.chinellato@cern.ch
 //
 
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <vector>
-
-#include "Math/Vector4D.h"
-#include <TFile.h>
-#include <TLorentzVector.h>
-#include <TH1F.h>
-#include <TH2F.h>
-#include <TProfile.h>
-#include <TPDGCode.h>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGMM/Mult/DataModel/Index.h" // for Particles2Tracks table
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/McCollisionExtra.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "Common/Core/TrackSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+
 #include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/PhysicsConstants.h"
-#include "PWGMM/Mult/DataModel/Index.h" // for Particles2Tracks table
+#include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include "Math/Vector4D.h"
+#include <TFile.h>
+#include <TH1F.h>
+#include <TH2F.h>
+#include <TLorentzVector.h>
+#include <TPDGCode.h>
+#include <TProfile.h>
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
@@ -228,7 +230,7 @@ struct lambdakzeromcfinder {
                 nPosReco++;
               }
             } // end track list loop
-          }   // end positive pdg check
+          } // end positive pdg check
           if (daughter.pdgCode() == negativePdg) {
             auto const& thisDaughterTracks = daughter.template tracks_as<LabeledTracks>();
             bool tpcOnlyFound = false;
@@ -245,7 +247,7 @@ struct lambdakzeromcfinder {
                 nNegReco++;
               }
             } // end track list loop
-          }   // end negative pdg check
+          } // end negative pdg check
         }
       }
     }
diff --git a/.conflict-base-0/PWGLF/TableProducer/Strangeness/lambdakzeromlselection.cxx b/.conflict-base-0/PWGLF/TableProducer/Strangeness/lambdakzeromlselection.cxx
index 412161ebe52..ff52e6918c4 100644
--- a/.conflict-base-0/PWGLF/TableProducer/Strangeness/lambdakzeromlselection.cxx
+++ b/.conflict-base-0/PWGLF/TableProducer/Strangeness/lambdakzeromlselection.cxx
@@ -20,37 +20,40 @@
 //    david.dobrigkeit.chinellato@cern.ch
 //
 
-#include <Math/Vector4D.h>
-#include <cmath>
-#include <array>
-#include <cstdlib>
+#include "PWGLF/DataModel/LFStrangenessMLTables.h"
+#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/ASoA.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
-#include "PWGLF/DataModel/LFStrangenessMLTables.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+#include "Tools/ML/MlResponse.h"
+#include "Tools/ML/model.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <Math/Vector4D.h>
+#include <TDatabasePDG.h>
 #include <TFile.h>
 #include <TH2F.h>
-#include <TProfile.h>
 #include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
-#include "Tools/ML/MlResponse.h"
-#include "Tools/ML/model.h"
+#include <TProfile.h>
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
 
 using namespace o2;
 using namespace o2::analysis;
@@ -75,8 +78,8 @@ struct lambdakzeromlselection {
 
   std::map<std::string, std::string> metadata;
 
-  Produces<aod::V0GammaMLScores> gammaMLSelections;   // optionally aggregate information from ML output for posterior analysis (derived data)
-  Produces<aod::V0LambdaMLScores> lambdaMLSelections; // optionally aggregate information from ML output for posterior analysis (derived data)
+  Produces<aod::V0GammaMLScores> gammaMLSelections;           // optionally aggregate information from ML output for posterior analysis (derived data)
+  Produces<aod::V0LambdaMLScores> lambdaMLSelections;         // optionally aggregate information from ML output for posterior analysis (derived data)
   Produces<aod::V0AntiLambdaMLScores> antiLambdaMLSelections; // optionally aggregate information from ML output for posterior analysis (derived data)
   Produces<aod::V0K0ShortMLScores> kzeroShortMLSelections;    // optionally aggregate information from ML output for posterior analysis (derived data)
 
diff --git a/.conflict-base-0/PWGLF/TableProducer/Strangeness/lambdakzeropid.cxx b/.conflict-base-0/PWGLF/TableProducer/Strangeness/lambdakzeropid.cxx
index c6041aa0e02..5fa295cbd07 100644
--- a/.conflict-base-0/PWGLF/TableProducer/Strangeness/lambdakzeropid.cxx
+++ b/.conflict-base-0/PWGLF/TableProducer/Strangeness/lambdakzeropid.cxx
@@ -23,36 +23,38 @@
 // (strange, weakly-decaying) particle. This task is meant to be a test, as
 // it hasn't been fully tested yet! Use at your own peril for now :-)
 
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <map>
-#include <iterator>
-#include <utility>
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
 #include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+#include "Common/TableProducer/PID/pidTOFBase.h"
+
 #include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsCalibration/MeanVertexObject.h"
 #include "CommonConstants/PhysicsConstants.h"
-#include "Common/TableProducer/PID/pidTOFBase.h"
-#include "Common/DataModel/PIDResponse.h"
+#include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsCalibration/MeanVertexObject.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <iterator>
+#include <map>
+#include <utility>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/TableProducer/Strangeness/lambdakzerospawner.cxx b/.conflict-base-0/PWGLF/TableProducer/Strangeness/lambdakzerospawner.cxx
index 19c174aef7f..ae22362ace9 100644
--- a/.conflict-base-0/PWGLF/TableProducer/Strangeness/lambdakzerospawner.cxx
+++ b/.conflict-base-0/PWGLF/TableProducer/Strangeness/lambdakzerospawner.cxx
@@ -16,19 +16,20 @@
 //  Creates V0 extension tables for derived data.
 //  A minimal task that saves a lot of disk space.
 
-#include <cmath>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+
 #include <array>
+#include <cmath>
 #include <cstdlib>
 #include <iterator>
 #include <utility>
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-base-0/PWGLF/TableProducer/Strangeness/sigma0builder.cxx b/.conflict-base-0/PWGLF/TableProducer/Strangeness/sigma0builder.cxx
index 32ed292dddd..51e8386e96c 100644
--- a/.conflict-base-0/PWGLF/TableProducer/Strangeness/sigma0builder.cxx
+++ b/.conflict-base-0/PWGLF/TableProducer/Strangeness/sigma0builder.cxx
@@ -20,36 +20,39 @@
 //    gianni.shigeru.setoue.liveraro@cern.ch
 //
 
-#include <Math/Vector4D.h>
-#include <cmath>
-#include <array>
-#include <cstdlib>
+#include "PWGLF/DataModel/LFSigmaTables.h"
+#include "PWGLF/DataModel/LFStrangenessMLTables.h"
+#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/ASoA.h"
-#include "ReconstructionDataFormats/Track.h"
+#include "Common/CCDB/ctpRateFetcher.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "Common/CCDB/ctpRateFetcher.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
-#include "PWGLF/DataModel/LFStrangenessMLTables.h"
-#include "PWGLF/DataModel/LFSigmaTables.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <Math/Vector4D.h>
+#include <TDatabasePDG.h>
 #include <TFile.h>
 #include <TH2F.h>
-#include <TProfile.h>
 #include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
+#include <TProfile.h>
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
 
 using namespace o2;
 using namespace o2::framework;
@@ -1188,8 +1191,8 @@ struct sigma0builder {
         if (v0MC.pdgCode() == 22) {
           histos.fill(HIST("MC/h2dGammaXYConversion"), v0.x(), v0.y());
           float GammaY = TMath::Abs(RecoDecay::y(std::array{v0.px(), v0.py(), v0.pz()}, o2::constants::physics::MassGamma));
-          if (GammaY < 0.5) {                                                                                                                // rapidity selection
-            histos.fill(HIST("MC/h2dPtVsCentralityBeforeSel_MCAssocGamma"), centrality, v0.pt());                                            // isgamma
+          if (GammaY < 0.5) {                                                                     // rapidity selection
+            histos.fill(HIST("MC/h2dPtVsCentralityBeforeSel_MCAssocGamma"), centrality, v0.pt()); // isgamma
           }
         }
 
diff --git a/.conflict-base-0/PWGLF/TableProducer/Strangeness/stCollIds.cxx b/.conflict-base-0/PWGLF/TableProducer/Strangeness/stCollIds.cxx
index 3cc94389197..f08650fa3c4 100644
--- a/.conflict-base-0/PWGLF/TableProducer/Strangeness/stCollIds.cxx
+++ b/.conflict-base-0/PWGLF/TableProducer/Strangeness/stCollIds.cxx
@@ -14,11 +14,12 @@
 ///
 /// \author Jochen Klein
 
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Framework/ASoA.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/ASoA.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/TableProducer/Strangeness/stracents.cxx b/.conflict-base-0/PWGLF/TableProducer/Strangeness/stracents.cxx
index ce5597563da..9b58d541ddc 100644
--- a/.conflict-base-0/PWGLF/TableProducer/Strangeness/stracents.cxx
+++ b/.conflict-base-0/PWGLF/TableProducer/Strangeness/stracents.cxx
@@ -15,25 +15,29 @@
 /// \author ALICE
 //
 
-#include <string>
-#include <vector>
-#include <algorithm>
-#include <map>
+#include "MetadataHelper.h"
+#include "TableHelper.h"
 
-#include <CCDB/BasicCCDBManager.h>
-#include <TH1F.h>
-#include <TFormula.h>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/RunningWorkflowInfo.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "Framework/HistogramRegistry.h"
-#include "Common/DataModel/Multiplicity.h"
+
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "MetadataHelper.h"
-#include "TableHelper.h"
+#include "Common/DataModel/Multiplicity.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include <CCDB/BasicCCDBManager.h>
+
 #include "TList.h"
+#include <TFormula.h>
+#include <TH1F.h>
+
+#include <algorithm>
+#include <map>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/TableProducer/Strangeness/strangederivedbuilder.cxx b/.conflict-base-0/PWGLF/TableProducer/Strangeness/strangederivedbuilder.cxx
index 8140448576a..0d2f8a5cdce 100644
--- a/.conflict-base-0/PWGLF/TableProducer/Strangeness/strangederivedbuilder.cxx
+++ b/.conflict-base-0/PWGLF/TableProducer/Strangeness/strangederivedbuilder.cxx
@@ -15,42 +15,44 @@
 // It is meant to help with providing auxiliary information
 // when dealing with derived data.
 
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <map>
-#include <iterator>
-#include <utility>
-#include <string>
-#include <vector>
+#include "PWGLF/DataModel/EPCalibrationTables.h"
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
 #include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/McCollisionExtra.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/Qvectors.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+#include "Common/TableProducer/PID/pidTOFBase.h"
+
 #include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/PhysicsConstants.h"
-#include "Common/TableProducer/PID/pidTOFBase.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Qvectors.h"
-#include "Framework/StaticFor.h"
+#include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "Common/DataModel/McCollisionExtra.h"
-#include "PWGLF/DataModel/EPCalibrationTables.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <iterator>
+#include <map>
+#include <string>
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/TableProducer/Strangeness/strangenessbuilder.cxx b/.conflict-base-0/PWGLF/TableProducer/Strangeness/strangenessbuilder.cxx
index 800b1105732..38da9798864 100644
--- a/.conflict-base-0/PWGLF/TableProducer/Strangeness/strangenessbuilder.cxx
+++ b/.conflict-base-0/PWGLF/TableProducer/Strangeness/strangenessbuilder.cxx
@@ -32,22 +32,25 @@
 //  -- v0builderopts ......: V0-specific building options (topological, deduplication, etc)
 //  -- cascadebuilderopts .: cascade-specific building options (topological, etc)
 
-#include <string>
-#include <vector>
-
-#include "Framework/DataSpecUtils.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "TableHelper.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "PWGLF/Utils/strangenessBuilderHelper.h"
+
+#include "Common/Core/TPCVDriftManager.h"
+#include "Common/DataModel/PIDResponse.h"
+
 #include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPObject.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include "Common/Core/TPCVDriftManager.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/DataSpecUtils.h"
+#include "Framework/runDataProcessing.h"
+
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/TableProducer/Strangeness/v0qaanalysis.cxx b/.conflict-base-0/PWGLF/TableProducer/Strangeness/v0qaanalysis.cxx
index bafe557c237..547570ba7df 100644
--- a/.conflict-base-0/PWGLF/TableProducer/Strangeness/v0qaanalysis.cxx
+++ b/.conflict-base-0/PWGLF/TableProducer/Strangeness/v0qaanalysis.cxx
@@ -13,21 +13,24 @@
 ///
 /// \author Francesca Ercolessi (francesca.ercolessi@cern.ch)
 
-#include <vector>
-#include <utility>
+#include "PWGLF/DataModel/v0qaanalysis.h"
 
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/v0qaanalysis.h"
+#include "PWGLF/DataModel/mcCentrality.h"
+#include "PWGLF/Utils/inelGt.h"
+
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CommonConstants/PhysicsConstants.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "PWGLF/DataModel/mcCentrality.h"
-#include "PWGLF/Utils/inelGt.h"
+
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/TableProducer/Strangeness/v0selector.cxx b/.conflict-base-0/PWGLF/TableProducer/Strangeness/v0selector.cxx
index 7d06871d78c..3d6a227609d 100644
--- a/.conflict-base-0/PWGLF/TableProducer/Strangeness/v0selector.cxx
+++ b/.conflict-base-0/PWGLF/TableProducer/Strangeness/v0selector.cxx
@@ -13,21 +13,22 @@
 ///
 /// \author Gijs van Weelden <g.van.weelden@cern.ch>
 
-#include <vector>
-#include <string>
-#include <algorithm>
-#include <TRandom3.h>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/DataModel/V0SelectorTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoA.h"
+#include "Common/Core/RecoDecay.h"
 
 #include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/RecoDecay.h"
+#include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/V0SelectorTables.h"
+#include <TRandom3.h>
+
+#include <algorithm>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/Tasks/GlobalEventProperties/heavyionMultiplicity.cxx b/.conflict-base-0/PWGLF/Tasks/GlobalEventProperties/heavyionMultiplicity.cxx
index b91db8d09e0..be8a1a6e2d7 100644
--- a/.conflict-base-0/PWGLF/Tasks/GlobalEventProperties/heavyionMultiplicity.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/GlobalEventProperties/heavyionMultiplicity.cxx
@@ -15,20 +15,20 @@
 /// \author Abhi Modak (abhi.modak@cern.ch)
 /// \since September 15, 2023
 
-#include <cmath>
-#include <cstdlib>
-#include <TPDGCode.h>
-#include <vector>
-
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGMM/Mult/DataModel/Index.h"
 #include "PWGMM/Mult/DataModel/bestCollisionTable.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "Common/Core/trackUtilities.h"
+
 #include "Common/CCDB/EventSelectionParams.h"
 #include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/MathConstants.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
@@ -38,9 +38,12 @@
 #include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/GlobalTrackID.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "PWGMM/Mult/DataModel/Index.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include <TPDGCode.h>
+
+#include <cmath>
+#include <cstdlib>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/Tasks/Nuspex/AntimatterAbsorptionHMPID.cxx b/.conflict-base-0/PWGLF/Tasks/Nuspex/AntimatterAbsorptionHMPID.cxx
index b5a5a2c3ee4..68af7268e35 100644
--- a/.conflict-base-0/PWGLF/Tasks/Nuspex/AntimatterAbsorptionHMPID.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/Nuspex/AntimatterAbsorptionHMPID.cxx
@@ -12,33 +12,34 @@
 /// \author Alberto Caliva (alberto.caliva@cern.ch)
 /// \since June 27, 2023
 
-#include <TMath.h>
-#include <TPDGCode.h>
-#include <TRandom.h>
-#include <TDatabasePDG.h>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoA.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/DataTypes.h"
+#include "Common/Core/PID/PIDTOF.h"
 #include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/Core/PID/PIDTOF.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "ReconstructionDataFormats/TrackParametrization.h"
-#include "ReconstructionDataFormats/DCA.h"
-#include "DetectorsBase/Propagator.h"
-#include "Common/Core/trackUtilities.h"
-#include "ReconstructionDataFormats/PID.h"
+
 #include "CCDB/BasicCCDBManager.h"
 #include "CCDB/CcdbApi.h"
 #include "DataFormatsParameters/GRPMagField.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/DataTypes.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/DCA.h"
+#include "ReconstructionDataFormats/PID.h"
+#include "ReconstructionDataFormats/Track.h"
+#include "ReconstructionDataFormats/TrackParametrization.h"
+
+#include <TDatabasePDG.h>
+#include <TMath.h>
+#include <TPDGCode.h>
+#include <TRandom.h>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/Tasks/Nuspex/NucleiEfficiencyTask.cxx b/.conflict-base-0/PWGLF/Tasks/Nuspex/NucleiEfficiencyTask.cxx
index 4ca2bd51c6f..23f968e3fc9 100644
--- a/.conflict-base-0/PWGLF/Tasks/Nuspex/NucleiEfficiencyTask.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/Nuspex/NucleiEfficiencyTask.cxx
@@ -12,37 +12,40 @@
 // Authors: Rafael Manhart,
 // Date: 06.05.2024
 
-#include <cmath>
-#include <TLorentzVector.h>
-#include <TMath.h>
-#include <TObjArray.h>
-#include <vector>
-#include <TF1.h>
-#include <string>
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/mcCentrality.h"
+#include "PWGLF/DataModel/spectraTOF.h"
+#include "PWGLF/Utils/inelGt.h"
 
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/McCollisionExtra.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/McCollisionExtra.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "TPDGCode.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/Core/TrackSelection.h"
-#include "Framework/StaticFor.h"
-#include "Common/Core/TrackSelectionDefaults.h"
-#include "PWGLF/DataModel/spectraTOF.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "PWGLF/Utils/inelGt.h"
-#include "PWGLF/DataModel/mcCentrality.h"
-#include "Common/Core/RecoDecay.h"
+#include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include "TPDGCode.h"
+#include <TF1.h>
+#include <TLorentzVector.h>
+#include <TMath.h>
+#include <TObjArray.h>
+
+#include <cmath>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::track;
diff --git a/.conflict-base-0/PWGLF/Tasks/Nuspex/NucleiHistTask.cxx b/.conflict-base-0/PWGLF/Tasks/Nuspex/NucleiHistTask.cxx
index e3152c05cfb..b4f0ba70aed 100644
--- a/.conflict-base-0/PWGLF/Tasks/Nuspex/NucleiHistTask.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/Nuspex/NucleiHistTask.cxx
@@ -12,37 +12,40 @@
 // Authors: Rafael Manhart,
 // Date: 30.11.2022
 
-#include <cmath>
-#include <TLorentzVector.h>
-#include <TMath.h>
-#include <TObjArray.h>
-#include <vector>
-#include <TF1.h>
-#include <string>
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/mcCentrality.h"
+#include "PWGLF/DataModel/spectraTOF.h"
+#include "PWGLF/Utils/inelGt.h"
 
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/McCollisionExtra.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/McCollisionExtra.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "TPDGCode.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/Core/TrackSelection.h"
-#include "Framework/StaticFor.h"
-#include "Common/Core/TrackSelectionDefaults.h"
-#include "PWGLF/DataModel/spectraTOF.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "PWGLF/Utils/inelGt.h"
-#include "PWGLF/DataModel/mcCentrality.h"
-#include "Common/Core/RecoDecay.h"
+#include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include "TPDGCode.h"
+#include <TF1.h>
+#include <TLorentzVector.h>
+#include <TMath.h>
+#include <TObjArray.h>
+
+#include <cmath>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::track;
diff --git a/.conflict-base-0/PWGLF/Tasks/Nuspex/QAHistTask.cxx b/.conflict-base-0/PWGLF/Tasks/Nuspex/QAHistTask.cxx
index 2afc40a7261..ff902ace030 100644
--- a/.conflict-base-0/PWGLF/Tasks/Nuspex/QAHistTask.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/Nuspex/QAHistTask.cxx
@@ -12,30 +12,30 @@
 // Authors: Rafael Manhart,
 // Date: 05.10.2023
 
-#include <cmath>
-#include <TLorentzVector.h>
-#include <TMath.h>
-#include <TObjArray.h>
-#include <string>
-#include <vector>
-
-#include "ReconstructionDataFormats/Track.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+#include "PWGLF/DataModel/LFParticleIdentification.h"
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
 #include "TPDGCode.h"
 #include <TH1F.h>
-#include "Framework/runDataProcessing.h"
+#include <TLorentzVector.h>
+#include <TMath.h>
+#include <TObjArray.h>
+
+#include <cmath>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/Tasks/Nuspex/QCspectraTPC.cxx b/.conflict-base-0/PWGLF/Tasks/Nuspex/QCspectraTPC.cxx
index 079b0d44a31..afe0d07b608 100644
--- a/.conflict-base-0/PWGLF/Tasks/Nuspex/QCspectraTPC.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/Nuspex/QCspectraTPC.cxx
@@ -9,22 +9,24 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/runDataProcessing.h"
+#include "PWGLF/DataModel/LFParticleIdentification.h"
 
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/McCollisionExtra.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/StaticFor.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/McCollisionExtra.h"
-#include "Common/Core/TrackSelectionDefaults.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
 #include "TPDGCode.h"
 
 using namespace o2;
@@ -496,7 +498,7 @@ struct QCspectraTPC {
             histos.fill(HIST("MC/pr/neg/prm/pt/numtof"), track.pt(), multiplicity, track.dcaXY());
           }
         }
-      }                                      // primaries
+      } // primaries
       if (!mcParticle.isPhysicalPrimary()) { // secondaries loop start
         if (mcParticle.pdgCode() == 211) {
           if (std::abs(mcParticle.y()) > cfgCutY) {
diff --git a/.conflict-base-0/PWGLF/Tasks/Nuspex/angularCorrelationsInJets.cxx b/.conflict-base-0/PWGLF/Tasks/Nuspex/angularCorrelationsInJets.cxx
index 20e1604e206..a6fc4bf6032 100644
--- a/.conflict-base-0/PWGLF/Tasks/Nuspex/angularCorrelationsInJets.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/Nuspex/angularCorrelationsInJets.cxx
@@ -14,33 +14,36 @@
 /// \author Lars Jörgensen (lars.christian.joergensen@cern.ch)
 /// \brief task for analysis of angular correlations in jets using Fastjet
 
-#include <vector>
-#include <utility>
-#include <map>
-#include <string>
-#include <random>
-#include <algorithm>
+#include "PWGJE/Core/JetBkgSubUtils.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/Core/PID/PIDTOF.h"
+#include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/PID/PIDTOF.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/TableProducer/PID/pidTOFBase.h"
-#include "Common/Core/RecoDecay.h"
 
-#include "fastjet/PseudoJet.hh"
+#include "CCDB/BasicCCDBManager.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include "TPDGCode.h"
+#include "TVector3.h"
+
 #include "fastjet/AreaDefinition.hh"
 #include "fastjet/ClusterSequenceArea.hh"
 #include "fastjet/GhostedAreaSpec.hh"
-#include "PWGJE/Core/JetBkgSubUtils.h"
-#include "TVector3.h"
-#include "TPDGCode.h"
+#include "fastjet/PseudoJet.hh"
+
+#include <algorithm>
+#include <map>
+#include <random>
+#include <string>
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/Tasks/Nuspex/deutRtTask.cxx b/.conflict-base-0/PWGLF/Tasks/Nuspex/deutRtTask.cxx
index f0092793232..18e5b9cd5d3 100644
--- a/.conflict-base-0/PWGLF/Tasks/Nuspex/deutRtTask.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/Nuspex/deutRtTask.cxx
@@ -9,21 +9,23 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/runDataProcessing.h"
-#include "TVector2.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/Core/TrackSelection.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
-#include "Common/Core/TrackSelectionDefaults.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "TVector2.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/Tasks/Nuspex/helium_flow.cxx b/.conflict-base-0/PWGLF/Tasks/Nuspex/helium_flow.cxx
index cc791f7fb2f..380e820ff96 100644
--- a/.conflict-base-0/PWGLF/Tasks/Nuspex/helium_flow.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/Nuspex/helium_flow.cxx
@@ -12,30 +12,33 @@
 /// \author Alberto Caliva (alberto.caliva@cern.ch)
 /// \since November 27, 2023
 
-#include <vector>
-#include <TMath.h>
-#include <TPDGCode.h>
-#include <TRandom.h>
-#include <TVector2.h>
-#include <TVector3.h>
-#include <TDatabasePDG.h>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoA.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/DataTypes.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/RunningWorkflowInfo.h"
-#include "Framework/DataTypes.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "ReconstructionDataFormats/PID.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/DCA.h"
-#include "Common/Core/trackUtilities.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/PIDResponse.h"
+#include "ReconstructionDataFormats/PID.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <TDatabasePDG.h>
+#include <TMath.h>
+#include <TPDGCode.h>
+#include <TRandom.h>
+#include <TVector2.h>
+#include <TVector3.h>
+
+#include <vector>
 
 using namespace std;
 using namespace o2;
diff --git a/.conflict-base-0/PWGLF/Tasks/Nuspex/hyhe4analysis.cxx b/.conflict-base-0/PWGLF/Tasks/Nuspex/hyhe4analysis.cxx
index 3766e57a61b..5a180dacdac 100644
--- a/.conflict-base-0/PWGLF/Tasks/Nuspex/hyhe4analysis.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/Nuspex/hyhe4analysis.cxx
@@ -19,32 +19,34 @@
 // --- kumar.lokesh@cern.ch
 // --- david.dobrigkeit.chinellato@cern.ch
 
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <map>
-#include <iterator>
-#include <utility>
+#include "PWGLF/DataModel/LFHyperhelium4Tables.h"
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
 #include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+
 #include "CCDB/BasicCCDBManager.h"
-#include "PWGLF/DataModel/LFHyperhelium4Tables.h"
+#include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <iterator>
+#include <map>
+#include <utility>
 
 using namespace std;
 using namespace o2;
diff --git a/.conflict-base-0/PWGLF/Tasks/Nuspex/hypertritonAnalysis.cxx b/.conflict-base-0/PWGLF/Tasks/Nuspex/hypertritonAnalysis.cxx
index 42470a606b0..9290648a12e 100644
--- a/.conflict-base-0/PWGLF/Tasks/Nuspex/hypertritonAnalysis.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/Nuspex/hypertritonAnalysis.cxx
@@ -18,37 +18,39 @@
 //    Please write to:
 //    david.dobrigkeit.chinellato@cern.ch
 //
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
+#include <Math/Vector4D.h>
+#include <TDatabasePDG.h>
 #include <TFile.h>
 #include <TH2F.h>
-#include <TProfile.h>
 #include <TLorentzVector.h>
-#include <Math/Vector4D.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
-#include <cmath>
+#include <TProfile.h>
+
 #include <array>
+#include <cmath>
 #include <cstdlib>
-#include "Framework/ASoAHelpers.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/Tasks/Nuspex/identifiedraa.cxx b/.conflict-base-0/PWGLF/Tasks/Nuspex/identifiedraa.cxx
index 3086152d226..bbaff5350c5 100644
--- a/.conflict-base-0/PWGLF/Tasks/Nuspex/identifiedraa.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/Nuspex/identifiedraa.cxx
@@ -30,6 +30,7 @@
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/AnalysisTask.h"
 
 using namespace o2;
diff --git a/.conflict-base-0/PWGLF/Tasks/Nuspex/mcspectraefficiency.cxx b/.conflict-base-0/PWGLF/Tasks/Nuspex/mcspectraefficiency.cxx
index 3442b00ab33..0beffe622c5 100644
--- a/.conflict-base-0/PWGLF/Tasks/Nuspex/mcspectraefficiency.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/Nuspex/mcspectraefficiency.cxx
@@ -10,14 +10,15 @@
 // or submit itself to any jurisdiction.
 
 // O2 includes
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+
 // ROOT includes
-#include <TH1F.h>
 #include "TPDGCode.h"
+#include <TH1F.h>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/Tasks/Nuspex/nucleiEbye.cxx b/.conflict-base-0/PWGLF/Tasks/Nuspex/nucleiEbye.cxx
index 681d8b2892e..177454e57ec 100644
--- a/.conflict-base-0/PWGLF/Tasks/Nuspex/nucleiEbye.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/Nuspex/nucleiEbye.cxx
@@ -9,22 +9,22 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <vector>
-#include <utility>
-#include <random>
-#include <iostream>
-#include <memory>
-#include <algorithm>
+#include "PWGLF/DataModel/LFEbyeTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
-
-#include "PWGLF/DataModel/LFEbyeTables.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 #include "TDatabasePDG.h"
 
+#include <algorithm>
+#include <iostream>
+#include <memory>
+#include <random>
+#include <utility>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-base-0/PWGLF/Tasks/Nuspex/nucleiFromHypertritonMap.cxx b/.conflict-base-0/PWGLF/Tasks/Nuspex/nucleiFromHypertritonMap.cxx
index 2d959f9488d..1becfae15f4 100644
--- a/.conflict-base-0/PWGLF/Tasks/Nuspex/nucleiFromHypertritonMap.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/Nuspex/nucleiFromHypertritonMap.cxx
@@ -12,30 +12,33 @@
 /// \author Roberta Ferioli (roberta.ferioli@cern.ch)
 /// \since November, 2024
 
-#include <vector>
-#include <TMath.h>
-#include <TPDGCode.h>
-#include <TRandom.h>
-#include <TVector2.h>
-#include <TVector3.h>
-#include <TDatabasePDG.h>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoA.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/DataTypes.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/RunningWorkflowInfo.h"
-#include "Framework/DataTypes.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "ReconstructionDataFormats/PID.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/DCA.h"
-#include "Common/Core/trackUtilities.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/PIDResponse.h"
+#include "ReconstructionDataFormats/PID.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <TDatabasePDG.h>
+#include <TMath.h>
+#include <TPDGCode.h>
+#include <TRandom.h>
+#include <TVector2.h>
+#include <TVector3.h>
+
+#include <vector>
 
 using namespace std;
 using namespace o2;
diff --git a/.conflict-base-0/PWGLF/Tasks/Nuspex/nuclei_in_toward_transv_regions.cxx b/.conflict-base-0/PWGLF/Tasks/Nuspex/nuclei_in_toward_transv_regions.cxx
index a64ba6dc09c..103b2200f4a 100644
--- a/.conflict-base-0/PWGLF/Tasks/Nuspex/nuclei_in_toward_transv_regions.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/Nuspex/nuclei_in_toward_transv_regions.cxx
@@ -12,31 +12,34 @@
 /// \author Alberto Caliva (alberto.caliva@cern.ch)
 /// \since August 22, 2024
 
-#include <vector>
-#include <TMath.h>
-#include <TPDGCode.h>
-#include <TRandom.h>
-#include <TVector2.h>
-#include <TVector3.h>
-#include <TLorentzVector.h>
-#include <TDatabasePDG.h>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoA.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/DataTypes.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/RunningWorkflowInfo.h"
-#include "Framework/DataTypes.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "ReconstructionDataFormats/PID.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/DCA.h"
-#include "Common/Core/trackUtilities.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/PIDResponse.h"
+#include "ReconstructionDataFormats/PID.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <TDatabasePDG.h>
+#include <TLorentzVector.h>
+#include <TMath.h>
+#include <TPDGCode.h>
+#include <TRandom.h>
+#include <TVector2.h>
+#include <TVector3.h>
+
+#include <vector>
 
 using namespace std;
 using namespace o2;
diff --git a/.conflict-base-0/PWGLF/Tasks/Nuspex/spectraCharged.cxx b/.conflict-base-0/PWGLF/Tasks/Nuspex/spectraCharged.cxx
index 94e3b30dc4a..a7a0453c395 100644
--- a/.conflict-base-0/PWGLF/Tasks/Nuspex/spectraCharged.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/Nuspex/spectraCharged.cxx
@@ -12,14 +12,16 @@
 // task for charged particle pt spectra vs multiplicity analysis with 2d unfolding for run3+
 // mimics https://github.com/alisw/AliPhysics/blob/master/PWGLF/SPECTRA/ChargedHadrons/MultDepSpec/AliMultDepSpecAnalysisTask.cxx
 
-#include "Framework/HistogramRegistry.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
 #include "TDatabasePDG.h"
 
 using namespace o2;
diff --git a/.conflict-base-0/PWGLF/Tasks/Nuspex/spectraTOF.cxx b/.conflict-base-0/PWGLF/Tasks/Nuspex/spectraTOF.cxx
index f80b2870959..e8b29ba35ae 100644
--- a/.conflict-base-0/PWGLF/Tasks/Nuspex/spectraTOF.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/Nuspex/spectraTOF.cxx
@@ -19,28 +19,33 @@
 
 // O2 includes
 
-#include <string>
-#include <vector>
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/McCollisionExtra.h"
-#include "Common/Core/TrackSelection.h"
-#include "Framework/StaticFor.h"
-#include "Common/Core/TrackSelectionDefaults.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
 #include "PWGLF/DataModel/spectraTOF.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "PWGLF/Utils/inelGt.h"
+
+#include "PWGLF/DataModel/LFParticleIdentification.h"
 #include "PWGLF/DataModel/mcCentrality.h"
+#include "PWGLF/Utils/inelGt.h"
+
 #include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/McCollisionExtra.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
 #include "TPDGCode.h"
+
+#include <string>
+#include <vector>
 using namespace o2;
 using namespace o2::track;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/Tasks/Nuspex/spectraTOFRun2.cxx b/.conflict-base-0/PWGLF/Tasks/Nuspex/spectraTOFRun2.cxx
index 9c31160f0a1..cb287907b9e 100644
--- a/.conflict-base-0/PWGLF/Tasks/Nuspex/spectraTOFRun2.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/Nuspex/spectraTOFRun2.cxx
@@ -18,20 +18,22 @@
 ///
 
 // O2 includes
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/spectraTOF.h"
+
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
 #include "Framework/StaticFor.h"
-#include "Common/Core/TrackSelectionDefaults.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
-#include "PWGLF/DataModel/spectraTOF.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
 #include "TPDGCode.h"
 
diff --git a/.conflict-base-0/PWGLF/Tasks/Nuspex/spectraTPC.cxx b/.conflict-base-0/PWGLF/Tasks/Nuspex/spectraTPC.cxx
index fd929553fb6..5488378dc9f 100644
--- a/.conflict-base-0/PWGLF/Tasks/Nuspex/spectraTPC.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/Nuspex/spectraTPC.cxx
@@ -18,14 +18,15 @@
 ///
 
 // O2 includes
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "ReconstructionDataFormats/Track.h"
 
 using namespace o2;
 using namespace o2::track;
@@ -186,7 +187,7 @@ struct tpcSpectra {
       fillParticleHistos<PID::Alpha>(track);
     }
   } // end of the process function
-};  // end of spectra task
+}; // end of spectra task
 
 struct tpcPidQaSignalwTof {
   static constexpr int Np = 9;
diff --git a/.conflict-base-0/PWGLF/Tasks/Nuspex/spectraTPCPiKaPr.cxx b/.conflict-base-0/PWGLF/Tasks/Nuspex/spectraTPCPiKaPr.cxx
index 0b856a92e6b..6f1b0b21c7d 100644
--- a/.conflict-base-0/PWGLF/Tasks/Nuspex/spectraTPCPiKaPr.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/Nuspex/spectraTPCPiKaPr.cxx
@@ -17,13 +17,14 @@
 ///
 
 // O2 includes
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/HistogramRegistry.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-base-0/PWGLF/Tasks/Nuspex/spectraTPCtiny.cxx b/.conflict-base-0/PWGLF/Tasks/Nuspex/spectraTPCtiny.cxx
index d58a8777771..3a1249c48ae 100644
--- a/.conflict-base-0/PWGLF/Tasks/Nuspex/spectraTPCtiny.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/Nuspex/spectraTPCtiny.cxx
@@ -17,13 +17,14 @@
 ///
 
 // O2 includes
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-base-0/PWGLF/Tasks/Nuspex/spectraTPCtinyPiKaPr.cxx b/.conflict-base-0/PWGLF/Tasks/Nuspex/spectraTPCtinyPiKaPr.cxx
index 9c9a340bfcf..9b0fbe79352 100644
--- a/.conflict-base-0/PWGLF/Tasks/Nuspex/spectraTPCtinyPiKaPr.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/Nuspex/spectraTPCtinyPiKaPr.cxx
@@ -17,13 +17,14 @@
 ///
 
 // O2 includes
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/HistogramRegistry.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-base-0/PWGLF/Tasks/QC/efficiencyQA.cxx b/.conflict-base-0/PWGLF/Tasks/QC/efficiencyQA.cxx
index 4a0257bb6e5..969c71000ef 100644
--- a/.conflict-base-0/PWGLF/Tasks/QC/efficiencyQA.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/QC/efficiencyQA.cxx
@@ -9,27 +9,27 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <array>
-#include <vector>
-#include <random>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
+#include "Common/Core/PID/TPCPIDResponse.h"
 #include "Common/Core/RecoDecay.h"
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/EventSelection.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
-
-#include "Common/Core/PID/TPCPIDResponse.h"
 #include "Common/DataModel/PIDResponse.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <array>
+#include <random>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/Tasks/QC/findableStudy.cxx b/.conflict-base-0/PWGLF/Tasks/QC/findableStudy.cxx
index d8ca8cc8c80..51fd1efde22 100644
--- a/.conflict-base-0/PWGLF/Tasks/QC/findableStudy.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/QC/findableStudy.cxx
@@ -19,42 +19,44 @@
 //    david.dobrigkeit.chinellato@cern.ch
 //
 
-#include <Math/Vector4D.h>
-#include <cmath>
-#include <array>
-#include <cstdlib>
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/Utils/v0SelectionBits.h"
+#include "PWGLF/Utils/v0SelectionGroup.h"
+#include "PWGLF/Utils/v0SelectionTools.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/McCollisionExtra.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/McCollisionExtra.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
-#include "PWGLF/Utils/v0SelectionBits.h"
-#include "PWGLF/Utils/v0SelectionGroup.h"
-#include "PWGLF/Utils/v0SelectionTools.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
+#include <Math/Vector4D.h>
+#include <TDatabasePDG.h>
 #include <TFile.h>
 #include <TH2F.h>
-#include <TProfile.h>
 #include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
+#include <TProfile.h>
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/Tasks/QC/kfPerformanceStudy.cxx b/.conflict-base-0/PWGLF/Tasks/QC/kfPerformanceStudy.cxx
index 5a9f49ecabf..5a26c7d1f36 100644
--- a/.conflict-base-0/PWGLF/Tasks/QC/kfPerformanceStudy.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/QC/kfPerformanceStudy.cxx
@@ -13,22 +13,24 @@
 //         cascades computed with standard DCAFitter methods and the KFparticle
 //         package. It is meant for the purposes of larger-scale QA of KF reco.
 
-#include <cmath>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <cmath>
 
 using namespace o2;
 using namespace o2::framework;
@@ -151,8 +153,8 @@ struct kfPerformanceStudy {
       }
 
       histos.fill(HIST("hPtCorrelation"), pt, ptKF);
-      histos.fill(HIST("h3dMassLambda"), pt, massLambda, massLambdaKF); // <- implicit pT choice, beware
-      histos.fill(HIST("h3dDCAxy"), pt, dcaXY, dcaXYKF);                // <- implicit pT choice, beware
+      histos.fill(HIST("h3dMassLambda"), pt, massLambda, massLambdaKF);          // <- implicit pT choice, beware
+      histos.fill(HIST("h3dDCAxy"), pt, dcaXY, dcaXYKF);                         // <- implicit pT choice, beware
       histos.fill(HIST("h3dPointingAngle"), pt, pointingAngle, pointingAngleKF); // <- implicit pT choice, beware
 
       histos.fill(HIST("hPointingAngle"), pointingAngle);
diff --git a/.conflict-base-0/PWGLF/Tasks/QC/kfStrangenessStudy.cxx b/.conflict-base-0/PWGLF/Tasks/QC/kfStrangenessStudy.cxx
index 24c5621e948..ecf18910f5e 100644
--- a/.conflict-base-0/PWGLF/Tasks/QC/kfStrangenessStudy.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/QC/kfStrangenessStudy.cxx
@@ -15,26 +15,29 @@
 
 /// \brief cascadebuilder.cxx and lambdakzerobuilder.cxx tasks need to be added to the workflow. Flag createCascCovMats needs to be enabled!
 
-#include <cmath>
-#include <iostream>
+#include "PWGLF/DataModel/kfStrangenessStudy.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/kfStrangenessStudy.h"
+
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/EventSelection.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <cmath>
+#include <iostream>
 
 using namespace o2;
 using namespace o2::framework;
@@ -462,9 +465,9 @@ struct kfStrangenessStudy {
           } else {
             LOG(debug) << "Daughter is no Lambda and/or has no daughters. V0 PDG code: " << MCv0.pdgCode();
           } // end v0 has daughters and is Lambda
-        }   // end loop cascade daughters
-      }     // end cascade has daughters
-    }       // end cascade has MC particle
+        } // end loop cascade daughters
+      } // end cascade has daughters
+    } // end cascade has MC particle
   }
 
   template <typename TCollision>
@@ -699,7 +702,7 @@ struct kfStrangenessStudy {
         fillCascDataTable(collision);
       }
     } // end cascade loop
-  }   // end process
+  } // end process
   PROCESS_SWITCH(kfStrangenessStudy, processData, "process data", false);
 
   void processMC(soa::Filtered<soa::Join<aod::Collisions, aod::EvSels>>::iterator const& collision,
@@ -801,7 +804,7 @@ struct kfStrangenessStudy {
       }
 
     } // end cascade loop
-  }   // end process
+  } // end process
   PROCESS_SWITCH(kfStrangenessStudy, processMC, "process MC", true);
 };
 
diff --git a/.conflict-base-0/PWGLF/Tasks/QC/lfITSTPCMatchingQA.cxx b/.conflict-base-0/PWGLF/Tasks/QC/lfITSTPCMatchingQA.cxx
index c31258d51ae..311db578caa 100644
--- a/.conflict-base-0/PWGLF/Tasks/QC/lfITSTPCMatchingQA.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/QC/lfITSTPCMatchingQA.cxx
@@ -9,26 +9,27 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <vector>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
+#include "Common/Core/PID/PIDTOF.h"
+#include "Common/Core/PID/TPCPIDResponse.h"
 #include "Common/Core/RecoDecay.h"
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "DataFormatsTPC/BetheBlochAleph.h"
-#include "Common/Core/PID/PIDTOF.h"
 #include "Common/TableProducer/PID/pidTOFBase.h"
+
+#include "DataFormatsTPC/BetheBlochAleph.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "Common/Core/PID/TPCPIDResponse.h"
-#include "Common/DataModel/PIDResponse.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
 #include "TDatabasePDG.h"
 
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-base-0/PWGLF/Tasks/QC/lfITSTPCMatchingSecondaryTracksQA.cxx b/.conflict-base-0/PWGLF/Tasks/QC/lfITSTPCMatchingSecondaryTracksQA.cxx
index 14aebdb354a..803d3ccfb4d 100644
--- a/.conflict-base-0/PWGLF/Tasks/QC/lfITSTPCMatchingSecondaryTracksQA.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/QC/lfITSTPCMatchingSecondaryTracksQA.cxx
@@ -15,28 +15,32 @@
 /// \author Alberto Caliva (alberto.caliva@cern.ch), Francesca Ercolessi (francesca.ercolessi@cern.ch), Nicolò Jacazio (nicolo.jacazio@cern.ch)
 /// \since Feb 11, 2025
 
-#include <TLorentzVector.h>
-#include <TMath.h>
-#include <TObjArray.h>
-#include <TPDGCode.h>
-#include <TVector2.h>
-#include <TVector3.h>
-#include <cmath>
-#include <vector>
-#include <string>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "Common/Core/RecoDecay.h"
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "ReconstructionDataFormats/Track.h"
 
+#include <TLorentzVector.h>
+#include <TMath.h>
+#include <TObjArray.h>
+#include <TPDGCode.h>
+#include <TVector2.h>
+#include <TVector3.h>
+
+#include <cmath>
+#include <string>
+#include <vector>
+
 using namespace std;
 using namespace o2;
 using namespace o2::soa;
diff --git a/.conflict-base-0/PWGLF/Tasks/QC/lfpidqa.cxx b/.conflict-base-0/PWGLF/Tasks/QC/lfpidqa.cxx
index 746473fd0a7..b82bdb2cd85 100644
--- a/.conflict-base-0/PWGLF/Tasks/QC/lfpidqa.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/QC/lfpidqa.cxx
@@ -17,21 +17,23 @@
 /// \brief  Task to produce the PID QA information for the TPC for the purpose of the Light flavor PWG
 ///
 
-#include <string_view>
+#include "PWGLF/DataModel/LFParticleIdentification.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/StaticFor.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
+#include "Common/Core/TrackSelection.h"
 #include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/Core/TrackSelection.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
+
+#include <string_view>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/Tasks/QC/lfpropStudy.cxx b/.conflict-base-0/PWGLF/Tasks/QC/lfpropStudy.cxx
index ab3c88ebbb3..b3995b496f8 100644
--- a/.conflict-base-0/PWGLF/Tasks/QC/lfpropStudy.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/QC/lfpropStudy.cxx
@@ -14,20 +14,22 @@
 /// \author Carolina Reetz <c.reetz@cern.ch>
 /// \brief QA task to study properties of propagated tracks
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "ReconstructionDataFormats/DCA.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/DCA.h"
+#include "ReconstructionDataFormats/Track.h"
+
 #include "TPDGCode.h"
 
 using namespace o2;
diff --git a/.conflict-base-0/PWGLF/Tasks/QC/mcParticlePrediction.cxx b/.conflict-base-0/PWGLF/Tasks/QC/mcParticlePrediction.cxx
index 0c1fca899f3..958773e0412 100644
--- a/.conflict-base-0/PWGLF/Tasks/QC/mcParticlePrediction.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/QC/mcParticlePrediction.cxx
@@ -16,18 +16,20 @@
 /// \brief Task to build the predictions from the models based on the generated particles
 ///
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/StaticFor.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "Common/DataModel/FT0Corrected.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/Utils/inelGt.h"
+#include "PWGLF/Utils/mcParticle.h"
+
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/FT0Corrected.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "PWGLF/Utils/mcParticle.h"
-#include "PWGLF/Utils/inelGt.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "CommonConstants/LHCConstants.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
 
 #include "TPDGCode.h"
 
@@ -60,9 +62,9 @@ struct Estimators {
   static constexpr estID ITSIB = 13;
   static constexpr estID ETA05 = 14;
   static constexpr estID ETA08 = 15;
-  static constexpr estID V0A = 16;  // (Run2)
-  static constexpr estID V0C = 17;  // (Run2)
-  static constexpr estID V0AC = 18; // (Run2 V0M)
+  static constexpr estID V0A = 16;             // (Run2)
+  static constexpr estID V0C = 17;             // (Run2)
+  static constexpr estID V0AC = 18;            // (Run2 V0M)
   static constexpr estID ImpactParameter = 19; // (Run2 V0M)
   static constexpr estID nEstimators = 20;
 
diff --git a/.conflict-base-0/PWGLF/Tasks/QC/mcSignalLoss.cxx b/.conflict-base-0/PWGLF/Tasks/QC/mcSignalLoss.cxx
index aefb6c98c1b..68909d4f610 100644
--- a/.conflict-base-0/PWGLF/Tasks/QC/mcSignalLoss.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/QC/mcSignalLoss.cxx
@@ -24,25 +24,27 @@
 //
 // Build hypertriton candidates from V0s and tracks
 
-#include <vector>
+#include "PWGLF/Utils/inelGt.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
+#include "Common/Core/PID/PIDTOF.h"
+#include "Common/Core/PID/TPCPIDResponse.h"
 #include "Common/Core/RecoDecay.h"
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "DataFormatsTPC/BetheBlochAleph.h"
-#include "Common/Core/PID/PIDTOF.h"
 #include "Common/TableProducer/PID/pidTOFBase.h"
+
+#include "DataFormatsTPC/BetheBlochAleph.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "Common/Core/PID/TPCPIDResponse.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "PWGLF/Utils/inelGt.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/Tasks/QC/mcinelgt0.cxx b/.conflict-base-0/PWGLF/Tasks/QC/mcinelgt0.cxx
index 40acd66a67f..63c2287abd1 100644
--- a/.conflict-base-0/PWGLF/Tasks/QC/mcinelgt0.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/QC/mcinelgt0.cxx
@@ -9,11 +9,12 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
+#include "PWGLF/Utils/inelGt.h"
+
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "PWGLF/Utils/inelGt.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/Tasks/QC/resonanceqa.cxx b/.conflict-base-0/PWGLF/Tasks/QC/resonanceqa.cxx
index 21c17a6e31b..7e102359590 100644
--- a/.conflict-base-0/PWGLF/Tasks/QC/resonanceqa.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/QC/resonanceqa.cxx
@@ -16,38 +16,38 @@
 // (5) particle = 2 --> lambdastar
 // (6) 4 process function (a) Data same event (b) Data mixed event (c) MC generated (d) MC reconstructed
 
-#include <TH1F.h>
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <TDatabasePDG.h>
 #include <TDirectory.h>
+#include <TFile.h>
+#include <TH1F.h>
+#include <TH2F.h>
 #include <THn.h>
 #include <TLorentzVector.h>
 #include <TMath.h>
 #include <TObjArray.h>
-#include <TFile.h>
-#include <TH2F.h>
-#include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
 
-#include <cmath>
 #include <array>
+#include <cmath>
 #include <cstdlib>
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/StepTHn.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/Core/trackUtilities.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/TrackSelection.h"
-#include "Framework/ASoAHelpers.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-base-0/PWGLF/Tasks/QC/stqa.cxx b/.conflict-base-0/PWGLF/Tasks/QC/stqa.cxx
index 0ab354233ff..fac64b91e1c 100644
--- a/.conflict-base-0/PWGLF/Tasks/QC/stqa.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/QC/stqa.cxx
@@ -9,14 +9,16 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/Core/trackUtilities.h"
 #include "ReconstructionDataFormats/DCA.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/Tasks/QC/straRecoStudy.cxx b/.conflict-base-0/PWGLF/Tasks/QC/straRecoStudy.cxx
index 1f7851cdbef..6caa238aea0 100644
--- a/.conflict-base-0/PWGLF/Tasks/QC/straRecoStudy.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/QC/straRecoStudy.cxx
@@ -20,38 +20,40 @@
 //    Please write to:
 //    david.dobrigkeit.chinellato@cern.ch
 //
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/McCollisionExtra.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/McCollisionExtra.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
+#include <Math/Vector4D.h>
+#include <TDatabasePDG.h>
 #include <TFile.h>
 #include <TH2F.h>
-#include <TProfile.h>
 #include <TLorentzVector.h>
-#include <Math/Vector4D.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
-#include <cmath>
+#include <TProfile.h>
+
 #include <array>
+#include <cmath>
 #include <cstdlib>
-#include "Framework/ASoAHelpers.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/Tasks/QC/strangederivedqa.cxx b/.conflict-base-0/PWGLF/Tasks/QC/strangederivedqa.cxx
index 2e709e07338..0c252538858 100644
--- a/.conflict-base-0/PWGLF/Tasks/QC/strangederivedqa.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/QC/strangederivedqa.cxx
@@ -14,26 +14,28 @@
 //
 // This code does basic QA of strangeness derived data
 
-#include <Math/Vector4D.h>
-#include <cmath>
-#include <array>
-#include <cstdlib>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/Core/trackUtilities.h"
 
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <Math/Vector4D.h>
+#include <TDatabasePDG.h>
 #include <TFile.h>
 #include <TH2F.h>
-#include <TProfile.h>
 #include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
+#include <TProfile.h>
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include <array>
+#include <cmath>
+#include <cstdlib>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/Tasks/QC/strangenessQCPP.cxx b/.conflict-base-0/PWGLF/Tasks/QC/strangenessQCPP.cxx
index 6dab146b363..b9e3990149c 100644
--- a/.conflict-base-0/PWGLF/Tasks/QC/strangenessQCPP.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/QC/strangenessQCPP.cxx
@@ -14,13 +14,15 @@
 /// In case of questions please write to:
 /// \author Roman Nepeivoda (roman.nepeivoda@cern.ch)
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
+#include "PWGLF/DataModel/QC/strangenessTablesQC.h"
+
 #include "Common/DataModel/EventSelection.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGLF/DataModel/QC/strangenessTablesQC.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
@@ -454,4 +456,5 @@ WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
   return WorkflowSpec{
     adaptAnalysisTask<strangenessQCPP>(cfgc, TaskName{"lf-strangenessqcpp"})};
-}
\ No newline at end of file
+}
+ 
\ No newline at end of file
diff --git a/.conflict-base-0/PWGLF/Tasks/QC/strangenessTrackingQC.cxx b/.conflict-base-0/PWGLF/Tasks/QC/strangenessTrackingQC.cxx
index 09c5698fd92..2458a769496 100644
--- a/.conflict-base-0/PWGLF/Tasks/QC/strangenessTrackingQC.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/QC/strangenessTrackingQC.cxx
@@ -9,29 +9,31 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "CCDB/BasicCCDBManager.h"
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "DCAFitter/DCAFitterN.h"
 #include "DataFormatsParameters/GRPMagField.h"
 #include "DataFormatsParameters/GRPObject.h"
 #include "DataFormatsTPC/BetheBlochAleph.h"
-#include "DCAFitter/DCAFitterN.h"
 #include "DetectorsBase/Propagator.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoA.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
 // #include "PWGHF/Core/PDG.h"
+#include "PWGLF/DataModel/LFNonPromptCascadeTables.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "ReconstructionDataFormats/DCA.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "PWGLF/DataModel/LFNonPromptCascadeTables.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/Tasks/QC/strangepidqa.cxx b/.conflict-base-0/PWGLF/Tasks/QC/strangepidqa.cxx
index c2bd9d89774..838b5bfc6b0 100644
--- a/.conflict-base-0/PWGLF/Tasks/QC/strangepidqa.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/QC/strangepidqa.cxx
@@ -12,32 +12,34 @@
 // This task is designed to do QA to the TOF PID applied to strangeness
 // in the regular framework
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <Math/Vector4D.h>
+#include <TDatabasePDG.h>
 #include <TFile.h>
 #include <TH2F.h>
-#include <TProfile.h>
 #include <TLorentzVector.h>
-#include <Math/Vector4D.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
-#include <cmath>
+#include <TProfile.h>
+
 #include <array>
+#include <cmath>
 #include <cstdlib>
-#include "Framework/ASoAHelpers.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/Tasks/QC/strderivedGenQA.cxx b/.conflict-base-0/PWGLF/Tasks/QC/strderivedGenQA.cxx
index 201dcd99ac2..73e6a214363 100644
--- a/.conflict-base-0/PWGLF/Tasks/QC/strderivedGenQA.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/QC/strderivedGenQA.cxx
@@ -19,36 +19,38 @@
 //    gianni.shigeru.setoue.liveraro@cern.ch
 //
 
-#include <Math/Vector4D.h>
-#include <cmath>
-#include <array>
-#include <vector>
-#include <cstdlib>
-
-#include <TFile.h>
-#include <TH2F.h>
-#include <TProfile.h>
-#include <TLorentzVector.h>
-#include <TPDGCode.h>
-#include <TDatabasePDG.h>
+#include "PWGLF/DataModel/LFStrangenessMLTables.h"
+#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/trackUtilities.h"
 #include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
-#include "PWGLF/DataModel/LFStrangenessMLTables.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <Math/Vector4D.h>
+#include <TDatabasePDG.h>
+#include <TFile.h>
+#include <TH2F.h>
+#include <TLorentzVector.h>
+#include <TPDGCode.h>
+#include <TProfile.h>
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/Tasks/QC/tpc_dEdx_postcalibration.cxx b/.conflict-base-0/PWGLF/Tasks/QC/tpc_dEdx_postcalibration.cxx
index 1e9fbd43851..c92c7f20251 100644
--- a/.conflict-base-0/PWGLF/Tasks/QC/tpc_dEdx_postcalibration.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/QC/tpc_dEdx_postcalibration.cxx
@@ -12,17 +12,19 @@
 /// \author Alberto Caliva (alberto.caliva@cern.ch)
 /// \since June 27, 2023
 
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "ReconstructionDataFormats/Track.h"
 
 using namespace o2;
diff --git a/.conflict-base-0/PWGLF/Tasks/QC/tpc_dedx_qa.cxx b/.conflict-base-0/PWGLF/Tasks/QC/tpc_dedx_qa.cxx
index 38f73b8edcb..6d2da6aa5d8 100644
--- a/.conflict-base-0/PWGLF/Tasks/QC/tpc_dedx_qa.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/QC/tpc_dedx_qa.cxx
@@ -12,19 +12,21 @@
 /// \author Alberto Caliva (alberto.caliva@cern.ch)
 /// \since September 19, 2023
 
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Multiplicity.h"
+
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "ReconstructionDataFormats/Track.h"
 
 using namespace o2;
diff --git a/.conflict-base-0/PWGLF/Tasks/QC/trackchecks.cxx b/.conflict-base-0/PWGLF/Tasks/QC/trackchecks.cxx
index 70eaa28dd3b..fb318965662 100644
--- a/.conflict-base-0/PWGLF/Tasks/QC/trackchecks.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/QC/trackchecks.cxx
@@ -8,21 +8,22 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include <cmath>
-#include <array>
-#include <utility>
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
+#include "Framework/runDataProcessing.h"
 
 #include <TF1.h>
 
+#include <array>
+#include <cmath>
+#include <utility>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-base-0/PWGLF/Tasks/QC/v0assoqa.cxx b/.conflict-base-0/PWGLF/Tasks/QC/v0assoqa.cxx
index fcfd8d59b01..60030e421d5 100644
--- a/.conflict-base-0/PWGLF/Tasks/QC/v0assoqa.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/QC/v0assoqa.cxx
@@ -11,40 +11,42 @@
 //
 // Strangeness-to-collision association tests
 //
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/Utils/strangenessBuilderHelper.h"
+
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/TPCVDriftManager.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/McCollisionExtra.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/McCollisionExtra.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
-#include "PWGLF/Utils/strangenessBuilderHelper.h"
-#include "Common/Core/TPCVDriftManager.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
+#include <Math/Vector4D.h>
+#include <TDatabasePDG.h>
 #include <TFile.h>
 #include <TH2F.h>
-#include <TProfile.h>
 #include <TLorentzVector.h>
-#include <Math/Vector4D.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
-#include <cmath>
+#include <TProfile.h>
+
 #include <array>
+#include <cmath>
 #include <cstdlib>
-#include "Framework/ASoAHelpers.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/Tasks/QC/v0cascadesqa.cxx b/.conflict-base-0/PWGLF/Tasks/QC/v0cascadesqa.cxx
index 5be2b6d4ba5..a75a9b22959 100644
--- a/.conflict-base-0/PWGLF/Tasks/QC/v0cascadesqa.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/QC/v0cascadesqa.cxx
@@ -18,20 +18,22 @@
 
 #include <cmath>
 // #include <cstdlib>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/trackUtilities.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/Tasks/QC/vertexQA.cxx b/.conflict-base-0/PWGLF/Tasks/QC/vertexQA.cxx
index 66ae298813d..844c9f8df81 100644
--- a/.conflict-base-0/PWGLF/Tasks/QC/vertexQA.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/QC/vertexQA.cxx
@@ -9,19 +9,20 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <algorithm>
-#include <cmath>
-#include <deque>
-#include <string>
-#include <vector>
-#include <utility>
+#include "Common/CCDB/ctpRateFetcher.h"
 
 #include "CCDB/BasicCCDBManager.h"
-#include "Common/CCDB/ctpRateFetcher.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
 
+#include <algorithm>
+#include <cmath>
+#include <deque>
+#include <string>
+#include <utility>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-base-0/PWGLF/Tasks/Resonances/chargedkstaranalysis.cxx b/.conflict-base-0/PWGLF/Tasks/Resonances/chargedkstaranalysis.cxx
index 8286f876bc8..7b729dcee7b 100644
--- a/.conflict-base-0/PWGLF/Tasks/Resonances/chargedkstaranalysis.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/Resonances/chargedkstaranalysis.cxx
@@ -17,23 +17,8 @@
 
 #include "TF1.h"
 // #include <TDatabasePDG.h>
-#include <TDirectory.h>
-#include <TFile.h>
-#include <TH1F.h>
-#include <TH2F.h>
-#include <THn.h>
-#include <TLorentzVector.h>
-#include <TMath.h>
-#include <TObjArray.h>
-#include <TPDGCode.h>
-#include <string>
-
-#include <array>
-#include <cmath>
-#include <cstdlib>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "CCDB/BasicCCDBManager.h"
-#include "CCDB/CcdbApi.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
@@ -41,6 +26,9 @@
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
 #include "CommonConstants/PhysicsConstants.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
@@ -48,9 +36,23 @@
 #include "Framework/HistogramRegistry.h"
 #include "Framework/StepTHn.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "ReconstructionDataFormats/Track.h"
 
+#include <TDirectory.h>
+#include <TFile.h>
+#include <TH1F.h>
+#include <TH2F.h>
+#include <THn.h>
+#include <TLorentzVector.h>
+#include <TMath.h>
+#include <TObjArray.h>
+#include <TPDGCode.h>
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <string>
+
 // For charged kstarpp analysis
 #include "PWGLF/DataModel/LFResonanceTables.h"
 
diff --git a/.conflict-base-0/PWGLF/Tasks/Resonances/chk892Flow.cxx b/.conflict-base-0/PWGLF/Tasks/Resonances/chk892Flow.cxx
index 2c616d81406..f0dadbcdb7a 100644
--- a/.conflict-base-0/PWGLF/Tasks/Resonances/chk892Flow.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/Resonances/chk892Flow.cxx
@@ -14,64 +14,58 @@
 /// \author Su-Jeong Ji <su-jeong.ji@cern.ch>, Bong-Hwi Lim <Bong-Hwi.Lim@cern.ch>
 ///
 
-#include <TH1F.h>
-#include <TH1D.h>
-#include <TDirectory.h>
-#include <THn.h>
-#include <TLorentzVector.h>
-#include <TObjArray.h>
-#include <TFile.h>
-#include <TH2F.h>
-
-#include <vector>
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <chrono>
-#include <string>
-
-#include "TRandom3.h"
-#include "TF1.h"
-#include "TVector2.h"
-#include "Math/Vector3D.h"
-#include "Math/Vector4D.h"
-#include "Math/GenVector/Boost.h"
-#include <TMath.h>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/StaticFor.h"
-#include "DCAFitter/DCAFitterN.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/Utils/collisionCuts.h"
 
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/Qvectors.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "Common/Core/trackUtilities.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/Core/RecoDecay.h"
-
-#include "CommonConstants/PhysicsConstants.h"
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
 #include "CommonConstants/MathConstants.h"
-
-#include "ReconstructionDataFormats/Track.h"
-
-#include "DataFormatsParameters/GRPObject.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "DCAFitter/DCAFitterN.h"
 #include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/StaticFor.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
-#include "CCDB/CcdbApi.h"
-#include "CCDB/BasicCCDBManager.h"
+#include "Math/GenVector/Boost.h"
+#include "Math/Vector3D.h"
+#include "Math/Vector4D.h"
+#include "TF1.h"
+#include "TRandom3.h"
+#include "TVector2.h"
+#include <TDirectory.h>
+#include <TFile.h>
+#include <TH1D.h>
+#include <TH1F.h>
+#include <TH2F.h>
+#include <THn.h>
+#include <TLorentzVector.h>
+#include <TMath.h>
+#include <TObjArray.h>
 
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/Utils/collisionCuts.h"
+#include <array>
+#include <chrono>
+#include <cmath>
+#include <cstdlib>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/Tasks/Resonances/chk892flow_pp.cxx b/.conflict-base-0/PWGLF/Tasks/Resonances/chk892flow_pp.cxx
index 7e1d65bd7e8..916deec5193 100644
--- a/.conflict-base-0/PWGLF/Tasks/Resonances/chk892flow_pp.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/Resonances/chk892flow_pp.cxx
@@ -15,65 +15,58 @@
 ///
 /// \author Su-Jeong Ji <su-jeong.ji@cern.ch>
 
-#include <TH1F.h>
-#include <TH1D.h>
-#include <TDirectory.h>
-#include <THn.h>
-#include <TLorentzVector.h>
-#include <TMath.h>
-#include <TObjArray.h>
-#include <TFile.h>
-#include <TH2F.h>
-#include <TDatabasePDG.h> // FIXME
-#include <TPDGCode.h>     // FIXME
-
-#include <vector>
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <chrono>
-#include <string>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/Utils/collisionCuts.h"
 
-#include "TRandom3.h"
-#include "TF1.h"
-#include "TVector2.h"
-#include "Math/Vector3D.h"
-#include "Math/Vector4D.h"
-#include "Math/GenVector/Boost.h"
-#include <TMath.h>
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/StepTHn.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/StaticFor.h"
-#include "DCAFitter/DCAFitterN.h"
-
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-
-#include "Common/Core/trackUtilities.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/Core/RecoDecay.h"
-
-#include "CommonConstants/PhysicsConstants.h"
-
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
 
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-
-#include "CCDB/CcdbApi.h"
-#include "CCDB/BasicCCDBManager.h"
+#include "Math/GenVector/Boost.h"
+#include "Math/Vector3D.h"
+#include "Math/Vector4D.h"
+#include "TF1.h"
+#include "TRandom3.h"
+#include "TVector2.h"
+#include <TDatabasePDG.h> // FIXME
+#include <TDirectory.h>
+#include <TFile.h>
+#include <TH1D.h>
+#include <TH1F.h>
+#include <TH2F.h>
+#include <THn.h>
+#include <TLorentzVector.h>
+#include <TMath.h>
+#include <TObjArray.h>
+#include <TPDGCode.h> // FIXME
 
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/Utils/collisionCuts.h"
+#include <array>
+#include <chrono>
+#include <cmath>
+#include <cstdlib>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/Tasks/Resonances/chk892pp.cxx b/.conflict-base-0/PWGLF/Tasks/Resonances/chk892pp.cxx
index 269e8d0845d..c4cc01298ca 100644
--- a/.conflict-base-0/PWGLF/Tasks/Resonances/chk892pp.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/Resonances/chk892pp.cxx
@@ -15,65 +15,58 @@
 ///
 /// \author Su-Jeong Ji <su-jeong.ji@cern.ch>
 
-#include <TH1F.h>
-#include <TH1D.h>
-#include <TDirectory.h>
-#include <THn.h>
-#include <TLorentzVector.h>
-#include <TMath.h>
-#include <TObjArray.h>
-#include <TFile.h>
-#include <TH2F.h>
-#include <TDatabasePDG.h> // FIXME
-#include <TPDGCode.h>     // FIXME
-
-#include <vector>
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <chrono>
-#include <string>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/Utils/collisionCuts.h"
 
-#include "TRandom3.h"
-#include "TF1.h"
-#include "TVector2.h"
-#include "Math/Vector3D.h"
-#include "Math/Vector4D.h"
-#include "Math/GenVector/Boost.h"
-#include <TMath.h>
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/StepTHn.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/StaticFor.h"
-#include "DCAFitter/DCAFitterN.h"
-
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-
-#include "Common/Core/trackUtilities.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/Core/RecoDecay.h"
-
-#include "CommonConstants/PhysicsConstants.h"
-
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
 
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-
-#include "CCDB/CcdbApi.h"
-#include "CCDB/BasicCCDBManager.h"
+#include "Math/GenVector/Boost.h"
+#include "Math/Vector3D.h"
+#include "Math/Vector4D.h"
+#include "TF1.h"
+#include "TRandom3.h"
+#include "TVector2.h"
+#include <TDatabasePDG.h> // FIXME
+#include <TDirectory.h>
+#include <TFile.h>
+#include <TH1D.h>
+#include <TH1F.h>
+#include <TH2F.h>
+#include <THn.h>
+#include <TLorentzVector.h>
+#include <TMath.h>
+#include <TObjArray.h>
+#include <TPDGCode.h> // FIXME
 
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/Utils/collisionCuts.h"
+#include <array>
+#include <chrono>
+#include <cmath>
+#include <cstdlib>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/Tasks/Resonances/deltaanalysis.cxx b/.conflict-base-0/PWGLF/Tasks/Resonances/deltaanalysis.cxx
index 10c0d3071d2..0d52228cc8f 100644
--- a/.conflict-base-0/PWGLF/Tasks/Resonances/deltaanalysis.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/Resonances/deltaanalysis.cxx
@@ -10,44 +10,43 @@
 // or submit itself to any jurisdiction.
 // Analysis task for delta analysis
 
-#include <TH1F.h>
-#include <TDirectory.h>
-#include <THn.h>
-#include <TLorentzVector.h>
-#include <TMath.h>
-#include <TObjArray.h>
-#include <TFile.h>
-#include <TH2F.h>
-#include <TLorentzVector.h>
-#include <TPDGCode.h>
-#include <TDatabasePDG.h>
-
-#include <cmath>
-#include <array>
-#include <cstdlib>
+#include "PWGLF/DataModel/LFLithium4Tables.h"
 
 #include "Common/Core/PID/PIDTOF.h"
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/TableProducer/PID/pidTOFBase.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
+#include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsTPC/BetheBlochAleph.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/Core/trackUtilities.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/TrackSelection.h"
-#include "Framework/ASoAHelpers.h"
-#include "DataFormatsTPC/BetheBlochAleph.h"
-#include "CCDB/BasicCCDBManager.h"
 
-#include "PWGLF/DataModel/LFLithium4Tables.h"
+#include <TDatabasePDG.h>
+#include <TDirectory.h>
+#include <TFile.h>
+#include <TH1F.h>
+#include <TH2F.h>
+#include <THn.h>
+#include <TLorentzVector.h>
+#include <TMath.h>
+#include <TObjArray.h>
+#include <TPDGCode.h>
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/Tasks/Resonances/doubleResonanceScan.cxx b/.conflict-base-0/PWGLF/Tasks/Resonances/doubleResonanceScan.cxx
index 4b67171c448..48358d1b4ef 100644
--- a/.conflict-base-0/PWGLF/Tasks/Resonances/doubleResonanceScan.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/Resonances/doubleResonanceScan.cxx
@@ -15,16 +15,17 @@
 /// \since 27/03/2025
 ///
 
-#include <vector>
-#include <TLorentzVector.h>
+#include "PWGLF/DataModel/LFResonanceTables.h"
 
-#include "Framework/AnalysisTask.h"
+#include "CommonConstants/MathConstants.h"
+#include "CommonConstants/PhysicsConstants.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
 
-#include "CommonConstants/PhysicsConstants.h"
-#include "CommonConstants/MathConstants.h"
+#include <TLorentzVector.h>
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/Tasks/Resonances/doublephimeson.cxx b/.conflict-base-0/PWGLF/Tasks/Resonances/doublephimeson.cxx
index 0c8f9c2c780..07c86976f25 100644
--- a/.conflict-base-0/PWGLF/Tasks/Resonances/doublephimeson.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/Resonances/doublephimeson.cxx
@@ -13,27 +13,31 @@
 /// \author sourav kundu
 /// \since 02/11/2023
 
+#include "PWGLF/DataModel/ReducedDoublePhiTables.h"
+
+#include "Common/Core/trackUtilities.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
 #include <Framework/Configurable.h>
-#include <TLorentzVector.h>
+
 #include <Math/GenVector/Boost.h>
-#include <Math/Vector4D.h>
 #include <Math/Vector3D.h>
+#include <Math/Vector4D.h>
+#include <TLorentzVector.h>
 #include <TMath.h>
+
 #include <fairlogger/Logger.h>
+
 #include <iostream>
 #include <iterator>
 #include <string>
 #include <vector>
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/StepTHn.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/ReducedDoublePhiTables.h"
-#include "CommonConstants/PhysicsConstants.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-base-0/PWGLF/Tasks/Resonances/f1protoncorrelation.cxx b/.conflict-base-0/PWGLF/Tasks/Resonances/f1protoncorrelation.cxx
index af45b89b8da..23e41a8f7f9 100644
--- a/.conflict-base-0/PWGLF/Tasks/Resonances/f1protoncorrelation.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/Resonances/f1protoncorrelation.cxx
@@ -13,25 +13,29 @@
 /// \author sourav kundu
 /// \since 02/11/2023
 
+#include "PWGLF/DataModel/ReducedF1ProtonTables.h"
+
+#include "Common/Core/trackUtilities.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
 #include <Framework/Configurable.h>
-#include <TLorentzVector.h>
+
 #include <Math/GenVector/Boost.h>
 #include <Math/Vector4D.h>
+#include <TLorentzVector.h>
 #include <TMath.h>
+
 #include <fairlogger/Logger.h>
+
 #include <iostream>
 #include <iterator>
 #include <string>
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/StepTHn.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/ReducedF1ProtonTables.h"
-#include "CommonConstants/PhysicsConstants.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-base-0/PWGLF/Tasks/Resonances/heptaquark.cxx b/.conflict-base-0/PWGLF/Tasks/Resonances/heptaquark.cxx
index 407c3199073..4f3caaf197a 100644
--- a/.conflict-base-0/PWGLF/Tasks/Resonances/heptaquark.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/Resonances/heptaquark.cxx
@@ -12,28 +12,32 @@
 /// \brief this is a starting point for the Resonances tutorial
 /// \author junlee kim
 
+#include "PWGLF/DataModel/ReducedHeptaQuarkTables.h"
+
+#include "Common/Core/trackUtilities.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
 #include <Framework/Configurable.h>
-#include <TLorentzVector.h>
+
 #include <Math/GenVector/Boost.h>
-#include <Math/Vector4D.h>
 #include <Math/Vector3D.h>
+#include <Math/Vector4D.h>
+#include <TLorentzVector.h>
 #include <TMath.h>
 #include <TRandom3.h>
+
 #include <fairlogger/Logger.h>
+
 #include <iostream>
 #include <iterator>
 #include <string>
 #include <vector>
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/StepTHn.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/ReducedHeptaQuarkTables.h"
-#include "CommonConstants/PhysicsConstants.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-base-0/PWGLF/Tasks/Resonances/highmasslambda.cxx b/.conflict-base-0/PWGLF/Tasks/Resonances/highmasslambda.cxx
index c799c1d0ba7..41e3a48e48a 100644
--- a/.conflict-base-0/PWGLF/Tasks/Resonances/highmasslambda.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/Resonances/highmasslambda.cxx
@@ -11,57 +11,59 @@
 // Phi meson spin alignment task
 // sourav.kundu@cern.ch
 
-#include <TH1F.h>
+#include "PWGLF/DataModel/EPCalibrationTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/PIDResponseITS.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include "Math/GenVector/Boost.h"
+#include "Math/Vector3D.h"
+#include "Math/Vector4D.h"
+#include "TF1.h"
+#include "TRandom3.h"
+#include <TDatabasePDG.h>
 #include <TDirectory.h>
+#include <TFile.h>
+#include <TH1F.h>
+#include <TH2F.h>
 #include <THn.h>
 #include <TLorentzVector.h>
 #include <TMath.h>
 #include <TObjArray.h>
-#include <TFile.h>
-#include <TH2F.h>
-#include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
-#include <cmath>
+
 #include <array>
+#include <cmath>
 #include <cstdlib>
-#include <vector>
 #include <string>
-
-#include "TRandom3.h"
-#include "Math/Vector3D.h"
-#include "Math/Vector4D.h"
-#include "Math/GenVector/Boost.h"
-#include "TF1.h"
-
-#include "PWGLF/DataModel/EPCalibrationTables.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/Core/trackUtilities.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/TrackSelection.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "Common/DataModel/PIDResponseITS.h"
+#include <vector>
 // #include "PWGHF/Utils/utilsBfieldCCDB.h"
 #include "PWGHF/Utils/utilsEvSelHf.h"
 #include "PWGHF/Utils/utilsTrkCandHf.h"
+
+#include "DCAFitter/DCAFitterN.h"
 #include "ReconstructionDataFormats/DCA.h"
 #include "ReconstructionDataFormats/V0.h"
-#include "DCAFitter/DCAFitterN.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/Tasks/Resonances/highmasslambdasvx.cxx b/.conflict-base-0/PWGLF/Tasks/Resonances/highmasslambdasvx.cxx
index d6405483d13..d285c487e26 100644
--- a/.conflict-base-0/PWGLF/Tasks/Resonances/highmasslambdasvx.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/Resonances/highmasslambdasvx.cxx
@@ -11,55 +11,56 @@
 // Phi meson spin alignment task
 // sourav.kundu@cern.ch
 
-#include <TH1F.h>
-#include <TDirectory.h>
-#include <THn.h>
-#include <TLorentzVector.h>
-#include <TMath.h>
-#include <TObjArray.h>
-#include <TFile.h>
-#include <TH2F.h>
-#include <TLorentzVector.h>
-#include <TPDGCode.h>
-#include <TDatabasePDG.h>
-#include <cmath>
-#include <array>
-#include <cstdlib>
-
-#include "TRandom3.h"
-#include "Math/Vector3D.h"
-#include "Math/Vector4D.h"
-#include "Math/GenVector/Boost.h"
-#include "TF1.h"
+#include "PWGHF/Utils/utilsBfieldCCDB.h"
+#include "PWGHF/Utils/utilsEvSelHf.h"
+#include "PWGHF/Utils/utilsTrkCandHf.h"
+#include "PWGLF/DataModel/EPCalibrationTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Common/Core/TrackSelection.h"
 #include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/EPCalibrationTables.h"
-#include "Framework/runDataProcessing.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/TrackSelection.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "DataFormatsParameters/GRPObject.h"
+#include "DCAFitter/DCAFitterN.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGHF/Utils/utilsBfieldCCDB.h"
-#include "PWGHF/Utils/utilsEvSelHf.h"
-#include "PWGHF/Utils/utilsTrkCandHf.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/DCA.h"
+#include "ReconstructionDataFormats/Track.h"
 #include "ReconstructionDataFormats/V0.h"
 
+#include "Math/GenVector/Boost.h"
+#include "Math/Vector3D.h"
+#include "Math/Vector4D.h"
+#include "TF1.h"
+#include "TRandom3.h"
+#include <TDatabasePDG.h>
+#include <TDirectory.h>
+#include <TFile.h>
+#include <TH1F.h>
+#include <TH2F.h>
+#include <THn.h>
+#include <TLorentzVector.h>
+#include <TMath.h>
+#include <TObjArray.h>
+#include <TPDGCode.h>
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-base-0/PWGLF/Tasks/Resonances/k1AnalysisMicro.cxx b/.conflict-base-0/PWGLF/Tasks/Resonances/k1AnalysisMicro.cxx
index 35d6224da36..506365a642a 100644
--- a/.conflict-base-0/PWGLF/Tasks/Resonances/k1AnalysisMicro.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/Resonances/k1AnalysisMicro.cxx
@@ -14,20 +14,23 @@
 /// \author Su-Jeong Ji <su-jeong.ji@cern.ch>, Bong-Hwi Lim <bong-hwi.lim@cern.ch>
 ///
 
-#include <vector>
-#include <TLorentzVector.h>
-#include <TDatabasePDG.h> // FIXME
-#include <TPDGCode.h>     // FIXME
+#include "PWGLF/DataModel/LFResonanceTables.h"
 
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Framework/AnalysisTask.h"
+#include "Common/DataModel/PIDResponse.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "DataFormatsParameters/GRPObject.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "CommonConstants/PhysicsConstants.h"
+
+#include <TDatabasePDG.h> // FIXME
+#include <TLorentzVector.h>
+#include <TPDGCode.h> // FIXME
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/Tasks/Resonances/k1analysis.cxx b/.conflict-base-0/PWGLF/Tasks/Resonances/k1analysis.cxx
index 601227b666e..af106a29189 100644
--- a/.conflict-base-0/PWGLF/Tasks/Resonances/k1analysis.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/Resonances/k1analysis.cxx
@@ -15,20 +15,23 @@
 ///
 /// \author Bong-Hwi Lim <bong-hwi.lim@cern.ch>
 
-#include <vector>
-#include <TLorentzVector.h>
-#include <TDatabasePDG.h> // FIXME
-#include <TPDGCode.h>     // FIXME
+#include "PWGLF/DataModel/LFResonanceTables.h"
 
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Framework/AnalysisTask.h"
+#include "Common/DataModel/PIDResponse.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "DataFormatsParameters/GRPObject.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "CommonConstants/PhysicsConstants.h"
+
+#include <TDatabasePDG.h> // FIXME
+#include <TLorentzVector.h>
+#include <TPDGCode.h> // FIXME
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/Tasks/Resonances/k892SpherocityAnalysis.cxx b/.conflict-base-0/PWGLF/Tasks/Resonances/k892SpherocityAnalysis.cxx
index 7081f79c751..83f93a83134 100644
--- a/.conflict-base-0/PWGLF/Tasks/Resonances/k892SpherocityAnalysis.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/Resonances/k892SpherocityAnalysis.cxx
@@ -13,17 +13,19 @@
 /// \brief Invariant Mass Reconstruction of K*(892) Resonance
 /// \author Sayan Dhani <sayan.dhani@cern.ch>
 
-#include <TLorentzVector.h>
-#include <TRandom.h>
+#include "PWGLF/DataModel/LFResonanceTables.h"
 
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Framework/AnalysisTask.h"
+#include "Common/DataModel/PIDResponse.h"
+
+#include "CommonConstants/PhysicsConstants.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
-#include "CommonConstants/PhysicsConstants.h"
+
+#include <TLorentzVector.h>
+#include <TRandom.h>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/Tasks/Resonances/k892analysis.cxx b/.conflict-base-0/PWGLF/Tasks/Resonances/k892analysis.cxx
index 34e4cc662a0..83bca847de5 100644
--- a/.conflict-base-0/PWGLF/Tasks/Resonances/k892analysis.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/Resonances/k892analysis.cxx
@@ -15,19 +15,21 @@
 ///
 /// \author Bong-Hwi Lim <bong-hwi.lim@cern.ch>, Sawan Sawan <sawan.sawan@cern.ch>
 
-#include <TLorentzVector.h>
-#include "TF1.h"
-#include "TRandom3.h"
+#include "PWGLF/DataModel/LFResonanceTables.h"
 
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Framework/AnalysisTask.h"
+#include "Common/DataModel/PIDResponse.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "DataFormatsParameters/GRPObject.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "CommonConstants/PhysicsConstants.h"
+
+#include "TF1.h"
+#include "TRandom3.h"
+#include <TLorentzVector.h>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/Tasks/Resonances/k892analysispbpb.cxx b/.conflict-base-0/PWGLF/Tasks/Resonances/k892analysispbpb.cxx
index 303a6cd6fc9..b15bc0d7217 100644
--- a/.conflict-base-0/PWGLF/Tasks/Resonances/k892analysispbpb.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/Resonances/k892analysispbpb.cxx
@@ -13,39 +13,40 @@
 /// \brief K*0 spectra in Pb-Pb
 /// \author Marta Urioni <marta.urioni@cern.ch>
 
-#include <TH1F.h>
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <Math/Vector4D.h>
 #include <TDirectory.h>
+#include <TFile.h>
+#include <TH1F.h>
+#include <TH2F.h>
 #include <THn.h>
 #include <TLorentzVector.h>
 #include <TMath.h>
 #include <TObjArray.h>
-#include <TFile.h>
-#include <TH2F.h>
-#include <TRandom3.h>
-#include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <Math/Vector4D.h>
-#include <cmath>
+#include <TRandom3.h>
+
 #include <array>
+#include <cmath>
 #include <cstdlib>
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/StepTHn.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/Core/trackUtilities.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/TrackSelection.h"
-#include "Framework/ASoAHelpers.h"
-#include "DataFormatsParameters/GRPObject.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-base-0/PWGLF/Tasks/Resonances/k892pmanalysis.cxx b/.conflict-base-0/PWGLF/Tasks/Resonances/k892pmanalysis.cxx
index 16963b77e6b..dcdfba8865c 100644
--- a/.conflict-base-0/PWGLF/Tasks/Resonances/k892pmanalysis.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/Resonances/k892pmanalysis.cxx
@@ -15,17 +15,19 @@
 ///
 /// \author Bong-Hwi Lim <bong-hwi.lim@cern.ch>, Alessandro Sturniolo <a.sturniolo@cern.ch>
 
-#include <TLorentzVector.h>
+#include "PWGLF/DataModel/LFResonanceTables.h"
 
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Framework/AnalysisTask.h"
+#include "Common/DataModel/PIDResponse.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "DataFormatsParameters/GRPObject.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "CommonConstants/PhysicsConstants.h"
+
+#include <TLorentzVector.h>
 
 using namespace o2;
 using namespace o2::framework;
@@ -443,7 +445,7 @@ struct k892pmanalysis {
 
   void processMCTrue(aod::ResoMCParents& resoParents)
   {
-    for (auto& part : resoParents) {  // loop over all pre-filtered MC particles
+    for (auto& part : resoParents) {       // loop over all pre-filtered MC particles
       if (std::abs(part.pdgCode()) != 323) // K*892(pm)
         continue;
       if (std::abs(part.y()) > 0.5) // rapidity cut
diff --git a/.conflict-base-0/PWGLF/Tasks/Resonances/kshortlambda.cxx b/.conflict-base-0/PWGLF/Tasks/Resonances/kshortlambda.cxx
index 225ea15e447..304c2511bc6 100644
--- a/.conflict-base-0/PWGLF/Tasks/Resonances/kshortlambda.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/Resonances/kshortlambda.cxx
@@ -13,6 +13,29 @@
 /// \brief higher mass resonance search in non-identical V0 pairs (K0s-L)
 /// \author  dukhishyam Mallick (dukhishyam.mallick@cern.ch)
 
+#include "PWGLF/DataModel/LFStrangenessTables.h" //
+
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h" //
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h" //
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h" //
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h" //
+#include "ReconstructionDataFormats/Track.h"
+
+#include "Math/GenVector/Boost.h"
+#include "Math/Vector3D.h"
+#include "Math/Vector4D.h"
+#include "TF1.h"
+#include "TRandom3.h"
 #include <TDirectory.h>
 #include <TFile.h>
 #include <TH1F.h>
@@ -22,32 +45,11 @@
 #include <TMath.h>
 #include <TObjArray.h>
 #include <TPDGCode.h>
+
 #include <array>
 #include <cmath>
 #include <cstdlib>
 #include <vector>
-#include "TF1.h"
-#include "TRandom3.h"
-#include "Math/Vector3D.h"
-#include "Math/Vector4D.h"
-#include "Math/GenVector/Boost.h"
-
-#include "Common/Core/TrackSelection.h"
-#include "Common/Core/trackUtilities.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/StepTHn.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/EventSelection.h" //
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/PIDResponse.h" //
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/AnalysisTask.h"              //
-#include "Framework/runDataProcessing.h"         //
-#include "PWGLF/DataModel/LFStrangenessTables.h" //
 
 using namespace o2;
 using namespace o2::framework;
@@ -795,11 +797,11 @@ struct Kshortlambda {
           lv1.SetPtEtaPhiM(t1.pt(), t1.eta(), t1.phi(), massK0s);
           lvLambda.SetPtEtaPhiM(lambdaVec.pt(), lambdaVec.eta(), lambdaVec.phi(), massLambda);
           lv3 = lv1 + lvLambda;
-          fourVecDau = ROOT::Math::PxPyPzMVector(daughter1.Px(), daughter1.Py(), daughter1.Pz(), massK0s);                           // Kshort
-          fourVecMother = ROOT::Math::PxPyPzMVector(lv3.Px(), lv3.Py(), lv3.Pz(), lv3.M());                                          // mass of KshortKshort pair
-          ROOT::Math::Boost boost{fourVecMother.BoostToCM()};                                                                        // boost mother to center of mass frame
-          fourVecDauCM = boost(fourVecDau);                                                                                          // boost the frame of daughter same as mother
-          threeVecDauCM = fourVecDauCM.Vect();                                                                                       // get the 3 vector of daughter in the frame of mother
+          fourVecDau = ROOT::Math::PxPyPzMVector(daughter1.Px(), daughter1.Py(), daughter1.Pz(), massK0s); // Kshort
+          fourVecMother = ROOT::Math::PxPyPzMVector(lv3.Px(), lv3.Py(), lv3.Pz(), lv3.M());                // mass of KshortKshort pair
+          ROOT::Math::Boost boost{fourVecMother.BoostToCM()};                                              // boost mother to center of mass frame
+          fourVecDauCM = boost(fourVecDau);                                                                // boost the frame of daughter same as mother
+          threeVecDauCM = fourVecDauCM.Vect();                                                             // get the 3 vector of daughter in the frame of mother
 
           if (std::abs(lv3.Rapidity()) < 0.5) {
             if (activateTHnSparseCosThStarHelicity) {
@@ -901,11 +903,11 @@ struct Kshortlambda {
           lvLambda.SetPtEtaPhiM(lambdaVec.pt(), lambdaVec.eta(), lambdaVec.phi(), massLambda);
           lv3 = lv1 + lvLambda;
 
-          fourVecDau = ROOT::Math::PxPyPzMVector(daughter1.Px(), daughter1.Py(), daughter1.Pz(), massK0s);            // Kshort
-          fourVecMother = ROOT::Math::PxPyPzMVector(lv3.Px(), lv3.Py(), lv3.Pz(), lv3.M());                           // mass of KshortKshort pair
-          ROOT::Math::Boost boost{fourVecMother.BoostToCM()};                                                         // boost mother to center of mass frame
-          fourVecDauCM = boost(fourVecDau);                                                                           // boost the frame of daughter same as mother
-          threeVecDauCM = fourVecDauCM.Vect();                                                                        // get the 3 vector of daughter in the frame of mother
+          fourVecDau = ROOT::Math::PxPyPzMVector(daughter1.Px(), daughter1.Py(), daughter1.Pz(), massK0s); // Kshort
+          fourVecMother = ROOT::Math::PxPyPzMVector(lv3.Px(), lv3.Py(), lv3.Pz(), lv3.M());                // mass of KshortKshort pair
+          ROOT::Math::Boost boost{fourVecMother.BoostToCM()};                                              // boost mother to center of mass frame
+          fourVecDauCM = boost(fourVecDau);                                                                // boost the frame of daughter same as mother
+          threeVecDauCM = fourVecDauCM.Vect();                                                             // get the 3 vector of daughter in the frame of mother
 
           if (std::abs(lv3.Rapidity()) < 0.5) {
 
diff --git a/.conflict-base-0/PWGLF/Tasks/Resonances/kstar892analysis.cxx b/.conflict-base-0/PWGLF/Tasks/Resonances/kstar892analysis.cxx
index 0a43e73bb5b..74ee0c5496c 100644
--- a/.conflict-base-0/PWGLF/Tasks/Resonances/kstar892analysis.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/Resonances/kstar892analysis.cxx
@@ -16,20 +16,23 @@
 /// adaped from k892analysis.cxx by Bong-Hwi Lim <bong-hwi.lim@cern.ch>, Sawan Sawan <sawan.sawan@cern.ch>
 /// \author Marta Urioni <marta.urioni@cern.ch>
 
-#include <TLorentzVector.h>
-#include "TF1.h"
-#include <vector>
+#include "PWGLF/DataModel/LFResonanceTables.h"
 
 #include "Common/Core/RecoDecay.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Framework/AnalysisTask.h"
+#include "Common/DataModel/PIDResponse.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "DataFormatsParameters/GRPObject.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "CommonConstants/PhysicsConstants.h"
+
+#include "TF1.h"
+#include <TLorentzVector.h>
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/Tasks/Resonances/kstarFlowv1.cxx b/.conflict-base-0/PWGLF/Tasks/Resonances/kstarFlowv1.cxx
index 08139c3c2d2..ab860f966c4 100644
--- a/.conflict-base-0/PWGLF/Tasks/Resonances/kstarFlowv1.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/Resonances/kstarFlowv1.cxx
@@ -14,53 +14,52 @@
 /// \author  Prottay Das <prottay.das@cern.ch>, Dukhishyam Mallick <dukhishyam.mallick@cern.ch>
 ///
 
-#include <TH1F.h>
 #include <TDirectory.h>
+#include <TFile.h>
+#include <TH1F.h>
+#include <TH2F.h>
 #include <THn.h>
 #include <TLorentzVector.h>
 #include <TMath.h>
 #include <TObjArray.h>
-#include <TFile.h>
-#include <TH2F.h>
-#include <TLorentzVector.h>
 #include <TPDGCode.h>
+
 #include <string>
 #include <vector>
 // #include <TDatabasePDG.h>
-#include <cmath>
-#include <array>
-#include <cstdlib>
-
-#include "TRandom3.h"
-#include "Math/Vector3D.h"
-#include "Math/Vector4D.h"
-#include "Math/GenVector/Boost.h"
-#include "TF1.h"
+#include "PWGLF/DataModel/SPCalibrationTables.h"
 
-#include "Common/Core/trackUtilities.h"
-#include "Common/Core/TrackSelection.h"
 #include "Common/Core/RecoDecay.h"
-
-#include "PWGLF/DataModel/SPCalibrationTables.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/TrackSelection.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
+
+#include "Math/GenVector/Boost.h"
+#include "Math/Vector3D.h"
+#include "Math/Vector4D.h"
+#include "TF1.h"
+#include "TRandom3.h"
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/Tasks/Resonances/lambda1520SpherocityAnalysis.cxx b/.conflict-base-0/PWGLF/Tasks/Resonances/lambda1520SpherocityAnalysis.cxx
index b8d6cfeae29..7d53afebf5b 100644
--- a/.conflict-base-0/PWGLF/Tasks/Resonances/lambda1520SpherocityAnalysis.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/Resonances/lambda1520SpherocityAnalysis.cxx
@@ -13,19 +13,22 @@
 /// \brief Invariant Mass Reconstruction of Lambda(1520) Resonance
 /// \author Yash Patley <yash.patley@cern.ch>
 
-#include <TLorentzVector.h>
-#include <TRandom.h>
-#include <vector>
+#include "PWGLF/DataModel/LFResonanceTables.h"
 
-#include "Common/DataModel/PIDResponse.h"
+#include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Framework/AnalysisTask.h"
+#include "Common/DataModel/PIDResponse.h"
+
+#include "CommonConstants/PhysicsConstants.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/RecoDecay.h"
+
+#include <TLorentzVector.h>
+#include <TRandom.h>
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/Tasks/Resonances/lambda1520_PbPb.cxx b/.conflict-base-0/PWGLF/Tasks/Resonances/lambda1520_PbPb.cxx
index d032d0c90aa..1298ef07c4f 100644
--- a/.conflict-base-0/PWGLF/Tasks/Resonances/lambda1520_PbPb.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/Resonances/lambda1520_PbPb.cxx
@@ -15,22 +15,25 @@
 /// \author Yash Patley <yash.patley@cern.ch>
 /// \author Nasir Mehdi Malik
 
+#include "PWGLF/DataModel/LFResonanceTables.h"
+
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 #include <Framework/ASoA.h>
 #include <Framework/AnalysisDataModel.h>
 #include <Framework/HistogramRegistry.h>
 #include <Framework/HistogramSpec.h>
+
 #include <TLorentzVector.h>
 #include <TRandom.h>
-#include <fairlogger/Logger.h>
 
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
-#include "CommonConstants/PhysicsConstants.h"
+#include <fairlogger/Logger.h>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/Tasks/Resonances/lambda1520analysis.cxx b/.conflict-base-0/PWGLF/Tasks/Resonances/lambda1520analysis.cxx
index 3e6749d451d..12130bfe422 100644
--- a/.conflict-base-0/PWGLF/Tasks/Resonances/lambda1520analysis.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/Resonances/lambda1520analysis.cxx
@@ -13,13 +13,15 @@
 /// \brief This task reconstructs track-track decay lambda(1520) resonance candidate
 /// \author Hirak Kumar Koley <hirak.koley@cern.ch>
 
-#include "TLorentzVector.h"
-#include "TF1.h"
-#include "TRandom3.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "PWGLF/DataModel/LFResonanceTables.h"
+
 #include "CommonConstants/PhysicsConstants.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TF1.h"
+#include "TLorentzVector.h"
+#include "TRandom3.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/Tasks/Resonances/lambdav2.cxx b/.conflict-base-0/PWGLF/Tasks/Resonances/lambdav2.cxx
index ae8c1b6446c..3aebbb27334 100644
--- a/.conflict-base-0/PWGLF/Tasks/Resonances/lambdav2.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/Resonances/lambdav2.cxx
@@ -11,50 +11,51 @@
 // Particle flow task
 // prottay.das@cern.ch
 
-#include <TH1F.h>
+#include "Math/GenVector/Boost.h"
+#include "Math/Vector3D.h"
+#include "Math/Vector4D.h"
+#include "TF1.h"
+#include "TRandom3.h"
+#include <TDatabasePDG.h>
 #include <TDirectory.h>
+#include <TFile.h>
+#include <TH1F.h>
+#include <TH2F.h>
 #include <THn.h>
 #include <TLorentzVector.h>
 #include <TMath.h>
 #include <TObjArray.h>
-#include <TFile.h>
-#include <TH2F.h>
-#include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
-#include <cmath>
+
 #include <array>
+#include <cmath>
 #include <cstdlib>
 
-#include "TRandom3.h"
-#include "Math/Vector3D.h"
-#include "Math/Vector4D.h"
-#include "Math/GenVector/Boost.h"
-#include "TF1.h"
-
 // #include "Common/DataModel/Qvectors.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "PWGLF/DataModel/SPCalibrationTables.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
+
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/FT0Corrected.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/TrackSelection.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "Common/DataModel/FT0Corrected.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/Tasks/Resonances/lstarpbpbv2.cxx b/.conflict-base-0/PWGLF/Tasks/Resonances/lstarpbpbv2.cxx
index 4b9bdb5aede..ce6094b71ee 100644
--- a/.conflict-base-0/PWGLF/Tasks/Resonances/lstarpbpbv2.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/Resonances/lstarpbpbv2.cxx
@@ -11,50 +11,51 @@
 // L* baryon v2
 // Prottay Das (prottay.das@cern.ch)
 
-#include <TH1F.h>
+#include "PWGLF/DataModel/EPCalibrationTables.h"
+
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/PIDResponseITS.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include "Math/GenVector/Boost.h"
+#include "Math/Vector3D.h"
+#include "Math/Vector4D.h"
+#include "TF1.h"
+#include "TRandom3.h"
+#include <TDatabasePDG.h>
 #include <TDirectory.h>
+#include <TFile.h>
+#include <TH1F.h>
+#include <TH2F.h>
 #include <THn.h>
 #include <TLorentzVector.h>
 #include <TMath.h>
 #include <TObjArray.h>
-#include <TFile.h>
-#include <TH2F.h>
-#include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <string>
-#include <vector>
-#include <TDatabasePDG.h>
-#include <cmath>
+
 #include <array>
+#include <cmath>
 #include <cstdlib>
-
-#include "TRandom3.h"
-#include "Math/Vector3D.h"
-#include "Math/Vector4D.h"
-#include "Math/GenVector/Boost.h"
-#include "TF1.h"
-
-#include "PWGLF/DataModel/EPCalibrationTables.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/Core/trackUtilities.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/TrackSelection.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "Common/DataModel/PIDResponseITS.h"
-#include "CCDB/BasicCCDBManager.h"
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/Tasks/Resonances/phianalysis.cxx b/.conflict-base-0/PWGLF/Tasks/Resonances/phianalysis.cxx
index b529cc1fb81..7bbe03013c6 100644
--- a/.conflict-base-0/PWGLF/Tasks/Resonances/phianalysis.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/Resonances/phianalysis.cxx
@@ -15,17 +15,19 @@
 ///
 /// \author Bong-Hwi Lim <bong-hwi.lim@cern.ch>
 
-#include <TLorentzVector.h>
+#include "PWGLF/DataModel/LFResonanceTables.h"
 
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Framework/AnalysisTask.h"
+#include "Common/DataModel/PIDResponse.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "DataFormatsParameters/GRPObject.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "CommonConstants/PhysicsConstants.h"
+
+#include <TLorentzVector.h>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/Tasks/Resonances/phianalysisTHnSparse.cxx b/.conflict-base-0/PWGLF/Tasks/Resonances/phianalysisTHnSparse.cxx
index f9fa43c1d7f..09b6f505843 100644
--- a/.conflict-base-0/PWGLF/Tasks/Resonances/phianalysisTHnSparse.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/Resonances/phianalysisTHnSparse.cxx
@@ -13,21 +13,24 @@
 /// \brief Analysis of phi resonance using THnSparse histograms.
 /// \author Veronika Barbasova (veronika.barbasova@cern.ch)
 
-#include <TLorentzVector.h>
-#include <vector>
-#include <string>
+#include "PWGLF/Utils/rsnOutput.h"
 
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/PID.h"
-#include "PWGLF/Utils/rsnOutput.h"
+
+#include <TLorentzVector.h>
+
+#include <string>
+#include <vector>
 // #include "TDatabasePDG.h"
 
 using namespace o2;
diff --git a/.conflict-base-0/PWGLF/Tasks/Resonances/phianalysisrun3.cxx b/.conflict-base-0/PWGLF/Tasks/Resonances/phianalysisrun3.cxx
index a865482393a..05e2b0e414e 100644
--- a/.conflict-base-0/PWGLF/Tasks/Resonances/phianalysisrun3.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/Resonances/phianalysisrun3.cxx
@@ -16,38 +16,39 @@
 // (5) particle = 2 --> lambdastar
 // (6) 4 process function (a) Data same event (b) Data mixed event (c) MC generated (d) MC reconstructed
 
-#include <TH1F.h>
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <Math/Vector4D.h>
+#include <TDatabasePDG.h>
 #include <TDirectory.h>
+#include <TFile.h>
+#include <TH1F.h>
+#include <TH2F.h>
 #include <THn.h>
 #include <TLorentzVector.h>
 #include <TMath.h>
 #include <TObjArray.h>
-#include <TFile.h>
-#include <TH2F.h>
-#include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
-#include <Math/Vector4D.h>
-#include <cmath>
+
 #include <array>
+#include <cmath>
 #include <cstdlib>
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/StepTHn.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/Core/trackUtilities.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/TrackSelection.h"
-#include "Framework/ASoAHelpers.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-base-0/PWGLF/Tasks/Resonances/rho770analysis.cxx b/.conflict-base-0/PWGLF/Tasks/Resonances/rho770analysis.cxx
index 07531afc724..fb4d9cbf643 100644
--- a/.conflict-base-0/PWGLF/Tasks/Resonances/rho770analysis.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/Resonances/rho770analysis.cxx
@@ -14,19 +14,21 @@
 /// \author Hyunji Lim (hyunji.lim@cern.ch)
 /// \since 03/12/2025
 
-#include <Framework/Configurable.h>
-#include <TLorentzVector.h>
-#include "TVector2.h"
+#include "PWGLF/DataModel/LFResonanceTables.h"
 
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+
+#include "CommonConstants/PhysicsConstants.h"
 #include "DataFormatsParameters/GRPObject.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
-#include "CommonConstants/PhysicsConstants.h"
+#include <Framework/Configurable.h>
+
+#include "TVector2.h"
+#include <TLorentzVector.h>
 
 using namespace o2;
 using namespace o2::framework;
@@ -67,8 +69,8 @@ struct rho770analysis {
   Configurable<bool> cfgHasTOF{"cfgHasTOF", false, "Require TOF"};
 
   // PID
-  Configurable<double> cMaxTOFnSigmaPion{"cMaxTOFnSigmaPion", 3.0, "TOF nSigma cut for Pion"}; // TOF
-  Configurable<double> cMaxTPCnSigmaPion{"cMaxTPCnSigmaPion", 5.0, "TPC nSigma cut for Pion"}; // TPC
+  Configurable<double> cMaxTOFnSigmaPion{"cMaxTOFnSigmaPion", 3.0, "TOF nSigma cut for Pion"};                          // TOF
+  Configurable<double> cMaxTPCnSigmaPion{"cMaxTPCnSigmaPion", 5.0, "TPC nSigma cut for Pion"};                          // TPC
   Configurable<double> cMaxTPCnSigmaPionnoTOF{"cMaxTPCnSigmaPionnoTOF", 2.0, "TPC nSigma cut for Pion in no TOF case"}; // TPC
   Configurable<double> nsigmaCutCombinedPion{"nsigmaCutCombinedPion", 3.0, "Combined nSigma cut for Pion"};
   Configurable<int> selectType{"selectType", 0, "PID selection type"};
diff --git a/.conflict-base-0/PWGLF/Tasks/Resonances/rhoanalysis.cxx b/.conflict-base-0/PWGLF/Tasks/Resonances/rhoanalysis.cxx
index ab1112f4995..e6bfac44bf1 100644
--- a/.conflict-base-0/PWGLF/Tasks/Resonances/rhoanalysis.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/Resonances/rhoanalysis.cxx
@@ -15,23 +15,25 @@
 ///
 /// \author Nasir Mehdi Malik
 
-#include <array>
+#include "RecoDecay.h"
 
-#include <TPDGCode.h>
+#include "Common/Core/RecoDecay.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
-#include "Framework/DataProcessorSpec.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/RecoDecay.h"
+#include "Framework/DataProcessorSpec.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "RecoDecay.h"
+#include "Framework/runDataProcessing.h"
+
+#include <TPDGCode.h>
+
+#include <array>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/Tasks/Resonances/rsnanalysis.cxx b/.conflict-base-0/PWGLF/Tasks/Resonances/rsnanalysis.cxx
index 7a672fe59a8..0e662918f5d 100644
--- a/.conflict-base-0/PWGLF/Tasks/Resonances/rsnanalysis.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/Resonances/rsnanalysis.cxx
@@ -17,9 +17,11 @@
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "Framework/ASoAHelpers.h"
+
 #include "TLorentzVector.h"
 
 using namespace std;
diff --git a/.conflict-base-0/PWGLF/Tasks/Resonances/sigma.cxx b/.conflict-base-0/PWGLF/Tasks/Resonances/sigma.cxx
index 9bcad07c143..5245c2eb5ae 100644
--- a/.conflict-base-0/PWGLF/Tasks/Resonances/sigma.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/Resonances/sigma.cxx
@@ -11,23 +11,8 @@
 ///
 /// \brief sigma resonance
 /// \author sarjeeta gami (sarjeeta.gami@cern.ch)
-#include <TDatabasePDG.h>
-#include <TDirectory.h>
-#include <TFile.h>
-#include <TH1F.h>
-#include <TH2F.h>
-#include <THn.h>
-#include <TLorentzVector.h>
-#include <TMath.h>
-#include <TObjArray.h>
-#include <TPDGCode.h>
-
-#include <array>
-#include <cmath>
-#include <cstdlib>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "CCDB/BasicCCDBManager.h"
-#include "CCDB/CcdbApi.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
@@ -35,6 +20,9 @@
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
 #include "CommonConstants/PhysicsConstants.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
@@ -42,9 +30,23 @@
 #include "Framework/HistogramRegistry.h"
 #include "Framework/StepTHn.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "ReconstructionDataFormats/Track.h"
 
+#include <TDatabasePDG.h>
+#include <TDirectory.h>
+#include <TFile.h>
+#include <TH1F.h>
+#include <TH2F.h>
+#include <THn.h>
+#include <TLorentzVector.h>
+#include <TMath.h>
+#include <TObjArray.h>
+#include <TPDGCode.h>
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-base-0/PWGLF/Tasks/Resonances/xi1530Analysis.cxx b/.conflict-base-0/PWGLF/Tasks/Resonances/xi1530Analysis.cxx
index 73694dda058..ada855ae4fb 100644
--- a/.conflict-base-0/PWGLF/Tasks/Resonances/xi1530Analysis.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/Resonances/xi1530Analysis.cxx
@@ -13,20 +13,23 @@
 /// \brief Invariant Mass Reconstruction of Xi(1530) Resonance
 /// \author Yash Patley <yash.patley@cern.ch>
 
-#include <TLorentzVector.h>
-#include <TRandom.h>
-#include <vector>
+#include "PWGLF/DataModel/LFResonanceTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Common/DataModel/PIDResponse.h"
+#include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Framework/AnalysisTask.h"
+#include "Common/DataModel/PIDResponse.h"
+
+#include "CommonConstants/PhysicsConstants.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/RecoDecay.h"
+
+#include <TLorentzVector.h>
+#include <TRandom.h>
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/Tasks/Resonances/xi1530Analysisqa.cxx b/.conflict-base-0/PWGLF/Tasks/Resonances/xi1530Analysisqa.cxx
index 42773fa2947..0fa785a0579 100644
--- a/.conflict-base-0/PWGLF/Tasks/Resonances/xi1530Analysisqa.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/Resonances/xi1530Analysisqa.cxx
@@ -14,21 +14,23 @@
 ///
 /// \author Min-jae Kim <minjae.kim@cern.ch>, Bong-Hwi Lim <bong-hwi.lim@cern.ch>
 // #include <TLorentzVector.h>
-#include "Math/Vector4D.h"
-#include "TF1.h"
-#include "TRandom3.h"
+#include "PWGLF/DataModel/LFResonanceTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Common/DataModel/PIDResponse.h"
+#include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "Common/DataModel/PIDResponse.h"
+
 #include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/RecoDecay.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
+#include "Math/Vector4D.h"
+#include "TF1.h"
+#include "TRandom3.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/Tasks/Strangeness/cascadeanalysis.cxx b/.conflict-base-0/PWGLF/Tasks/Strangeness/cascadeanalysis.cxx
index baf37b72717..4f9de5dbb74 100644
--- a/.conflict-base-0/PWGLF/Tasks/Strangeness/cascadeanalysis.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/Strangeness/cascadeanalysis.cxx
@@ -28,31 +28,33 @@
 //    david.dobrigkeit.chinellato@cern.ch
 //
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
+#include <Math/Vector4D.h>
+#include <TDatabasePDG.h>
 #include <TFile.h>
 #include <TH2F.h>
-#include <TProfile.h>
 #include <TLorentzVector.h>
-#include <Math/Vector4D.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
-#include <cmath>
+#include <TProfile.h>
+
 #include <array>
+#include <cmath>
 #include <cstdlib>
-#include "Framework/ASoAHelpers.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/Tasks/Strangeness/cascadeanalysisMC.cxx b/.conflict-base-0/PWGLF/Tasks/Strangeness/cascadeanalysisMC.cxx
index a1947c8b6b5..e4fe51055bd 100644
--- a/.conflict-base-0/PWGLF/Tasks/Strangeness/cascadeanalysisMC.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/Strangeness/cascadeanalysisMC.cxx
@@ -31,31 +31,33 @@
 //    david.dobrigkeit.chinellato@cern.ch
 //
 
-#include <Math/Vector4D.h>
-#include <cmath>
-#include <array>
-#include <cstdlib>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
+#include <Math/Vector4D.h>
+#include <TDatabasePDG.h>
 #include <TFile.h>
 #include <TH2F.h>
-#include <TProfile.h>
 #include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
+#include <TProfile.h>
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/Tasks/Strangeness/cascpolsp.cxx b/.conflict-base-0/PWGLF/Tasks/Strangeness/cascpolsp.cxx
index 237fe8ba375..68fa15f699e 100644
--- a/.conflict-base-0/PWGLF/Tasks/Strangeness/cascpolsp.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/Strangeness/cascpolsp.cxx
@@ -11,52 +11,53 @@
 // Cascade polarisation task
 // prottay.das@cern.ch
 
-#include <TH1F.h>
+#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/DataModel/SPCalibrationTables.h"
+#include "PWGLF/DataModel/cascqaanalysis.h"
+
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/FT0Corrected.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include "Math/GenVector/Boost.h"
+#include "Math/Vector3D.h"
+#include "Math/Vector4D.h"
+#include "TF1.h"
+#include "TRandom3.h"
+#include <TDatabasePDG.h>
 #include <TDirectory.h>
+#include <TFile.h>
+#include <TH1F.h>
+#include <TH2F.h>
 #include <THn.h>
 #include <TLorentzVector.h>
 #include <TMath.h>
 #include <TObjArray.h>
-#include <TFile.h>
-#include <TH2F.h>
-#include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
-#include <cmath>
+
 #include <array>
+#include <cmath>
 #include <cstdlib>
 
-#include "TRandom3.h"
-#include "Math/Vector3D.h"
-#include "Math/Vector4D.h"
-#include "Math/GenVector/Boost.h"
-#include "TF1.h"
-
-#include "PWGLF/DataModel/SPCalibrationTables.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/Core/trackUtilities.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/TrackSelection.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
-#include "Common/DataModel/FT0Corrected.h"
-#include "PWGLF/DataModel/cascqaanalysis.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-base-0/PWGLF/Tasks/Strangeness/cascpostprocessing.cxx b/.conflict-base-0/PWGLF/Tasks/Strangeness/cascpostprocessing.cxx
index d92e48733b5..5d521b5348a 100644
--- a/.conflict-base-0/PWGLF/Tasks/Strangeness/cascpostprocessing.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/Strangeness/cascpostprocessing.cxx
@@ -16,14 +16,16 @@
 /// \modified by Roman Nepeivoda (roman.nepeivoda@cern.ch)
 /// \since June 1, 2023
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/DataModel/cascqaanalysis.h"
+
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGLF/DataModel/cascqaanalysis.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 
 // constants
 const float ctauxiPDG = 4.91;     // from PDG
diff --git a/.conflict-base-0/PWGLF/Tasks/Strangeness/derivedcascadeanalysis.cxx b/.conflict-base-0/PWGLF/Tasks/Strangeness/derivedcascadeanalysis.cxx
index 95a25f589e3..b49650dce88 100644
--- a/.conflict-base-0/PWGLF/Tasks/Strangeness/derivedcascadeanalysis.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/Strangeness/derivedcascadeanalysis.cxx
@@ -13,44 +13,47 @@
 /// \brief Tasks processing derived data for Cascade analysis in PbPb collisions
 /// \author Lucia Anna Tarasovicova (lucia.anna.husova@cern.ch)
 
-#include <string>
-#include <vector>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "Common/CCDB/ctpRateFetcher.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "MetadataHelper.h"
+
 #include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/CCDB/EventSelectionParams.h"
+#include "Common/CCDB/TriggerAliases.h"
+#include "Common/CCDB/ctpRateFetcher.h"
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "Framework/StaticFor.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "Framework/ConfigParamSpec.h"
-#include "Common/CCDB/EventSelectionParams.h"
-#include "Common/CCDB/TriggerAliases.h"
 #include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/LHCConstants.h"
-#include "Framework/HistogramRegistry.h"
 #include "DataFormatsFT0/Digit.h"
-#include "DataFormatsParameters/GRPLHCIFData.h"
+#include "DataFormatsParameters/AggregatedRunInfo.h"
 #include "DataFormatsParameters/GRPECSObject.h"
+#include "DataFormatsParameters/GRPLHCIFData.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/ConfigParamSpec.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
 #include "ITSMFTBase/DPLAlpideParam.h"
-#include "MetadataHelper.h"
-#include "DataFormatsParameters/AggregatedRunInfo.h"
+#include "ReconstructionDataFormats/Track.h"
 
 #include <TFile.h>
 #include <TH2F.h>
-#include <TProfile.h>
 #include <TLorentzVector.h>
 #include <TPDGCode.h>
+#include <TProfile.h>
+
+#include <string>
+#include <vector>
 
 // constants
 const float ctauxiPDG = 4.91;     // from PDG
diff --git a/.conflict-base-0/PWGLF/Tasks/Strangeness/derivedlambdakzeroanalysis.cxx b/.conflict-base-0/PWGLF/Tasks/Strangeness/derivedlambdakzeroanalysis.cxx
index 544ed23807a..97ab9a0ad53 100644
--- a/.conflict-base-0/PWGLF/Tasks/Strangeness/derivedlambdakzeroanalysis.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/Strangeness/derivedlambdakzeroanalysis.cxx
@@ -28,44 +28,45 @@
 //    david.dobrigkeit.chinellato@cern.ch
 //
 
-#include <Math/Vector4D.h>
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <string>
-#include <map>
-#include <algorithm>
-#include <vector>
-
-#include <TFile.h>
-#include <TH2D.h>
-#include <TProfile.h>
-#include <TLorentzVector.h>
-#include <TPDGCode.h>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "CommonConstants/MathConstants.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/trackUtilities.h"
-#include "Common/CCDB/ctpRateFetcher.h"
-#include "Common/DataModel/EventSelection.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "PWGLF/DataModel/LFStrangenessMLTables.h"
 #include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGUD/Core/SGSelector.h"
+
+#include "Common/CCDB/ctpRateFetcher.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/Core/SGSelector.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 #include "Tools/ML/MlResponse.h"
 #include "Tools/ML/model.h"
 
+#include "CommonConstants/MathConstants.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <Math/Vector4D.h>
+#include <TFile.h>
+#include <TH2D.h>
+#include <TLorentzVector.h>
+#include <TPDGCode.h>
+#include <TProfile.h>
+
+#include <algorithm>
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <map>
+#include <string>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-base-0/PWGLF/Tasks/Strangeness/derivedupcanalysis.cxx b/.conflict-base-0/PWGLF/Tasks/Strangeness/derivedupcanalysis.cxx
index b3021033d32..386a61a1e25 100644
--- a/.conflict-base-0/PWGLF/Tasks/Strangeness/derivedupcanalysis.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/Strangeness/derivedupcanalysis.cxx
@@ -13,34 +13,37 @@
 /// \brief Analysis of strangeness production in UPC collisions
 /// \author Roman Nepeivoda (roman.nepeivoda@cern.ch)
 
-#include <bitset>
-#include <TFile.h>
-#include <TH2F.h>
-#include <TProfile.h>
-#include <TPDGCode.h>
-#include <vector>
-#include <algorithm>
-#include <cmath>
-#include <string>
+#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/Utils/strangenessMasks.h"
+#include "PWGUD/Core/SGSelector.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/StaticFor.h"
-#include "PWGUD/Core/SGSelector.h"
-#include "PWGLF/Utils/strangenessMasks.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <TFile.h>
+#include <TH2F.h>
+#include <TPDGCode.h>
+#include <TProfile.h>
+
+#include <algorithm>
+#include <bitset>
+#include <cmath>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/Tasks/Strangeness/hyperon-reco-test.cxx b/.conflict-base-0/PWGLF/Tasks/Strangeness/hyperon-reco-test.cxx
index 5605730d709..85054f07f7b 100644
--- a/.conflict-base-0/PWGLF/Tasks/Strangeness/hyperon-reco-test.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/Strangeness/hyperon-reco-test.cxx
@@ -9,31 +9,31 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <cmath>
-#include <vector>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
 
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/Core/trackUtilities.h"
-#include "Common/DataModel/Centrality.h"
-#include "Framework/ASoAHelpers.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-
 #include "TMath.h"
-
 #include <TDatabasePDG.h>
 #include <TH2F.h>
 #include <TPDGCode.h>
 
+#include <cmath>
+#include <vector>
+
 using namespace std;
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/Tasks/Strangeness/k0_mixed_events.cxx b/.conflict-base-0/PWGLF/Tasks/Strangeness/k0_mixed_events.cxx
index 5de8a32c122..73fc5ac67f7 100644
--- a/.conflict-base-0/PWGLF/Tasks/Strangeness/k0_mixed_events.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/Strangeness/k0_mixed_events.cxx
@@ -14,40 +14,40 @@
 /// \author Sofia Tomassini, Gleb Romanenko, Nicolò Jacazio
 /// \since 31 May 2023
 
-#include <vector>
-#include <map>
-#include <memory>
-#include <string>
-#include <utility>
+#include "PWGCF/Femto3D/Core/femto3dPairTask.h"
+#include "PWGCF/Femto3D/DataModel/singletrackselector.h"
+#include "PWGLF/DataModel/mcCentrality.h"
+#include "PWGLF/Utils/inelGt.h"
 
-#include <TParameter.h>
-#include <TH1F.h>
-#include <TLorentzVector.h>
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
+#include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/Propagator.h"
 #include "Framework/ASoA.h"
-#include "Framework/DataTypes.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/DataTypes.h"
 #include "Framework/Expressions.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/StaticFor.h"
-
+#include "Framework/runDataProcessing.h"
 #include "MathUtils/Utils.h"
-#include "Common/DataModel/Multiplicity.h"
 
-#include "PWGCF/Femto3D/DataModel/singletrackselector.h"
-#include "PWGCF/Femto3D/Core/femto3dPairTask.h"
-#include "Common/DataModel/Centrality.h"
-#include "PWGLF/DataModel/mcCentrality.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "PWGLF/Utils/inelGt.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "DetectorsBase/Propagator.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+#include <TH1F.h>
+#include <TLorentzVector.h>
+#include <TParameter.h>
+
+#include <map>
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::soa;
diff --git a/.conflict-base-0/PWGLF/Tasks/Strangeness/lambdaJetpolarization.cxx b/.conflict-base-0/PWGLF/Tasks/Strangeness/lambdaJetpolarization.cxx
index cca1bdf193e..62420403d65 100644
--- a/.conflict-base-0/PWGLF/Tasks/Strangeness/lambdaJetpolarization.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/Strangeness/lambdaJetpolarization.cxx
@@ -11,41 +11,46 @@
 ///
 
 /// \author Youpeng Su (yousu@cern.ch)
-#include <iostream>
-#include <string>
-#include <vector>
-#include <cmath>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/EventSelection.h"
+#include "PWGLF/DataModel/lambdaJetpolarization.h"
+
+#include "PWGJE/Core/JetBkgSubUtils.h"
+#include "PWGJE/Core/JetDerivedDataUtilities.h"
+#include "PWGJE/DataModel/Jet.h"
+#include "PWGJE/DataModel/JetReducedData.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include <TLorentzVector.h>
+
 #include "Framework/ASoA.h"
 #include "Framework/AnalysisDataModel.h"
-#include <TTree.h>
-#include <TFile.h>
-#include <TMatrixD.h>
-#include "TProfile2D.h"
-#include "PWGLF/DataModel/lambdaJetpolarization.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
+#include "Math/GenVector/Boost.h"
 #include "Math/Vector3D.h"
 #include "Math/Vector4D.h"
-#include "Math/GenVector/Boost.h"
+#include "TProfile2D.h"
+#include <TFile.h>
+#include <TLorentzVector.h>
+#include <TMatrixD.h>
+#include <TTree.h>
 
+#include <fastjet/AreaDefinition.hh>
 #include <fastjet/ClusterSequence.hh>
 #include <fastjet/ClusterSequenceArea.hh>
+#include <fastjet/GhostedAreaSpec.hh>
+#include <fastjet/PseudoJet.hh>
+#include <fastjet/Selector.hh>
 #include <fastjet/tools/JetMedianBackgroundEstimator.hh>
 #include <fastjet/tools/Subtractor.hh>
-#include <fastjet/Selector.hh>
-#include <fastjet/PseudoJet.hh>
-#include <fastjet/AreaDefinition.hh>
-#include <fastjet/GhostedAreaSpec.hh>
-#include "PWGJE/Core/JetBkgSubUtils.h"
-#include "PWGJE/Core/JetDerivedDataUtilities.h"
-#include "PWGJE/DataModel/JetReducedData.h"
-#include "PWGJE/DataModel/Jet.h"
-#include "Common/Core/trackUtilities.h"
+
+#include <cmath>
+#include <iostream>
+#include <string>
+#include <vector>
 
 using std::cout;
 using std::endl;
diff --git a/.conflict-base-0/PWGLF/Tasks/Strangeness/lambdak0sflattenicity.cxx b/.conflict-base-0/PWGLF/Tasks/Strangeness/lambdak0sflattenicity.cxx
index 4114d614b90..e8fa858b0b4 100755
--- a/.conflict-base-0/PWGLF/Tasks/Strangeness/lambdak0sflattenicity.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/Strangeness/lambdak0sflattenicity.cxx
@@ -17,26 +17,27 @@
 /// \brief V0 task for production of strange hadrons as a function of flattenicity
 /// \author Suraj Prasad (suraj.prasad@cern.ch)
 
-#include <CommonConstants/MathConstants.h>
-#include <Framework/Configurable.h>
-#include <cmath>
-#include <vector>
-#include <TGraph.h>
-#include <TRandom2.h>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/Utils/inelGt.h"
+
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+#include <CommonConstants/MathConstants.h>
+#include <Framework/Configurable.h>
 
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
+#include <TGraph.h>
+#include <TRandom2.h>
 
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/Utils/inelGt.h"
+#include <cmath>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/Tasks/Strangeness/lambdakzeroanalysisMC.cxx b/.conflict-base-0/PWGLF/Tasks/Strangeness/lambdakzeroanalysisMC.cxx
index afbe1a8a061..7451c31dcf9 100644
--- a/.conflict-base-0/PWGLF/Tasks/Strangeness/lambdakzeroanalysisMC.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/Strangeness/lambdakzeroanalysisMC.cxx
@@ -22,31 +22,33 @@
 //    aimeric.landou@cern.ch (MC adaptation)
 //    david.dobrigkeit.chinellato@cern.ch (original lambdakzeroanalysis task)
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/trackUtilities.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
+#include <Math/Vector4D.h>
+#include <TDatabasePDG.h>
 #include <TFile.h>
 #include <TH2F.h>
-#include <TProfile.h>
 #include <TLorentzVector.h>
-#include <Math/Vector4D.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
-#include <cmath>
+#include <TProfile.h>
+
 #include <array>
+#include <cmath>
 #include <cstdlib>
-#include "Framework/ASoAHelpers.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/Tasks/Strangeness/lambdalambda.cxx b/.conflict-base-0/PWGLF/Tasks/Strangeness/lambdalambda.cxx
index bf8579f105d..0b43d1e85c1 100644
--- a/.conflict-base-0/PWGLF/Tasks/Strangeness/lambdalambda.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/Strangeness/lambdalambda.cxx
@@ -11,51 +11,46 @@
 
 /// \author Junlee Kim (jikim1290@gmail.com)
 
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <chrono>
-#include <string>
-#include <vector>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "TLorentzVector.h"
-#include "TRandom3.h"
-#include "TF1.h"
-#include "TVector3.h"
-#include "Math/Vector3D.h"
-#include "Math/Vector4D.h"
-#include "Math/GenVector/Boost.h"
-#include <TMath.h>
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/StepTHn.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/StaticFor.h"
-
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-
-#include "Common/Core/trackUtilities.h"
-#include "Common/Core/TrackSelection.h"
-
-#include "CommonConstants/PhysicsConstants.h"
-
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
 
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-
-#include "CCDB/CcdbApi.h"
-#include "CCDB/BasicCCDBManager.h"
+#include "Math/GenVector/Boost.h"
+#include "Math/Vector3D.h"
+#include "Math/Vector4D.h"
+#include "TF1.h"
+#include "TLorentzVector.h"
+#include "TRandom3.h"
+#include "TVector3.h"
+#include <TMath.h>
 
-#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include <array>
+#include <chrono>
+#include <cmath>
+#include <cstdlib>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/Tasks/Strangeness/lambdapolarization.cxx b/.conflict-base-0/PWGLF/Tasks/Strangeness/lambdapolarization.cxx
index 38e17ba338a..8a09414f37d 100644
--- a/.conflict-base-0/PWGLF/Tasks/Strangeness/lambdapolarization.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/Strangeness/lambdapolarization.cxx
@@ -11,54 +11,49 @@
 
 /// \author Junlee Kim (jikim1290@gmail.com)
 
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <chrono>
-#include <string>
-#include <vector>
-
-#include "TLorentzVector.h"
-#include "TRandom3.h"
-#include "TF1.h"
-#include "TVector2.h"
-#include "Math/Vector3D.h"
-#include "Math/Vector4D.h"
-#include "Math/GenVector/Boost.h"
-#include <TMath.h>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/StaticFor.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGMM/Mult/DataModel/Index.h" // for Particles2Tracks table
 
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Qvectors.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/PIDResponseITS.h"
+#include "Common/DataModel/Qvectors.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "Common/Core/trackUtilities.h"
-#include "Common/Core/TrackSelection.h"
-
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
 #include "CommonConstants/PhysicsConstants.h"
-
-#include "ReconstructionDataFormats/Track.h"
-
-#include "DataFormatsParameters/GRPObject.h"
 #include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/StaticFor.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
-#include "CCDB/CcdbApi.h"
-#include "CCDB/BasicCCDBManager.h"
+#include "Math/GenVector/Boost.h"
+#include "Math/Vector3D.h"
+#include "Math/Vector4D.h"
+#include "TF1.h"
+#include "TLorentzVector.h"
+#include "TRandom3.h"
+#include "TVector2.h"
+#include <TMath.h>
 
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGMM/Mult/DataModel/Index.h" // for Particles2Tracks table
+#include <array>
+#include <chrono>
+#include <cmath>
+#include <cstdlib>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/Tasks/Strangeness/nonPromptCascade.cxx b/.conflict-base-0/PWGLF/Tasks/Strangeness/nonPromptCascade.cxx
index 79e8ad6f4e0..ec4c573a644 100644
--- a/.conflict-base-0/PWGLF/Tasks/Strangeness/nonPromptCascade.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/Strangeness/nonPromptCascade.cxx
@@ -9,41 +9,43 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <cmath>
-#include <memory>
-#include <string>
-#include <vector>
-
-#include "Math/Vector4D.h"
-
-#include "CCDB/BasicCCDBManager.h"
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "DetectorsVertexing/PVertexer.h"
-#include "ReconstructionDataFormats/Vertex.h"
+#include "EventFiltering/Zorro.h"
+#include "EventFiltering/ZorroSummary.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "DCAFitter/DCAFitterN.h"
 #include "DataFormatsParameters/GRPMagField.h"
 #include "DataFormatsParameters/GRPObject.h"
 #include "DataFormatsTPC/BetheBlochAleph.h"
-#include "DCAFitter/DCAFitterN.h"
 #include "DetectorsBase/Propagator.h"
-#include "EventFiltering/Zorro.h"
-#include "EventFiltering/ZorroSummary.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "DetectorsVertexing/PVertexer.h"
 #include "Framework/ASoA.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Vertex.h"
+
+#include "Math/Vector4D.h"
+
+#include <cmath>
+#include <memory>
+#include <string>
+#include <vector>
 // #include "PWGHF/Core/PDG.h"
+#include "PWGLF/DataModel/LFNonPromptCascadeTables.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "ReconstructionDataFormats/DCA.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "PWGLF/DataModel/LFNonPromptCascadeTables.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/Tasks/Strangeness/sigmaanalysis.cxx b/.conflict-base-0/PWGLF/Tasks/Strangeness/sigmaanalysis.cxx
index c01a0a71cae..eb16b8f4b04 100644
--- a/.conflict-base-0/PWGLF/Tasks/Strangeness/sigmaanalysis.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/Strangeness/sigmaanalysis.cxx
@@ -19,35 +19,39 @@
 //    gianni.shigeru.setoue.liveraro@cern.ch
 //
 
-#include <Math/Vector4D.h>
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <string>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/ASoA.h"
-#include "ReconstructionDataFormats/Track.h"
+#include "PWGLF/DataModel/LFSigmaTables.h"
+#include "PWGLF/DataModel/LFStrangenessMLTables.h"
+#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
-#include "PWGLF/DataModel/LFStrangenessMLTables.h"
-#include "PWGLF/DataModel/LFSigmaTables.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <Math/Vector4D.h>
+#include <TDatabasePDG.h>
 #include <TFile.h>
 #include <TH2F.h>
-#include <TProfile.h>
 #include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
+#include <TProfile.h>
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <string>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/Tasks/Strangeness/v0postprocessing.cxx b/.conflict-base-0/PWGLF/Tasks/Strangeness/v0postprocessing.cxx
index 4f6ab094f46..43e93b06ec6 100644
--- a/.conflict-base-0/PWGLF/Tasks/Strangeness/v0postprocessing.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/Strangeness/v0postprocessing.cxx
@@ -13,14 +13,16 @@
 /// \author Francesca Ercolessi (francesca.ercolessi@cern.ch)
 /// \since
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "PWGLF/DataModel/v0qaanalysis.h"
+
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CommonConstants/PhysicsConstants.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/Tasks/Strangeness/v0topologicalcuts.cxx b/.conflict-base-0/PWGLF/Tasks/Strangeness/v0topologicalcuts.cxx
index fd351646bee..d04a84c114d 100644
--- a/.conflict-base-0/PWGLF/Tasks/Strangeness/v0topologicalcuts.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/Strangeness/v0topologicalcuts.cxx
@@ -22,15 +22,18 @@ that are filled with the V0 invariant mass under the K0, Lambda and Antilambda m
 The cuts are passed as configurable strings for convenience.
 This analysis includes two processes, one for Real Data and one for MC Data switchable at the end of the code, only run one at a time*/
 
-#include <memory>
-#include <vector>
-#include <string>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/EventSelection.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+
 #include "CommonUtils/StringUtils.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include <memory>
+#include <string>
+#include <vector>
 
 // namespaces to be used for the plot names and topological cuts that will be given by a configurable string
 namespace cuthistoskzerosh
diff --git a/.conflict-base-0/PWGLF/Tasks/Strangeness/vzero_cascade_absorption.cxx b/.conflict-base-0/PWGLF/Tasks/Strangeness/vzero_cascade_absorption.cxx
index 6ca2e43ba69..3d83711e27b 100644
--- a/.conflict-base-0/PWGLF/Tasks/Strangeness/vzero_cascade_absorption.cxx
+++ b/.conflict-base-0/PWGLF/Tasks/Strangeness/vzero_cascade_absorption.cxx
@@ -12,25 +12,28 @@
 /// \author Alberto Caliva (alberto.caliva@cern.ch)
 /// \since September 26, 2023
 
-#include <cmath>
-#include <TMath.h>
-#include <TPDGCode.h>
-#include <TObjArray.h>
-#include <TLorentzVector.h>
-#include <TDatabasePDG.h>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <TDatabasePDG.h>
+#include <TLorentzVector.h>
+#include <TMath.h>
+#include <TObjArray.h>
+#include <TPDGCode.h>
+
+#include <cmath>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGLF/Utils/collisionCuts.h b/.conflict-base-0/PWGLF/Utils/collisionCuts.h
index 399454e9368..c676edd995e 100644
--- a/.conflict-base-0/PWGLF/Utils/collisionCuts.h
+++ b/.conflict-base-0/PWGLF/Utils/collisionCuts.h
@@ -20,11 +20,12 @@
 #ifndef PWGLF_UTILS_COLLISIONCUTS_H_
 #define PWGLF_UTILS_COLLISIONCUTS_H_
 
-#include <vector>
+#include "Common/DataModel/EventSelection.h"
 
 #include "Framework/HistogramRegistry.h"
 #include "Framework/Logger.h"
-#include "Common/DataModel/EventSelection.h"
+
+#include <vector>
 
 namespace o2::analysis
 {
diff --git a/.conflict-base-0/PWGLF/Utils/mcParticle.h b/.conflict-base-0/PWGLF/Utils/mcParticle.h
index e85d98ca5f0..b8a9ffd5def 100644
--- a/.conflict-base-0/PWGLF/Utils/mcParticle.h
+++ b/.conflict-base-0/PWGLF/Utils/mcParticle.h
@@ -20,11 +20,11 @@
 #ifndef PWGLF_UTILS_MCPARTICLE_H_
 #define PWGLF_UTILS_MCPARTICLE_H_
 
+#include "ReconstructionDataFormats/PID.h"
+
 #include <string>
 #include <vector>
 
-#include "ReconstructionDataFormats/PID.h"
-
 namespace o2
 {
 namespace pwglf
diff --git a/.conflict-base-0/PWGLF/Utils/rsnOutput.h b/.conflict-base-0/PWGLF/Utils/rsnOutput.h
index 592eaef40cc..6915aedd052 100644
--- a/.conflict-base-0/PWGLF/Utils/rsnOutput.h
+++ b/.conflict-base-0/PWGLF/Utils/rsnOutput.h
@@ -16,13 +16,13 @@
 #ifndef PWGLF_UTILS_RSNOUTPUT_H_
 #define PWGLF_UTILS_RSNOUTPUT_H_
 
-#include <utility>
-#include <string>
-#include <vector>
-
 #include "Framework/HistogramRegistry.h"
 #include "Framework/Logger.h"
 
+#include <string>
+#include <utility>
+#include <vector>
+
 namespace o2::analysis
 {
 namespace rsn
diff --git a/.conflict-base-0/PWGLF/Utils/strangenessBuilderHelper.h b/.conflict-base-0/PWGLF/Utils/strangenessBuilderHelper.h
index 85257418e0a..5e693ab941f 100644
--- a/.conflict-base-0/PWGLF/Utils/strangenessBuilderHelper.h
+++ b/.conflict-base-0/PWGLF/Utils/strangenessBuilderHelper.h
@@ -12,25 +12,27 @@
 #ifndef PWGLF_UTILS_STRANGENESSBUILDERHELPER_H_
 #define PWGLF_UTILS_STRANGENESSBUILDERHELPER_H_
 
-#include <cstdlib>
-#include <cmath>
-#include <array>
+#include "Common/Core/trackUtilities.h"
+#include "Tools/KFparticle/KFUtilities.h"
+
+#include "CommonConstants/PhysicsConstants.h"
 #include "DCAFitter/DCAFitterN.h"
+#include "DetectorsBase/GeometryManager.h"
 #include "Framework/AnalysisDataModel.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/trackUtilities.h"
-#include "Tools/KFparticle/KFUtilities.h"
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
 
 #ifndef HomogeneousField
 #define HomogeneousField
 #endif
 
 /// includes KFParticle
-#include "KFParticle.h"
 #include "KFPTrack.h"
 #include "KFPVertex.h"
+#include "KFParticle.h"
 #include "KFParticleBase.h"
 #include "KFVertex.h"
 
diff --git a/.conflict-base-0/PWGLF/Utils/svPoolCreator.h b/.conflict-base-0/PWGLF/Utils/svPoolCreator.h
index c0b32c2574e..0a4c3c2d75a 100644
--- a/.conflict-base-0/PWGLF/Utils/svPoolCreator.h
+++ b/.conflict-base-0/PWGLF/Utils/svPoolCreator.h
@@ -12,15 +12,17 @@
 #ifndef PWGLF_UTILS_SVPOOLCREATOR_H_
 #define PWGLF_UTILS_SVPOOLCREATOR_H_
 
-#include <array>
-#include <unordered_map>
-#include <vector>
-#include <utility>
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
 #include "Common/Core/trackUtilities.h"
+
 #include "DCAFitter/DCAFitterN.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+
+#include <array>
+#include <unordered_map>
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::constants;
diff --git a/.conflict-base-0/PWGLF/Utils/v0SelectionGroup.h b/.conflict-base-0/PWGLF/Utils/v0SelectionGroup.h
index a353a86c742..298342d1076 100644
--- a/.conflict-base-0/PWGLF/Utils/v0SelectionGroup.h
+++ b/.conflict-base-0/PWGLF/Utils/v0SelectionGroup.h
@@ -12,12 +12,16 @@
 #ifndef PWGLF_UTILS_V0SELECTIONGROUP_H_
 #define PWGLF_UTILS_V0SELECTIONGROUP_H_
 
-#include <iosfwd>
-#include <Rtypes.h>
-#include <TMath.h>
 #include "v0SelectionBits.h"
-#include "Framework/Logger.h"
+
 #include "CommonConstants/PhysicsConstants.h"
+#include "Framework/Logger.h"
+
+#include <TMath.h>
+
+#include <Rtypes.h>
+
+#include <iosfwd>
 
 class v0SelectionGroup
 {
diff --git a/.conflict-base-0/PWGMM/Lumi/Tasks/LumiFDDFT0.cxx b/.conflict-base-0/PWGMM/Lumi/Tasks/LumiFDDFT0.cxx
index 878e0482f7c..c51de496afe 100644
--- a/.conflict-base-0/PWGMM/Lumi/Tasks/LumiFDDFT0.cxx
+++ b/.conflict-base-0/PWGMM/Lumi/Tasks/LumiFDDFT0.cxx
@@ -10,41 +10,38 @@
 // or submit itself to any jurisdiction.
 // author: akhuntia@cern.ch
 
-#include <array>
-#include <cmath>
-#include <iostream>
-#include <vector>
-
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "CommonUtils/NameConf.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
+#include "CommonConstants/GeomConstants.h"
+#include "CommonUtils/NameConf.h"
+#include "DataFormatsCalibration/MeanVertexObject.h"
+#include "DataFormatsFDD/Digit.h"
+#include "DataFormatsFIT/Triggers.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "DetectorsVertexing/PVertexer.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisDataModel.h"
-
-#include "DetectorsVertexing/PVertexer.h"
 #include "ReconstructionDataFormats/DCA.h"
 #include "ReconstructionDataFormats/PrimaryVertex.h"
 #include "ReconstructionDataFormats/Vertex.h"
 
-#include "DataFormatsFDD/Digit.h"
-#include "DataFormatsFIT/Triggers.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-
-#include "DetectorsBase/GeometryManager.h"
-#include "DetectorsBase/Propagator.h"
-#include "CommonConstants/GeomConstants.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "CCDB/CcdbApi.h"
-#include "DataFormatsCalibration/MeanVertexObject.h"
+#include <array>
+#include <cmath>
+#include <iostream>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGMM/Lumi/Tasks/fitLumi.cxx b/.conflict-base-0/PWGMM/Lumi/Tasks/fitLumi.cxx
index a62771cda66..54e6d0dfc74 100644
--- a/.conflict-base-0/PWGMM/Lumi/Tasks/fitLumi.cxx
+++ b/.conflict-base-0/PWGMM/Lumi/Tasks/fitLumi.cxx
@@ -11,19 +11,20 @@
 
 // author: arvind.khuntia@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Common/DataModel/EventSelection.h"
-#include "DataFormatsFDD/Digit.h"
-#include "DataFormatsFIT/Triggers.h"
 #include "Common/DataModel/FT0Corrected.h"
 
+#include "CCDB/BasicCCDBManager.h"
 #include "CCDB/CcdbApi.h"
 #include "CommonDataFormat/BunchFilling.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPObject.h"
+#include "DataFormatsFDD/Digit.h"
+#include "DataFormatsFIT/Triggers.h"
 #include "DataFormatsParameters/GRPLHCIFData.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TH1F.h"
 #include "TH2F.h"
 
@@ -111,7 +112,7 @@ struct VdMAO2D {
           registry.get<TH1>(HIST("FT0/bcVertexCollBC"))->Fill(localBC);
         }
       } // vertex
-    }   // ft0
+    } // ft0
     nTF++;
   } // process
 
@@ -174,7 +175,7 @@ struct VdMAO2D {
         }
 
       } // vertex
-    }   // fdd
+    } // fdd
   }
   PROCESS_SWITCH(VdMAO2D, processFDD, "Process FDD trigger rates for VdM", true);
 
diff --git a/.conflict-base-0/PWGMM/Lumi/Tasks/lumi.cxx b/.conflict-base-0/PWGMM/Lumi/Tasks/lumi.cxx
index cc0149dbde7..f7d873cbbff 100644
--- a/.conflict-base-0/PWGMM/Lumi/Tasks/lumi.cxx
+++ b/.conflict-base-0/PWGMM/Lumi/Tasks/lumi.cxx
@@ -15,43 +15,35 @@
 // o2-analysis-trackselection -b --isRun3 0 | o2-analysis-mm-lumi -b
 // --configuration json://./config.json
 
-#include <array>
-#include <cmath>
-#include <iostream>
-#include <vector>
-
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
+#include "CommonConstants/GeomConstants.h"
 #include "CommonUtils/NameConf.h"
-
+#include "DataFormatsCalibration/MeanVertexObject.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "DetectorsVertexing/PVertexer.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/runDataProcessing.h"
-
-#include "DetectorsVertexing/PVertexer.h"
-
 #include "ReconstructionDataFormats/DCA.h"
 #include "ReconstructionDataFormats/PrimaryVertex.h"
 #include "ReconstructionDataFormats/Vertex.h"
 
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-
-#include "DetectorsBase/GeometryManager.h"
-#include "DetectorsBase/Propagator.h"
-
-#include "CommonConstants/GeomConstants.h"
-
-#include "CCDB/BasicCCDBManager.h"
-#include "CCDB/CcdbApi.h"
-
-#include "DataFormatsCalibration/MeanVertexObject.h"
+#include <array>
+#include <cmath>
+#include <iostream>
+#include <vector>
 
 namespace o2::aod
 {
diff --git a/.conflict-base-0/PWGMM/Lumi/Tasks/lumiStability.cxx b/.conflict-base-0/PWGMM/Lumi/Tasks/lumiStability.cxx
index 5938ec42cdd..3d57896d080 100644
--- a/.conflict-base-0/PWGMM/Lumi/Tasks/lumiStability.cxx
+++ b/.conflict-base-0/PWGMM/Lumi/Tasks/lumiStability.cxx
@@ -14,26 +14,27 @@
 ///
 /// \author Josue Martinez Garcia, josuem@cern.ch
 
-#include <utility>
-#include <map>
-#include <string>
-#include <vector>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "Common/CCDB/EventSelectionParams.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Framework/ASoAHelpers.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonDataFormat/BunchFilling.h"
 #include "DataFormatsFDD/Digit.h"
 #include "DataFormatsFT0/Digit.h"
 #include "DataFormatsFV0/Digit.h"
-#include "Framework/ASoA.h"
-#include "Common/CCDB/EventSelectionParams.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "CommonDataFormat/BunchFilling.h"
-#include "DataFormatsParameters/GRPLHCIFData.h"
 #include "DataFormatsParameters/GRPECSObject.h"
+#include "DataFormatsParameters/GRPLHCIFData.h"
+#include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include <map>
+#include <string>
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGMM/Mult/Core/include/Axes.h b/.conflict-base-0/PWGMM/Mult/Core/include/Axes.h
index c215a8ba357..7cd9e1f8cc6 100644
--- a/.conflict-base-0/PWGMM/Mult/Core/include/Axes.h
+++ b/.conflict-base-0/PWGMM/Mult/Core/include/Axes.h
@@ -11,8 +11,8 @@
 
 #ifndef PWGMM_MULT_CORE_INCLUDE_AXES_H_
 #define PWGMM_MULT_CORE_INCLUDE_AXES_H_
-#include "Framework/HistogramSpec.h"
 #include "CommonConstants/MathConstants.h"
+#include "Framework/HistogramSpec.h"
 
 namespace pwgmm::mult
 {
diff --git a/.conflict-base-0/PWGMM/Mult/Core/include/Histograms.h b/.conflict-base-0/PWGMM/Mult/Core/include/Histograms.h
index 2b41c9ecefe..a173c0b9460 100644
--- a/.conflict-base-0/PWGMM/Mult/Core/include/Histograms.h
+++ b/.conflict-base-0/PWGMM/Mult/Core/include/Histograms.h
@@ -12,6 +12,7 @@
 #ifndef PWGMM_MULT_CORE_INCLUDE_HISTOGRAMS_H_
 #define PWGMM_MULT_CORE_INCLUDE_HISTOGRAMS_H_
 #include "TPDGCode.h"
+
 #include <array>
 #include <string_view>
 
diff --git a/.conflict-base-0/PWGMM/Mult/DataModel/ReducedTables.h b/.conflict-base-0/PWGMM/Mult/DataModel/ReducedTables.h
index fbdd68b89db..90ebdffbf1a 100644
--- a/.conflict-base-0/PWGMM/Mult/DataModel/ReducedTables.h
+++ b/.conflict-base-0/PWGMM/Mult/DataModel/ReducedTables.h
@@ -11,13 +11,14 @@
 
 #ifndef PWGMM_MULT_DATAMODEL_REDUCEDTABLES_H_
 #define PWGMM_MULT_DATAMODEL_REDUCEDTABLES_H_
-#include <vector>
-
-#include "Framework/AnalysisDataModel.h"
-#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+
+#include <vector>
+
 namespace o2::aod
 {
 
diff --git a/.conflict-base-0/PWGMM/Mult/TableProducer/particles2tracks.cxx b/.conflict-base-0/PWGMM/Mult/TableProducer/particles2tracks.cxx
index 6b7e7db6a17..70db2e8349b 100644
--- a/.conflict-base-0/PWGMM/Mult/TableProducer/particles2tracks.cxx
+++ b/.conflict-base-0/PWGMM/Mult/TableProducer/particles2tracks.cxx
@@ -16,11 +16,11 @@
 /// \brief  A task to create a reverse index from McParticles to Tracks
 ///
 
-#include "Framework/runDataProcessing.h"
+#include "Index.h"
+
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-
-#include "Index.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGMM/Mult/TableProducer/percentiles.cxx b/.conflict-base-0/PWGMM/Mult/TableProducer/percentiles.cxx
index c11fca858f8..1df708f4298 100644
--- a/.conflict-base-0/PWGMM/Mult/TableProducer/percentiles.cxx
+++ b/.conflict-base-0/PWGMM/Mult/TableProducer/percentiles.cxx
@@ -8,20 +8,20 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
+#include "Gencentralities.h"
 #include "Selections.h"
 
+#include "Common/DataModel/Centrality.h"
+#include <Common/DataModel/EventSelection.h>
+#include <Common/DataModel/TrackSelectionTables.h>
+
+#include <CCDB/BasicCCDBManager.h>
 #include <Framework/AnalysisDataModel.h>
 #include <Framework/AnalysisTask.h>
 #include <Framework/Configurable.h>
-#include <Common/DataModel/EventSelection.h>
-#include "Common/DataModel/Centrality.h"
-#include <Common/DataModel/TrackSelectionTables.h>
 #include <Framework/O2DatabasePDGPlugin.h>
-#include <CCDB/BasicCCDBManager.h>
 #include <Framework/runDataProcessing.h>
 
-#include "Gencentralities.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-base-0/PWGMM/Mult/TableProducer/reducer.cxx b/.conflict-base-0/PWGMM/Mult/TableProducer/reducer.cxx
index de9d516703b..e507ca0d2c4 100644
--- a/.conflict-base-0/PWGMM/Mult/TableProducer/reducer.cxx
+++ b/.conflict-base-0/PWGMM/Mult/TableProducer/reducer.cxx
@@ -9,15 +9,15 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <random>
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-
-#include "Selections.h"
 #include "ReducedTables.h"
+#include "Selections.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
 
+#include <random>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-base-0/PWGMM/Mult/TableProducer/reducerPostprocess.cxx b/.conflict-base-0/PWGMM/Mult/TableProducer/reducerPostprocess.cxx
index d05f5534eb0..9d4b33a87da 100644
--- a/.conflict-base-0/PWGMM/Mult/TableProducer/reducerPostprocess.cxx
+++ b/.conflict-base-0/PWGMM/Mult/TableProducer/reducerPostprocess.cxx
@@ -9,10 +9,9 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/AnalysisTask.h"
-
 #include "ReducedTables.h"
 
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
 
 using namespace o2;
diff --git a/.conflict-base-0/PWGMM/Mult/TableProducer/trackPropagation.cxx b/.conflict-base-0/PWGMM/Mult/TableProducer/trackPropagation.cxx
index 8eaa59e850b..707c92b324a 100644
--- a/.conflict-base-0/PWGMM/Mult/TableProducer/trackPropagation.cxx
+++ b/.conflict-base-0/PWGMM/Mult/TableProducer/trackPropagation.cxx
@@ -17,25 +17,26 @@
 // collisions to this track, picks the one with the smallest DCAxy and puts it
 // in a table
 
-#include "CCDB/BasicCCDBManager.h"
+#include "bestCollisionTable.h"
+
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/CollisionAssociationTables.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/GeomConstants.h"
 #include "DataFormatsParameters/GRPMagField.h"
 #include "DetectorsBase/Propagator.h"
+#include "Field/MagneticField.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/TrackFwd.h"
+
 #include "Math/MatrixFunctions.h"
 #include "Math/SMatrix.h"
-
-#include "Field/MagneticField.h"
 #include "TGeoGlobalMagField.h"
 
-#include "Common/DataModel/CollisionAssociationTables.h"
-#include "bestCollisionTable.h"
-
 using SMatrix55 = ROOT::Math::SMatrix<double, 5, 5, ROOT::Math::MatRepSym<double, 5>>;
 using SMatrix5 = ROOT::Math::SVector<Double_t, 5>;
 
diff --git a/.conflict-base-0/PWGMM/Mult/Tasks/assessment-mft.cxx b/.conflict-base-0/PWGMM/Mult/Tasks/assessment-mft.cxx
index 70304229e1e..eb2cbba5a22 100644
--- a/.conflict-base-0/PWGMM/Mult/Tasks/assessment-mft.cxx
+++ b/.conflict-base-0/PWGMM/Mult/Tasks/assessment-mft.cxx
@@ -15,11 +15,10 @@
 // \brief This code loops over MFT tracks and fills basic histograms
 //        close to the QC ones
 
-#include "Framework/runDataProcessing.h"
+#include "CommonConstants/LHCConstants.h"
 #include "Framework/AnalysisTask.h"
-
+#include "Framework/runDataProcessing.h"
 #include "MathUtils/Utils.h"
-#include "CommonConstants/LHCConstants.h"
 
 using namespace o2;
 using namespace o2::framework;
@@ -35,7 +34,7 @@ struct AssessmentMFT {
       {"TracksChi2", "; #chi^{2}; tracks", {HistType::kTH1F, {{600, 0, 20}}}},                             //
       {"TracksNclustersEta", "; nClusters; #eta; tracks", {HistType::kTH2F, {{7, 4, 10}, {100, -8, 8}}}},  //
       {"TracksTime", "; time; #count", {HistType::kTH1D, {{6000000, 0, 60000}}}},                          //
-    }                                                                                                      //
+    } //
   };
 
   void process(aod::Collisions::iterator const& collision, aod::MFTTracks const& tracks, aod::BCs const& bcs)
diff --git a/.conflict-base-0/PWGMM/Mult/Tasks/dndeta-hi.cxx b/.conflict-base-0/PWGMM/Mult/Tasks/dndeta-hi.cxx
index 7ac1bc49bb5..f26376eff27 100644
--- a/.conflict-base-0/PWGMM/Mult/Tasks/dndeta-hi.cxx
+++ b/.conflict-base-0/PWGMM/Mult/Tasks/dndeta-hi.cxx
@@ -9,29 +9,25 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <Math/Vector4D.h>
-#include <array>
-#include <cmath>
-#include <chrono>
-#include <cstdlib>
-#include <iostream>
-#include <TFile.h>
-#include <TH2F.h>
-#include <TProfile.h>
-#include <TPDGCode.h>
-#include <TDatabasePDG.h>
-
+#include "Index.h"
 #include "bestCollisionTable.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
+
+#include "PWGHF/Core/SelectorCuts.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "Common/CCDB/EventSelectionParams.h"
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/PIDResponse.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/MathConstants.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
@@ -41,14 +37,21 @@
 #include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/RuntimeError.h"
 #include "Framework/runDataProcessing.h"
-#include "Index.h"
 #include "ReconstructionDataFormats/GlobalTrackID.h"
 #include "ReconstructionDataFormats/Track.h"
 
-#include "PWGHF/Core/SelectorCuts.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include <Math/Vector4D.h>
+#include <TDatabasePDG.h>
+#include <TFile.h>
+#include <TH2F.h>
+#include <TPDGCode.h>
+#include <TProfile.h>
+
+#include <array>
+#include <chrono>
+#include <cmath>
+#include <cstdlib>
+#include <iostream>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGMM/Mult/Tasks/dndeta-mft.cxx b/.conflict-base-0/PWGMM/Mult/Tasks/dndeta-mft.cxx
index f70cc1d638a..e7c925f4a16 100644
--- a/.conflict-base-0/PWGMM/Mult/Tasks/dndeta-mft.cxx
+++ b/.conflict-base-0/PWGMM/Mult/Tasks/dndeta-mft.cxx
@@ -15,9 +15,14 @@
 // \brief This code loops over MFT tracks and collisions and fills histograms
 //        useful to compute dNdeta
 
-#include <chrono>
-#include <cmath>
+#include "bestCollisionTable.h"
+
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
+#include "CommonConstants/MathConstants.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
@@ -25,17 +30,13 @@
 #include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/RuntimeError.h"
 #include "Framework/runDataProcessing.h"
-
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "CommonConstants/MathConstants.h"
 #include "MathUtils/Utils.h"
 #include "ReconstructionDataFormats/GlobalTrackID.h"
+
 #include "TDatabasePDG.h"
 
-#include "bestCollisionTable.h"
+#include <chrono>
+#include <cmath>
 
 using namespace o2;
 using namespace o2::framework;
@@ -108,7 +109,7 @@ struct PseudorapidityDensityMFT {
       {"EventSelection",
        ";status;events",
        {HistType::kTH1F, {{7, 0.5, 7.5}}}}, //
-    }                                       //
+    } //
   };
 
   void init(InitContext&)
diff --git a/.conflict-base-0/PWGMM/Mult/Tasks/dndeta.cxx b/.conflict-base-0/PWGMM/Mult/Tasks/dndeta.cxx
index 220bdbdebb8..97ed3227b9b 100644
--- a/.conflict-base-0/PWGMM/Mult/Tasks/dndeta.cxx
+++ b/.conflict-base-0/PWGMM/Mult/Tasks/dndeta.cxx
@@ -9,27 +9,28 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
+#include "Axes.h"
+#include "Functions.h"
+#include "Gencentralities.h"
+#include "Histograms.h"
+#include "Index.h"
+#include "Selections.h"
+#include "bestCollisionTable.h"
+
 #include "Common/CCDB/EventSelectionParams.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Centrality.h"
+
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/Configurable.h"
 #include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/runDataProcessing.h"
+
 #include <TDatabasePDG.h>
 #include <TPDGCode.h>
 
-#include "Gencentralities.h"
-#include "Index.h"
-#include "bestCollisionTable.h"
-
-#include "Axes.h"
-#include "Functions.h"
-#include "Selections.h"
-#include "Histograms.h"
-
 using namespace o2;
 using namespace o2::aod::track;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGMM/Mult/Tasks/dndetaMFTPbPb.cxx b/.conflict-base-0/PWGMM/Mult/Tasks/dndetaMFTPbPb.cxx
index 4cc9a98d524..35da69384d7 100644
--- a/.conflict-base-0/PWGMM/Mult/Tasks/dndetaMFTPbPb.cxx
+++ b/.conflict-base-0/PWGMM/Mult/Tasks/dndetaMFTPbPb.cxx
@@ -15,15 +15,19 @@
 /// \author Gyula Bencedi, gyula.bencedi@cern.ch
 /// \since  Nov 2024
 
-#include <algorithm>
-#include <chrono>
-#include <cmath>
-#include <numeric>
-#include <vector>
-#include <string>
+#include "Functions.h"
+#include "Index.h"
+#include "bestCollisionTable.h"
 
-#include "CCDB/BasicCCDBManager.h"
+#include "Common/CCDB/ctpRateFetcher.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/CollisionAssociationTables.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonConstants/MathConstants.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
@@ -31,22 +35,17 @@
 #include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/RuntimeError.h"
 #include "Framework/runDataProcessing.h"
-
-#include "Common/CCDB/ctpRateFetcher.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/CollisionAssociationTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "CommonConstants/MathConstants.h"
-
 #include "MathUtils/Utils.h"
 #include "ReconstructionDataFormats/GlobalTrackID.h"
+
 #include "TPDGCode.h"
 
-#include "Functions.h"
-#include "Index.h"
-#include "bestCollisionTable.h"
+#include <algorithm>
+#include <chrono>
+#include <cmath>
+#include <numeric>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGMM/Mult/Tasks/effpt-mft.cxx b/.conflict-base-0/PWGMM/Mult/Tasks/effpt-mft.cxx
index 2d3a9919922..3b343e605a2 100644
--- a/.conflict-base-0/PWGMM/Mult/Tasks/effpt-mft.cxx
+++ b/.conflict-base-0/PWGMM/Mult/Tasks/effpt-mft.cxx
@@ -9,24 +9,27 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <cmath>
-#include "Framework/Configurable.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RuntimeError.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "Framework/runDataProcessing.h"
+#include "Index.h"
 
-#include "ReconstructionDataFormats/GlobalTrackID.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CommonConstants/MathConstants.h"
-#include "TDatabasePDG.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/Configurable.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/RuntimeError.h"
+#include "Framework/runDataProcessing.h"
 #include "MathUtils/Utils.h"
-#include "Index.h"
+#include "ReconstructionDataFormats/GlobalTrackID.h"
+
+#include "TDatabasePDG.h"
+
+#include <cmath>
 
 using namespace o2;
 using namespace o2::framework;
@@ -219,9 +222,9 @@ struct EffPtMFT {
             registry.fill(HIST("TracksPhiEtaGenDuplicates"), particle.phi(), particle.eta());
           }
         } // the particle has a track
-      }   // loop on particlesI
-    }     // loop on collisions
-  }       // end of processTrackEfficiencyIndexed
+      } // loop on particlesI
+    } // loop on collisions
+  } // end of processTrackEfficiencyIndexed
 
   PROCESS_SWITCH(EffPtMFT, processTrackEfficiencyIndexed, "Calculate tracking efficiency vs pt (indexed)", false);
 };
diff --git a/.conflict-base-0/PWGMM/Mult/Tasks/flatenicityFV0.cxx b/.conflict-base-0/PWGMM/Mult/Tasks/flatenicityFV0.cxx
index 3a403d9ea1b..61128107a83 100644
--- a/.conflict-base-0/PWGMM/Mult/Tasks/flatenicityFV0.cxx
+++ b/.conflict-base-0/PWGMM/Mult/Tasks/flatenicityFV0.cxx
@@ -8,8 +8,11 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include <cmath>
-#include <vector>
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
@@ -17,16 +20,13 @@
 #include "Framework/HistogramRegistry.h"
 #include "Framework/StaticFor.h"
 #include "Framework/runDataProcessing.h"
-
 #include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 
 #include <TGraph.h>
 
+#include <cmath>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-base-0/PWGMM/Mult/Tasks/flattenicty-chrg.cxx b/.conflict-base-0/PWGMM/Mult/Tasks/flattenicty-chrg.cxx
index fbfa4ab578d..9e49ff8918b 100644
--- a/.conflict-base-0/PWGMM/Mult/Tasks/flattenicty-chrg.cxx
+++ b/.conflict-base-0/PWGMM/Mult/Tasks/flattenicty-chrg.cxx
@@ -17,29 +17,29 @@
 //
 // \since 2024
 
-#include <cmath>
-#include <string>
-#include <string_view>
-#include <vector>
-
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 #include "EventFiltering/filterTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
+#include "DataFormatsFT0/Digit.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/StaticFor.h"
 #include "Framework/runDataProcessing.h"
-
-#include "CCDB/BasicCCDBManager.h"
-#include "CCDB/CcdbApi.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "DataFormatsFT0/Digit.h"
 #include "ReconstructionDataFormats/Track.h"
 
+#include <cmath>
+#include <string>
+#include <string_view>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-base-0/PWGMM/Mult/Tasks/heavy-ion-mult.cxx b/.conflict-base-0/PWGMM/Mult/Tasks/heavy-ion-mult.cxx
index bb12521502d..b6de125b7f0 100644
--- a/.conflict-base-0/PWGMM/Mult/Tasks/heavy-ion-mult.cxx
+++ b/.conflict-base-0/PWGMM/Mult/Tasks/heavy-ion-mult.cxx
@@ -18,22 +18,21 @@
 // 3. https://github.com/AliceO2Group/O2Physics/blob/master/PWGMM/Mult/Tasks/puremc-dndeta.cxx
 // 4. O2 analysis tutorial: https://indico.cern.ch/event/1267433/
 
-#include <cmath>
-#include <cstdlib>
-#include <iostream>
-#include <TPDGCode.h>
-#include <TDatabasePDG.h>
-#include <vector>
-
+#include "Index.h"
 #include "bestCollisionTable.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "Common/Core/trackUtilities.h"
+
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "Common/CCDB/EventSelectionParams.h"
 #include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/MathConstants.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
@@ -43,9 +42,14 @@
 #include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/GlobalTrackID.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "Index.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include <TDatabasePDG.h>
+#include <TPDGCode.h>
+
+#include <cmath>
+#include <cstdlib>
+#include <iostream>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGMM/Mult/Tasks/mcdata_split_test.cxx b/.conflict-base-0/PWGMM/Mult/Tasks/mcdata_split_test.cxx
index 5d5194be4be..731e8877b8a 100644
--- a/.conflict-base-0/PWGMM/Mult/Tasks/mcdata_split_test.cxx
+++ b/.conflict-base-0/PWGMM/Mult/Tasks/mcdata_split_test.cxx
@@ -13,17 +13,15 @@
 ///
 /// \author hhesouno
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
-
-#include "ReconstructionDataFormats/GlobalTrackID.h"
-
-#include "Common/DataModel/EventSelection.h"
-
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/GlobalTrackID.h"
 
 #include <TRandom.h>
 
diff --git a/.conflict-base-0/PWGMM/Mult/Tasks/multiplicityPbPb.cxx b/.conflict-base-0/PWGMM/Mult/Tasks/multiplicityPbPb.cxx
index 367b7e991a6..c3a4d1baeab 100644
--- a/.conflict-base-0/PWGMM/Mult/Tasks/multiplicityPbPb.cxx
+++ b/.conflict-base-0/PWGMM/Mult/Tasks/multiplicityPbPb.cxx
@@ -13,17 +13,15 @@
 ///
 /// \author hhesouno
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
-
-#include "ReconstructionDataFormats/GlobalTrackID.h"
-
-#include "Common/DataModel/EventSelection.h"
-
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/GlobalTrackID.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGMM/Mult/Tasks/puremc-dndeta.cxx b/.conflict-base-0/PWGMM/Mult/Tasks/puremc-dndeta.cxx
index 86e52b38850..bc033151387 100644
--- a/.conflict-base-0/PWGMM/Mult/Tasks/puremc-dndeta.cxx
+++ b/.conflict-base-0/PWGMM/Mult/Tasks/puremc-dndeta.cxx
@@ -9,17 +9,19 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
+#include "Axes.h"
+#include "Histograms.h"
+
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/runDataProcessing.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+
 #include <TDatabasePDG.h>
 #include <TPDGCode.h>
 
-#include "Axes.h"
-#include "Histograms.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-base-0/PWGMM/Mult/Tasks/run2dndeta.cxx b/.conflict-base-0/PWGMM/Mult/Tasks/run2dndeta.cxx
index 9db9fd291d9..f3b5012010b 100644
--- a/.conflict-base-0/PWGMM/Mult/Tasks/run2dndeta.cxx
+++ b/.conflict-base-0/PWGMM/Mult/Tasks/run2dndeta.cxx
@@ -8,25 +8,26 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include <cmath>
-#include "Framework/Configurable.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonConstants/MathConstants.h"
 #include "Framework/ASoAHelpers.h"
-#include "Framework/RuntimeError.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/Configurable.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/RuntimeError.h"
 #include "Framework/runDataProcessing.h"
-
 #include "ReconstructionDataFormats/GlobalTrackID.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "CommonConstants/MathConstants.h"
-#include "TDatabasePDG.h"
 
+#include "TDatabasePDG.h"
 #include <TF1.h>
 
+#include <cmath>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
@@ -56,7 +57,7 @@ struct PseudorapidityDensity {
       {"TracksEtaZvtx_gt0", "; #eta; Z_{vtx}; tracks", {HistType::kTH2F, {{21, -2.1, 2.1}, {201, -20.1, 20.1}}}},    //
       {"TracksPhiEta", "; #varphi; #eta; tracks", {HistType::kTH2F, {{600, 0, 2 * M_PI}, {21, -2.1, 2.1}}}},         //
       {"EventSelection", ";status;events", {HistType::kTH1F, {{4, 0.5, 4.5}}}}                                       //
-    }                                                                                                                //
+    } //
   };
 
   void init(InitContext&)
diff --git a/.conflict-base-0/PWGMM/Mult/Tasks/vertexing-fwd.cxx b/.conflict-base-0/PWGMM/Mult/Tasks/vertexing-fwd.cxx
index aecb9e7cd9c..cce0162eb7e 100644
--- a/.conflict-base-0/PWGMM/Mult/Tasks/vertexing-fwd.cxx
+++ b/.conflict-base-0/PWGMM/Mult/Tasks/vertexing-fwd.cxx
@@ -16,18 +16,19 @@
 // \brief This code loops over every ambiguous MFT tracks and associates
 // them to a collision that has the smallest DCAxy
 
-#include <cmath>
+#include "CommonConstants/LHCConstants.h"
+#include "CommonConstants/MathConstants.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/Configurable.h"
+#include "Framework/runDataProcessing.h"
+#include "MathUtils/Utils.h"
 #include "ReconstructionDataFormats/TrackFwd.h"
+
 #include "Math/MatrixFunctions.h"
 #include "Math/SMatrix.h"
-#include "MathUtils/Utils.h"
-#include "Framework/Configurable.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/runDataProcessing.h"
 
-#include "CommonConstants/MathConstants.h"
-#include "CommonConstants/LHCConstants.h"
+#include <cmath>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGMM/UE/Tasks/dedx_analysys.cxx b/.conflict-base-0/PWGMM/UE/Tasks/dedx_analysys.cxx
index 13c8b32b20e..37b67cb01b6 100644
--- a/.conflict-base-0/PWGMM/UE/Tasks/dedx_analysys.cxx
+++ b/.conflict-base-0/PWGMM/UE/Tasks/dedx_analysys.cxx
@@ -12,19 +12,21 @@
 /// \author Paola Vargas
 /// \since January 8, 2025
 
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Multiplicity.h"
+
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "ReconstructionDataFormats/Track.h"
 
 using namespace o2;
diff --git a/.conflict-base-0/PWGMM/UE/Tasks/ue-zdc-analysys.cxx b/.conflict-base-0/PWGMM/UE/Tasks/ue-zdc-analysys.cxx
index ec5294f7248..9f7c48a0aaf 100644
--- a/.conflict-base-0/PWGMM/UE/Tasks/ue-zdc-analysys.cxx
+++ b/.conflict-base-0/PWGMM/UE/Tasks/ue-zdc-analysys.cxx
@@ -12,16 +12,17 @@
 /// \brief Task for ZDC
 /// \author
 /// \since
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/CCDB/EventSelectionParams.h"
 #include "Common/CCDB/TriggerAliases.h"
+#include "Common/Core/TrackSelection.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/Core/TrackSelection.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/GlobalTrackID.h"
 #include "ReconstructionDataFormats/Track.h"
 
diff --git a/.conflict-base-0/PWGMM/UE/Tasks/uecharged.cxx b/.conflict-base-0/PWGMM/UE/Tasks/uecharged.cxx
index 9cfaeb96022..8e2d6a01bc0 100644
--- a/.conflict-base-0/PWGMM/UE/Tasks/uecharged.cxx
+++ b/.conflict-base-0/PWGMM/UE/Tasks/uecharged.cxx
@@ -12,30 +12,30 @@
 /// \since November 2021
 /// \last update: July 2024
 
-#include <cmath>
-#include <vector>
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/StaticFor.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-
+#include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/Core/TrackSelectionDefaults.h"
 
 #include "TDatabasePDG.h"
+#include <TF1.h>
 #include <TH1F.h>
 #include <TH2F.h>
-#include <TF1.h>
 #include <TRandom.h>
 
+#include <cmath>
+#include <vector>
+
 // TODO: implement 50% stat for MC closure vs 50% for testing, add flag for weak decays
 
 using namespace o2;
diff --git a/.conflict-base-0/PWGUD/AQC/FITtest.cxx b/.conflict-base-0/PWGUD/AQC/FITtest.cxx
index bdeaaa34426..a522d758d4a 100644
--- a/.conflict-base-0/PWGUD/AQC/FITtest.cxx
+++ b/.conflict-base-0/PWGUD/AQC/FITtest.cxx
@@ -13,18 +13,19 @@
 /// \author Anisa Khatun, anisa.khatun@cern.ch
 /// \since  04.08.2023
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "ReconstructionDataFormats/BCRange.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/DataModel/FT0Corrected.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/DataModel/FT0Corrected.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "CommonConstants/LHCConstants.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
+#include "CommonConstants/LHCConstants.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/BCRange.h"
+
 #include "TLorentzVector.h"
 
 using namespace o2;
diff --git a/.conflict-base-0/PWGUD/AQC/udQC.cxx b/.conflict-base-0/PWGUD/AQC/udQC.cxx
index 3da67d1f683..0c1ad7dba40 100644
--- a/.conflict-base-0/PWGUD/AQC/udQC.cxx
+++ b/.conflict-base-0/PWGUD/AQC/udQC.cxx
@@ -14,18 +14,22 @@
 /// \author Paul Buehler, paul.buehler@oeaw.ac.at
 /// \since  04.05.2023
 
-#include <vector>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "ReconstructionDataFormats/BCRange.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/DataModel/FT0Corrected.h"
 #include "PWGUD/Core/UDHelpers.h"
+
+#include "Common/DataModel/FT0Corrected.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/BCRange.h"
+
 #include "TLorentzVector.h"
 #include "TMath.h"
 
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-base-0/PWGUD/AQC/udQCmidRap.cxx b/.conflict-base-0/PWGUD/AQC/udQCmidRap.cxx
index acb35f21f57..43643d33707 100644
--- a/.conflict-base-0/PWGUD/AQC/udQCmidRap.cxx
+++ b/.conflict-base-0/PWGUD/AQC/udQCmidRap.cxx
@@ -14,14 +14,17 @@
 /// \author Paul Buehler
 /// \since 17.01.2023
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "ReconstructionDataFormats/BCRange.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/DataModel/FT0Corrected.h"
 #include "PWGUD/Core/UDHelpers.h"
+
+#include "Common/DataModel/FT0Corrected.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/BCRange.h"
+
 #include "TLorentzVector.h"
 #include "TMath.h"
 
diff --git a/.conflict-base-0/PWGUD/Core/DGCutparHolder.h b/.conflict-base-0/PWGUD/Core/DGCutparHolder.h
index 8312d72ac32..a67aefc4080 100644
--- a/.conflict-base-0/PWGUD/Core/DGCutparHolder.h
+++ b/.conflict-base-0/PWGUD/Core/DGCutparHolder.h
@@ -13,6 +13,7 @@
 #define PWGUD_CORE_DGCUTPARHOLDER_H_
 
 #include <Rtypes.h>
+
 #include <vector>
 
 // object to hold customizable cut values
diff --git a/.conflict-base-0/PWGUD/Core/DGPIDSelector.cxx b/.conflict-base-0/PWGUD/Core/DGPIDSelector.cxx
index 04dab87ef7a..2efc0372916 100644
--- a/.conflict-base-0/PWGUD/Core/DGPIDSelector.cxx
+++ b/.conflict-base-0/PWGUD/Core/DGPIDSelector.cxx
@@ -8,11 +8,13 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include <vector>
-#include <string>
-#include "CommonConstants/PhysicsConstants.h"
 #include "DGPIDSelector.h"
 
+#include "CommonConstants/PhysicsConstants.h"
+
+#include <string>
+#include <vector>
+
 // -----------------------------------------------------------------------------
 float particleMass(TDatabasePDG* pdg, int pid)
 {
diff --git a/.conflict-base-0/PWGUD/Core/DGPIDSelector.h b/.conflict-base-0/PWGUD/Core/DGPIDSelector.h
index c130c2094ce..191396b1074 100644
--- a/.conflict-base-0/PWGUD/Core/DGPIDSelector.h
+++ b/.conflict-base-0/PWGUD/Core/DGPIDSelector.h
@@ -12,12 +12,15 @@
 #ifndef PWGUD_CORE_DGPIDSELECTOR_H_
 #define PWGUD_CORE_DGPIDSELECTOR_H_
 
-#include <gandiva/projector.h>
-#include <vector>
-#include <TVector3.h>
+#include "Framework/Logger.h"
+
 #include "TDatabasePDG.h"
 #include "TLorentzVector.h"
-#include "Framework/Logger.h"
+#include <TVector3.h>
+
+#include <gandiva/projector.h>
+
+#include <vector>
 
 const int numDGPIDCutParameters = 9;
 float particleMass(TDatabasePDG* pdg, int pid);
diff --git a/.conflict-base-0/PWGUD/Core/DGSelector.h b/.conflict-base-0/PWGUD/Core/DGSelector.h
index c9349da9247..bcf29920c5a 100644
--- a/.conflict-base-0/PWGUD/Core/DGSelector.h
+++ b/.conflict-base-0/PWGUD/Core/DGSelector.h
@@ -12,14 +12,16 @@
 #ifndef PWGUD_CORE_DGSELECTOR_H_
 #define PWGUD_CORE_DGSELECTOR_H_
 
-#include <vector>
+#include "PWGUD/Core/DGCutparHolder.h"
+#include "PWGUD/Core/UDHelpers.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/Logger.h"
 
 #include "TDatabasePDG.h"
 #include "TLorentzVector.h"
-#include "Framework/Logger.h"
-#include "Framework/AnalysisTask.h"
-#include "PWGUD/Core/UDHelpers.h"
-#include "PWGUD/Core/DGCutparHolder.h"
+
+#include <vector>
 
 // -----------------------------------------------------------------------------
 // add here Selectors for different types of diffractive events
diff --git a/.conflict-base-0/PWGUD/Core/SGCutParHolder.h b/.conflict-base-0/PWGUD/Core/SGCutParHolder.h
index 753e9f0c96f..fcee2d79703 100644
--- a/.conflict-base-0/PWGUD/Core/SGCutParHolder.h
+++ b/.conflict-base-0/PWGUD/Core/SGCutParHolder.h
@@ -13,6 +13,7 @@
 #define PWGUD_CORE_SGCUTPARHOLDER_H_
 
 #include <Rtypes.h>
+
 #include <vector>
 
 // object to hold customizable cut values
diff --git a/.conflict-base-0/PWGUD/Core/SGTrackSelector.h b/.conflict-base-0/PWGUD/Core/SGTrackSelector.h
index 4288ef89e80..11517771eac 100644
--- a/.conflict-base-0/PWGUD/Core/SGTrackSelector.h
+++ b/.conflict-base-0/PWGUD/Core/SGTrackSelector.h
@@ -16,16 +16,19 @@
 #ifndef PWGUD_CORE_SGTRACKSELECTOR_H_
 #define PWGUD_CORE_SGTRACKSELECTOR_H_
 
-#include <vector>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
+#include "PWGUD/Core/SGSelector.h"
+#include "PWGUD/DataModel/UDTables.h"
+
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include <iostream>
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/SGSelector.h"
-#include <TString.h>
+#include "Framework/runDataProcessing.h"
+
 #include "TVector3.h"
+#include <TString.h>
+
+#include <iostream>
+#include <vector>
 using namespace std;
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-base-0/PWGUD/Core/UDFSParser.cxx b/.conflict-base-0/PWGUD/Core/UDFSParser.cxx
index 8759e404f69..c7206806307 100644
--- a/.conflict-base-0/PWGUD/Core/UDFSParser.cxx
+++ b/.conflict-base-0/PWGUD/Core/UDFSParser.cxx
@@ -9,10 +9,11 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/Logger.h"
+#include "UDFSParser.h"
+
 #include "CommonConstants/LHCConstants.h"
 #include "CommonDataFormat/BunchFilling.h"
-#include "UDFSParser.h"
+#include "Framework/Logger.h"
 
 // -----------------------------------------------------------------------------
 UDFSParser::UDFSParser(const char* filename)
diff --git a/.conflict-base-0/PWGUD/Core/UDGoodRunSelector.cxx b/.conflict-base-0/PWGUD/Core/UDGoodRunSelector.cxx
index ec51580cccf..06940cd3728 100644
--- a/.conflict-base-0/PWGUD/Core/UDGoodRunSelector.cxx
+++ b/.conflict-base-0/PWGUD/Core/UDGoodRunSelector.cxx
@@ -9,11 +9,14 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <algorithm>
+#include "PWGUD/Core/UDGoodRunSelector.h"
+
 #include "Framework/Logger.h"
+
 #include "rapidjson/document.h"
 #include "rapidjson/filereadstream.h"
-#include "PWGUD/Core/UDGoodRunSelector.h"
+
+#include <algorithm>
 
 class TFile;
 
diff --git a/.conflict-base-0/PWGUD/Core/UDGoodRunSelector.h b/.conflict-base-0/PWGUD/Core/UDGoodRunSelector.h
index 4cf49330698..1b73f2c3ac4 100644
--- a/.conflict-base-0/PWGUD/Core/UDGoodRunSelector.h
+++ b/.conflict-base-0/PWGUD/Core/UDGoodRunSelector.h
@@ -12,8 +12,8 @@
 #ifndef PWGUD_CORE_UDGOODRUNSELECTOR_H_
 #define PWGUD_CORE_UDGOODRUNSELECTOR_H_
 
-#include <string>
 #include <map>
+#include <string>
 #include <vector>
 
 // A class to select good runs
diff --git a/.conflict-base-0/PWGUD/Core/UDHelpers.h b/.conflict-base-0/PWGUD/Core/UDHelpers.h
index 4b692f7c5c1..ba7dc979a18 100644
--- a/.conflict-base-0/PWGUD/Core/UDHelpers.h
+++ b/.conflict-base-0/PWGUD/Core/UDHelpers.h
@@ -16,19 +16,22 @@
 #ifndef PWGUD_CORE_UDHELPERS_H_
 #define PWGUD_CORE_UDHELPERS_H_
 
-#include <vector>
-#include <bitset>
+#include "PWGUD/Core/DGCutparHolder.h"
+#include "PWGUD/Core/UPCHelpers.h"
 
-#include "TLorentzVector.h"
-#include "Framework/Logger.h"
-#include "DataFormatsFT0/Digit.h"
-#include "DataFormatsFIT/Triggers.h"
-#include "CommonConstants/LHCConstants.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/Core/UPCHelpers.h"
-#include "PWGUD/Core/DGCutparHolder.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonConstants/LHCConstants.h"
+#include "DataFormatsFIT/Triggers.h"
+#include "DataFormatsFT0/Digit.h"
+#include "Framework/Logger.h"
+
+#include "TLorentzVector.h"
+
+#include <bitset>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGUD/Core/UPCHelpers.h b/.conflict-base-0/PWGUD/Core/UPCHelpers.h
index 03ff2475c8c..b4d0dfa8899 100644
--- a/.conflict-base-0/PWGUD/Core/UPCHelpers.h
+++ b/.conflict-base-0/PWGUD/Core/UPCHelpers.h
@@ -12,13 +12,17 @@
 #ifndef PWGUD_CORE_UPCHELPERS_H_
 #define PWGUD_CORE_UPCHELPERS_H_
 
-#include "Framework/AnalysisDataModel.h"
-#include "Common/DataModel/EventSelection.h"
+#include "UPCCutparHolder.h"
+
+#include "PWGUD/DataModel/UDTables.h"
+
 #include "Common/CCDB/EventSelectionParams.h"
+#include "Common/DataModel/EventSelection.h"
+
 #include "CommonConstants/LHCConstants.h"
+#include "Framework/AnalysisDataModel.h"
+
 #include "TLorentzVector.h"
-#include "UPCCutparHolder.h"
-#include "PWGUD/DataModel/UDTables.h"
 
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-base-0/PWGUD/Core/UPCJpsiCentralBarrelCorrHelper.h b/.conflict-base-0/PWGUD/Core/UPCJpsiCentralBarrelCorrHelper.h
index 955601495e6..77d3781cbc0 100644
--- a/.conflict-base-0/PWGUD/Core/UPCJpsiCentralBarrelCorrHelper.h
+++ b/.conflict-base-0/PWGUD/Core/UPCJpsiCentralBarrelCorrHelper.h
@@ -16,10 +16,11 @@
 #ifndef PWGUD_CORE_UPCJPSICENTRALBARRELCORRHELPER_H_
 #define PWGUD_CORE_UPCJPSICENTRALBARRELCORRHELPER_H_
 
-#include <vector>
-#include <algorithm>
 #include "CommonConstants/MathConstants.h"
+
+#include <algorithm>
 #include <random>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGUD/Core/UPCPairCuts.h b/.conflict-base-0/PWGUD/Core/UPCPairCuts.h
index 6b0e37adca0..f0cdf532561 100644
--- a/.conflict-base-0/PWGUD/Core/UPCPairCuts.h
+++ b/.conflict-base-0/PWGUD/Core/UPCPairCuts.h
@@ -16,14 +16,14 @@
 #ifndef PWGUD_CORE_UPCPAIRCUTS_H_
 #define PWGUD_CORE_UPCPAIRCUTS_H_
 
-#include <cmath>
+#include "PWGUD/Core/UPCTauCentralBarrelHelperRL.h"
 
-#include "Framework/Logger.h"
-#include "Framework/HistogramRegistry.h"
 #include "CommonConstants/MathConstants.h"
 #include "CommonConstants/PhysicsConstants.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/Logger.h"
 
-#include "PWGUD/Core/UPCTauCentralBarrelHelperRL.h"
+#include <cmath>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGUD/Core/decayTree.cxx b/.conflict-base-0/PWGUD/Core/decayTree.cxx
index 026c77af706..f5691c42bcd 100644
--- a/.conflict-base-0/PWGUD/Core/decayTree.cxx
+++ b/.conflict-base-0/PWGUD/Core/decayTree.cxx
@@ -9,16 +9,17 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <utility>
+#include "decayTree.h"
+
+#include "rapidjson/document.h"
+#include "rapidjson/filereadstream.h"
+
 #include <cstdio>
 #include <map>
 #include <string>
+#include <utility>
 #include <vector>
 
-#include "rapidjson/document.h"
-#include "rapidjson/filereadstream.h"
-#include "decayTree.h"
-
 using namespace rapidjson;
 
 // -----------------------------------------------------------------------------
diff --git a/.conflict-base-0/PWGUD/Core/decayTree.h b/.conflict-base-0/PWGUD/Core/decayTree.h
index 3dd4f53578b..22680126420 100644
--- a/.conflict-base-0/PWGUD/Core/decayTree.h
+++ b/.conflict-base-0/PWGUD/Core/decayTree.h
@@ -12,17 +12,18 @@
 #ifndef PWGUD_CORE_DECAYTREE_H_
 #define PWGUD_CORE_DECAYTREE_H_
 
-#include <utility>
-#include <map>
-#include <vector>
-#include <string>
-
 #include "Framework/AnalysisTask.h"
-#include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/Logger.h"
-#include "TLorentzVector.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+
 #include "TDatabasePDG.h"
+#include "TLorentzVector.h"
+
+#include <map>
+#include <string>
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGUD/DataModel/SGTables.h b/.conflict-base-0/PWGUD/DataModel/SGTables.h
index bf9ef68da96..672d8f1763f 100644
--- a/.conflict-base-0/PWGUD/DataModel/SGTables.h
+++ b/.conflict-base-0/PWGUD/DataModel/SGTables.h
@@ -12,14 +12,16 @@
 #ifndef PWGUD_DATAMODEL_SGTABLES_H_
 #define PWGUD_DATAMODEL_SGTABLES_H_
 
-#include <vector>
-#include <cmath>
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoA.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/DataTypes.h"
 #include "MathUtils/Utils.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+
+#include <cmath>
+#include <vector>
 
 namespace o2::aod
 {
diff --git a/.conflict-base-0/PWGUD/TableProducer/Converters/UDCollisionSelExtrasConverter.cxx b/.conflict-base-0/PWGUD/TableProducer/Converters/UDCollisionSelExtrasConverter.cxx
index 1fa1882e7d5..d8585bc3377 100644
--- a/.conflict-base-0/PWGUD/TableProducer/Converters/UDCollisionSelExtrasConverter.cxx
+++ b/.conflict-base-0/PWGUD/TableProducer/Converters/UDCollisionSelExtrasConverter.cxx
@@ -20,11 +20,12 @@
 
 /// \author Sasha Bylinkin <alexandr.bylinkin@cern.ch>
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "PWGUD/DataModel/UDTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-base-0/PWGUD/TableProducer/Converters/UDCollisionSelExtrasV002Converter.cxx b/.conflict-base-0/PWGUD/TableProducer/Converters/UDCollisionSelExtrasV002Converter.cxx
index b10b467ec4d..967c94a2b18 100644
--- a/.conflict-base-0/PWGUD/TableProducer/Converters/UDCollisionSelExtrasV002Converter.cxx
+++ b/.conflict-base-0/PWGUD/TableProducer/Converters/UDCollisionSelExtrasV002Converter.cxx
@@ -13,11 +13,12 @@
 /// \brief Converts UDCollisionSelExtras table from version 000 to 002 and 001 to 002
 /// \author Roman Lavicka <roman.lavicka@cern.ch>
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "PWGUD/DataModel/UDTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-base-0/PWGUD/TableProducer/Converters/UDCollisionsConverter.cxx b/.conflict-base-0/PWGUD/TableProducer/Converters/UDCollisionsConverter.cxx
index 8be7bce717b..27883d2592d 100644
--- a/.conflict-base-0/PWGUD/TableProducer/Converters/UDCollisionsConverter.cxx
+++ b/.conflict-base-0/PWGUD/TableProducer/Converters/UDCollisionsConverter.cxx
@@ -20,11 +20,12 @@
 
 /// \author Sasha Bylinkin <alexandr.bylinkin@cern.ch>
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "PWGUD/DataModel/UDTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-base-0/PWGUD/TableProducer/Converters/UDFwdTracksExtraConverter.cxx b/.conflict-base-0/PWGUD/TableProducer/Converters/UDFwdTracksExtraConverter.cxx
index f9b1f2d0d22..bf2fd2cb4da 100644
--- a/.conflict-base-0/PWGUD/TableProducer/Converters/UDFwdTracksExtraConverter.cxx
+++ b/.conflict-base-0/PWGUD/TableProducer/Converters/UDFwdTracksExtraConverter.cxx
@@ -21,11 +21,12 @@
 
 /// \author Andrea Giovanni Riffero <andrea.giovanni.riffero@cern.ch>
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "PWGUD/DataModel/UDTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-base-0/PWGUD/TableProducer/DGBCCandProducer.cxx b/.conflict-base-0/PWGUD/TableProducer/DGBCCandProducer.cxx
index 97b60c42c9e..d5a3b64214c 100644
--- a/.conflict-base-0/PWGUD/TableProducer/DGBCCandProducer.cxx
+++ b/.conflict-base-0/PWGUD/TableProducer/DGBCCandProducer.cxx
@@ -14,15 +14,18 @@
 /// \author Paul Buehler, paul.buehler@oeaw.ac.at
 /// \since  30.09.2022
 
-#include <algorithm>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "ReconstructionDataFormats/Vertex.h"
-#include "PWGUD/DataModel/UDTables.h"
+#include "DGBCCandProducer.h"
+
+#include "PWGUD/Core/DGSelector.h"
 #include "PWGUD/Core/UDHelpers.h"
 #include "PWGUD/Core/UPCHelpers.h"
-#include "PWGUD/Core/DGSelector.h"
-#include "DGBCCandProducer.h"
+#include "PWGUD/DataModel/UDTables.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Vertex.h"
+
+#include <algorithm>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGUD/TableProducer/DGBCCandProducer.h b/.conflict-base-0/PWGUD/TableProducer/DGBCCandProducer.h
index 07717afbfde..66f67b32a50 100644
--- a/.conflict-base-0/PWGUD/TableProducer/DGBCCandProducer.h
+++ b/.conflict-base-0/PWGUD/TableProducer/DGBCCandProducer.h
@@ -16,12 +16,13 @@
 #ifndef PWGUD_TABLEPRODUCER_DGBCCANDPRODUCER_H_
 #define PWGUD_TABLEPRODUCER_DGBCCANDPRODUCER_H_
 
-#include <map>
-#include <vector>
 #include "Framework/ASoA.h"
 #include "Framework/AnalysisDataModel.h"
-#include "MathUtils/Utils.h"
 #include "Framework/DataTypes.h"
+#include "MathUtils/Utils.h"
+
+#include <map>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGUD/TableProducer/fwdTrackPropagation.cxx b/.conflict-base-0/PWGUD/TableProducer/fwdTrackPropagation.cxx
index cc6ba621690..523035ad0f6 100644
--- a/.conflict-base-0/PWGUD/TableProducer/fwdTrackPropagation.cxx
+++ b/.conflict-base-0/PWGUD/TableProducer/fwdTrackPropagation.cxx
@@ -12,22 +12,22 @@
 /// \author Diana Krupova, diana.krupova@cern.ch
 /// \since 04.06.2024
 
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
+#include "PWGUD/DataModel/UDTables.h"
 
 #include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include "TGeoGlobalMagField.h"
-#include "Field/MagneticField.h"
 #include "DetectorsBase/Propagator.h"
+#include "Field/MagneticField.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 #include "GlobalTracking/MatchGlobalFwd.h"
 #include "MCHTracking/TrackExtrap.h"
 #include "MCHTracking/TrackParam.h"
-#include "Math/SMatrix.h"
 #include "ReconstructionDataFormats/TrackFwd.h"
 
-#include "PWGUD/DataModel/UDTables.h"
+#include "Math/SMatrix.h"
+#include "TGeoGlobalMagField.h"
 
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-base-0/PWGUD/TableProducer/tauEventTableProducer.cxx b/.conflict-base-0/PWGUD/TableProducer/tauEventTableProducer.cxx
index 548d8701689..158dabadec0 100644
--- a/.conflict-base-0/PWGUD/TableProducer/tauEventTableProducer.cxx
+++ b/.conflict-base-0/PWGUD/TableProducer/tauEventTableProducer.cxx
@@ -17,20 +17,25 @@
 //
 
 // C++ headers
+#include <algorithm>
+#include <random>
 #include <set>
 #include <utility>
-#include <algorithm>
 #include <vector>
-#include <random>
 
 // O2 headers
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/runDataProcessing.h"
 
 // O2Physics headers
+#include "PWGUD/Core/SGSelector.h"
+#include "PWGUD/Core/UPCTauCentralBarrelHelperRL.h"
+#include "PWGUD/DataModel/TauEventTables.h"
+#include "PWGUD/DataModel/UDTables.h"
+
 #include "Common/CCDB/EventSelectionParams.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
@@ -38,10 +43,6 @@
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "PWGUD/Core/UPCTauCentralBarrelHelperRL.h"
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/DataModel/TauEventTables.h"
-#include "PWGUD/Core/SGSelector.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGUD/TableProducer/udMcCollisions2udCollisions.cxx b/.conflict-base-0/PWGUD/TableProducer/udMcCollisions2udCollisions.cxx
index cea35fb70ea..2522dd65896 100644
--- a/.conflict-base-0/PWGUD/TableProducer/udMcCollisions2udCollisions.cxx
+++ b/.conflict-base-0/PWGUD/TableProducer/udMcCollisions2udCollisions.cxx
@@ -16,13 +16,14 @@
 /// \brief  A task to create a reverse index from UDMcCollisions to UDCollisions
 ///
 
-#include <vector>
+#include "PWGUD/DataModel/UDIndex.h"
+#include "PWGUD/DataModel/UDTables.h"
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/DataModel/UDIndex.h"
+#include "Framework/runDataProcessing.h"
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGUD/TableProducer/udMcParticles2udTracks.cxx b/.conflict-base-0/PWGUD/TableProducer/udMcParticles2udTracks.cxx
index 4a876a72fb3..df797f9ea3a 100644
--- a/.conflict-base-0/PWGUD/TableProducer/udMcParticles2udTracks.cxx
+++ b/.conflict-base-0/PWGUD/TableProducer/udMcParticles2udTracks.cxx
@@ -16,13 +16,14 @@
 /// \brief  A task to create a reverse index from UDMcParticles to UDTracks
 ///
 
-#include <vector>
+#include "PWGUD/DataModel/UDIndex.h"
+#include "PWGUD/DataModel/UDTables.h"
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/DataModel/UDIndex.h"
+#include "Framework/runDataProcessing.h"
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGUD/Tasks/FwdMuonsUPC.cxx b/.conflict-base-0/PWGUD/Tasks/FwdMuonsUPC.cxx
index 0c4b3d81e3b..c821c4daa1d 100644
--- a/.conflict-base-0/PWGUD/Tasks/FwdMuonsUPC.cxx
+++ b/.conflict-base-0/PWGUD/Tasks/FwdMuonsUPC.cxx
@@ -16,22 +16,23 @@
 
 /// \author Andrea Giovanni Riffero <andrea.giovanni.riffero@cern.ch>
 
-#include <vector>
-#include <unordered_map>
+#include "PWGUD/DataModel/UDTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPLHCIFData.h"
 #include "DataFormatsParameters/GRPECSObject.h"
-#include "PWGUD/DataModel/UDTables.h"
+#include "DataFormatsParameters/GRPLHCIFData.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 
 #include "TLorentzVector.h"
-#include "TSystem.h"
 #include "TMath.h"
 #include "TRandom3.h"
+#include "TSystem.h"
+
+#include <unordered_map>
+#include <vector>
 
 // table for saving tree with info on data
 namespace dimu
diff --git a/.conflict-base-0/PWGUD/Tasks/analysisMCDPMJetSGv3.cxx b/.conflict-base-0/PWGUD/Tasks/analysisMCDPMJetSGv3.cxx
index 4347871377a..6c6bfdfb3ab 100644
--- a/.conflict-base-0/PWGUD/Tasks/analysisMCDPMJetSGv3.cxx
+++ b/.conflict-base-0/PWGUD/Tasks/analysisMCDPMJetSGv3.cxx
@@ -13,10 +13,11 @@
 ///
 /// \author Simone Ragoni
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 // #include "TDatabasePDG.h"
 #include "PWGUD/Core/UPCHelpers.h"
 #include "PWGUD/DataModel/UDTables.h"
diff --git a/.conflict-base-0/PWGUD/Tasks/decayTreeAnalyzer.cxx b/.conflict-base-0/PWGUD/Tasks/decayTreeAnalyzer.cxx
index c725a2ca72a..9a379877afa 100644
--- a/.conflict-base-0/PWGUD/Tasks/decayTreeAnalyzer.cxx
+++ b/.conflict-base-0/PWGUD/Tasks/decayTreeAnalyzer.cxx
@@ -13,18 +13,18 @@
 // \author Paul Buehler, paul.buehler@oeaw.ac.at
 // \since  01.03.2024
 
-#include <string>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
+#include "PWGUD/Core/UDGoodRunSelector.h"
+#include "PWGUD/Core/UDHelpers.h"
+#include "PWGUD/Core/decayTree.h"
+#include "PWGUD/DataModel/UDTables.h"
 
 #include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPLHCIFData.h"
 #include "CommonConstants/LHCConstants.h"
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/UDHelpers.h"
-#include "PWGUD/Core/UDGoodRunSelector.h"
-#include "PWGUD/Core/decayTree.h"
+#include "DataFormatsParameters/GRPLHCIFData.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include <string>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGUD/Tasks/dgCandAnalyzer.cxx b/.conflict-base-0/PWGUD/Tasks/dgCandAnalyzer.cxx
index 93c62c567d5..7697610eb8d 100644
--- a/.conflict-base-0/PWGUD/Tasks/dgCandAnalyzer.cxx
+++ b/.conflict-base-0/PWGUD/Tasks/dgCandAnalyzer.cxx
@@ -13,20 +13,21 @@
 // \author Paul Buehler, paul.buehler@oeaw.ac.at
 // \since  06.06.2022
 
-#include <set>
-#include <string>
+#include "PWGUD/Core/DGPIDSelector.h"
+#include "PWGUD/Core/UDGoodRunSelector.h"
+#include "PWGUD/Core/UDHelpers.h"
+#include "PWGUD/DataModel/UDTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
+#include "Common/DataModel/PIDResponse.h"
 
 #include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPLHCIFData.h"
 #include "CommonConstants/LHCConstants.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/UDHelpers.h"
-#include "PWGUD/Core/DGPIDSelector.h"
-#include "PWGUD/Core/UDGoodRunSelector.h"
+#include "DataFormatsParameters/GRPLHCIFData.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include <set>
+#include <string>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGUD/Tasks/diffMCDataScanner.cxx b/.conflict-base-0/PWGUD/Tasks/diffMCDataScanner.cxx
index 8ad8d7ae853..1ee06c28b61 100644
--- a/.conflict-base-0/PWGUD/Tasks/diffMCDataScanner.cxx
+++ b/.conflict-base-0/PWGUD/Tasks/diffMCDataScanner.cxx
@@ -13,9 +13,10 @@
 /// \author Paul Buehler, paul.buehler@oeaw.ac.at
 /// \since  01.10.2021
 
-#include "Framework/AnalysisTask.h"
-#include "PWGUD/DataModel/McPIDTable.h"
 #include "PWGUD/Core/UDHelpers.h"
+#include "PWGUD/DataModel/McPIDTable.h"
+
+#include "Framework/AnalysisTask.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGUD/Tasks/diffMCQA.cxx b/.conflict-base-0/PWGUD/Tasks/diffMCQA.cxx
index 19bf3016a97..f7a3fa16500 100644
--- a/.conflict-base-0/PWGUD/Tasks/diffMCQA.cxx
+++ b/.conflict-base-0/PWGUD/Tasks/diffMCQA.cxx
@@ -13,12 +13,14 @@
 /// \author Paul Buehler, paul.buehler@oeaw.ac.at
 /// \since  01.10.2021
 
-#include "Framework/runDataProcessing.h"
+#include "PWGUD/Core/UDHelpers.h"
+
+#include "CommonConstants/PhysicsConstants.h"
 #include "Framework/AnalysisTask.h"
-#include "TLorentzVector.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/BCRange.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "PWGUD/Core/UDHelpers.h"
+
+#include "TLorentzVector.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGUD/Tasks/diffQA.cxx b/.conflict-base-0/PWGUD/Tasks/diffQA.cxx
index a1e9ec34185..6c331ca7146 100644
--- a/.conflict-base-0/PWGUD/Tasks/diffQA.cxx
+++ b/.conflict-base-0/PWGUD/Tasks/diffQA.cxx
@@ -13,13 +13,15 @@
 /// \author Paul Buehler, paul.buehler@oeaw.ac.at
 /// \since  20.05.2022
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "TLorentzVector.h"
+#include "PWGUD/Core/UDHelpers.h"
+
 #include "CommonConstants/LHCConstants.h"
-#include "ReconstructionDataFormats/BCRange.h"
 #include "CommonConstants/PhysicsConstants.h"
-#include "PWGUD/Core/UDHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/BCRange.h"
+
+#include "TLorentzVector.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGUD/Tasks/eventByevent.cxx b/.conflict-base-0/PWGUD/Tasks/eventByevent.cxx
index 072ae2d961c..ba7a512a26e 100644
--- a/.conflict-base-0/PWGUD/Tasks/eventByevent.cxx
+++ b/.conflict-base-0/PWGUD/Tasks/eventByevent.cxx
@@ -10,16 +10,19 @@
 // or submit itself to any jurisdiction.
 //
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include <iostream>
+#include "PWGUD/Core/SGSelector.h"
+#include "PWGUD/Core/SGTrackSelector.h"
 #include "PWGUD/DataModel/UDTables.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TLorentzVector.h"
 #include <TString.h>
 #include <TTree.h>
-#include "TLorentzVector.h"
-#include "PWGUD/Core/SGSelector.h"
-#include "PWGUD/Core/SGTrackSelector.h"
+
+#include <iostream>
 
 using namespace std;
 using namespace o2;
diff --git a/.conflict-base-0/PWGUD/Tasks/exclusivePentaquark.cxx b/.conflict-base-0/PWGUD/Tasks/exclusivePentaquark.cxx
index c63dc7fce68..24c7cd2b674 100644
--- a/.conflict-base-0/PWGUD/Tasks/exclusivePentaquark.cxx
+++ b/.conflict-base-0/PWGUD/Tasks/exclusivePentaquark.cxx
@@ -8,15 +8,19 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include <iostream>
+#include "PWGUD/Core/SGSelector.h"
 #include "PWGUD/DataModel/UDTables.h"
-#include <TString.h>
-#include "TLorentzVector.h"
+
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/Core/SGSelector.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TLorentzVector.h"
+#include <TString.h>
+
+#include <iostream>
 using std::array;
 using namespace std;
 using namespace o2;
diff --git a/.conflict-base-0/PWGUD/Tasks/exclusivePhi.cxx b/.conflict-base-0/PWGUD/Tasks/exclusivePhi.cxx
index 634d17a5d8e..ba639348852 100644
--- a/.conflict-base-0/PWGUD/Tasks/exclusivePhi.cxx
+++ b/.conflict-base-0/PWGUD/Tasks/exclusivePhi.cxx
@@ -9,16 +9,20 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 //
-#include <vector>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include <iostream>
 #include "PWGUD/DataModel/UDTables.h"
-#include <TString.h>
-#include "TLorentzVector.h"
+
 #include "Common/DataModel/PIDResponse.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TLorentzVector.h"
+#include <TString.h>
+
+#include <iostream>
+#include <vector>
+
 using std::array;
 using namespace std;
 using namespace o2;
@@ -648,7 +652,7 @@ struct ExclusivePhi {
         }
       }
     } // Kaon Band
-  }   // end of process
+  } // end of process
 
 }; // end of struct
 
diff --git a/.conflict-base-0/PWGUD/Tasks/exclusivePhiLeptons.cxx b/.conflict-base-0/PWGUD/Tasks/exclusivePhiLeptons.cxx
index b212dd21723..45cdeb2d450 100644
--- a/.conflict-base-0/PWGUD/Tasks/exclusivePhiLeptons.cxx
+++ b/.conflict-base-0/PWGUD/Tasks/exclusivePhiLeptons.cxx
@@ -8,16 +8,20 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include <vector>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include <iostream>
+#include "PWGUD/Core/SGSelector.h"
 #include "PWGUD/DataModel/UDTables.h"
-#include <TString.h>
-#include "TLorentzVector.h"
+
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/Core/SGSelector.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TLorentzVector.h"
+#include <TString.h>
+
+#include <iostream>
+#include <vector>
 using std::array;
 using namespace std;
 using namespace o2;
diff --git a/.conflict-base-0/PWGUD/Tasks/exclusivePhiLeptonsTrees.cxx b/.conflict-base-0/PWGUD/Tasks/exclusivePhiLeptonsTrees.cxx
index 00abada06d4..48f00ab2524 100644
--- a/.conflict-base-0/PWGUD/Tasks/exclusivePhiLeptonsTrees.cxx
+++ b/.conflict-base-0/PWGUD/Tasks/exclusivePhiLeptonsTrees.cxx
@@ -8,16 +8,20 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include <vector>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include <iostream>
+#include "PWGUD/Core/SGSelector.h"
 #include "PWGUD/DataModel/UDTables.h"
-#include <TString.h>
-#include "TLorentzVector.h"
+
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/Core/SGSelector.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TLorentzVector.h"
+#include <TString.h>
+
+#include <iostream>
+#include <vector>
 using std::array;
 using namespace std;
 using namespace o2;
diff --git a/.conflict-base-0/PWGUD/Tasks/exclusiveTwoProtons.cxx b/.conflict-base-0/PWGUD/Tasks/exclusiveTwoProtons.cxx
index b7cf9b84004..966bd2c923a 100644
--- a/.conflict-base-0/PWGUD/Tasks/exclusiveTwoProtons.cxx
+++ b/.conflict-base-0/PWGUD/Tasks/exclusiveTwoProtons.cxx
@@ -8,15 +8,19 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include <iostream>
+#include "PWGUD/Core/SGSelector.h"
 #include "PWGUD/DataModel/UDTables.h"
-#include <TString.h>
-#include "TLorentzVector.h"
+
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/Core/SGSelector.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TLorentzVector.h"
+#include <TString.h>
+
+#include <iostream>
 using std::array;
 using namespace std;
 using namespace o2;
diff --git a/.conflict-base-0/PWGUD/Tasks/exclusiveTwoProtonsSG.cxx b/.conflict-base-0/PWGUD/Tasks/exclusiveTwoProtonsSG.cxx
index 0ac54805c69..539ed887676 100644
--- a/.conflict-base-0/PWGUD/Tasks/exclusiveTwoProtonsSG.cxx
+++ b/.conflict-base-0/PWGUD/Tasks/exclusiveTwoProtonsSG.cxx
@@ -8,15 +8,19 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include <iostream>
+#include "PWGUD/Core/SGSelector.h"
 #include "PWGUD/DataModel/UDTables.h"
-#include <TString.h>
-#include "TLorentzVector.h"
+
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/Core/SGSelector.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TLorentzVector.h"
+#include <TString.h>
+
+#include <iostream>
 using std::array;
 using namespace std;
 using namespace o2;
diff --git a/.conflict-base-0/PWGUD/Tasks/flowCumulantsUpc.cxx b/.conflict-base-0/PWGUD/Tasks/flowCumulantsUpc.cxx
index 155a398cd44..9300fb8d2dd 100644
--- a/.conflict-base-0/PWGUD/Tasks/flowCumulantsUpc.cxx
+++ b/.conflict-base-0/PWGUD/Tasks/flowCumulantsUpc.cxx
@@ -14,42 +14,44 @@
 /// \since  Mar/2025
 /// \brief  jira: , task to measure flow observables with cumulant method
 
-#include <CCDB/BasicCCDBManager.h>
-#include <cmath>
-#include <vector>
-#include <array>
-#include <unordered_map>
-#include <string>
-#include <memory>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/HistogramRegistry.h"
+#include "FlowContainer.h"
+#include "GFW.h"
+#include "GFWCumulant.h"
+#include "GFWPowerArray.h"
+#include "GFWWeights.h"
 
-#include "Common/DataModel/EventSelection.h"
+#include "PWGUD/Core/SGSelector.h"
+#include "PWGUD/DataModel/UDTables.h"
+
+#include "Common/CCDB/ctpRateFetcher.h"
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/CCDB/ctpRateFetcher.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/SGSelector.h"
-#include "TVector3.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include <CCDB/BasicCCDBManager.h>
 
-#include "GFWPowerArray.h"
-#include "GFW.h"
-#include "GFWCumulant.h"
-#include "GFWWeights.h"
-#include "FlowContainer.h"
 #include "TList.h"
+#include "TVector3.h"
+#include <TF1.h>
+#include <TObjArray.h>
 #include <TProfile.h>
 #include <TRandom3.h>
-#include <TObjArray.h>
-#include <TF1.h>
+
+#include <array>
+#include <cmath>
+#include <memory>
+#include <string>
+#include <unordered_map>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGUD/Tasks/polarisationRho.cxx b/.conflict-base-0/PWGUD/Tasks/polarisationRho.cxx
index c10e86baad6..3693acbfe2a 100644
--- a/.conflict-base-0/PWGUD/Tasks/polarisationRho.cxx
+++ b/.conflict-base-0/PWGUD/Tasks/polarisationRho.cxx
@@ -8,13 +8,16 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include <iostream>
 #include "PWGUD/DataModel/UDTables.h"
-#include <TString.h>
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TLorentzVector.h"
+#include <TString.h>
+
+#include <iostream>
 using namespace std;
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-base-0/PWGUD/Tasks/sgD0Analyzer.cxx b/.conflict-base-0/PWGUD/Tasks/sgD0Analyzer.cxx
index 58b01cbe281..229b6f09a4a 100644
--- a/.conflict-base-0/PWGUD/Tasks/sgD0Analyzer.cxx
+++ b/.conflict-base-0/PWGUD/Tasks/sgD0Analyzer.cxx
@@ -13,17 +13,21 @@
 // \author Sasha Bylinkin, alexander.bylinkin@gmail.com
 // \since  April 2023
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include <iostream>
-#include "PWGUD/DataModel/UDTables.h"
 #include "PWGUD/Core/SGSelector.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "PWGUD/Core/SGTrackSelector.h"
-#include <TString.h>
+#include "PWGUD/DataModel/UDTables.h"
+
+#include "Common/DataModel/PIDResponse.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TLorentzVector.h"
+#include <TString.h>
+
+#include <iostream>
 using namespace std;
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-base-0/PWGUD/Tasks/sgExcUniverse.cxx b/.conflict-base-0/PWGUD/Tasks/sgExcUniverse.cxx
index f7dd3691c25..47369db47cc 100644
--- a/.conflict-base-0/PWGUD/Tasks/sgExcUniverse.cxx
+++ b/.conflict-base-0/PWGUD/Tasks/sgExcUniverse.cxx
@@ -13,17 +13,19 @@
 // \author Sasha Bylinkin, alexander.bylinkin@gmail.com
 // \since  April 2023
 
-#include "Framework/runDataProcessing.h"
+#include "PWGUD/Core/SGSelector.h"
+#include "PWGUD/Core/SGTrackSelector.h"
+#include "PWGUD/Core/UDHelpers.h"
+#include "PWGUD/DataModel/UDTables.h"
+
+#include "Common/DataModel/PIDResponse.h"
+
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
-#include "TVector3.h"
-#include "TTree.h"
 #include "TFile.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/UDHelpers.h"
-#include "PWGUD/Core/SGSelector.h"
-#include "PWGUD/Core/SGTrackSelector.h"
+#include "TTree.h"
+#include "TVector3.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGUD/Tasks/sgExclOmega.cxx b/.conflict-base-0/PWGUD/Tasks/sgExclOmega.cxx
index 0a816e1dc0e..4a3cf48490f 100644
--- a/.conflict-base-0/PWGUD/Tasks/sgExclOmega.cxx
+++ b/.conflict-base-0/PWGUD/Tasks/sgExclOmega.cxx
@@ -13,17 +13,21 @@
 // \author Sasha Bylinkin, alexander.bylinkin@gmail.com
 // \since  April 2023
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include <iostream>
-#include "PWGUD/DataModel/UDTables.h"
 #include "PWGUD/Core/SGSelector.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "PWGUD/Core/SGTrackSelector.h"
-#include <TString.h>
+#include "PWGUD/DataModel/UDTables.h"
+
+#include "Common/DataModel/PIDResponse.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TLorentzVector.h"
+#include <TString.h>
+
+#include <iostream>
 using namespace std;
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-base-0/PWGUD/Tasks/sgExclusivePhi.cxx b/.conflict-base-0/PWGUD/Tasks/sgExclusivePhi.cxx
index df10373e571..9bea84b6ae4 100644
--- a/.conflict-base-0/PWGUD/Tasks/sgExclusivePhi.cxx
+++ b/.conflict-base-0/PWGUD/Tasks/sgExclusivePhi.cxx
@@ -9,16 +9,20 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 //
-#include <vector>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include <iostream>
+#include "PWGUD/Core/SGSelector.h"
 #include "PWGUD/DataModel/UDTables.h"
-#include <TString.h>
-#include "TLorentzVector.h"
+
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/Core/SGSelector.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TLorentzVector.h"
+#include <TString.h>
+
+#include <iostream>
+#include <vector>
 
 using std::array;
 using namespace std;
@@ -655,7 +659,7 @@ struct sgExclusivePhi {
             }
           }
         } // end of two tracks only loop
-      }   // vertex cut
+      } // vertex cut
 
       if (allTracksAreKaonsBandPID.size() == 2) {
 
@@ -731,8 +735,8 @@ struct sgExclusivePhi {
           }
         }
       } // Kaon Band
-    }   // double gap
-  }     // end of process
+    } // double gap
+  } // end of process
 
 }; // end of struct
 
diff --git a/.conflict-base-0/PWGUD/Tasks/sgExclusivePhiITSselections.cxx b/.conflict-base-0/PWGUD/Tasks/sgExclusivePhiITSselections.cxx
index 2d8bc72c0f6..6a70d8f3a1d 100644
--- a/.conflict-base-0/PWGUD/Tasks/sgExclusivePhiITSselections.cxx
+++ b/.conflict-base-0/PWGUD/Tasks/sgExclusivePhiITSselections.cxx
@@ -9,16 +9,20 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 //
-#include <vector>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include <iostream>
+#include "PWGUD/Core/SGSelector.h"
 #include "PWGUD/DataModel/UDTables.h"
-#include <TString.h>
-#include "TLorentzVector.h"
+
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/Core/SGSelector.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TLorentzVector.h"
+#include <TString.h>
+
+#include <iostream>
+#include <vector>
 
 using std::array;
 using namespace std;
@@ -298,7 +302,7 @@ struct sgExclusivePhiITSselections {
             }
           }
         } // Mass cut
-      }   // end of two tracks only loop
+      } // end of two tracks only loop
 
       if (allTracksAreKaonsBandPID.size() == 2) {
         registry.fill(HIST("hTracksKaons"), allTracksAreKaonsBandPID.size() + 10);
@@ -357,7 +361,7 @@ struct sgExclusivePhiITSselections {
       } // Kaon Band
 
     } // double gap
-  }   // end of process
+  } // end of process
 
   void processSG(UDCollisionsFull::iterator const& collision, udtracksfull const& tracks)
   // process function subscribing to SG data
diff --git a/.conflict-base-0/PWGUD/Tasks/sgFITAnalyzer.cxx b/.conflict-base-0/PWGUD/Tasks/sgFITAnalyzer.cxx
index 73d42421b87..58889965136 100644
--- a/.conflict-base-0/PWGUD/Tasks/sgFITAnalyzer.cxx
+++ b/.conflict-base-0/PWGUD/Tasks/sgFITAnalyzer.cxx
@@ -13,18 +13,20 @@
 // \author Sasha Bylinkin, alexander.bylinkin@gmail.com
 // \since  April 2023
 
-#include "Framework/runDataProcessing.h"
+#include "PWGUD/Core/SGSelector.h"
+#include "PWGUD/Core/SGTrackSelector.h"
+#include "PWGUD/Core/UDHelpers.h"
+#include "PWGUD/DataModel/UDTables.h"
+
+#include "Common/DataModel/PIDResponse.h"
+
 #include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 
-#include "TVector3.h"
-#include "TTree.h"
 #include "TFile.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/UDHelpers.h"
-#include "PWGUD/Core/SGSelector.h"
-#include "PWGUD/Core/SGTrackSelector.h"
+#include "TTree.h"
+#include "TVector3.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGUD/Tasks/sgFourPiAnalyzer.cxx b/.conflict-base-0/PWGUD/Tasks/sgFourPiAnalyzer.cxx
index 6a6abfc4628..49f9fd42c38 100644
--- a/.conflict-base-0/PWGUD/Tasks/sgFourPiAnalyzer.cxx
+++ b/.conflict-base-0/PWGUD/Tasks/sgFourPiAnalyzer.cxx
@@ -13,21 +13,25 @@
 // \author Sasha Bylinkin, alexander.bylinkin@gmail.com
 // \since  April 2023
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include <iostream>
-#include "PWGUD/DataModel/UDTables.h"
 #include "PWGUD/Core/SGSelector.h"
 #include "PWGUD/Core/SGTrackSelector.h"
+#include "PWGUD/DataModel/UDTables.h"
+
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/DataTypes.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 #include "MathUtils/Utils.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include <TString.h>
+
 #include "TLorentzVector.h"
+#include <TString.h>
+
+#include <iostream>
 using namespace std;
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-base-0/PWGUD/Tasks/sgInclJpsi.cxx b/.conflict-base-0/PWGUD/Tasks/sgInclJpsi.cxx
index f5001af7c10..013a97cc20f 100644
--- a/.conflict-base-0/PWGUD/Tasks/sgInclJpsi.cxx
+++ b/.conflict-base-0/PWGUD/Tasks/sgInclJpsi.cxx
@@ -13,17 +13,21 @@
 // \author Sasha Bylinkin, alexander.bylinkin@gmail.com
 // \since  April 2023
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include <iostream>
-#include "PWGUD/DataModel/UDTables.h"
 #include "PWGUD/Core/SGSelector.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "PWGUD/Core/SGTrackSelector.h"
-#include <TString.h>
+#include "PWGUD/DataModel/UDTables.h"
+
+#include "Common/DataModel/PIDResponse.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TLorentzVector.h"
+#include <TString.h>
+
+#include <iostream>
 using namespace std;
 using namespace o2;
 using namespace o2::aod;
@@ -297,7 +301,7 @@ struct SGInclJpsi {
             registry.fill(HIST("sss_Ntr_mm_invm_3"), tracks.size(), v01.M(), -1);
             registry.fill(HIST("sss_mm_pt_invm_3"), v01.Pt(), v01.M(), -1);
           }
-      }
+        }
       }
       if (selectionPIDElec(t0, use_tof, nsigmatpc_cut, nsigmatof_cut) && selectionPIDElec(t1, use_tof, nsigmatpc_cut, nsigmatof_cut)) {
         // Apply pion hypothesis and create pairs
diff --git a/.conflict-base-0/PWGUD/Tasks/sgPIDAnalyzer.cxx b/.conflict-base-0/PWGUD/Tasks/sgPIDAnalyzer.cxx
index e4015417971..5edef2f187d 100644
--- a/.conflict-base-0/PWGUD/Tasks/sgPIDAnalyzer.cxx
+++ b/.conflict-base-0/PWGUD/Tasks/sgPIDAnalyzer.cxx
@@ -13,19 +13,21 @@
 // \author Sasha Bylinkin, alexander.bylinkin@gmail.com
 // \since  April 2023
 
-#include "Framework/runDataProcessing.h"
+#include "PWGUD/Core/SGSelector.h"
+#include "PWGUD/Core/SGTrackSelector.h"
+#include "PWGUD/Core/UDHelpers.h"
+#include "PWGUD/DataModel/SGTables.h"
+
+#include "Common/DataModel/PIDResponse.h"
+
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
-#include "TVector3.h"
-#include "TTree.h"
 #include "TFile.h"
+#include "TTree.h"
+#include "TVector3.h"
 #include <TH1F.h>
 #include <TH2F.h>
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/DataModel/SGTables.h"
-#include "PWGUD/Core/UDHelpers.h"
-#include "PWGUD/Core/SGSelector.h"
-#include "PWGUD/Core/SGTrackSelector.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGUD/Tasks/sgPIDSpectra.cxx b/.conflict-base-0/PWGUD/Tasks/sgPIDSpectra.cxx
index 7ecea94c66d..b873d37198d 100644
--- a/.conflict-base-0/PWGUD/Tasks/sgPIDSpectra.cxx
+++ b/.conflict-base-0/PWGUD/Tasks/sgPIDSpectra.cxx
@@ -13,17 +13,19 @@
 // \author Sasha Bylinkin, alexander.bylinkin@gmail.com
 // \since  April 2023
 
-#include "Framework/runDataProcessing.h"
+#include "PWGUD/Core/SGSelector.h"
+#include "PWGUD/Core/SGTrackSelector.h"
+#include "PWGUD/Core/UDHelpers.h"
+#include "PWGUD/DataModel/UDTables.h"
+
+#include "Common/DataModel/PIDResponse.h"
+
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
-#include "TVector3.h"
-#include "TTree.h"
 #include "TFile.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/UDHelpers.h"
-#include "PWGUD/Core/SGSelector.h"
-#include "PWGUD/Core/SGTrackSelector.h"
+#include "TTree.h"
+#include "TVector3.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGUD/Tasks/sgPIDSpectraTable.cxx b/.conflict-base-0/PWGUD/Tasks/sgPIDSpectraTable.cxx
index 9a370403a6b..f6c608a1881 100644
--- a/.conflict-base-0/PWGUD/Tasks/sgPIDSpectraTable.cxx
+++ b/.conflict-base-0/PWGUD/Tasks/sgPIDSpectraTable.cxx
@@ -12,19 +12,22 @@
 // \Single Gap Event Analyzer
 // \author Sasha Bylinkin, alexander.bylinkin@gmail.com
 // \since  April 2023
-#include <vector>
-#include "Framework/runDataProcessing.h"
+#include "PWGUD/Core/SGSelector.h"
+#include "PWGUD/Core/SGTrackSelector.h"
+#include "PWGUD/Core/UDHelpers.h"
+#include "PWGUD/DataModel/SGTables.h"
+#include "PWGUD/DataModel/UDTables.h"
+
+#include "Common/DataModel/PIDResponse.h"
+
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
-#include "TVector3.h"
-#include "TTree.h"
 #include "TFile.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/DataModel/SGTables.h"
-#include "PWGUD/Core/UDHelpers.h"
-#include "PWGUD/Core/SGSelector.h"
-#include "PWGUD/Core/SGTrackSelector.h"
+#include "TTree.h"
+#include "TVector3.h"
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGUD/Tasks/sgSixPiAnalyzer.cxx b/.conflict-base-0/PWGUD/Tasks/sgSixPiAnalyzer.cxx
index c3561ad7026..888b4325a61 100644
--- a/.conflict-base-0/PWGUD/Tasks/sgSixPiAnalyzer.cxx
+++ b/.conflict-base-0/PWGUD/Tasks/sgSixPiAnalyzer.cxx
@@ -13,22 +13,25 @@
 // \author Sasha Bylinkin, alexander.bylinkin@gmail.com
 // \since  April 2023
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include <iostream>
-#include "PWGUD/DataModel/UDTables.h"
 #include "PWGUD/Core/SGSelector.h"
 #include "PWGUD/Core/SGTrackSelector.h"
+#include "PWGUD/DataModel/UDTables.h"
+
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/DataTypes.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 #include "MathUtils/Utils.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 
-#include <TString.h>
 #include "TLorentzVector.h"
+#include <TString.h>
+
+#include <iostream>
 using namespace std;
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-base-0/PWGUD/Tasks/sgSpectraAnalyzer.cxx b/.conflict-base-0/PWGUD/Tasks/sgSpectraAnalyzer.cxx
index afd766e0992..17bd0d6db03 100644
--- a/.conflict-base-0/PWGUD/Tasks/sgSpectraAnalyzer.cxx
+++ b/.conflict-base-0/PWGUD/Tasks/sgSpectraAnalyzer.cxx
@@ -13,18 +13,20 @@
 // \author Sasha Bylinkin, alexander.bylinkin@gmail.com
 // \since  April 2023
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
+#include "PWGUD/Core/SGSelector.h"
+#include "PWGUD/Core/SGTrackSelector.h"
+#include "PWGUD/DataModel/UDTables.h"
+
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
 #include <iostream>
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/SGSelector.h"
-#include "PWGUD/Core/SGTrackSelector.h"
-//#include "Common/DataModel/PIDResponse.h"
-//#include "PWGUD/Core/RLhelper.h"
-#include <TString.h>
+// #include "Common/DataModel/PIDResponse.h"
+// #include "PWGUD/Core/RLhelper.h"
 #include "TLorentzVector.h"
+#include <TString.h>
 using namespace std;
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-base-0/PWGUD/Tasks/sgTwoPiAnalyzer.cxx b/.conflict-base-0/PWGUD/Tasks/sgTwoPiAnalyzer.cxx
index e1568bb1838..a7763f614cc 100644
--- a/.conflict-base-0/PWGUD/Tasks/sgTwoPiAnalyzer.cxx
+++ b/.conflict-base-0/PWGUD/Tasks/sgTwoPiAnalyzer.cxx
@@ -13,22 +13,25 @@
 // \author Sasha Bylinkin, alexander.bylinkin@gmail.com
 // \since  April 2023
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include <iostream>
-#include "PWGUD/DataModel/UDTables.h"
 #include "PWGUD/Core/SGSelector.h"
 #include "PWGUD/Core/SGTrackSelector.h"
+#include "PWGUD/DataModel/UDTables.h"
+
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/DataTypes.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 #include "MathUtils/Utils.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 
-#include <TString.h>
 #include "TLorentzVector.h"
+#include <TString.h>
+
+#include <iostream>
 using namespace std;
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-base-0/PWGUD/Tasks/sginclusivePhiKstarSD.cxx b/.conflict-base-0/PWGUD/Tasks/sginclusivePhiKstarSD.cxx
index 628818bd553..c92293b2275 100644
--- a/.conflict-base-0/PWGUD/Tasks/sginclusivePhiKstarSD.cxx
+++ b/.conflict-base-0/PWGUD/Tasks/sginclusivePhiKstarSD.cxx
@@ -14,29 +14,30 @@
 /// \author Sandeep Dudi, sandeep.dudi3@gmail.com
 /// \since  May 2024
 
-#include <cstdlib>
-#include <vector>
-#include <TString.h>
-#include <TMath.h>
-#include "Math/Vector4D.h"
-#include "Math/Vector3D.h"
-#include "Math/GenVector/Boost.h"
-#include "TPDGCode.h"
+#include "PWGUD/Core/SGSelector.h"
+#include "PWGUD/Core/SGTrackSelector.h"
+#include "PWGUD/Core/UPCHelpers.h"
+#include "PWGUD/DataModel/UDTables.h"
+
+#include "Common/DataModel/PIDResponse.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoA.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Vertex.h"
 
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/SGSelector.h"
-#include "PWGUD/Core/SGTrackSelector.h"
-#include "PWGUD/Core/UPCHelpers.h"
+#include "Math/GenVector/Boost.h"
+#include "Math/Vector3D.h"
+#include "Math/Vector4D.h"
+#include "TPDGCode.h"
+#include <TMath.h>
+#include <TString.h>
 
-#include "Common/DataModel/PIDResponse.h"
+#include <cstdlib>
+#include <vector>
 
 using namespace std;
 using namespace o2;
diff --git a/.conflict-base-0/PWGUD/Tasks/upcAnalysis.cxx b/.conflict-base-0/PWGUD/Tasks/upcAnalysis.cxx
index 74a007314e0..533e9bbeb32 100644
--- a/.conflict-base-0/PWGUD/Tasks/upcAnalysis.cxx
+++ b/.conflict-base-0/PWGUD/Tasks/upcAnalysis.cxx
@@ -9,16 +9,16 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TLorentzVector.h"
 #include <TH1D.h>
 #include <TH2D.h>
-#include "TLorentzVector.h"
 
 using namespace o2;
 using namespace o2::aod::evsel;
diff --git a/.conflict-base-0/PWGUD/Tasks/upcCandidateAnalyzer.cxx b/.conflict-base-0/PWGUD/Tasks/upcCandidateAnalyzer.cxx
index 568ecacb872..d07f76c22ee 100644
--- a/.conflict-base-0/PWGUD/Tasks/upcCandidateAnalyzer.cxx
+++ b/.conflict-base-0/PWGUD/Tasks/upcCandidateAnalyzer.cxx
@@ -9,11 +9,12 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "PWGUD/DataModel/UDTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TLorentzVector.h"
 
 using namespace o2;
diff --git a/.conflict-base-0/PWGUD/Tasks/upcCandidateProducerQa.cpp b/.conflict-base-0/PWGUD/Tasks/upcCandidateProducerQa.cpp
index 29accce2fe4..e697941c115 100644
--- a/.conflict-base-0/PWGUD/Tasks/upcCandidateProducerQa.cpp
+++ b/.conflict-base-0/PWGUD/Tasks/upcCandidateProducerQa.cpp
@@ -9,16 +9,18 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Common/CCDB/EventSelectionParams.h"
-#include "Common/DataModel/EventSelection.h"
-#include "CommonConstants/LHCConstants.h"
 #include "PWGUD/Core/UPCCutparHolder.h"
 #include "PWGUD/Core/UPCHelpers.h"
 #include "PWGUD/DataModel/UDTables.h"
 
+#include "Common/CCDB/EventSelectionParams.h"
+#include "Common/DataModel/EventSelection.h"
+
+#include "CommonConstants/LHCConstants.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2::framework;
 using namespace o2::framework::expressions;
 
diff --git a/.conflict-base-0/PWGUD/Tasks/upcEventITSROFcounter.cxx b/.conflict-base-0/PWGUD/Tasks/upcEventITSROFcounter.cxx
index 51241be5d69..7156c8038e0 100644
--- a/.conflict-base-0/PWGUD/Tasks/upcEventITSROFcounter.cxx
+++ b/.conflict-base-0/PWGUD/Tasks/upcEventITSROFcounter.cxx
@@ -15,24 +15,24 @@
 /// \author Roman Lavicka <roman.lavicka@cern.ch>, Austrian Academy of Sciences & SMI
 /// \since  09.08.2024
 
-#include <utility>
-#include <vector>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "ITSMFTBase/DPLAlpideParam.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "ReconstructionDataFormats/Vertex.h"
+#include "PWGUD/Core/SGSelector.h"
+#include "PWGUD/DataModel/UDTables.h"
 
 #include "Common/CCDB/EventSelectionParams.h"
 #include "Common/DataModel/EventSelection.h"
 
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/SGSelector.h"
+#include "CCDB/BasicCCDBManager.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ITSMFTBase/DPLAlpideParam.h"
+#include "ReconstructionDataFormats/Vertex.h"
 
 #include <TH1D.h>
 
+#include <utility>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-base-0/PWGUD/Tasks/upcForward.cxx b/.conflict-base-0/PWGUD/Tasks/upcForward.cxx
index bebcf0b2be2..16571bc28ac 100644
--- a/.conflict-base-0/PWGUD/Tasks/upcForward.cxx
+++ b/.conflict-base-0/PWGUD/Tasks/upcForward.cxx
@@ -14,16 +14,19 @@ o2-analysis-timestamp| o2-analysis-upc-forward | o2-analysis-event-selection  --
 for now AO2D.root I am using is
 alien:///alice/data/2015/LHC15o/000246392/pass5_lowIR/PWGZZ/Run3_Conversion/148_20210304-0829_child_1/AOD/001/AO2D.root
 */
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "Common/CCDB/TriggerAliases.h"
 #include "Common/DataModel/EventSelection.h"
-#include <iostream>
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TLorentzVector.h"
 #include <TH1D.h>
 #include <TH2D.h>
 #include <TString.h>
-#include "TLorentzVector.h"
-#include "Common/CCDB/TriggerAliases.h"
+
+#include <iostream>
 
 using namespace std;
 using namespace o2;
diff --git a/.conflict-base-0/PWGUD/Tasks/upcJpsiCorr.cxx b/.conflict-base-0/PWGUD/Tasks/upcJpsiCorr.cxx
index 8db8746b99d..9ec14bdf12a 100644
--- a/.conflict-base-0/PWGUD/Tasks/upcJpsiCorr.cxx
+++ b/.conflict-base-0/PWGUD/Tasks/upcJpsiCorr.cxx
@@ -15,22 +15,23 @@
 /// \author Sara Haidlova, sara.haidlova@cern.ch
 /// \since March 2024
 
-#include <vector>
 #include <utility>
+#include <vector>
 
 // O2 headers
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "CommonConstants/MathConstants.h"
 #include "CommonConstants/PhysicsConstants.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 // O2Physics headers
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/RecoDecay.h"
-#include "PWGUD/DataModel/UDTables.h"
+#include "PWGUD/Core/SGSelector.h"
 #include "PWGUD/Core/UDHelpers.h"
 #include "PWGUD/Core/UPCJpsiCentralBarrelCorrHelper.h"
-#include "PWGUD/Core/SGSelector.h"
+#include "PWGUD/DataModel/UDTables.h"
+
+#include "Common/Core/RecoDecay.h"
+#include "Common/DataModel/PIDResponse.h"
 
 // ROOT headers
 #include "TLorentzVector.h"
diff --git a/.conflict-base-0/PWGUD/Tasks/upcMft.cxx b/.conflict-base-0/PWGUD/Tasks/upcMft.cxx
index a3ae2b03287..168f9c47f96 100644
--- a/.conflict-base-0/PWGUD/Tasks/upcMft.cxx
+++ b/.conflict-base-0/PWGUD/Tasks/upcMft.cxx
@@ -13,27 +13,28 @@
 #include <iostream>
 
 // root headers
+#include "TLorentzVector.h"
+#include "TMath.h"
 #include <TH1F.h>
 #include <TH2F.h>
-#include "TMath.h"
-#include "TLorentzVector.h"
 
 // framework headers
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 // for track propagation
-#include "ReconstructionDataFormats/TrackFwd.h"
-#include "Math/MatrixFunctions.h"
-#include "Math/SMatrix.h"
-#include "MathUtils/Utils.h"
 #include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsMFT/TrackMFT.h"
 #include "DataFormatsParameters/GRPMagField.h"
 #include "DetectorsBase/Propagator.h"
-#include "TGeoGlobalMagField.h"
 #include "Field/MagneticField.h"
-#include "DataFormatsMFT/TrackMFT.h"
+#include "MathUtils/Utils.h"
+#include "ReconstructionDataFormats/TrackFwd.h"
+
+#include "Math/MatrixFunctions.h"
+#include "Math/SMatrix.h"
+#include "TGeoGlobalMagField.h"
 
 // define namespaces
 using namespace o2;
diff --git a/.conflict-base-0/PWGUD/Tasks/upcPhotonuclearAnalysisJMG.cxx b/.conflict-base-0/PWGUD/Tasks/upcPhotonuclearAnalysisJMG.cxx
index d20a78429dd..7d474f26513 100644
--- a/.conflict-base-0/PWGUD/Tasks/upcPhotonuclearAnalysisJMG.cxx
+++ b/.conflict-base-0/PWGUD/Tasks/upcPhotonuclearAnalysisJMG.cxx
@@ -13,15 +13,10 @@
 /// \author Josué Martínez García, josuem@cern.ch
 /// \file   upcPhotonuclearAnalysisJMG.cxx
 
-#include <vector>
-
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "Framework/StepTHn.h"
-#include "CommonConstants/MathConstants.h"
-#include <TTree.h>
+#include "PWGCF/Core/CorrelationContainer.h"
+#include "PWGUD/Core/UPCPairCuts.h"
+#include "PWGUD/Core/UPCTauCentralBarrelHelperRL.h"
+#include "PWGUD/DataModel/UDTables.h"
 
 #include "Common/CCDB/EventSelectionParams.h"
 #include "Common/Core/TrackSelection.h"
@@ -29,12 +24,18 @@
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "PWGCF/Core/CorrelationContainer.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonConstants/MathConstants.h"
 #include "DataFormatsParameters/GRPObject.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
 
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/UPCPairCuts.h"
-#include "PWGUD/Core/UPCTauCentralBarrelHelperRL.h"
+#include <TTree.h>
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGUD/Tasks/upcPionAnalysis.cxx b/.conflict-base-0/PWGUD/Tasks/upcPionAnalysis.cxx
index fc215ea1822..4d581d5548c 100644
--- a/.conflict-base-0/PWGUD/Tasks/upcPionAnalysis.cxx
+++ b/.conflict-base-0/PWGUD/Tasks/upcPionAnalysis.cxx
@@ -9,18 +9,22 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 //
-#include <vector>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include <iostream>
-#include "PWGUD/DataModel/UDTables.h"
-#include <TString.h>
-#include <TTree.h>
-#include "TLorentzVector.h"
 #include "PWGUD/Core/SGSelector.h"
 #include "PWGUD/Core/SGTrackSelector.h"
+#include "PWGUD/DataModel/UDTables.h"
+
 #include "Common/Core/RecoDecay.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TLorentzVector.h"
+#include <TString.h>
+#include <TTree.h>
+
+#include <iostream>
+#include <vector>
 using namespace std;
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-base-0/PWGUD/Tasks/upcQuarkoniaCentralBarrel.cxx b/.conflict-base-0/PWGUD/Tasks/upcQuarkoniaCentralBarrel.cxx
index f195a750fa4..d029f336604 100644
--- a/.conflict-base-0/PWGUD/Tasks/upcQuarkoniaCentralBarrel.cxx
+++ b/.conflict-base-0/PWGUD/Tasks/upcQuarkoniaCentralBarrel.cxx
@@ -30,40 +30,41 @@
 //    david.dobrigkeit.chinellato@cern.ch
 //
 
-#include <Math/Vector4D.h>
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <map>
-#include <string>
-#include <vector>
-
-#include <TFile.h>
-#include <TH2F.h>
-#include <TProfile.h>
-#include <TLorentzVector.h>
-#include <TPDGCode.h>
+#include "PWGUD/Core/SGSelector.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/trackUtilities.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/Core/SGSelector.h"
-
+#include "Common/DataModel/TrackSelectionTables.h"
 #include "EventFiltering/Zorro.h"
 #include "EventFiltering/ZorroSummary.h"
 
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <Math/Vector4D.h>
+#include <TFile.h>
+#include <TH2F.h>
+#include <TLorentzVector.h>
+#include <TPDGCode.h>
+#include <TProfile.h>
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <map>
+#include <string>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-base-0/PWGUD/Tasks/upcRhoPrimeAnalysis.cxx b/.conflict-base-0/PWGUD/Tasks/upcRhoPrimeAnalysis.cxx
index d4048806854..6cb00abe79a 100644
--- a/.conflict-base-0/PWGUD/Tasks/upcRhoPrimeAnalysis.cxx
+++ b/.conflict-base-0/PWGUD/Tasks/upcRhoPrimeAnalysis.cxx
@@ -12,20 +12,20 @@
 /// \brief  Task for analysis of rho' in UPCs using UD tables (from SG producer).
 /// \author Cesar Ramirez, cesar.ramirez@cern.ch
 
-#include <string> // Para std::string
-#include <vector> // Para std::vector
+#include "PWGUD/Core/UPCTauCentralBarrelHelperRL.h"
+#include "PWGUD/DataModel/UDTables.h"
+
+#include "Common/DataModel/PIDResponse.h"
 
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
 
 #include "Math/Vector4D.h" // similiar to TLorentzVector (which is now legacy apparently)
-#include <random>
-
-#include "Common/DataModel/PIDResponse.h"
 
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/UPCTauCentralBarrelHelperRL.h"
+#include <random>
+#include <string> // Para std::string
+#include <vector> // Para std::vector
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/PWGUD/Tasks/upcTauRl.cxx b/.conflict-base-0/PWGUD/Tasks/upcTauRl.cxx
index c0684cec14b..8f723ac30e8 100644
--- a/.conflict-base-0/PWGUD/Tasks/upcTauRl.cxx
+++ b/.conflict-base-0/PWGUD/Tasks/upcTauRl.cxx
@@ -17,20 +17,24 @@
 //
 
 // C++ headers
+#include <algorithm>
+#include <random>
 #include <set>
 #include <utility>
-#include <algorithm>
 #include <vector>
-#include <random>
 
 // O2 headers
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/runDataProcessing.h"
 
 // O2Physics headers
+#include "PWGUD/Core/SGSelector.h"
+#include "PWGUD/Core/UPCTauCentralBarrelHelperRL.h"
+#include "PWGUD/DataModel/UDTables.h"
+
 #include "Common/CCDB/EventSelectionParams.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
@@ -38,9 +42,6 @@
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "PWGUD/Core/UPCTauCentralBarrelHelperRL.h"
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/SGSelector.h"
 
 // ROOT headers
 #include "Math/Vector4D.h"
diff --git a/.conflict-base-0/PWGUD/Tasks/upcTauTau13topo.cxx b/.conflict-base-0/PWGUD/Tasks/upcTauTau13topo.cxx
index 0d18b316b8b..e4e433ec883 100644
--- a/.conflict-base-0/PWGUD/Tasks/upcTauTau13topo.cxx
+++ b/.conflict-base-0/PWGUD/Tasks/upcTauTau13topo.cxx
@@ -17,9 +17,9 @@
 // copts="--configuration json://tautauConfig.json -b"
 // o2-analysis-ud-tautau13topo $copts > output.log
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 // #include "TDatabasePDG.h" // not recommended in o2
 #include "Framework/O2DatabasePDGPlugin.h"
@@ -28,13 +28,13 @@
 // #include "Common/DataModel/EventSelection.h"
 // #include "Common/DataModel/TrackSelectionTables.h"
 
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/UDHelpers.h"
 #include "PWGUD/Core/DGPIDSelector.h"
 #include "PWGUD/Core/SGSelector.h"
+#include "PWGUD/Core/UDHelpers.h"
+#include "PWGUD/DataModel/UDTables.h"
 
 #include "Common/Core/RecoDecay.h"
+#include "Common/DataModel/PIDResponse.h"
 // #include <CommonUtils/EnumFlags.h>
 #include "TPDGCode.h"
 
diff --git a/.conflict-base-0/PWGUD/Tasks/upcVetoAnalysis.cxx b/.conflict-base-0/PWGUD/Tasks/upcVetoAnalysis.cxx
index 45b3844ed51..84d73774439 100644
--- a/.conflict-base-0/PWGUD/Tasks/upcVetoAnalysis.cxx
+++ b/.conflict-base-0/PWGUD/Tasks/upcVetoAnalysis.cxx
@@ -8,21 +8,21 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include <map>
-#include <string>
-#include <unordered_set>
-#include <vector>
-#include <unordered_map>
-#include <memory>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-
 #include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/LHCConstants.h"
 #include "DataFormatsFIT/Triggers.h"
-#include "DataFormatsParameters/GRPLHCIFData.h"
 #include "DataFormatsParameters/GRPECSObject.h"
+#include "DataFormatsParameters/GRPLHCIFData.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include <map>
+#include <memory>
+#include <string>
+#include <unordered_map>
+#include <unordered_set>
+#include <vector>
 
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-base-0/Tools/KFparticle/qaKFEventTrack.cxx b/.conflict-base-0/Tools/KFparticle/qaKFEventTrack.cxx
index f3f026a8da7..ccadf3f60af 100644
--- a/.conflict-base-0/Tools/KFparticle/qaKFEventTrack.cxx
+++ b/.conflict-base-0/Tools/KFparticle/qaKFEventTrack.cxx
@@ -16,37 +16,40 @@
 ///
 
 #include "Tools/KFparticle/qaKFEventTrack.h"
-#include <CCDB/BasicCCDBManager.h>
-#include <string>
+
 #include "TableHelper.h"
+
+#include <CCDB/BasicCCDBManager.h>
+
 #include <iostream>
+#include <string>
 using namespace std;
 
 /// includes O2
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/DCA.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DetectorsBase/Propagator.h"
 
 /// includes O2Physics
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/Core/trackUtilities.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 #include "Tools/KFparticle/KFUtilities.h"
 
 /// includes KFParticle
-#include "KFParticle.h"
 #include "KFPTrack.h"
 #include "KFPVertex.h"
+#include "KFParticle.h"
 #include "KFParticleBase.h"
 #include "KFVertex.h"
 
diff --git a/.conflict-base-0/Tools/KFparticle/qaKFEventTrack.h b/.conflict-base-0/Tools/KFparticle/qaKFEventTrack.h
index 399a3139a91..3ded6f627ea 100644
--- a/.conflict-base-0/Tools/KFparticle/qaKFEventTrack.h
+++ b/.conflict-base-0/Tools/KFparticle/qaKFEventTrack.h
@@ -15,10 +15,11 @@
 #ifndef TOOLS_KFPARTICLE_QAKFEVENTTRACK_H_
 #define TOOLS_KFPARTICLE_QAKFEVENTTRACK_H_
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Common/Core/trackUtilities.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+
 enum FlagsTracks {
   kITS = BIT(0),
   kTPC = BIT(1),
diff --git a/.conflict-base-0/Tools/KFparticle/qaKFParticle.cxx b/.conflict-base-0/Tools/KFparticle/qaKFParticle.cxx
index f4ffdf58a85..a0886d647d9 100644
--- a/.conflict-base-0/Tools/KFparticle/qaKFParticle.cxx
+++ b/.conflict-base-0/Tools/KFparticle/qaKFParticle.cxx
@@ -16,38 +16,42 @@
 ///
 
 #include "Tools/KFparticle/qaKFParticle.h"
+
+#include "TableHelper.h"
+
 #include <CCDB/BasicCCDBManager.h>
-#include <string>
+
 #include <TDatabasePDG.h>
 #include <TPDGCode.h>
-#include "TableHelper.h"
+
+#include <string>
 
 /// includes O2
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/DCA.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DetectorsBase/Propagator.h"
 
 /// includes O2Physics
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/trackUtilities.h"
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/Core/RecoDecay.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 #include "Tools/KFparticle/KFUtilities.h"
 
 /// includes KFParticle
-#include "KFParticle.h"
 #include "KFPTrack.h"
 #include "KFPVertex.h"
+#include "KFParticle.h"
 #include "KFParticleBase.h"
 #include "KFVertex.h"
 
diff --git a/.conflict-base-0/Tools/KFparticle/qaKFParticle.h b/.conflict-base-0/Tools/KFparticle/qaKFParticle.h
index afb23851cb5..ddde56d6931 100644
--- a/.conflict-base-0/Tools/KFparticle/qaKFParticle.h
+++ b/.conflict-base-0/Tools/KFparticle/qaKFParticle.h
@@ -15,10 +15,11 @@
 #ifndef TOOLS_KFPARTICLE_QAKFPARTICLE_H_
 #define TOOLS_KFPARTICLE_QAKFPARTICLE_H_
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Common/Core/trackUtilities.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+
 enum Source {
   kPrompt = BIT(0),
   kNonPrompt = BIT(1),
diff --git a/.conflict-base-0/Tools/KFparticle/qaKFParticleLc.cxx b/.conflict-base-0/Tools/KFparticle/qaKFParticleLc.cxx
index 20da1eb6128..c8f0c6fe6b2 100644
--- a/.conflict-base-0/Tools/KFparticle/qaKFParticleLc.cxx
+++ b/.conflict-base-0/Tools/KFparticle/qaKFParticleLc.cxx
@@ -16,38 +16,42 @@
 ///
 
 #include "Tools/KFparticle/qaKFParticleLc.h"
+
+#include "TableHelper.h"
+
 #include <CCDB/BasicCCDBManager.h>
-#include <string>
+
 #include <TDatabasePDG.h>
 #include <TPDGCode.h>
-#include "TableHelper.h"
+
+#include <string>
 
 /// includes O2
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/DCA.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DetectorsBase/Propagator.h"
 
 /// includes O2Physics
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/trackUtilities.h"
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/Core/RecoDecay.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 #include "Tools/KFparticle/KFUtilities.h"
 
 /// includes KFParticle
-#include "KFParticle.h"
 #include "KFPTrack.h"
 #include "KFPVertex.h"
+#include "KFParticle.h"
 #include "KFParticleBase.h"
 #include "KFVertex.h"
 
diff --git a/.conflict-base-0/Tools/KFparticle/qaKFParticleLc.h b/.conflict-base-0/Tools/KFparticle/qaKFParticleLc.h
index 8c57232f99a..444b45bb5eb 100644
--- a/.conflict-base-0/Tools/KFparticle/qaKFParticleLc.h
+++ b/.conflict-base-0/Tools/KFparticle/qaKFParticleLc.h
@@ -15,10 +15,11 @@
 #ifndef TOOLS_KFPARTICLE_QAKFPARTICLELC_H_
 #define TOOLS_KFPARTICLE_QAKFPARTICLELC_H_
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Common/Core/trackUtilities.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+
 enum Source {
   kPrompt = BIT(0),
   kNonPrompt = BIT(1),
diff --git a/.conflict-base-0/Tutorials/ML/applyMlSelection.cxx b/.conflict-base-0/Tutorials/ML/applyMlSelection.cxx
index 4ca579acc44..0212c53d913 100644
--- a/.conflict-base-0/Tutorials/ML/applyMlSelection.cxx
+++ b/.conflict-base-0/Tutorials/ML/applyMlSelection.cxx
@@ -15,14 +15,15 @@
 ///
 /// \author Fabio Catalano <fabio.catalano@cern.ch>, CERN
 
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+
+#include "Tools/ML/MlResponse.h"
+
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
 
-#include "Tools/ML/MlResponse.h"
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-
 using namespace o2;
 using namespace o2::analysis;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Tutorials/ML/applyOnnxModel.cxx b/.conflict-base-0/Tutorials/ML/applyOnnxModel.cxx
index 6bf5d6ecb59..f49a315494f 100644
--- a/.conflict-base-0/Tutorials/ML/applyOnnxModel.cxx
+++ b/.conflict-base-0/Tutorials/ML/applyOnnxModel.cxx
@@ -14,10 +14,11 @@
 ///
 /// \author Christian Sonnabend <christian.sonnabend@cern.ch>, GSI
 
-#include "Framework/runDataProcessing.h"
+#include "Tools/ML/model.h"
+
 #include "Framework/AnalysisTask.h"
 #include "Framework/Logger.h"
-#include "Tools/ML/model.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Tutorials/OpenData/flowAnalysis.cxx b/.conflict-base-0/Tutorials/OpenData/flowAnalysis.cxx
index dc5e180b300..75fe73001f4 100644
--- a/.conflict-base-0/Tutorials/OpenData/flowAnalysis.cxx
+++ b/.conflict-base-0/Tutorials/OpenData/flowAnalysis.cxx
@@ -15,20 +15,22 @@
 /// \author
 /// \since
 
-#include <TF1.h>
-#include <TH3.h>
-#include <Framework/runDataProcessing.h>
-#include <Framework/AnalysisTask.h>
-#include <Framework/HistogramRegistry.h>
-#include <Framework/AnalysisDataModel.h>
-#include <Common/DataModel/EventSelection.h>
 #include <Common/CCDB/TriggerAliases.h>
 #include <Common/DataModel/Centrality.h>
+#include <Common/DataModel/EventSelection.h>
 #include <Common/DataModel/Multiplicity.h>
-#include <Common/DataModel/TrackSelectionTables.h>
 #include <Common/DataModel/PIDResponse.h>
+#include <Common/DataModel/TrackSelectionTables.h>
+
 #include <CCDB/BasicCCDBManager.h>
 #include <DataFormatsParameters/GRPObject.h>
+#include <Framework/AnalysisDataModel.h>
+#include <Framework/AnalysisTask.h>
+#include <Framework/HistogramRegistry.h>
+#include <Framework/runDataProcessing.h>
+
+#include <TF1.h>
+#include <TH3.h>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Tutorials/PWGCF/EventPlane/src/qVectorstutorial.cxx b/.conflict-base-0/Tutorials/PWGCF/EventPlane/src/qVectorstutorial.cxx
index b5b01185a49..eb02ea865ec 100644
--- a/.conflict-base-0/Tutorials/PWGCF/EventPlane/src/qVectorstutorial.cxx
+++ b/.conflict-base-0/Tutorials/PWGCF/EventPlane/src/qVectorstutorial.cxx
@@ -10,32 +10,32 @@
 // or submit itself to any jurisdiction.
 
 // C++/ROOT includes.
-#include <chrono>
-#include <string>
-#include <vector>
 #include <TComplex.h>
 #include <TH1F.h>
 #include <TH2D.h>
 #include <TMath.h>
 #include <TVector2.h>
 
+#include <chrono>
+#include <string>
+#include <vector>
+
 // o2Physics includes.
+#include "Common/Core/EventPlaneHelper.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Qvectors.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StaticFor.h"
-
-#include "Common/DataModel/Qvectors.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/Core/EventPlaneHelper.h"
-#include "Common/Core/TrackSelection.h"
-
-#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/runDataProcessing.h"
 
 // o2 includes.
 
diff --git a/.conflict-base-0/Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask1.cxx b/.conflict-base-0/Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask1.cxx
index 369e63cbdf6..246fba0e183 100644
--- a/.conflict-base-0/Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask1.cxx
+++ b/.conflict-base-0/Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask1.cxx
@@ -16,9 +16,9 @@
 #include "Framework/runDataProcessing.h"
 
 /// FemtoDream includes
+#include "PWGCF/DataModel/FemtoDerived.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamMath.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
-#include "PWGCF/DataModel/FemtoDerived.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask2.cxx b/.conflict-base-0/Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask2.cxx
index ff5fa93aa5b..303d3d8e3ef 100644
--- a/.conflict-base-0/Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask2.cxx
+++ b/.conflict-base-0/Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask2.cxx
@@ -16,9 +16,9 @@
 #include "Framework/runDataProcessing.h"
 
 /// FemtoDream includes
+#include "PWGCF/DataModel/FemtoDerived.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamMath.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
-#include "PWGCF/DataModel/FemtoDerived.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask3.cxx b/.conflict-base-0/Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask3.cxx
index ca200fd3937..69aa8baf37c 100644
--- a/.conflict-base-0/Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask3.cxx
+++ b/.conflict-base-0/Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask3.cxx
@@ -16,9 +16,9 @@
 #include "Framework/runDataProcessing.h"
 
 /// FemtoDream includes
+#include "PWGCF/DataModel/FemtoDerived.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamMath.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
-#include "PWGCF/DataModel/FemtoDerived.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask4.cxx b/.conflict-base-0/Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask4.cxx
index 90ae5168a78..a6b61304a53 100644
--- a/.conflict-base-0/Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask4.cxx
+++ b/.conflict-base-0/Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask4.cxx
@@ -16,9 +16,9 @@
 #include "Framework/runDataProcessing.h"
 
 /// FemtoDream includes
+#include "PWGCF/DataModel/FemtoDerived.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamMath.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
-#include "PWGCF/DataModel/FemtoDerived.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask5.cxx b/.conflict-base-0/Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask5.cxx
index d9159c2e3cc..3332d4ce43d 100644
--- a/.conflict-base-0/Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask5.cxx
+++ b/.conflict-base-0/Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask5.cxx
@@ -14,12 +14,13 @@
 /// O2 includes
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
+
 #include "TDatabasePDG.h"
 
 /// FemtoDream includes
+#include "PWGCF/DataModel/FemtoDerived.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamMath.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
-#include "PWGCF/DataModel/FemtoDerived.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Tutorials/PWGCF/FlowGenericFramework/src/flowGFWTutorial.cxx b/.conflict-base-0/Tutorials/PWGCF/FlowGenericFramework/src/flowGFWTutorial.cxx
index cfd0eca696b..8e5f096c8ac 100644
--- a/.conflict-base-0/Tutorials/PWGCF/FlowGenericFramework/src/flowGFWTutorial.cxx
+++ b/.conflict-base-0/Tutorials/PWGCF/FlowGenericFramework/src/flowGFWTutorial.cxx
@@ -9,26 +9,28 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <CCDB/BasicCCDBManager.h>
-#include <cmath>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/HistogramRegistry.h"
+#include "GFW.h"
+#include "GFWCumulant.h"
+#include "GFWPowerArray.h"
 
-#include "Common/DataModel/EventSelection.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include <CCDB/BasicCCDBManager.h>
 
-#include "GFWPowerArray.h"
-#include "GFW.h"
-#include "GFWCumulant.h"
 #include "TList.h"
 #include <TProfile.h>
 #include <TRandom3.h>
 
+#include <cmath>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-base-0/Tutorials/PWGCF/TwoParticleCorrelations/src/firstcfcorrelations.cxx b/.conflict-base-0/Tutorials/PWGCF/TwoParticleCorrelations/src/firstcfcorrelations.cxx
index cdec4f3ca95..ef8f6f78b32 100644
--- a/.conflict-base-0/Tutorials/PWGCF/TwoParticleCorrelations/src/firstcfcorrelations.cxx
+++ b/.conflict-base-0/Tutorials/PWGCF/TwoParticleCorrelations/src/firstcfcorrelations.cxx
@@ -13,18 +13,20 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "PWGCF/Core/CorrelationContainer.h"
+#include "PWGCF/Core/PairCuts.h"
+
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonConstants/MathConstants.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/RunningWorkflowInfo.h"
-#include "CommonConstants/MathConstants.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Centrality.h"
-#include "PWGCF/Core/CorrelationContainer.h"
-#include "PWGCF/Core/PairCuts.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Tutorials/PWGCF/TwoParticleCorrelations/src/firstcfo2physics.cxx b/.conflict-base-0/Tutorials/PWGCF/TwoParticleCorrelations/src/firstcfo2physics.cxx
index d5d1a6777d3..d6b459e43b3 100644
--- a/.conflict-base-0/Tutorials/PWGCF/TwoParticleCorrelations/src/firstcfo2physics.cxx
+++ b/.conflict-base-0/Tutorials/PWGCF/TwoParticleCorrelations/src/firstcfo2physics.cxx
@@ -13,11 +13,11 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-
 #include "Common/DataModel/Centrality.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-base-0/Tutorials/PWGEM/Cocktail/configs/ana_config.json b/.conflict-base-0/Tutorials/PWGEM/Cocktail/configs/ana_config.json
index 1b61ab3c3a8..dda7d3d0127 100644
--- a/.conflict-base-0/Tutorials/PWGEM/Cocktail/configs/ana_config.json
+++ b/.conflict-base-0/Tutorials/PWGEM/Cocktail/configs/ana_config.json
@@ -15,4 +15,4 @@
         "cfgPhotonPtFileName": "",
         "cfgPhotonPtDirName": ""
     }
-}
\ No newline at end of file
+}
diff --git a/.conflict-base-0/Tutorials/PWGEM/Cocktail/files/parametrizations/PbPb_5TeV.json b/.conflict-base-0/Tutorials/PWGEM/Cocktail/files/parametrizations/PbPb_5TeV.json
index 85e0fec1703..dee9dacae8d 100644
--- a/.conflict-base-0/Tutorials/PWGEM/Cocktail/files/parametrizations/PbPb_5TeV.json
+++ b/.conflict-base-0/Tutorials/PWGEM/Cocktail/files/parametrizations/PbPb_5TeV.json
@@ -399,4 +399,4 @@
         "221_pt": "(TMath::TwoPi()*x*(219.382*exp(-(sqrt(x*x+0.139571*0.139571)-0.139571)/0.384303)+2471.6*pow(exp(-1.12373*x-0.752507*x*x)+x/0.438343,-5.45943)))*((((x<9.445400)*(TMath::Max(TMath::Max(1.68883e-09*TMath::Power((exp(- -1.16032*sqrt(x*x+0.547*0.547-0.139*0.139)-0.435153*(x*x+0.547*0.547-0.139*0.139))+TMath::Power(0.480215/1.68883e-09,-1./16.7077)*sqrt(x*x+0.547*0.547-0.139*0.139)/0.0356546),-16.7077)/TMath::Power((exp(- -1.16032*x-0.435153*x*x)+x/0.0356546),-16.7077)+1.75797*TMath::Landau(x,2.41484,1.01421),0.00469052*TMath::Power((exp(- -0.124633*sqrt(x*x+0.547*0.547-0.139*0.139)-0.310906*(x*x+0.547*0.547-0.139*0.139))+TMath::Power(0.479677/0.00469052,-1./0.657178)*sqrt(x*x+0.547*0.547-0.139*0.139)/0.0210313),-0.657178)/TMath::Power((exp(- -0.124633*x-0.310906*x*x)+x/0.0210313),-0.657178)+1.42452*TMath::Landau(x,2.46537,0.969902)),TMath::Max(4.88363e-10*TMath::Power((exp(- -2.82354*sqrt(x*x+0.547*0.547-0.139*0.139)-0.728315*(x*x+0.547*0.547-0.139*0.139))+TMath::Power(0.483053/4.88363e-10,-1./16.2073)*sqrt(x*x+0.547*0.547-0.139*0.139)/0.0021492),-16.2073)/TMath::Power((exp(- -2.82354*x-0.728315*x*x)+x/0.0021492),-16.2073)+1.57731*TMath::Landau(x,2.40466,1.00957),0.00469052*TMath::Power((exp(- -0.124633*sqrt(x*x+0.547*0.547-0.139*0.139)-0.310906*(x*x+0.547*0.547-0.139*0.139))+TMath::Power(0.479677/0.00469052,-1./0.657178)*sqrt(x*x+0.547*0.547-0.139*0.139)/0.0210313),-0.657178)/TMath::Power((exp(- -0.124633*x-0.310906*x*x)+x/0.0210313),-0.657178)+1.42452*TMath::Landau(x,2.46537,0.969902))))+(x>=9.445400)*1.06*(((0.52091*1.)+(159.301*(-0.00307058*TMath::Power(1.+((x/1.03888)*(x/1.03888)),-(0.567478)))))/(1.+(-0.00307058*TMath::Power(1.+((x/1.03888)*(x/1.03888)),-(0.567478))))))))",
         "333_pt": "(TMath::TwoPi()*x*(219.382*exp(-(sqrt(x*x+0.139571*0.139571)-0.139571)/0.384303)+2471.6*pow(exp(-1.12373*x-0.752507*x*x)+x/0.438343,-5.45943)))*(0.1191/(1+exp(-(x- -0.316437)/0.554431))+-0.507618*TMath::Gaus(x,1.69654,1.62649)+0.494136*TMath::Gaus(x,2.56805,1.6193)+0.0789659)"
     }
-}
\ No newline at end of file
+}
diff --git a/.conflict-base-0/Tutorials/PWGEM/Cocktail/files/parametrizations/pp_13TeV.json b/.conflict-base-0/Tutorials/PWGEM/Cocktail/files/parametrizations/pp_13TeV.json
index 1f999879643..d4d5a77bf8f 100644
--- a/.conflict-base-0/Tutorials/PWGEM/Cocktail/files/parametrizations/pp_13TeV.json
+++ b/.conflict-base-0/Tutorials/PWGEM/Cocktail/files/parametrizations/pp_13TeV.json
@@ -43,4 +43,4 @@
         "113_pt": "(x*(123.313*(pow((exp((0.171351*x)-(abs(0.00418378)*(x*x)))+(x/0.919801)),-(6.29677)))))*((((0.37788/(1+exp(-((x-0.265203)/0.274547))))+(-(0.393597*TMath::Gaus(x,0.324349,0.819888))))+(-(0.230459*TMath::Gaus(x,1.23251,1.24114))))+0.412584)",
         "223_pt": "(x*(123.313*(pow((exp((0.171351*x)-(abs(0.00418378)*(x*x)))+(x/0.919801)),-(6.29677)))))*((((0.435069/(1+exp(-((x-0.302485)/0.27614))))+(-(0.258853*TMath::Gaus(x,0.42493,0.693856))))+(-(0.202117*TMath::Gaus(x,1.07795,1.09857))))+0.242026)"
     }
-}
\ No newline at end of file
+}
diff --git a/.conflict-base-0/Tutorials/PWGEM/Cocktail/plotLFCocktail.C b/.conflict-base-0/Tutorials/PWGEM/Cocktail/plotLFCocktail.C
index 8740544d66f..db095ad62f7 100644
--- a/.conflict-base-0/Tutorials/PWGEM/Cocktail/plotLFCocktail.C
+++ b/.conflict-base-0/Tutorials/PWGEM/Cocktail/plotLFCocktail.C
@@ -72,4 +72,5 @@ void plotLFCocktail(TString filename = "AnalysisResults.root", int rebin = 1)
   }
   gPad->BuildLegend(0.62, 0.9, 0.9, 0.6);
   mee[0]->SetTitle("after resolution and acceptance");
-}
\ No newline at end of file
+}
+ 
\ No newline at end of file
diff --git a/.conflict-base-0/Tutorials/PWGEM/emcclustertutorial.cxx b/.conflict-base-0/Tutorials/PWGEM/emcclustertutorial.cxx
index a047206e70d..222346a9114 100644
--- a/.conflict-base-0/Tutorials/PWGEM/emcclustertutorial.cxx
+++ b/.conflict-base-0/Tutorials/PWGEM/emcclustertutorial.cxx
@@ -9,32 +9,31 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <climits>
-#include <cstdlib>
-#include <map>
-#include <memory>
-#include <sstream>
-#include <string>
-#include <vector>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoA.h"
-#include "Framework/HistogramRegistry.h"
+#include "PWGJE/DataModel/EMCALClusters.h"
 
-#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
 
-#include "EMCALBase/Geometry.h"
-#include "EMCALCalib/BadChannelMap.h"
-#include "PWGJE/DataModel/EMCALClusters.h"
+#include "CommonDataFormat/InteractionRecord.h"
+#include "DataFormatsEMCAL/AnalysisCluster.h"
 #include "DataFormatsEMCAL/Cell.h"
 #include "DataFormatsEMCAL/Constants.h"
-#include "DataFormatsEMCAL/AnalysisCluster.h"
+#include "EMCALBase/Geometry.h"
+#include "EMCALCalib/BadChannelMap.h"
+#include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 
-#include "CommonDataFormat/InteractionRecord.h"
+#include <climits>
+#include <cstdlib>
+#include <map>
+#include <memory>
+#include <sstream>
+#include <string>
+#include <vector>
 
 // \struct ClusterTutorial
 /// \brief Skeleton task for EMCal cluster tutorial
diff --git a/.conflict-base-0/Tutorials/PWGEM/pcm/pcmtutorial.cxx b/.conflict-base-0/Tutorials/PWGEM/pcm/pcmtutorial.cxx
index c10b4251991..d31ffa85177 100644
--- a/.conflict-base-0/Tutorials/PWGEM/pcm/pcmtutorial.cxx
+++ b/.conflict-base-0/Tutorials/PWGEM/pcm/pcmtutorial.cxx
@@ -12,16 +12,18 @@
 /// \brief tutorial for pcm analysis.
 /// \author daiki.sekihata@cern.ch
 
-#include <TMath.h>
-#include <Math/Vector4D.h>
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+#include "PWGEM/PhotonMeson/Utils/PCMUtilities.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Common/Core/trackUtilities.h"
+
 #include "CommonConstants/PhysicsConstants.h"
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/PhotonMeson/Utils/PCMUtilities.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include <Math/Vector4D.h>
+#include <TMath.h>
 
 using namespace o2;
 using namespace o2::soa;
diff --git a/.conflict-base-0/Tutorials/PWGLF/Resonance/resonancesCombine.cxx b/.conflict-base-0/Tutorials/PWGLF/Resonance/resonancesCombine.cxx
index 26a28661c6c..8ff1a07b1e0 100644
--- a/.conflict-base-0/Tutorials/PWGLF/Resonance/resonancesCombine.cxx
+++ b/.conflict-base-0/Tutorials/PWGLF/Resonance/resonancesCombine.cxx
@@ -14,16 +14,18 @@
 /// \author Bong-Hwi Lim <bong-hwi.lim@cern.ch>
 /// \since 13/12/2024
 
-#include <TLorentzVector.h>
-#include <TPDGCode.h>
+#include "PWGLF/DataModel/LFResonanceTables.h"
 
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/DataModel/Qvectors.h"
 #include "Common/Core/EventPlaneHelper.h"
-#include "Framework/AnalysisTask.h"
+#include "Common/DataModel/Qvectors.h"
+
+#include "CommonConstants/PhysicsConstants.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
+
+#include <TLorentzVector.h>
+#include <TPDGCode.h>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Tutorials/PWGLF/Resonance/resonancesMicrotrack.cxx b/.conflict-base-0/Tutorials/PWGLF/Resonance/resonancesMicrotrack.cxx
index 5022d4b602d..0e0073f6e3e 100644
--- a/.conflict-base-0/Tutorials/PWGLF/Resonance/resonancesMicrotrack.cxx
+++ b/.conflict-base-0/Tutorials/PWGLF/Resonance/resonancesMicrotrack.cxx
@@ -14,15 +14,16 @@
 /// \author Bong-Hwi Lim <bong-hwi.lim@cern.ch>
 /// \since 07/03/2025
 
-#include <TLorentzVector.h>
-#include <TPDGCode.h>
+#include "PWGLF/DataModel/LFResonanceTables.h"
 
 #include "CommonConstants/MathConstants.h"
 #include "CommonConstants/PhysicsConstants.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
+
+#include <TLorentzVector.h>
+#include <TPDGCode.h>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Tutorials/PWGLF/Resonance/resonances_step0.cxx b/.conflict-base-0/Tutorials/PWGLF/Resonance/resonances_step0.cxx
index 706abc72cd2..33d64cbc34b 100644
--- a/.conflict-base-0/Tutorials/PWGLF/Resonance/resonances_step0.cxx
+++ b/.conflict-base-0/Tutorials/PWGLF/Resonance/resonances_step0.cxx
@@ -13,12 +13,13 @@
 /// \author
 /// \since 08/11/2023
 
-#include <TLorentzVector.h>
+#include "PWGLF/DataModel/LFResonanceTables.h"
 
-#include "Framework/AnalysisTask.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
+
+#include <TLorentzVector.h>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Tutorials/PWGLF/Resonance/resonances_step1.cxx b/.conflict-base-0/Tutorials/PWGLF/Resonance/resonances_step1.cxx
index 2f566ace97c..7db2098ae2f 100644
--- a/.conflict-base-0/Tutorials/PWGLF/Resonance/resonances_step1.cxx
+++ b/.conflict-base-0/Tutorials/PWGLF/Resonance/resonances_step1.cxx
@@ -13,14 +13,15 @@
 /// \author
 /// \since 08/11/2023
 
-#include <TLorentzVector.h>
-#include <TPDGCode.h>
+#include "PWGLF/DataModel/LFResonanceTables.h"
 
 #include "CommonConstants/PhysicsConstants.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
+
+#include <TLorentzVector.h>
+#include <TPDGCode.h>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Tutorials/PWGLF/Resonance/resonances_step2.cxx b/.conflict-base-0/Tutorials/PWGLF/Resonance/resonances_step2.cxx
index 000bbf1e501..ff905f82582 100644
--- a/.conflict-base-0/Tutorials/PWGLF/Resonance/resonances_step2.cxx
+++ b/.conflict-base-0/Tutorials/PWGLF/Resonance/resonances_step2.cxx
@@ -13,13 +13,14 @@
 /// \author
 /// \since 08/11/2023
 
-#include <TLorentzVector.h>
+#include "PWGLF/DataModel/LFResonanceTables.h"
 
 #include "CommonConstants/PhysicsConstants.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
+
+#include <TLorentzVector.h>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Tutorials/PWGLF/Resonance/resonances_step3.cxx b/.conflict-base-0/Tutorials/PWGLF/Resonance/resonances_step3.cxx
index f2ef8dbbe67..80d24b43b17 100644
--- a/.conflict-base-0/Tutorials/PWGLF/Resonance/resonances_step3.cxx
+++ b/.conflict-base-0/Tutorials/PWGLF/Resonance/resonances_step3.cxx
@@ -13,11 +13,12 @@
 /// \author Hirak Kumar Koley <hirak.koley@cern.ch>
 /// \since 11/10/2024
 
+#include "PWGLF/DataModel/LFResonanceTables.h"
+
 #include "CommonConstants/PhysicsConstants.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Tutorials/PWGLF/Resonance/resonances_step4.cxx b/.conflict-base-0/Tutorials/PWGLF/Resonance/resonances_step4.cxx
index 05f7b35f7cf..6c54f87a713 100644
--- a/.conflict-base-0/Tutorials/PWGLF/Resonance/resonances_step4.cxx
+++ b/.conflict-base-0/Tutorials/PWGLF/Resonance/resonances_step4.cxx
@@ -13,11 +13,12 @@
 /// \author Hirak Kumar Koley <hirak.koley@cern.ch>
 /// \since 11/10/2024
 
+#include "PWGLF/DataModel/LFResonanceTables.h"
+
 #include "CommonConstants/PhysicsConstants.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Tutorials/PWGLF/Resonance/resonances_step5.cxx b/.conflict-base-0/Tutorials/PWGLF/Resonance/resonances_step5.cxx
index 7d8463b9236..3fc33f45f81 100644
--- a/.conflict-base-0/Tutorials/PWGLF/Resonance/resonances_step5.cxx
+++ b/.conflict-base-0/Tutorials/PWGLF/Resonance/resonances_step5.cxx
@@ -13,11 +13,12 @@
 /// \author Hirak Kumar Koley
 /// \since 11/10/2024
 
+#include "PWGLF/DataModel/LFResonanceTables.h"
+
 #include "CommonConstants/PhysicsConstants.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Tutorials/PWGLF/Resonance/resonances_step6.cxx b/.conflict-base-0/Tutorials/PWGLF/Resonance/resonances_step6.cxx
index 23ccac6dfd2..723d5a64712 100644
--- a/.conflict-base-0/Tutorials/PWGLF/Resonance/resonances_step6.cxx
+++ b/.conflict-base-0/Tutorials/PWGLF/Resonance/resonances_step6.cxx
@@ -13,13 +13,14 @@
 /// \author Hirak Kumar Koley
 /// \since 11/10/2024
 
-#include <TLorentzVector.h>
+#include "PWGLF/DataModel/LFResonanceTables.h"
 
 #include "CommonConstants/PhysicsConstants.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
+
+#include <TLorentzVector.h>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_skeleton.cxx b/.conflict-base-0/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_skeleton.cxx
index 788aaead7ae..9c7265a5051 100644
--- a/.conflict-base-0/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_skeleton.cxx
+++ b/.conflict-base-0/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_skeleton.cxx
@@ -15,11 +15,13 @@
 /// \author Nepeivoda Roman (roman.nepeivoda@cern.ch)
 /// \author Chiara De Martin (chiara.de.martin@cern.ch)
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/EventSelection.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/DataModel/EventSelection.h"
+
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_step0.cxx b/.conflict-base-0/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_step0.cxx
index b0e595246d7..96c7877e130 100644
--- a/.conflict-base-0/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_step0.cxx
+++ b/.conflict-base-0/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_step0.cxx
@@ -15,11 +15,13 @@
 /// \author Nepeivoda Roman (roman.nepeivoda@cern.ch)
 /// \author Chiara De Martin (chiara.de.martin@cern.ch)
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/EventSelection.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/DataModel/EventSelection.h"
+
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_step1.cxx b/.conflict-base-0/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_step1.cxx
index 836be98b240..92da4bfb428 100644
--- a/.conflict-base-0/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_step1.cxx
+++ b/.conflict-base-0/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_step1.cxx
@@ -15,11 +15,13 @@
 /// \author Nepeivoda Roman (roman.nepeivoda@cern.ch)
 /// \author Chiara De Martin (chiara.de.martin@cern.ch)
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/EventSelection.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/DataModel/EventSelection.h"
+
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_step2.cxx b/.conflict-base-0/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_step2.cxx
index 1558bb78052..c182142fd0a 100644
--- a/.conflict-base-0/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_step2.cxx
+++ b/.conflict-base-0/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_step2.cxx
@@ -15,12 +15,14 @@
 /// \author Nepeivoda Roman (roman.nepeivoda@cern.ch)
 /// \author Chiara De Martin (chiara.de.martin@cern.ch)
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/EventSelection.h"
 #include "PWGLF/DataModel/LFStrangenessPIDTables.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/DataModel/EventSelection.h"
+
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_step3.cxx b/.conflict-base-0/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_step3.cxx
index f12a4f02560..f6491959c37 100644
--- a/.conflict-base-0/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_step3.cxx
+++ b/.conflict-base-0/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_step3.cxx
@@ -15,12 +15,14 @@
 /// \author Nepeivoda Roman (roman.nepeivoda@cern.ch)
 /// \author Chiara De Martin (chiara.de.martin@cern.ch)
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/EventSelection.h"
 #include "PWGLF/DataModel/LFStrangenessPIDTables.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/DataModel/EventSelection.h"
+
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_step4.cxx b/.conflict-base-0/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_step4.cxx
index d45ef3c26a1..706e580bcb2 100644
--- a/.conflict-base-0/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_step4.cxx
+++ b/.conflict-base-0/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_step4.cxx
@@ -15,12 +15,14 @@
 /// \author Nepeivoda Roman (roman.nepeivoda@cern.ch)
 /// \author Chiara De Martin (chiara.de.martin@cern.ch)
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/EventSelection.h"
 #include "PWGLF/DataModel/LFStrangenessPIDTables.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/DataModel/EventSelection.h"
+
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Tutorials/PWGLF/Strangeness/pp/strangeness_step0.cxx b/.conflict-base-0/Tutorials/PWGLF/Strangeness/pp/strangeness_step0.cxx
index a14b0a5aa3f..4c2b6569e09 100644
--- a/.conflict-base-0/Tutorials/PWGLF/Strangeness/pp/strangeness_step0.cxx
+++ b/.conflict-base-0/Tutorials/PWGLF/Strangeness/pp/strangeness_step0.cxx
@@ -13,11 +13,13 @@
 /// \author Nepeivoda Roman (roman.nepeivoda@cern.ch)
 /// \author Chiara De Martin (chiara.de.martin@cern.ch)
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/EventSelection.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Common/DataModel/EventSelection.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-base-0/Tutorials/PWGLF/Strangeness/pp/strangeness_step1.cxx b/.conflict-base-0/Tutorials/PWGLF/Strangeness/pp/strangeness_step1.cxx
index 70748658778..ca57646dc97 100644
--- a/.conflict-base-0/Tutorials/PWGLF/Strangeness/pp/strangeness_step1.cxx
+++ b/.conflict-base-0/Tutorials/PWGLF/Strangeness/pp/strangeness_step1.cxx
@@ -13,11 +13,13 @@
 /// \author Nepeivoda Roman (roman.nepeivoda@cern.ch)
 /// \author Chiara De Martin (chiara.de.martin@cern.ch)
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/EventSelection.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Common/DataModel/EventSelection.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-base-0/Tutorials/PWGLF/Strangeness/pp/strangeness_step2.cxx b/.conflict-base-0/Tutorials/PWGLF/Strangeness/pp/strangeness_step2.cxx
index 9701410db1b..fd863f5090a 100644
--- a/.conflict-base-0/Tutorials/PWGLF/Strangeness/pp/strangeness_step2.cxx
+++ b/.conflict-base-0/Tutorials/PWGLF/Strangeness/pp/strangeness_step2.cxx
@@ -13,12 +13,14 @@
 /// \author Nepeivoda Roman (roman.nepeivoda@cern.ch)
 /// \author Chiara De Martin (chiara.de.martin@cern.ch)
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/EventSelection.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-base-0/Tutorials/PWGLF/Strangeness/pp/strangeness_step3.cxx b/.conflict-base-0/Tutorials/PWGLF/Strangeness/pp/strangeness_step3.cxx
index 6121831fadb..ef06ffaded7 100644
--- a/.conflict-base-0/Tutorials/PWGLF/Strangeness/pp/strangeness_step3.cxx
+++ b/.conflict-base-0/Tutorials/PWGLF/Strangeness/pp/strangeness_step3.cxx
@@ -13,12 +13,14 @@
 /// \author Nepeivoda Roman (roman.nepeivoda@cern.ch)
 /// \author Chiara De Martin (chiara.de.martin@cern.ch)
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/EventSelection.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-base-0/Tutorials/PWGLF/Strangeness/pp/strangeness_step4.cxx b/.conflict-base-0/Tutorials/PWGLF/Strangeness/pp/strangeness_step4.cxx
index 544d4283932..b96601c16f8 100644
--- a/.conflict-base-0/Tutorials/PWGLF/Strangeness/pp/strangeness_step4.cxx
+++ b/.conflict-base-0/Tutorials/PWGLF/Strangeness/pp/strangeness_step4.cxx
@@ -13,12 +13,14 @@
 /// \author Nepeivoda Roman (roman.nepeivoda@cern.ch)
 /// \author Chiara De Martin (chiara.de.martin@cern.ch)
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/EventSelection.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Tutorials/PWGMM/myExampleTask.cxx b/.conflict-base-0/Tutorials/PWGMM/myExampleTask.cxx
index f7035781b6e..2de9b8c1114 100644
--- a/.conflict-base-0/Tutorials/PWGMM/myExampleTask.cxx
+++ b/.conflict-base-0/Tutorials/PWGMM/myExampleTask.cxx
@@ -13,8 +13,8 @@
 ///        it is meant to be a blank page for further developments.
 /// \author everyone
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Tutorials/PWGUD/UDTutorial_01.cxx b/.conflict-base-0/Tutorials/PWGUD/UDTutorial_01.cxx
index c2cbf7b4f13..70161203257 100644
--- a/.conflict-base-0/Tutorials/PWGUD/UDTutorial_01.cxx
+++ b/.conflict-base-0/Tutorials/PWGUD/UDTutorial_01.cxx
@@ -13,13 +13,15 @@
 // \author Paul Buehler, paul.buehler@oeaw.ac.at
 // \since  April 2023
 
-#include "Framework/runDataProcessing.h"
+#include "PWGUD/Core/UDHelpers.h"
+#include "PWGUD/DataModel/UDTables.h"
+
+#include "Common/DataModel/PIDResponse.h"
+
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 #include "TVector3.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/UDHelpers.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Tutorials/PWGUD/UDTutorial_02a.cxx b/.conflict-base-0/Tutorials/PWGUD/UDTutorial_02a.cxx
index 75aa83c87a7..f10174d8d5b 100644
--- a/.conflict-base-0/Tutorials/PWGUD/UDTutorial_02a.cxx
+++ b/.conflict-base-0/Tutorials/PWGUD/UDTutorial_02a.cxx
@@ -13,14 +13,16 @@
 // \author Paul Buehler, paul.buehler@oeaw.ac.at
 // \since  April 2023
 
-#include "Framework/runDataProcessing.h"
+#include "PWGUD/Core/UDHelpers.h"
+#include "PWGUD/DataModel/UDTables.h"
+
+#include "Common/DataModel/PIDResponse.h"
+
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 #include "TDatabasePDG.h"
 #include "TLorentzVector.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/UDHelpers.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Tutorials/PWGUD/UDTutorial_02b.cxx b/.conflict-base-0/Tutorials/PWGUD/UDTutorial_02b.cxx
index 26a76a98186..315ae0dd45a 100644
--- a/.conflict-base-0/Tutorials/PWGUD/UDTutorial_02b.cxx
+++ b/.conflict-base-0/Tutorials/PWGUD/UDTutorial_02b.cxx
@@ -13,13 +13,14 @@
 // \author Paul Buehler, paul.buehler@oeaw.ac.at
 // \since  April 2023
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
+#include "PWGUD/Core/DGPIDSelector.h"
+#include "PWGUD/Core/UDHelpers.h"
+#include "PWGUD/DataModel/UDTables.h"
 
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/UDHelpers.h"
-#include "PWGUD/Core/DGPIDSelector.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Tutorials/PWGUD/UDTutorial_03a.cxx b/.conflict-base-0/Tutorials/PWGUD/UDTutorial_03a.cxx
index 9840123236b..a466ddfc1ff 100644
--- a/.conflict-base-0/Tutorials/PWGUD/UDTutorial_03a.cxx
+++ b/.conflict-base-0/Tutorials/PWGUD/UDTutorial_03a.cxx
@@ -13,15 +13,17 @@
 // \author Paul Buehler, paul.buehler@oeaw.ac.at
 // \since  October 2023
 
-#include "Framework/runDataProcessing.h"
+#include "PWGUD/Core/UDHelpers.h"
+
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 #include "TDatabasePDG.h"
 #include "TLorentzVector.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/Core/UDHelpers.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Tutorials/PWGUD/UDTutorial_03b.cxx b/.conflict-base-0/Tutorials/PWGUD/UDTutorial_03b.cxx
index 71a144f1d1e..562836e0dce 100644
--- a/.conflict-base-0/Tutorials/PWGUD/UDTutorial_03b.cxx
+++ b/.conflict-base-0/Tutorials/PWGUD/UDTutorial_03b.cxx
@@ -13,15 +13,17 @@
 // \author Paul Buehler, paul.buehler@oeaw.ac.at
 // \since  October 2023
 
-#include "Framework/runDataProcessing.h"
+#include "PWGUD/Core/UDHelpers.h"
+
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 #include "TDatabasePDG.h"
 #include "TLorentzVector.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/Core/UDHelpers.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Tutorials/PWGUD/UDTutorial_04.cxx b/.conflict-base-0/Tutorials/PWGUD/UDTutorial_04.cxx
index 94a93cb0ef4..8b16a7fde51 100644
--- a/.conflict-base-0/Tutorials/PWGUD/UDTutorial_04.cxx
+++ b/.conflict-base-0/Tutorials/PWGUD/UDTutorial_04.cxx
@@ -13,13 +13,14 @@
 // \author Paul Buehler, paul.buehler@oeaw.ac.at
 // \since  October 2023
 
-#include "Framework/runDataProcessing.h"
+#include "PWGUD/Core/UDHelpers.h"
+#include "PWGUD/DataModel/UDTables.h"
+
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 #include "TDatabasePDG.h"
 #include "TLorentzVector.h"
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/UDHelpers.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Tutorials/PWGUD/UDTutorial_05.cxx b/.conflict-base-0/Tutorials/PWGUD/UDTutorial_05.cxx
index 40375c48614..9ca8ddf62d5 100644
--- a/.conflict-base-0/Tutorials/PWGUD/UDTutorial_05.cxx
+++ b/.conflict-base-0/Tutorials/PWGUD/UDTutorial_05.cxx
@@ -10,16 +10,18 @@
 // or submit itself to any jurisdiction.
 //
 
-#include <iostream>
-#include "TLorentzVector.h"
-#include "TDatabasePDG.h"
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "PWGUD/DataModel/UDTables.h"
 #include "PWGUD/Core/SGSelector.h"
 #include "PWGUD/Core/SGTrackSelector.h"
+#include "PWGUD/DataModel/UDTables.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TDatabasePDG.h"
+#include "TLorentzVector.h"
+
+#include <iostream>
 
 // using namespace std;
 using namespace o2;
diff --git a/.conflict-base-0/Tutorials/PWGUD/UDTutorial_06.cxx b/.conflict-base-0/Tutorials/PWGUD/UDTutorial_06.cxx
index 9b1d1f55895..d7ef0273e7f 100644
--- a/.conflict-base-0/Tutorials/PWGUD/UDTutorial_06.cxx
+++ b/.conflict-base-0/Tutorials/PWGUD/UDTutorial_06.cxx
@@ -14,23 +14,23 @@
 /// \date 10.10.2024
 
 // O2 headers
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 // O2Physics headers
-#include "PWGUD/DataModel/UDTables.h"
 #include "PWGUD/Core/UDHelpers.h"
+#include "PWGUD/DataModel/UDTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPLHCIFData.h"
 #include "DataFormatsParameters/GRPECSObject.h"
+#include "DataFormatsParameters/GRPLHCIFData.h"
 
 // ROOT headers
-#include "TSystem.h"
 #include "TDatabasePDG.h"
 #include "TLorentzVector.h"
-#include "TLorentzVector.h"
 #include "TMath.h"
+#include "TSystem.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Tutorials/PWGUD/UDTutorial_07.cxx b/.conflict-base-0/Tutorials/PWGUD/UDTutorial_07.cxx
index 0060b68293e..cfa5dc6d27c 100644
--- a/.conflict-base-0/Tutorials/PWGUD/UDTutorial_07.cxx
+++ b/.conflict-base-0/Tutorials/PWGUD/UDTutorial_07.cxx
@@ -9,16 +9,19 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 //
-#include <iostream>
-#include <TString.h>
-#include <TTree.h>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "PWGUD/DataModel/UDTables.h"
-#include "TLorentzVector.h"
 #include "PWGUD/Core/SGSelector.h"
 #include "PWGUD/Core/SGTrackSelector.h"
+#include "PWGUD/DataModel/UDTables.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TLorentzVector.h"
+#include <TString.h>
+#include <TTree.h>
+
+#include <iostream>
 
 using namespace std;
 using namespace o2;
diff --git a/.conflict-base-0/Tutorials/Skimming/DataModel/JEDerived.h b/.conflict-base-0/Tutorials/Skimming/DataModel/JEDerived.h
index 20a8b3d076e..b0b79c2060a 100644
--- a/.conflict-base-0/Tutorials/Skimming/DataModel/JEDerived.h
+++ b/.conflict-base-0/Tutorials/Skimming/DataModel/JEDerived.h
@@ -29,7 +29,7 @@ DECLARE_SOA_COLUMN(Area, area, float);
 DECLARE_SOA_DYNAMIC_COLUMN(Px, px, [](float pt, float phi) { return pt * TMath::Cos(phi); });
 DECLARE_SOA_DYNAMIC_COLUMN(Py, py, [](float pt, float phi) { return pt * TMath::Sin(phi); });
 DECLARE_SOA_DYNAMIC_COLUMN(Pz, pz, [](float pt, float eta) { return pt * TMath::SinH(eta); });
-DECLARE_SOA_DYNAMIC_COLUMN(P, p, [](float pt, float eta) { return pt * TMath::CosH(eta); }); //absolute p
+DECLARE_SOA_DYNAMIC_COLUMN(P, p, [](float pt, float eta) { return pt * TMath::CosH(eta); }); // absolute p
 } // namespace jejet
 
 DECLARE_SOA_TABLE(JEJets, "AOD", "JEJET",
@@ -56,7 +56,7 @@ DECLARE_SOA_COLUMN(Phi, phi, float);
 DECLARE_SOA_DYNAMIC_COLUMN(Px, px, [](float pt, float phi) { return pt * TMath::Cos(phi); });
 DECLARE_SOA_DYNAMIC_COLUMN(Py, py, [](float pt, float phi) { return pt * TMath::Sin(phi); });
 DECLARE_SOA_DYNAMIC_COLUMN(Pz, pz, [](float pt, float eta) { return pt * TMath::SinH(eta); });
-DECLARE_SOA_DYNAMIC_COLUMN(P, p, [](float pt, float eta) { return pt * TMath::CosH(eta); }); //absolute p
+DECLARE_SOA_DYNAMIC_COLUMN(P, p, [](float pt, float eta) { return pt * TMath::CosH(eta); }); // absolute p
 } // namespace jeconstituent
 
 DECLARE_SOA_TABLE(JEConstituents, "AOD", "JECONSTITUENT", o2::soa::Index<>,
diff --git a/.conflict-base-0/Tutorials/Skimming/derivedBasicConsumer.cxx b/.conflict-base-0/Tutorials/Skimming/derivedBasicConsumer.cxx
index c96eeb156e7..21b06c2f9a6 100644
--- a/.conflict-base-0/Tutorials/Skimming/derivedBasicConsumer.cxx
+++ b/.conflict-base-0/Tutorials/Skimming/derivedBasicConsumer.cxx
@@ -11,13 +11,15 @@
 /// \author Nima Zardoshti <nima.zardoshti@cern.ch>, CERN
 
 // O2 includes
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "DataModel/DerivedExampleTable.h"
 
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "ReconstructionDataFormats/Track.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-base-0/Tutorials/Skimming/derivedBasicProvider.cxx b/.conflict-base-0/Tutorials/Skimming/derivedBasicProvider.cxx
index 93e567ecc9b..b0613b74cfd 100644
--- a/.conflict-base-0/Tutorials/Skimming/derivedBasicProvider.cxx
+++ b/.conflict-base-0/Tutorials/Skimming/derivedBasicProvider.cxx
@@ -10,13 +10,15 @@
 // or submit itself to any jurisdiction.
 
 // O2 includes
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "DataModel/DerivedExampleTable.h"
 
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "ReconstructionDataFormats/Track.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-base-0/Tutorials/Skimming/jetProvider.cxx b/.conflict-base-0/Tutorials/Skimming/jetProvider.cxx
index 36b985bc18d..ace25583de3 100644
--- a/.conflict-base-0/Tutorials/Skimming/jetProvider.cxx
+++ b/.conflict-base-0/Tutorials/Skimming/jetProvider.cxx
@@ -11,14 +11,17 @@
 /// \author Nima Zardoshti <nima.zardoshti@cern.ch>, CERN
 
 // O2 includes
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "DataModel/JEDerived.h"
-#include "PWGJE/DataModel/Jet.h"
+
 #include "PWGJE/Core/JetFinder.h"
+#include "PWGJE/DataModel/Jet.h"
+
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "ReconstructionDataFormats/Track.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Tutorials/Skimming/jetSpectraAnalyser.cxx b/.conflict-base-0/Tutorials/Skimming/jetSpectraAnalyser.cxx
index 6e635cd659e..2257e40086a 100644
--- a/.conflict-base-0/Tutorials/Skimming/jetSpectraAnalyser.cxx
+++ b/.conflict-base-0/Tutorials/Skimming/jetSpectraAnalyser.cxx
@@ -14,18 +14,19 @@
 // Author: Nima Zardoshti
 //
 
-#include "TH1F.h"
-#include "TTree.h"
+#include "DataModel/JEDerived.h"
+
+#include "PWGJE/Core/JetFinder.h"
+#include "PWGJE/DataModel/Jet.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 
-#include "PWGJE/DataModel/Jet.h"
-#include "PWGJE/Core/JetFinder.h"
-#include "DataModel/JEDerived.h"
+#include "TH1F.h"
+#include "TTree.h"
 
 using namespace o2;
 using namespace o2::framework;
@@ -39,7 +40,7 @@ struct JetSpectraAnalyser {
      {"hNJetConstituents", "Number of constituents;N;entries", {HistType::kTH1F, {{100, -0.5, 99.5}}}},
      {"hConstituentPt", "Constituent pT; Constituent #it{p}_{T} (GeV/#it{c});entries", {HistType::kTH1F, {{100, 0., 100.}}}}}};
 
-  //Filter jetCuts = aod::jet::pt > f_jetPtMin;
+  // Filter jetCuts = aod::jet::pt > f_jetPtMin;
 
   void process(aod::JEJet const& jet,
                aod::JEConstituents const& constituents)
@@ -55,4 +56,5 @@ WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
   return WorkflowSpec{
     adaptAnalysisTask<JetSpectraAnalyser>(cfgc, TaskName{"jetspectra-task-skim-analyser"})};
-}
\ No newline at end of file
+}
+ 
\ No newline at end of file
diff --git a/.conflict-base-0/Tutorials/Skimming/jetSpectraReference.cxx b/.conflict-base-0/Tutorials/Skimming/jetSpectraReference.cxx
index 74fb82dfc83..e73f5526dc4 100644
--- a/.conflict-base-0/Tutorials/Skimming/jetSpectraReference.cxx
+++ b/.conflict-base-0/Tutorials/Skimming/jetSpectraReference.cxx
@@ -14,17 +14,17 @@
 // Author: Nima Zardoshti
 //
 
-#include "TH1F.h"
-#include "TTree.h"
+#include "PWGJE/Core/JetFinder.h"
+#include "PWGJE/DataModel/Jet.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 
-#include "PWGJE/DataModel/Jet.h"
-#include "PWGJE/Core/JetFinder.h"
+#include "TH1F.h"
+#include "TTree.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Tutorials/Skimming/spectraNucleiAnalyser.cxx b/.conflict-base-0/Tutorials/Skimming/spectraNucleiAnalyser.cxx
index f0647db20a9..cdad3b82434 100644
--- a/.conflict-base-0/Tutorials/Skimming/spectraNucleiAnalyser.cxx
+++ b/.conflict-base-0/Tutorials/Skimming/spectraNucleiAnalyser.cxx
@@ -10,16 +10,17 @@
 // or submit itself to any jurisdiction.
 // O2 includes
 
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
+#include "DataModel/LFDerived.h"
+
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "DataModel/LFDerived.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
 #include <TLorentzVector.h>
 
diff --git a/.conflict-base-0/Tutorials/Skimming/spectraNucleiProvider.cxx b/.conflict-base-0/Tutorials/Skimming/spectraNucleiProvider.cxx
index 7a76882fd7a..66fe7b5de4d 100644
--- a/.conflict-base-0/Tutorials/Skimming/spectraNucleiProvider.cxx
+++ b/.conflict-base-0/Tutorials/Skimming/spectraNucleiProvider.cxx
@@ -11,16 +11,17 @@
 /// \author Nima Zardoshti <nima.zardoshti@cern.ch>, CERN
 
 // O2 includes
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "MathUtils/Utils.h"
 #include "DataModel/LFDerived.h"
 
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "MathUtils/Utils.h"
+#include "ReconstructionDataFormats/Track.h"
 
 #include <TLorentzVector.h>
 
diff --git a/.conflict-base-0/Tutorials/Skimming/spectraNucleiReference.cxx b/.conflict-base-0/Tutorials/Skimming/spectraNucleiReference.cxx
index 40535297fef..2af935c4339 100644
--- a/.conflict-base-0/Tutorials/Skimming/spectraNucleiReference.cxx
+++ b/.conflict-base-0/Tutorials/Skimming/spectraNucleiReference.cxx
@@ -10,18 +10,16 @@
 // or submit itself to any jurisdiction.
 // O2 includes
 
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
 #include <TLorentzVector.h>
 
diff --git a/.conflict-base-0/Tutorials/Skimming/spectraTPCAnalyser.cxx b/.conflict-base-0/Tutorials/Skimming/spectraTPCAnalyser.cxx
index 769ad0b885a..b5e42893f15 100644
--- a/.conflict-base-0/Tutorials/Skimming/spectraTPCAnalyser.cxx
+++ b/.conflict-base-0/Tutorials/Skimming/spectraTPCAnalyser.cxx
@@ -10,13 +10,15 @@
 // or submit itself to any jurisdiction.
 
 // O2 includes
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
+#include "DataModel/LFDerived.h"
+
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "DataModel/LFDerived.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "ReconstructionDataFormats/Track.h"
 
 using namespace o2;
 using namespace o2::framework;
@@ -63,7 +65,7 @@ struct TPCSpectraAnalyserTask {
     histos.fill(HIST(hpt[i]), track.pt());
   }
 
-  Filter collisionFilter = nabs(aod::collision::posZ) < cfgCutVertex; //collision filters not doing anything now?
+  Filter collisionFilter = nabs(aod::collision::posZ) < cfgCutVertex; // collision filters not doing anything now?
   Filter trackFilter = nabs(aod::lftrack::eta) < cfgCutEta;
 
   void process(soa::Filtered<aod::LFTracks>::iterator const& track)
diff --git a/.conflict-base-0/Tutorials/Skimming/spectraTPCProvider.cxx b/.conflict-base-0/Tutorials/Skimming/spectraTPCProvider.cxx
index c0bbf087fd3..12ca5c9a1ba 100644
--- a/.conflict-base-0/Tutorials/Skimming/spectraTPCProvider.cxx
+++ b/.conflict-base-0/Tutorials/Skimming/spectraTPCProvider.cxx
@@ -11,15 +11,17 @@
 /// \author Nima Zardoshti <nima.zardoshti@cern.ch>, CERN
 
 // O2 includes
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
+#include "DataModel/LFDerived.h"
+
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "MathUtils/Utils.h"
-#include "DataModel/LFDerived.h"
+#include "ReconstructionDataFormats/Track.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Tutorials/Skimming/spectraTPCReference.cxx b/.conflict-base-0/Tutorials/Skimming/spectraTPCReference.cxx
index 5d23fd202dc..7fbca871870 100644
--- a/.conflict-base-0/Tutorials/Skimming/spectraTPCReference.cxx
+++ b/.conflict-base-0/Tutorials/Skimming/spectraTPCReference.cxx
@@ -10,13 +10,14 @@
 // or submit itself to any jurisdiction.
 
 // O2 includes
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "ReconstructionDataFormats/Track.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
@@ -47,7 +48,7 @@ struct TPCSpectraReferenceTask {
     }
   }
 
-  //Defining filters and input
+  // Defining filters and input
   Configurable<float> cfgCutVertex{"cfgCutVertex", 10.0f, "Accepted z-vertex range"};
   Configurable<float> cfgCutEta{"cfgCutEta", 0.8f, "Eta range for tracks"};
   Configurable<float> cfgCutPt{"cfgCutPt", 0.0f, "Pt range for tracks"};
diff --git a/.conflict-base-0/Tutorials/Skimming/spectraUPCAnalyser.cxx b/.conflict-base-0/Tutorials/Skimming/spectraUPCAnalyser.cxx
index cdc6c9a0c4b..2c831ddc591 100644
--- a/.conflict-base-0/Tutorials/Skimming/spectraUPCAnalyser.cxx
+++ b/.conflict-base-0/Tutorials/Skimming/spectraUPCAnalyser.cxx
@@ -10,16 +10,18 @@
 // or submit itself to any jurisdiction.
 
 // O2 includes
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
+#include "DataModel/UDDerived.h"
+
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "DataModel/UDDerived.h"
-#include "TLorentzVector.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include "TLorentzVector.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Tutorials/Skimming/spectraUPCProvider.cxx b/.conflict-base-0/Tutorials/Skimming/spectraUPCProvider.cxx
index 053b7437080..3d6909f88d0 100644
--- a/.conflict-base-0/Tutorials/Skimming/spectraUPCProvider.cxx
+++ b/.conflict-base-0/Tutorials/Skimming/spectraUPCProvider.cxx
@@ -10,18 +10,19 @@
 // or submit itself to any jurisdiction.
 /// \author Nima Zardoshti <nima.zardoshti@cern.ch>, CERN
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "ReconstructionDataFormats/Track.h"
+#include "DataModel/UDDerived.h"
 
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
 #include <TH1D.h>
-#include "DataModel/UDDerived.h"
 
 using namespace o2;
 using namespace o2::aod::evsel;
diff --git a/.conflict-base-0/Tutorials/Skimming/spectraUPCReference.cxx b/.conflict-base-0/Tutorials/Skimming/spectraUPCReference.cxx
index f0a26f248f8..59ba6c24ab1 100644
--- a/.conflict-base-0/Tutorials/Skimming/spectraUPCReference.cxx
+++ b/.conflict-base-0/Tutorials/Skimming/spectraUPCReference.cxx
@@ -9,17 +9,16 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 
-#include <TH1D.h>
 #include "TLorentzVector.h"
+#include <TH1D.h>
 
 using namespace o2;
 using namespace o2::aod::evsel;
diff --git a/.conflict-base-0/Tutorials/include/configurableCut.h b/.conflict-base-0/Tutorials/include/configurableCut.h
index b690058abf1..2bbb47486fc 100644
--- a/.conflict-base-0/Tutorials/include/configurableCut.h
+++ b/.conflict-base-0/Tutorials/include/configurableCut.h
@@ -13,10 +13,13 @@
 #define CONFIGURABLECUT_H
 
 #include "Framework/Array2D.h"
-#include <iosfwd>
-#include <Rtypes.h>
+
 #include <TMath.h>
 
+#include <Rtypes.h>
+
+#include <iosfwd>
+
 static constexpr double default_matrix[3][3] = {{1.1, 1.2, 1.3}, {2.1, 2.2, 2.3}, {3.1, 3.2, 3.3}};
 
 class configurableCut
diff --git a/.conflict-base-0/Tutorials/src/ZDCVZeroIteration.cxx b/.conflict-base-0/Tutorials/src/ZDCVZeroIteration.cxx
index 10b45687213..1804fe5690f 100644
--- a/.conflict-base-0/Tutorials/src/ZDCVZeroIteration.cxx
+++ b/.conflict-base-0/Tutorials/src/ZDCVZeroIteration.cxx
@@ -17,8 +17,8 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Tutorials/src/associatedExample.cxx b/.conflict-base-0/Tutorials/src/associatedExample.cxx
index 6538104d3f5..f7abeeb604e 100644
--- a/.conflict-base-0/Tutorials/src/associatedExample.cxx
+++ b/.conflict-base-0/Tutorials/src/associatedExample.cxx
@@ -13,8 +13,8 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 namespace o2::aod
 {
@@ -140,7 +140,7 @@ struct PartitionColExtra {
 struct BuildHmpidIndex {
   // build the index table HMPIDTracksIndex
   Builds<aod::HMPIDTracksIndex> idx;
-  void init(InitContext const&){};
+  void init(InitContext const&) {};
 };
 
 struct ConsumeHmpidIndex {
diff --git a/.conflict-base-0/Tutorials/src/ccdbaccess.cxx b/.conflict-base-0/Tutorials/src/ccdbaccess.cxx
index afa5c9d4d52..69f804195d1 100644
--- a/.conflict-base-0/Tutorials/src/ccdbaccess.cxx
+++ b/.conflict-base-0/Tutorials/src/ccdbaccess.cxx
@@ -18,10 +18,10 @@
 /// \author Nicolo' Jacazio
 /// \since 2020-06-22
 
-#include "Framework/runDataProcessing.h"
+#include "CommonDataFormat/InteractionRecord.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 #include <CCDB/BasicCCDBManager.h>
-#include "CommonDataFormat/InteractionRecord.h"
 
 #include <chrono>
 
diff --git a/.conflict-base-0/Tutorials/src/collisionTracksIteration.cxx b/.conflict-base-0/Tutorials/src/collisionTracksIteration.cxx
index a2261504d3b..e7999a01455 100644
--- a/.conflict-base-0/Tutorials/src/collisionTracksIteration.cxx
+++ b/.conflict-base-0/Tutorials/src/collisionTracksIteration.cxx
@@ -15,8 +15,8 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Tutorials/src/compatibleBCs.cxx b/.conflict-base-0/Tutorials/src/compatibleBCs.cxx
index 20d38d032db..22c8b2c49be 100644
--- a/.conflict-base-0/Tutorials/src/compatibleBCs.cxx
+++ b/.conflict-base-0/Tutorials/src/compatibleBCs.cxx
@@ -15,9 +15,9 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "CommonConstants/LHCConstants.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Tutorials/src/conditionalExpressions.cxx b/.conflict-base-0/Tutorials/src/conditionalExpressions.cxx
index 07b9dbac403..5843f2b5a33 100644
--- a/.conflict-base-0/Tutorials/src/conditionalExpressions.cxx
+++ b/.conflict-base-0/Tutorials/src/conditionalExpressions.cxx
@@ -11,8 +11,8 @@
 ///
 /// \brief Demonstration of conditions in filter expressions
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Tutorials/src/configurableCut.cxx b/.conflict-base-0/Tutorials/src/configurableCut.cxx
index 62b1d1adc66..22ef7341b84 100644
--- a/.conflict-base-0/Tutorials/src/configurableCut.cxx
+++ b/.conflict-base-0/Tutorials/src/configurableCut.cxx
@@ -10,6 +10,7 @@
 // or submit itself to any jurisdiction.
 
 #include "configurableCut.h"
+
 #include <iostream>
 
 std::ostream& operator<<(std::ostream& os, configurableCut const& c)
diff --git a/.conflict-base-0/Tutorials/src/configurableCut.json b/.conflict-base-0/Tutorials/src/configurableCut.json
index 33d4294b132..be9ab281ad8 100644
--- a/.conflict-base-0/Tutorials/src/configurableCut.json
+++ b/.conflict-base-0/Tutorials/src/configurableCut.json
@@ -10,12 +10,12 @@
     "internal-dpl-aod-spawner": "",
     "configurable-demo": {
         "cut": {
-		"cut": "0.1",
-		"state": "1"
-	},
+            "cut": "0.1",
+            "state": "1"
+        },
         "mutable_cut": {
-		"cut": "0.2",
-		"state": "-1"
-	}
+            "cut": "0.2",
+            "state": "-1"
+        }
     }
 }
diff --git a/.conflict-base-0/Tutorials/src/configurableObjects.cxx b/.conflict-base-0/Tutorials/src/configurableObjects.cxx
index 210d93c0dac..0d34f8f1913 100644
--- a/.conflict-base-0/Tutorials/src/configurableObjects.cxx
+++ b/.conflict-base-0/Tutorials/src/configurableObjects.cxx
@@ -14,11 +14,12 @@
 /// \author
 /// \since
 
-#include <sstream>
-
 #include "configurableCut.h"
-#include "Framework/runDataProcessing.h"
+
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include <sstream>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Tutorials/src/consume.cxx b/.conflict-base-0/Tutorials/src/consume.cxx
index f97e65bda87..95e8a8e9a4b 100644
--- a/.conflict-base-0/Tutorials/src/consume.cxx
+++ b/.conflict-base-0/Tutorials/src/consume.cxx
@@ -14,8 +14,9 @@
 /// \since
 
 #include "IntermediateTables.h"
-#include "Framework/runDataProcessing.h"
+
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Tutorials/src/dynamicColumns.cxx b/.conflict-base-0/Tutorials/src/dynamicColumns.cxx
index 48de150b042..2e6dbcc0a15 100644
--- a/.conflict-base-0/Tutorials/src/dynamicColumns.cxx
+++ b/.conflict-base-0/Tutorials/src/dynamicColumns.cxx
@@ -13,8 +13,8 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 namespace o2::aod
 {
diff --git a/.conflict-base-0/Tutorials/src/efficiencyGlobal.cxx b/.conflict-base-0/Tutorials/src/efficiencyGlobal.cxx
index ef509cb0bac..e405c479697 100644
--- a/.conflict-base-0/Tutorials/src/efficiencyGlobal.cxx
+++ b/.conflict-base-0/Tutorials/src/efficiencyGlobal.cxx
@@ -17,9 +17,10 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 #include <CCDB/BasicCCDBManager.h>
+
 #include <chrono>
 
 using namespace o2::framework;
@@ -56,7 +57,7 @@ struct EfficiencyGlobal {
   {
     for (auto& track : tracks) {
       pt->Fill(track.pt(), efficiency->GetBinContent(efficiency->FindBin(track.pt())));
-      //LOGF(info, "Efficiency %f for pt %f", efficiency->GetBinContent(efficiency->FindBin(track.pt())), track.pt());
+      // LOGF(info, "Efficiency %f for pt %f", efficiency->GetBinContent(efficiency->FindBin(track.pt())), track.pt());
     }
   }
 };
diff --git a/.conflict-base-0/Tutorials/src/efficiencyPerRun.cxx b/.conflict-base-0/Tutorials/src/efficiencyPerRun.cxx
index c2fa7a887ca..57f28054d37 100644
--- a/.conflict-base-0/Tutorials/src/efficiencyPerRun.cxx
+++ b/.conflict-base-0/Tutorials/src/efficiencyPerRun.cxx
@@ -20,9 +20,10 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 #include <CCDB/BasicCCDBManager.h>
+
 #include <chrono>
 
 using namespace o2::framework;
@@ -58,7 +59,7 @@ struct EfficiencyPerRun {
 
     for (auto& track : tracks) {
       pt->Fill(track.pt(), efficiency->GetBinContent(efficiency->FindBin(track.pt())));
-      //LOGF(info, "Efficiency %f for pt %f", efficiency->GetBinContent(efficiency->FindBin(track.pt())), track.pt());
+      // LOGF(info, "Efficiency %f for pt %f", efficiency->GetBinContent(efficiency->FindBin(track.pt())), track.pt());
     }
   }
 };
diff --git a/.conflict-base-0/Tutorials/src/eventMixing.cxx b/.conflict-base-0/Tutorials/src/eventMixing.cxx
index a1526740886..759dfeb2ff2 100644
--- a/.conflict-base-0/Tutorials/src/eventMixing.cxx
+++ b/.conflict-base-0/Tutorials/src/eventMixing.cxx
@@ -14,15 +14,17 @@
 /// \author Karwowska Maja
 /// \since
 
-#include <vector>
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-base-0/Tutorials/src/eventMixingValidation.cxx b/.conflict-base-0/Tutorials/src/eventMixingValidation.cxx
index cc1933b0a25..1bfc9891ac5 100644
--- a/.conflict-base-0/Tutorials/src/eventMixingValidation.cxx
+++ b/.conflict-base-0/Tutorials/src/eventMixingValidation.cxx
@@ -14,15 +14,17 @@
 /// \author Karwowska Maja
 /// \since
 
-#include <vector>
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/SliceCache.h"
 #include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Multiplicity.h"
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
@@ -39,7 +41,7 @@ struct MixedEventsEmptyTables {
   std::vector<double> xBins{VARIABLE_WIDTH, -0.064, -0.062, -0.060, 0.066, 0.068, 0.070, 0.072};
   std::vector<double> yBins{VARIABLE_WIDTH, -0.320, -0.301, -0.300, 0.330, 0.340, 0.350, 0.360};
   using BinningType = ColumnBinningPolicy<aod::collision::PosX, aod::collision::PosY>;
-  BinningType binningOnPositions{{xBins, yBins}, true};                                 // true is for 'ignore overflows' (true by default)
+  BinningType binningOnPositions{{xBins, yBins}, true};                                         // true is for 'ignore overflows' (true by default)
   SameKindPair<aod::Collisions, MyTracks, BinningType> pair{binningOnPositions, 5, -1, &cache}; // indicates that 5 events should be mixed and under/overflow (-1) to be ignored
 
   void process(aod::Collisions const& collisions, MyTracks const& tracks)
@@ -71,7 +73,7 @@ struct MixedEventsJoinedTracks {
   std::vector<double> xBins{VARIABLE_WIDTH, -0.064, -0.062, -0.060, 0.066, 0.068, 0.070, 0.072};
   std::vector<double> yBins{VARIABLE_WIDTH, -0.320, -0.301, -0.300, 0.330, 0.340, 0.350, 0.360};
   using BinningType = ColumnBinningPolicy<aod::collision::PosX, aod::collision::PosY>;
-  BinningType binningOnPositions{{xBins, yBins}, true};                                        // true is for 'ignore overflows' (true by default)
+  BinningType binningOnPositions{{xBins, yBins}, true};                                                // true is for 'ignore overflows' (true by default)
   SameKindPair<aod::Collisions, aod::FullTracks, BinningType> pair{binningOnPositions, 5, -1, &cache}; // indicates that 5 events should be mixed and under/overflow (-1) to be ignored
 
   void process(aod::Collisions const& collisions, aod::FullTracks const& tracks)
diff --git a/.conflict-base-0/Tutorials/src/extendedColumns.cxx b/.conflict-base-0/Tutorials/src/extendedColumns.cxx
index 72bb2bb55b4..43ec8f77a7d 100644
--- a/.conflict-base-0/Tutorials/src/extendedColumns.cxx
+++ b/.conflict-base-0/Tutorials/src/extendedColumns.cxx
@@ -13,8 +13,8 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 namespace o2::aod
 {
diff --git a/.conflict-base-0/Tutorials/src/extendedTables.cxx b/.conflict-base-0/Tutorials/src/extendedTables.cxx
index 643a81e1504..4b50c4d85b0 100644
--- a/.conflict-base-0/Tutorials/src/extendedTables.cxx
+++ b/.conflict-base-0/Tutorials/src/extendedTables.cxx
@@ -13,8 +13,8 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 namespace o2::aod
 {
diff --git a/.conflict-base-0/Tutorials/src/filters.cxx b/.conflict-base-0/Tutorials/src/filters.cxx
index a3c590b8bfd..6b2d4a1aba4 100644
--- a/.conflict-base-0/Tutorials/src/filters.cxx
+++ b/.conflict-base-0/Tutorials/src/filters.cxx
@@ -13,8 +13,8 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 namespace o2::aod
 {
diff --git a/.conflict-base-0/Tutorials/src/fullTrackIteration.cxx b/.conflict-base-0/Tutorials/src/fullTrackIteration.cxx
index c88ba5b1a78..0bfa4532d55 100644
--- a/.conflict-base-0/Tutorials/src/fullTrackIteration.cxx
+++ b/.conflict-base-0/Tutorials/src/fullTrackIteration.cxx
@@ -13,8 +13,8 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Tutorials/src/hepMC.cxx b/.conflict-base-0/Tutorials/src/hepMC.cxx
index d05941eff06..10d73141b78 100644
--- a/.conflict-base-0/Tutorials/src/hepMC.cxx
+++ b/.conflict-base-0/Tutorials/src/hepMC.cxx
@@ -13,8 +13,8 @@
 /// \author jgrosseo
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Tutorials/src/histogramRegistry.cxx b/.conflict-base-0/Tutorials/src/histogramRegistry.cxx
index ddbcdd18c56..24d5899361c 100644
--- a/.conflict-base-0/Tutorials/src/histogramRegistry.cxx
+++ b/.conflict-base-0/Tutorials/src/histogramRegistry.cxx
@@ -13,12 +13,13 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include <TParameter.h>
 
+#include "Framework/AnalysisTask.h"
 #include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
+
+#include <TParameter.h>
 
 using namespace o2;
 using namespace o2::framework;
@@ -30,7 +31,7 @@ struct EtaPhiHistograms {
     {
       {"eta", "#eta", {HistType::kTH1F, {{102, -2.01, 2.01}}}},     //
       {"phi", "#varphi", {HistType::kTH1F, {{100, 0., 2. * M_PI}}}} //
-    }                                                               //
+    } //
   };
 
   void process(aod::Tracks const& tracks)
@@ -49,7 +50,7 @@ struct FilteredHistograms {
     {
       {"eta", "#eta", {HistType::kTH1F, {{102, -2.01, 2.01}}}},                            //
       {"ptToPt", "#ptToPt", {HistType::kTH2F, {{100, -0.01, 10.01}, {100, -0.01, 10.01}}}} //
-    }                                                                                      //
+    } //
   };
 
   void process(aod::Tracks const& tracks)
@@ -259,7 +260,7 @@ struct TListTest {
     {
       {"eta", "#eta", {HistType::kTH1F, {{102, -2.01, 2.01}}}},     //
       {"phi", "#varphi", {HistType::kTH1F, {{100, 0., 2. * M_PI}}}} //
-    }                                                               //
+    } //
   };
 
   void init(InitContext const&)
diff --git a/.conflict-base-0/Tutorials/src/histogramTrackSelection.cxx b/.conflict-base-0/Tutorials/src/histogramTrackSelection.cxx
index df164396b66..599aa0e0ee9 100644
--- a/.conflict-base-0/Tutorials/src/histogramTrackSelection.cxx
+++ b/.conflict-base-0/Tutorials/src/histogramTrackSelection.cxx
@@ -17,12 +17,12 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-
 #include "Common/Core/TrackSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-base-0/Tutorials/src/histograms.cxx b/.conflict-base-0/Tutorials/src/histograms.cxx
index 613b27d05d6..13c44fbc713 100644
--- a/.conflict-base-0/Tutorials/src/histograms.cxx
+++ b/.conflict-base-0/Tutorials/src/histograms.cxx
@@ -19,8 +19,8 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Tutorials/src/histogramsFullTracks.cxx b/.conflict-base-0/Tutorials/src/histogramsFullTracks.cxx
index 8c45e5a3927..a68e3e5a873 100644
--- a/.conflict-base-0/Tutorials/src/histogramsFullTracks.cxx
+++ b/.conflict-base-0/Tutorials/src/histogramsFullTracks.cxx
@@ -13,9 +13,11 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 #include <TH2F.h>
+
 #include <cmath>
 
 using namespace o2;
diff --git a/.conflict-base-0/Tutorials/src/jetAnalysis.cxx b/.conflict-base-0/Tutorials/src/jetAnalysis.cxx
index 8313e69f2bb..e684f645b90 100644
--- a/.conflict-base-0/Tutorials/src/jetAnalysis.cxx
+++ b/.conflict-base-0/Tutorials/src/jetAnalysis.cxx
@@ -14,10 +14,11 @@
 /// \author Jochen Klein
 /// \since
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "PWGJE/DataModel/Jet.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-base-0/Tutorials/src/mcHistograms.cxx b/.conflict-base-0/Tutorials/src/mcHistograms.cxx
index 75c28c6c3c4..08bcb24119d 100644
--- a/.conflict-base-0/Tutorials/src/mcHistograms.cxx
+++ b/.conflict-base-0/Tutorials/src/mcHistograms.cxx
@@ -13,10 +13,11 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "CommonConstants/MathConstants.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TDatabasePDG.h"
 
 using namespace o2;
diff --git a/.conflict-base-0/Tutorials/src/mcOnly.cxx b/.conflict-base-0/Tutorials/src/mcOnly.cxx
index e72295ecb3a..293bd0a1904 100644
--- a/.conflict-base-0/Tutorials/src/mcOnly.cxx
+++ b/.conflict-base-0/Tutorials/src/mcOnly.cxx
@@ -13,10 +13,11 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "CommonConstants/MathConstants.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TDatabasePDG.h"
 
 using namespace o2;
diff --git a/.conflict-base-0/Tutorials/src/multiplicityEventTrackSelection.cxx b/.conflict-base-0/Tutorials/src/multiplicityEventTrackSelection.cxx
index c1e3714f2f3..2c0b4cce38a 100644
--- a/.conflict-base-0/Tutorials/src/multiplicityEventTrackSelection.cxx
+++ b/.conflict-base-0/Tutorials/src/multiplicityEventTrackSelection.cxx
@@ -17,12 +17,12 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-base-0/Tutorials/src/muonIteration.cxx b/.conflict-base-0/Tutorials/src/muonIteration.cxx
index 4b94fe77ae3..497a07cd881 100644
--- a/.conflict-base-0/Tutorials/src/muonIteration.cxx
+++ b/.conflict-base-0/Tutorials/src/muonIteration.cxx
@@ -16,8 +16,8 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
@@ -65,7 +65,7 @@ struct IterateMuonsSparse {
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
   return WorkflowSpec{
-    //adaptAnalysisTask<IterateMuonsExclusives>(cfgc), // currently does not work
+    // adaptAnalysisTask<IterateMuonsExclusives>(cfgc), // currently does not work
     adaptAnalysisTask<IterateMuons>(cfgc),
     adaptAnalysisTask<IterateMuonsSparse>(cfgc),
   };
diff --git a/.conflict-base-0/Tutorials/src/newCollections.cxx b/.conflict-base-0/Tutorials/src/newCollections.cxx
index 490782347f3..689d442314f 100644
--- a/.conflict-base-0/Tutorials/src/newCollections.cxx
+++ b/.conflict-base-0/Tutorials/src/newCollections.cxx
@@ -13,8 +13,8 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 // define columns in a sub-namespace of o2::aod
 // and tables in namespace o2::aod
diff --git a/.conflict-base-0/Tutorials/src/partitions.cxx b/.conflict-base-0/Tutorials/src/partitions.cxx
index f5b58529a80..aee5605da20 100644
--- a/.conflict-base-0/Tutorials/src/partitions.cxx
+++ b/.conflict-base-0/Tutorials/src/partitions.cxx
@@ -13,8 +13,8 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Tutorials/src/pidTpcTof.cxx b/.conflict-base-0/Tutorials/src/pidTpcTof.cxx
index 777c09c1920..b5d755cf1c0 100644
--- a/.conflict-base-0/Tutorials/src/pidTpcTof.cxx
+++ b/.conflict-base-0/Tutorials/src/pidTpcTof.cxx
@@ -17,8 +17,8 @@
 
 // O2 includes
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
 
 // O2Physics includes
 #include "Common/DataModel/PIDResponse.h"
diff --git a/.conflict-base-0/Tutorials/src/preprocess.cxx b/.conflict-base-0/Tutorials/src/preprocess.cxx
index 417bafbf744..290c040db39 100644
--- a/.conflict-base-0/Tutorials/src/preprocess.cxx
+++ b/.conflict-base-0/Tutorials/src/preprocess.cxx
@@ -16,10 +16,11 @@
 /// \since
 
 #include "IntermediateTables.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
+
 #include "Framework/AnalysisTask.h"
 #include "Framework/ConfigParamSpec.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Tutorials/src/propagatedTracks.cxx b/.conflict-base-0/Tutorials/src/propagatedTracks.cxx
index 651738de71e..097adc3ecf3 100644
--- a/.conflict-base-0/Tutorials/src/propagatedTracks.cxx
+++ b/.conflict-base-0/Tutorials/src/propagatedTracks.cxx
@@ -14,18 +14,18 @@
 // Needs o2-analysis-track-propagation
 //
 
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/Core/trackUtilities.h"
-#include "ReconstructionDataFormats/DCA.h"
-#include "DetectorsBase/Propagator.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CommonUtils/NameConf.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
 #include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/DCA.h"
 
 using namespace o2;
 using namespace o2::constants::math;
@@ -105,4 +105,5 @@ WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
     adaptAnalysisTask<PropagatedTracksQa>(cfgc),
     adaptAnalysisTask<PropagatedTracksExtra>(cfgc),
   };
-}
\ No newline at end of file
+}
+ 
\ No newline at end of file
diff --git a/.conflict-base-0/Tutorials/src/reweighting.cxx b/.conflict-base-0/Tutorials/src/reweighting.cxx
index 17a4ad4bf33..b1f0c43a22f 100644
--- a/.conflict-base-0/Tutorials/src/reweighting.cxx
+++ b/.conflict-base-0/Tutorials/src/reweighting.cxx
@@ -28,11 +28,15 @@
 // This workflow is used to create a flat tree for model training
 // Use o2-aod-merger to combine dataframes in output AnalysisResults_trees.root
 
-#include <onnxruntime_cxx_api.h>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/Multiplicity.h"
 #include "TrainingTree.h"
+
+#include "Common/DataModel/Multiplicity.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include <onnxruntime_cxx_api.h>
+
 #include <cmath>
 
 using namespace o2;
diff --git a/.conflict-base-0/Tutorials/src/schemaEvolution.cxx b/.conflict-base-0/Tutorials/src/schemaEvolution.cxx
index a15fcba6dda..04033257753 100644
--- a/.conflict-base-0/Tutorials/src/schemaEvolution.cxx
+++ b/.conflict-base-0/Tutorials/src/schemaEvolution.cxx
@@ -16,8 +16,8 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 namespace o2::aod
 {
diff --git a/.conflict-base-0/Tutorials/src/tableIOout.cxx b/.conflict-base-0/Tutorials/src/tableIOout.cxx
index 403740755d9..75678bca3b6 100644
--- a/.conflict-base-0/Tutorials/src/tableIOout.cxx
+++ b/.conflict-base-0/Tutorials/src/tableIOout.cxx
@@ -14,8 +14,8 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 namespace o2::aod
 {
diff --git a/.conflict-base-0/Tutorials/src/trackIteration.cxx b/.conflict-base-0/Tutorials/src/trackIteration.cxx
index ff3271d90c0..53b85c39ec9 100644
--- a/.conflict-base-0/Tutorials/src/trackIteration.cxx
+++ b/.conflict-base-0/Tutorials/src/trackIteration.cxx
@@ -13,8 +13,8 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-base-0/Tutorials/src/tracksCombinations.cxx b/.conflict-base-0/Tutorials/src/tracksCombinations.cxx
index 413e8399e9b..ca5db69f0f4 100644
--- a/.conflict-base-0/Tutorials/src/tracksCombinations.cxx
+++ b/.conflict-base-0/Tutorials/src/tracksCombinations.cxx
@@ -15,11 +15,12 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
 #include "Common/DataModel/Multiplicity.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::soa;
diff --git a/.conflict-base-0/Tutorials/src/treeCreator.cxx b/.conflict-base-0/Tutorials/src/treeCreator.cxx
index 27d1f1eda21..70879497ecd 100644
--- a/.conflict-base-0/Tutorials/src/treeCreator.cxx
+++ b/.conflict-base-0/Tutorials/src/treeCreator.cxx
@@ -30,11 +30,13 @@
 // This workflow is used to create a flat tree for model training
 // Use o2-aod-merger to combine dataframes in output AnalysisResults_trees.root
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/Multiplicity.h"
 #include "TrainingTree.h"
 
+#include "Common/DataModel/Multiplicity.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-base-0/Tutorials/src/weakDecayIteration.cxx b/.conflict-base-0/Tutorials/src/weakDecayIteration.cxx
index 0c4bc01f877..0735f5537e0 100644
--- a/.conflict-base-0/Tutorials/src/weakDecayIteration.cxx
+++ b/.conflict-base-0/Tutorials/src/weakDecayIteration.cxx
@@ -17,8 +17,8 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/ALICE3/Core/DelphesO2TrackSmearer.h b/.conflict-side-0/ALICE3/Core/DelphesO2TrackSmearer.h
index 1e0fd873e2c..7714e53f65f 100644
--- a/.conflict-side-0/ALICE3/Core/DelphesO2TrackSmearer.h
+++ b/.conflict-side-0/ALICE3/Core/DelphesO2TrackSmearer.h
@@ -24,12 +24,13 @@
 #ifndef ALICE3_CORE_DELPHESO2TRACKSMEARER_H_
 #define ALICE3_CORE_DELPHESO2TRACKSMEARER_H_
 
-#include <map>
-#include <iostream>
-#include <fstream>
+#include "ReconstructionDataFormats/Track.h"
 
 #include "TRandom.h"
-#include "ReconstructionDataFormats/Track.h"
+
+#include <fstream>
+#include <iostream>
+#include <map>
 
 ///////////////////////////////
 /// DelphesO2/src/lutCovm.hh //
@@ -85,7 +86,7 @@ struct map_t {
     if (bin > nbins - 1)
       return nbins - 1;
     return bin;
-  }                                                                                                            //;
+  } //;
   void print() { printf("nbins = %d, min = %f, max = %f, log = %s \n", nbins, min, max, log ? "on" : "off"); } //;
 };
 
@@ -214,8 +215,8 @@ class TrackSmearer
         return 7; // Helium3
       default:
         return 2; // Default: pion
-    }             //;
-  }               //;
+    } //;
+  } //;
 
   void setdNdEta(float val) { mdNdEta = val; } //;
 
diff --git a/.conflict-side-0/ALICE3/Core/DetLayer.cxx b/.conflict-side-0/ALICE3/Core/DetLayer.cxx
index 25e61e6e6d5..fa49e4d811e 100644
--- a/.conflict-side-0/ALICE3/Core/DetLayer.cxx
+++ b/.conflict-side-0/ALICE3/Core/DetLayer.cxx
@@ -16,11 +16,11 @@
 /// \brief  Basic struct to hold information regarding a detector layer to be used in fast simulation
 ///
 
-#include <vector>
-#include <string>
-
 #include "DetLayer.h"
 
+#include <string>
+#include <vector>
+
 namespace o2::fastsim
 {
 
diff --git a/.conflict-side-0/ALICE3/Core/DetLayer.h b/.conflict-side-0/ALICE3/Core/DetLayer.h
index 2577c73e42d..e70d719a6e4 100644
--- a/.conflict-side-0/ALICE3/Core/DetLayer.h
+++ b/.conflict-side-0/ALICE3/Core/DetLayer.h
@@ -19,10 +19,10 @@
 #ifndef ALICE3_CORE_DETLAYER_H_
 #define ALICE3_CORE_DETLAYER_H_
 
-#include <string>
-
 #include "TString.h"
 
+#include <string>
+
 namespace o2::fastsim
 {
 
diff --git a/.conflict-side-0/ALICE3/Core/TOFResoALICE3.h b/.conflict-side-0/ALICE3/Core/TOFResoALICE3.h
index b102091f756..9179c550e8e 100644
--- a/.conflict-side-0/ALICE3/Core/TOFResoALICE3.h
+++ b/.conflict-side-0/ALICE3/Core/TOFResoALICE3.h
@@ -20,9 +20,9 @@
 #define O2_ANALYSIS_PID_TOFRESOALICE3_H_
 
 // O2 includes
-#include "PID/ParamBase.h"
 #include "PID/DetectorResponse.h"
 #include "PID/PIDTOF.h"
+#include "PID/ParamBase.h"
 #include "ReconstructionDataFormats/PID.h"
 
 namespace o2::pid::tof
diff --git a/.conflict-side-0/ALICE3/DataModel/A3DecayFinderTables.h b/.conflict-side-0/ALICE3/DataModel/A3DecayFinderTables.h
index 55229bbb5d4..ed5bccfbb56 100644
--- a/.conflict-side-0/ALICE3/DataModel/A3DecayFinderTables.h
+++ b/.conflict-side-0/ALICE3/DataModel/A3DecayFinderTables.h
@@ -19,9 +19,10 @@
 #define ALICE3_DATAMODEL_A3DECAYFINDERTABLES_H_
 
 // O2 includes
-#include "Framework/AnalysisDataModel.h"
 #include "Common/Core/RecoDecay.h"
 
+#include "Framework/AnalysisDataModel.h"
+
 enum a3selectionBit : uint32_t { kDCAxy = 0,
                                  kInnerTOFPion,
                                  kInnerTOFKaon,
diff --git a/.conflict-side-0/ALICE3/TableProducer/OTF/onTheFlyTrackerPid.cxx b/.conflict-side-0/ALICE3/TableProducer/OTF/onTheFlyTrackerPid.cxx
index 42d2bcc5252..54de20c87b7 100644
--- a/.conflict-side-0/ALICE3/TableProducer/OTF/onTheFlyTrackerPid.cxx
+++ b/.conflict-side-0/ALICE3/TableProducer/OTF/onTheFlyTrackerPid.cxx
@@ -20,42 +20,45 @@
 /// \since  May 22, 2025
 ///
 
-#include <utility>
-#include <map>
-#include <string>
-#include <algorithm>
-#include <vector>
+#include "TableHelper.h"
 
+#include "ALICE3/Core/DelphesO2TrackSmearer.h"
+#include "ALICE3/Core/TrackUtilities.h"
+#include "ALICE3/DataModel/OTFPIDTrk.h"
+#include "ALICE3/DataModel/OTFRICH.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
+#include "CommonConstants/GeomConstants.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "CommonUtils/NameConf.h"
+#include "DataFormatsCalibration/MeanVertexObject.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "DetectorsVertexing/HelixHelper.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/Core/trackUtilities.h"
-#include "ALICE3/Core/TrackUtilities.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/DCA.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "CommonUtils/NameConf.h"
-#include "CCDB/CcdbApi.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "DataFormatsCalibration/MeanVertexObject.h"
-#include "CommonConstants/GeomConstants.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "TRandom3.h"
+
 #include "TF1.h"
 #include "TH2F.h"
-#include "TVector3.h"
+#include "TRandom3.h"
 #include "TString.h"
-#include "ALICE3/DataModel/OTFRICH.h"
-#include "DetectorsVertexing/HelixHelper.h"
-#include "TableHelper.h"
-#include "ALICE3/Core/DelphesO2TrackSmearer.h"
-#include "ALICE3/DataModel/OTFPIDTrk.h"
+#include "TVector3.h"
+
+#include <algorithm>
+#include <map>
+#include <string>
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/ALICE3/TableProducer/alice3-centrality.cxx b/.conflict-side-0/ALICE3/TableProducer/alice3-centrality.cxx
index 48c7ae617bf..bd6b8ac09d1 100644
--- a/.conflict-side-0/ALICE3/TableProducer/alice3-centrality.cxx
+++ b/.conflict-side-0/ALICE3/TableProducer/alice3-centrality.cxx
@@ -12,12 +12,13 @@
 /// \author David Dobrigkeit Chinellato <david.dobrigkeit.chinellato@cern.ch>, UNICAMP/CERN
 
 // O2 includes
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 #include <CCDB/BasicCCDBManager.h>
-#include "Common/DataModel/Centrality.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/ALICE3/TableProducer/alice3-correlatorDDbar.cxx b/.conflict-side-0/ALICE3/TableProducer/alice3-correlatorDDbar.cxx
index 6c270dc1cd5..63679b81b76 100644
--- a/.conflict-side-0/ALICE3/TableProducer/alice3-correlatorDDbar.cxx
+++ b/.conflict-side-0/ALICE3/TableProducer/alice3-correlatorDDbar.cxx
@@ -14,21 +14,20 @@
 ///
 /// \author Fabio Colamaria <fabio.colamaria@ba.infn.it>, INFN Bari
 
-#include <vector>
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/Core/SelectorCuts.h"
+#include "PWGHF/HFC/DataModel/CorrelationTables.h"
+
+#include "ALICE3/DataModel/A3DecayFinderTables.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
 #include "CommonConstants/PhysicsConstants.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
 
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-
-#include "ALICE3/DataModel/A3DecayFinderTables.h"
-
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/Core/SelectorCuts.h"
-#include "PWGHF/HFC/DataModel/CorrelationTables.h"
+#include <vector>
 // #include "PWGHF/DataModel/CandidateReconstructionTables.h"
 // #include "PWGHF/DataModel/CandidateSelectionTables.h"
 
diff --git a/.conflict-side-0/ALICE3/TableProducer/alice3-decayfinder.cxx b/.conflict-side-0/ALICE3/TableProducer/alice3-decayfinder.cxx
index 2d12ea9ed14..76ee4cc5027 100644
--- a/.conflict-side-0/ALICE3/TableProducer/alice3-decayfinder.cxx
+++ b/.conflict-side-0/ALICE3/TableProducer/alice3-decayfinder.cxx
@@ -17,35 +17,37 @@
 //    HF decays. Work in progress: use at your own risk!
 //
 
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <map>
-#include <iterator>
-#include <utility>
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "ReconstructionDataFormats/Track.h"
+#include "ALICE3/DataModel/A3DecayFinderTables.h"
+#include "ALICE3/DataModel/OTFTOF.h"
+#include "ALICE3/DataModel/RICH.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
 #include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "DCAFitter/DCAFitterN.h"
 #include "DataFormatsCalibration/MeanVertexObject.h"
-#include "ALICE3/DataModel/OTFTOF.h"
-#include "ALICE3/DataModel/RICH.h"
-#include "ALICE3/DataModel/A3DecayFinderTables.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <iterator>
+#include <map>
+#include <utility>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/ALICE3/TableProducer/alice3-decaypreselector.cxx b/.conflict-side-0/ALICE3/TableProducer/alice3-decaypreselector.cxx
index 527d1c1d197..b613d893292 100644
--- a/.conflict-side-0/ALICE3/TableProducer/alice3-decaypreselector.cxx
+++ b/.conflict-side-0/ALICE3/TableProducer/alice3-decaypreselector.cxx
@@ -17,36 +17,38 @@
 //    HF decays. Work in progress: use at your own risk!
 //
 
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <map>
-#include <iterator>
-#include <vector>
-#include <utility>
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "ReconstructionDataFormats/Track.h"
+#include "ALICE3/DataModel/A3DecayFinderTables.h"
+#include "ALICE3/DataModel/OTFRICH.h"
+#include "ALICE3/DataModel/OTFTOF.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
 #include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "DCAFitter/DCAFitterN.h"
 #include "DataFormatsCalibration/MeanVertexObject.h"
-#include "ALICE3/DataModel/OTFTOF.h"
-#include "ALICE3/DataModel/OTFRICH.h"
-#include "ALICE3/DataModel/A3DecayFinderTables.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <iterator>
+#include <map>
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/ALICE3/TableProducer/alice3-multicharmTable.cxx b/.conflict-side-0/ALICE3/TableProducer/alice3-multicharmTable.cxx
index 16b16c666d8..62713161343 100644
--- a/.conflict-side-0/ALICE3/TableProducer/alice3-multicharmTable.cxx
+++ b/.conflict-side-0/ALICE3/TableProducer/alice3-multicharmTable.cxx
@@ -17,41 +17,43 @@
 //    HF decays. Work in progress: use at your own risk!
 //
 
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <map>
-#include <iterator>
-#include <utility>
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "ReconstructionDataFormats/Track.h"
+#include "ALICE3/DataModel/A3DecayFinderTables.h"
+#include "ALICE3/DataModel/OTFMulticharm.h"
+#include "ALICE3/DataModel/OTFStrangeness.h"
+#include "ALICE3/DataModel/OTFTOF.h"
+#include "ALICE3/DataModel/RICH.h"
+#include "ALICE3/DataModel/tracksAlice3.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
 #include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "DCAFitter/DCAFitterN.h"
 #include "DataFormatsCalibration/MeanVertexObject.h"
-#include "ALICE3/DataModel/OTFTOF.h"
-#include "ALICE3/DataModel/RICH.h"
-#include "ALICE3/DataModel/A3DecayFinderTables.h"
-#include "ALICE3/DataModel/OTFStrangeness.h"
-#include "ALICE3/DataModel/OTFMulticharm.h"
-#include "ALICE3/DataModel/tracksAlice3.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
 #include "DetectorsVertexing/PVertexer.h"
 #include "DetectorsVertexing/PVertexerHelpers.h"
-#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <iterator>
+#include <map>
+#include <utility>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/ALICE3/TableProducer/alice3-pidTOF.cxx b/.conflict-side-0/ALICE3/TableProducer/alice3-pidTOF.cxx
index 3e54b1f46dc..cd5fe0dfff0 100644
--- a/.conflict-side-0/ALICE3/TableProducer/alice3-pidTOF.cxx
+++ b/.conflict-side-0/ALICE3/TableProducer/alice3-pidTOF.cxx
@@ -17,15 +17,16 @@
 ///
 
 // O2 includes
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "ALICE3/Core/TOFResoALICE3.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StaticFor.h"
+#include "ReconstructionDataFormats/Track.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/ALICE3/TableProducer/alice3-trackextension.cxx b/.conflict-side-0/ALICE3/TableProducer/alice3-trackextension.cxx
index 578d1979310..8709b5e7b7e 100644
--- a/.conflict-side-0/ALICE3/TableProducer/alice3-trackextension.cxx
+++ b/.conflict-side-0/ALICE3/TableProducer/alice3-trackextension.cxx
@@ -13,11 +13,12 @@
 // Task performing basic track selection for the ALICE3.
 //
 
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/Core/trackUtilities.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/ALICE3/TableProducer/alice3-trackselection.cxx b/.conflict-side-0/ALICE3/TableProducer/alice3-trackselection.cxx
index 58f3a4f33ce..b45910da01d 100644
--- a/.conflict-side-0/ALICE3/TableProducer/alice3-trackselection.cxx
+++ b/.conflict-side-0/ALICE3/TableProducer/alice3-trackselection.cxx
@@ -14,11 +14,12 @@
 /// \brief  Track selection for the ALICE3 studies
 ///
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/ALICE3/Tasks/ECALqa.cxx b/.conflict-side-0/ALICE3/Tasks/ECALqa.cxx
index b3d1b200f71..8903a101b56 100644
--- a/.conflict-side-0/ALICE3/Tasks/ECALqa.cxx
+++ b/.conflict-side-0/ALICE3/Tasks/ECALqa.cxx
@@ -17,12 +17,13 @@
 ///
 
 // O2 includes
-#include "Framework/AnalysisTask.h"
 #include "ALICE3/DataModel/ECAL.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "ReconstructionDataFormats/PID.h"
+
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/PID.h"
 
 using namespace o2;
 using namespace o2::track;
diff --git a/.conflict-side-0/ALICE3/Tasks/alice3-cdeuteron.cxx b/.conflict-side-0/ALICE3/Tasks/alice3-cdeuteron.cxx
index de6b6738d02..c8357dc9a30 100644
--- a/.conflict-side-0/ALICE3/Tasks/alice3-cdeuteron.cxx
+++ b/.conflict-side-0/ALICE3/Tasks/alice3-cdeuteron.cxx
@@ -13,15 +13,17 @@
 /// \author Alexander Kalweit <alexander.kalweit@cern.ch>, CERN
 
 // O2 includes
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/PIDResponse.h"
+
+#include "DCAFitter/DCAFitterN.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "TLorentzVector.h"
 #include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/PID.h"
-#include "Common/Core/RecoDecay.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/trackUtilities.h"
+
+#include "TLorentzVector.h"
 
 using namespace o2;
 using namespace o2::framework;
@@ -468,7 +470,7 @@ struct Alice3CDeuteron {
 
           // fitterCasc.getTrack(1).getPxPyPzGlo(pvecbach);
         } // End loop on pions
-      }   // End loop on kaons
+      } // End loop on kaons
       histos.fill(HIST("event/candperdeuteron"), ncand);
     } // End loop on deuterons
   }
diff --git a/.conflict-side-0/ALICE3/Tasks/alice3-dilepton.cxx b/.conflict-side-0/ALICE3/Tasks/alice3-dilepton.cxx
index e3632fc5a02..6f20f518d27 100644
--- a/.conflict-side-0/ALICE3/Tasks/alice3-dilepton.cxx
+++ b/.conflict-side-0/ALICE3/Tasks/alice3-dilepton.cxx
@@ -16,16 +16,17 @@
 
 #include "Math/Vector4D.h"
 // O2 includes
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/HistogramRegistry.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Framework/AnalysisDataModel.h"
-#include "ALICE3/DataModel/OTFTOF.h"
 #include "ALICE3/DataModel/OTFRICH.h"
+#include "ALICE3/DataModel/OTFTOF.h"
 #include "ALICE3/DataModel/tracksAlice3.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-side-0/ALICE3/Tasks/alice3-multicharm.cxx b/.conflict-side-0/ALICE3/Tasks/alice3-multicharm.cxx
index 2b6ad804ddf..16332ead7e0 100644
--- a/.conflict-side-0/ALICE3/Tasks/alice3-multicharm.cxx
+++ b/.conflict-side-0/ALICE3/Tasks/alice3-multicharm.cxx
@@ -17,41 +17,43 @@
 //    HF decays. Work in progress: use at your own risk!
 //
 
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <map>
-#include <iterator>
-#include <utility>
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "ReconstructionDataFormats/Track.h"
+#include "ALICE3/DataModel/A3DecayFinderTables.h"
+#include "ALICE3/DataModel/OTFMulticharm.h"
+#include "ALICE3/DataModel/OTFStrangeness.h"
+#include "ALICE3/DataModel/OTFTOF.h"
+#include "ALICE3/DataModel/RICH.h"
+#include "ALICE3/DataModel/tracksAlice3.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
 #include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "DCAFitter/DCAFitterN.h"
 #include "DataFormatsCalibration/MeanVertexObject.h"
-#include "ALICE3/DataModel/OTFTOF.h"
-#include "ALICE3/DataModel/RICH.h"
-#include "ALICE3/DataModel/A3DecayFinderTables.h"
-#include "ALICE3/DataModel/OTFStrangeness.h"
-#include "ALICE3/DataModel/OTFMulticharm.h"
-#include "ALICE3/DataModel/tracksAlice3.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
 #include "DetectorsVertexing/PVertexer.h"
 #include "DetectorsVertexing/PVertexerHelpers.h"
-#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <iterator>
+#include <map>
+#include <utility>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/ALICE3/Tasks/alice3-qa-multiplicity.cxx b/.conflict-side-0/ALICE3/Tasks/alice3-qa-multiplicity.cxx
index b798209dfde..8d15316eb05 100644
--- a/.conflict-side-0/ALICE3/Tasks/alice3-qa-multiplicity.cxx
+++ b/.conflict-side-0/ALICE3/Tasks/alice3-qa-multiplicity.cxx
@@ -11,11 +11,12 @@
 /// \author Nicolo' Jacazio <nicolo.jacazio@cern.ch>, CERN
 
 // O2 includes
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-0/ALICE3/Tasks/alice3-qa-singleparticle.cxx b/.conflict-side-0/ALICE3/Tasks/alice3-qa-singleparticle.cxx
index 1c8f0f19330..32925a2708b 100644
--- a/.conflict-side-0/ALICE3/Tasks/alice3-qa-singleparticle.cxx
+++ b/.conflict-side-0/ALICE3/Tasks/alice3-qa-singleparticle.cxx
@@ -17,9 +17,10 @@
 
 // O2 includes
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TDatabasePDG.h"
 #include "TMCProcess.h"
 
diff --git a/.conflict-side-0/ALICE3/Tasks/alice3-taskcorrelationDDbar.cxx b/.conflict-side-0/ALICE3/Tasks/alice3-taskcorrelationDDbar.cxx
index b6c8058f747..914cc3ba95c 100644
--- a/.conflict-side-0/ALICE3/Tasks/alice3-taskcorrelationDDbar.cxx
+++ b/.conflict-side-0/ALICE3/Tasks/alice3-taskcorrelationDDbar.cxx
@@ -14,15 +14,15 @@
 ///
 /// \author Fabio Colamaria <fabio.colamaria@ba.infn.it>, INFN Bari
 
-#include <vector>
+#include "PWGHF/Core/SelectorCuts.h"
+#include "PWGHF/HFC/DataModel/CorrelationTables.h"
+#include "PWGHF/Utils/utilsAnalysis.h"
 
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
 
-#include "PWGHF/Core/SelectorCuts.h"
-#include "PWGHF/Utils/utilsAnalysis.h"
-#include "PWGHF/HFC/DataModel/CorrelationTables.h"
+#include <vector>
 // #include "PWGHF/DataModel/CandidateReconstructionTables.h"
 // #include "PWGHF/DataModel/CandidateSelectionTables.h"
 
diff --git a/.conflict-side-0/ALICE3/Tasks/alice3Efficiency.cxx b/.conflict-side-0/ALICE3/Tasks/alice3Efficiency.cxx
index 7741ea24696..0f247305d00 100644
--- a/.conflict-side-0/ALICE3/Tasks/alice3Efficiency.cxx
+++ b/.conflict-side-0/ALICE3/Tasks/alice3Efficiency.cxx
@@ -17,16 +17,17 @@
 /// \since  May 27, 2025
 ///
 
-#include <map>
-#include <vector>
-
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/HistogramRegistry.h"
 #include "Framework/ConfigParamRegistry.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TEfficiency.h"
 #include "THashList.h"
 
+#include <map>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 std::map<int, TEfficiency*> effVsPt;
diff --git a/.conflict-side-0/ALICE3/Tasks/alice3SeparationPower.cxx b/.conflict-side-0/ALICE3/Tasks/alice3SeparationPower.cxx
index ae5b52d0692..c01cbdaf767 100644
--- a/.conflict-side-0/ALICE3/Tasks/alice3SeparationPower.cxx
+++ b/.conflict-side-0/ALICE3/Tasks/alice3SeparationPower.cxx
@@ -17,20 +17,22 @@
 /// \since  May 13, 2025
 ///
 
-#include <utility>
-#include <map>
-#include <string>
-#include <vector>
+#include "ALICE3/DataModel/OTFRICH.h"
+#include "ALICE3/DataModel/OTFTOF.h"
 
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
 #include "Framework/HistogramRegistry.h"
-#include "TProfile2D.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+
 #include "THashList.h"
-#include "ALICE3/DataModel/OTFTOF.h"
-#include "ALICE3/DataModel/OTFRICH.h"
+#include "TProfile2D.h"
+
+#include <map>
+#include <string>
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/ALICE3/Tasks/pidFTOFqa.cxx b/.conflict-side-0/ALICE3/Tasks/pidFTOFqa.cxx
index 52dbaf8dcfa..03fa51e58cc 100644
--- a/.conflict-side-0/ALICE3/Tasks/pidFTOFqa.cxx
+++ b/.conflict-side-0/ALICE3/Tasks/pidFTOFqa.cxx
@@ -10,14 +10,15 @@
 // or submit itself to any jurisdiction.
 
 // O2 includes
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
 #include "ALICE3/DataModel/FTOF.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-0/ALICE3/Tasks/pidRICHqa.cxx b/.conflict-side-0/ALICE3/Tasks/pidRICHqa.cxx
index ab2a71e3ad9..392d4d99b8d 100644
--- a/.conflict-side-0/ALICE3/Tasks/pidRICHqa.cxx
+++ b/.conflict-side-0/ALICE3/Tasks/pidRICHqa.cxx
@@ -16,9 +16,10 @@
 ///
 
 // O2 includes
-#include "Framework/AnalysisTask.h"
 #include "ALICE3/DataModel/RICH.h"
 #include "Common/DataModel/PIDResponse.h"
+
+#include "Framework/AnalysisTask.h"
 #include "ReconstructionDataFormats/PID.h"
 
 using namespace o2;
diff --git a/.conflict-side-0/Common/CCDB/EventSelectionParams.h b/.conflict-side-0/Common/CCDB/EventSelectionParams.h
index 4633ff7aa73..cc4c397dd1b 100644
--- a/.conflict-side-0/Common/CCDB/EventSelectionParams.h
+++ b/.conflict-side-0/Common/CCDB/EventSelectionParams.h
@@ -17,9 +17,10 @@
 #ifndef COMMON_CCDB_EVENTSELECTIONPARAMS_H_
 #define COMMON_CCDB_EVENTSELECTIONPARAMS_H_
 
-#include <Rtypes.h>
 #include <TMath.h>
 
+#include <Rtypes.h>
+
 namespace o2::aod::evsel
 {
 // Event selection criteria
diff --git a/.conflict-side-0/Common/CCDB/RCTSelectionFlags.h b/.conflict-side-0/Common/CCDB/RCTSelectionFlags.h
index 1f396751c25..f80a1a7aa1b 100644
--- a/.conflict-side-0/Common/CCDB/RCTSelectionFlags.h
+++ b/.conflict-side-0/Common/CCDB/RCTSelectionFlags.h
@@ -18,11 +18,13 @@
 #define COMMON_CCDB_RCTSELECTIONFLAGS_H_
 
 #include <CommonUtils/EnumFlags.h>
-#include <Rtypes.h>
+
 #include <TMath.h>
 
-#include <stdexcept>
+#include <Rtypes.h>
+
 #include <algorithm>
+#include <stdexcept>
 #include <string>
 #include <vector>
 
diff --git a/.conflict-side-0/Common/CCDB/TriggerAliases.cxx b/.conflict-side-0/Common/CCDB/TriggerAliases.cxx
index 789d293c1d0..1c013e58ad3 100644
--- a/.conflict-side-0/Common/CCDB/TriggerAliases.cxx
+++ b/.conflict-side-0/Common/CCDB/TriggerAliases.cxx
@@ -10,6 +10,7 @@
 // or submit itself to any jurisdiction.
 
 #include "Common/CCDB/TriggerAliases.h"
+
 #include "Framework/Logger.h"
 
 std::string aliasLabels[kNaliases] = {
diff --git a/.conflict-side-0/Common/CCDB/TriggerAliases.h b/.conflict-side-0/Common/CCDB/TriggerAliases.h
index f1baf04fdcc..fff86e67e1f 100644
--- a/.conflict-side-0/Common/CCDB/TriggerAliases.h
+++ b/.conflict-side-0/Common/CCDB/TriggerAliases.h
@@ -12,10 +12,11 @@
 #ifndef COMMON_CCDB_TRIGGERALIASES_H_
 #define COMMON_CCDB_TRIGGERALIASES_H_
 
+#include <Rtypes.h>
+
 #include <cstdint>
 #include <map>
 #include <string>
-#include <Rtypes.h>
 
 enum triggerAliases {
   kINT7 = 0,
diff --git a/.conflict-side-0/Common/CCDB/ctpRateFetcher.cxx b/.conflict-side-0/Common/CCDB/ctpRateFetcher.cxx
index e20fc41616c..5a3b1e48132 100644
--- a/.conflict-side-0/Common/CCDB/ctpRateFetcher.cxx
+++ b/.conflict-side-0/Common/CCDB/ctpRateFetcher.cxx
@@ -11,14 +11,14 @@
 
 #include "ctpRateFetcher.h"
 
-#include <map>
-#include <vector>
-
+#include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/LHCConstants.h"
 #include "DataFormatsCTP/Configuration.h"
 #include "DataFormatsCTP/Scalers.h"
 #include "DataFormatsParameters/GRPLHCIFData.h"
-#include "CCDB/BasicCCDBManager.h"
+
+#include <map>
+#include <vector>
 
 namespace o2
 {
diff --git a/.conflict-side-0/Common/CCDB/ctpRateFetcher.h b/.conflict-side-0/Common/CCDB/ctpRateFetcher.h
index 6aaf5e3ebaa..beb8cd28b8e 100644
--- a/.conflict-side-0/Common/CCDB/ctpRateFetcher.h
+++ b/.conflict-side-0/Common/CCDB/ctpRateFetcher.h
@@ -12,10 +12,10 @@
 #ifndef COMMON_CCDB_CTPRATEFETCHER_H_
 #define COMMON_CCDB_CTPRATEFETCHER_H_
 
-#include <string>
-
 #include "CCDB/BasicCCDBManager.h"
 
+#include <string>
+
 namespace o2
 {
 
diff --git a/.conflict-side-0/Common/CCDB/macros/ctpRateF.C b/.conflict-side-0/Common/CCDB/macros/ctpRateF.C
index 32b93e4aa6b..efce284c159 100644
--- a/.conflict-side-0/Common/CCDB/macros/ctpRateF.C
+++ b/.conflict-side-0/Common/CCDB/macros/ctpRateF.C
@@ -9,15 +9,16 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <map>
-#include <vector>
+#include "Common/CCDB/ctpRateFetcher.h"
 
+#include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/LHCConstants.h"
 #include "DataFormatsCTP/Configuration.h"
 #include "DataFormatsCTP/Scalers.h"
 #include "DataFormatsParameters/GRPLHCIFData.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "Common/CCDB/ctpRateFetcher.h"
+
+#include <map>
+#include <vector>
 
 struct ctpRateFetcher {
   ctpRateFetcher() = default;
diff --git a/.conflict-side-0/Common/CCDB/macros/upload_event_selection_params.C b/.conflict-side-0/Common/CCDB/macros/upload_event_selection_params.C
index cafc863ab03..8296dc0f78a 100644
--- a/.conflict-side-0/Common/CCDB/macros/upload_event_selection_params.C
+++ b/.conflict-side-0/Common/CCDB/macros/upload_event_selection_params.C
@@ -9,12 +9,15 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "CCDB/CcdbApi.h"
+#include "EventSelectionParams.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
+
 #include "TString.h"
+
 #include <map>
 #include <string>
-#include "EventSelectionParams.h"
 using std::map;
 using std::string;
 
diff --git a/.conflict-side-0/Common/CCDB/macros/upload_event_selection_params_run3.C b/.conflict-side-0/Common/CCDB/macros/upload_event_selection_params_run3.C
index f81491949c6..f7887aa1df5 100644
--- a/.conflict-side-0/Common/CCDB/macros/upload_event_selection_params_run3.C
+++ b/.conflict-side-0/Common/CCDB/macros/upload_event_selection_params_run3.C
@@ -9,11 +9,14 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
+#include "EventSelectionParams.h"
+
 #include "CCDB/CcdbApi.h"
+
 #include "TString.h"
+
 #include <map>
 #include <string>
-#include "EventSelectionParams.h"
 using std::map;
 using std::string;
 
@@ -140,4 +143,5 @@ void fillMapOfCustomOrbitShifts(std::map<int, int>& mapOrbitShift)
   mapOrbitShift[523797] = 41;
   mapOrbitShift[523821] = 36;
   mapOrbitShift[523897] = 38;
-}
\ No newline at end of file
+}
+ 
\ No newline at end of file
diff --git a/.conflict-side-0/Common/CCDB/macros/upload_trigger_aliases.C b/.conflict-side-0/Common/CCDB/macros/upload_trigger_aliases.C
index 9fa91cd9b13..a6bf004edb5 100644
--- a/.conflict-side-0/Common/CCDB/macros/upload_trigger_aliases.C
+++ b/.conflict-side-0/Common/CCDB/macros/upload_trigger_aliases.C
@@ -9,12 +9,15 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "CCDB/CcdbApi.h"
+#include "TriggerAliases.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
+
 #include "TObjArray.h"
-#include "TriggerAliases.h"
-#include "TTree.h"
 #include "TString.h"
+#include "TTree.h"
+
 #include <fstream>
 #include <map>
 #include <string>
diff --git a/.conflict-side-0/Common/CCDB/macros/upload_trigger_aliases_run3.C b/.conflict-side-0/Common/CCDB/macros/upload_trigger_aliases_run3.C
index e946d9117d4..75e813b6dd3 100644
--- a/.conflict-side-0/Common/CCDB/macros/upload_trigger_aliases_run3.C
+++ b/.conflict-side-0/Common/CCDB/macros/upload_trigger_aliases_run3.C
@@ -9,13 +9,16 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "DataFormatsCTP/Configuration.h"
-#include "CCDB/CcdbApi.h"
+#include "TriggerAliases.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
+#include "DataFormatsCTP/Configuration.h"
+
 #include "TObjArray.h"
-#include "TriggerAliases.h"
-#include "TTree.h"
 #include "TString.h"
+#include "TTree.h"
+
 #include <fstream>
 #include <map>
 #include <string>
diff --git a/.conflict-side-0/Common/Core/CollisionAssociation.h b/.conflict-side-0/Common/Core/CollisionAssociation.h
index 69ec38a24db..c505f0c6dbb 100644
--- a/.conflict-side-0/Common/Core/CollisionAssociation.h
+++ b/.conflict-side-0/Common/Core/CollisionAssociation.h
@@ -20,13 +20,13 @@
 #ifndef COMMON_CORE_COLLISIONASSOCIATION_H_
 #define COMMON_CORE_COLLISIONASSOCIATION_H_
 
-#include <vector>
-#include <memory>
-#include <utility>
-
 #include "CommonConstants/LHCConstants.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+
+#include <memory>
+#include <utility>
+#include <vector>
 
 namespace o2::aod
 {
diff --git a/.conflict-side-0/Common/Core/EventPlaneHelper.cxx b/.conflict-side-0/Common/Core/EventPlaneHelper.cxx
index 75424d900d9..b1e63af16fa 100644
--- a/.conflict-side-0/Common/Core/EventPlaneHelper.cxx
+++ b/.conflict-side-0/Common/Core/EventPlaneHelper.cxx
@@ -20,13 +20,13 @@
 
 #include "Common/Core/EventPlaneHelper.h"
 
+#include "TMath.h"
+#include "TVector3.h"
+
 #include <algorithm>
 #include <iterator>
-#include <vector>
 #include <memory>
-
-#include "TMath.h"
-#include "TVector3.h"
+#include <vector>
 
 double EventPlaneHelper::GetPhiFV0(int chno, o2::fv0::Geometry* fv0geom)
 {
diff --git a/.conflict-side-0/Common/Core/EventPlaneHelper.h b/.conflict-side-0/Common/Core/EventPlaneHelper.h
index d6a2f3cba11..c85c04fe092 100644
--- a/.conflict-side-0/Common/Core/EventPlaneHelper.h
+++ b/.conflict-side-0/Common/Core/EventPlaneHelper.h
@@ -21,17 +21,16 @@
 #ifndef COMMON_CORE_EVENTPLANEHELPER_H_
 #define COMMON_CORE_EVENTPLANEHELPER_H_
 
-#include <vector>
-#include <memory>
+#include "FT0Base/Geometry.h"
+#include "FV0Base/Geometry.h"
 
 #include "TNamed.h"
-
 #include <TComplex.h>
 #include <TH2D.h>
 #include <TProfile.h>
 
-#include "FV0Base/Geometry.h"
-#include "FT0Base/Geometry.h"
+#include <memory>
+#include <vector>
 
 class EventPlaneHelper
 {
diff --git a/.conflict-side-0/Common/Core/FFitWeights.cxx b/.conflict-side-0/Common/Core/FFitWeights.cxx
index 3a92114f48c..3cb9216ba85 100644
--- a/.conflict-side-0/Common/Core/FFitWeights.cxx
+++ b/.conflict-side-0/Common/Core/FFitWeights.cxx
@@ -16,12 +16,12 @@
 
 #include "FFitWeights.h"
 
-#include <string>
+#include <TSpline.h>
+
 #include <cstdio>
+#include <string>
 #include <vector>
 
-#include <TSpline.h>
-
 ClassImp(FFitWeights)
 
   FFitWeights::FFitWeights() : TNamed("", ""),
diff --git a/.conflict-side-0/Common/Core/FFitWeights.h b/.conflict-side-0/Common/Core/FFitWeights.h
index c80165730f7..5227eefa359 100644
--- a/.conflict-side-0/Common/Core/FFitWeights.h
+++ b/.conflict-side-0/Common/Core/FFitWeights.h
@@ -17,22 +17,22 @@
 #ifndef COMMON_CORE_FFITWEIGHTS_H_
 #define COMMON_CORE_FFITWEIGHTS_H_
 
-#include <vector>
-#include <string>
-#include <utility>
-#include <algorithm>
-#include <complex>
-#include <memory>
-
+#include "TCollection.h"
+#include "TFile.h"
+#include "TH1D.h"
+#include "TH2D.h"
+#include "TH3D.h"
+#include "TMath.h"
 #include "TNamed.h"
 #include "TObjArray.h"
-#include "TH3D.h"
-#include "TH2D.h"
-#include "TH1D.h"
-#include "TFile.h"
-#include "TCollection.h"
 #include "TString.h"
-#include "TMath.h"
+
+#include <algorithm>
+#include <complex>
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
 
 class FFitWeights : public TNamed
 {
diff --git a/.conflict-side-0/Common/Core/OrbitRange.cxx b/.conflict-side-0/Common/Core/OrbitRange.cxx
index 51a3ec5fe78..b57654079bc 100644
--- a/.conflict-side-0/Common/Core/OrbitRange.cxx
+++ b/.conflict-side-0/Common/Core/OrbitRange.cxx
@@ -14,6 +14,7 @@
 //
 
 #include "Common/Core/OrbitRange.h"
+
 #include "TCollection.h"
 #include "TMath.h"
 
diff --git a/.conflict-side-0/Common/Core/PID/DetectorResponse.h b/.conflict-side-0/Common/Core/PID/DetectorResponse.h
index 1f687a4605c..e78251935ee 100644
--- a/.conflict-side-0/Common/Core/PID/DetectorResponse.h
+++ b/.conflict-side-0/Common/Core/PID/DetectorResponse.h
@@ -20,18 +20,21 @@
 #ifndef O2_ANALYSIS_PID_DETECTORRESPONSE_H_
 #define O2_ANALYSIS_PID_DETECTORRESPONSE_H_
 
+#include "Framework/Logger.h"
+
 #include <array>
 #include <vector>
-#include "Framework/Logger.h"
 // ROOT includes
 #include "Rtypes.h"
-#include "TMath.h"
+
 #include "TFile.h"
+#include "TMath.h"
 
 // O2 includes
-#include "ReconstructionDataFormats/PID.h"
 #include "Common/Core/PID/ParamBase.h"
 
+#include "ReconstructionDataFormats/PID.h"
+
 namespace o2::pid
 {
 /// \brief Class to handle the general detector response
diff --git a/.conflict-side-0/Common/Core/PID/PIDTOF.cxx b/.conflict-side-0/Common/Core/PID/PIDTOF.cxx
index bec41fafc43..10a3588730c 100644
--- a/.conflict-side-0/Common/Core/PID/PIDTOF.cxx
+++ b/.conflict-side-0/Common/Core/PID/PIDTOF.cxx
@@ -17,6 +17,7 @@
 ///
 
 #include "PIDTOF.h"
+
 #include <string>
 
 namespace o2::pid::tof
diff --git a/.conflict-side-0/Common/Core/PID/PIDTOF.h b/.conflict-side-0/Common/Core/PID/PIDTOF.h
index ad16716916c..fb02804745a 100644
--- a/.conflict-side-0/Common/Core/PID/PIDTOF.h
+++ b/.conflict-side-0/Common/Core/PID/PIDTOF.h
@@ -25,17 +25,18 @@
 
 // ROOT includes
 #include "Rtypes.h"
-#include "TMath.h"
-#include "TGraph.h"
-#include "TFile.h"
+
 #include "TF2.h"
+#include "TFile.h"
+#include "TGraph.h"
+#include "TMath.h"
 
 // O2 includes
+#include "CommonConstants/PhysicsConstants.h"
 #include "DataFormatsTOF/ParameterContainers.h"
+#include "Framework/DataTypes.h"
 #include "Framework/Logger.h"
 #include "ReconstructionDataFormats/PID.h"
-#include "Framework/DataTypes.h"
-#include "CommonConstants/PhysicsConstants.h"
 
 namespace o2::pid::tof
 {
diff --git a/.conflict-side-0/Common/Core/PID/ParamBase.cxx b/.conflict-side-0/Common/Core/PID/ParamBase.cxx
index 74824781d07..ab5a0d0f4dd 100644
--- a/.conflict-side-0/Common/Core/PID/ParamBase.cxx
+++ b/.conflict-side-0/Common/Core/PID/ParamBase.cxx
@@ -18,7 +18,9 @@
 ///
 
 #include "PID/ParamBase.h"
+
 #include "Framework/Logger.h"
+
 #include "TFile.h"
 
 namespace o2::pid
diff --git a/.conflict-side-0/Common/Core/PID/ParamBase.h b/.conflict-side-0/Common/Core/PID/ParamBase.h
index ec4b17083f4..28bbc6b732b 100644
--- a/.conflict-side-0/Common/Core/PID/ParamBase.h
+++ b/.conflict-side-0/Common/Core/PID/ParamBase.h
@@ -26,11 +26,11 @@
 #include <vector>    // std::vector
 
 // ROOT includes
-#include "TNamed.h"
-#include "TFile.h"
-
 #include "Framework/Logger.h"
 
+#include "TFile.h"
+#include "TNamed.h"
+
 namespace o2::pid
 {
 /// Variable to use for the pid input/output i.e. float, double et cetera
diff --git a/.conflict-side-0/Common/Core/PID/TPCPIDResponse.h b/.conflict-side-0/Common/Core/PID/TPCPIDResponse.h
index f25e1acd69e..03ec6c2302f 100644
--- a/.conflict-side-0/Common/Core/PID/TPCPIDResponse.h
+++ b/.conflict-side-0/Common/Core/PID/TPCPIDResponse.h
@@ -17,14 +17,15 @@
 #ifndef COMMON_CORE_PID_TPCPIDRESPONSE_H_
 #define COMMON_CORE_PID_TPCPIDRESPONSE_H_
 
+#include "Framework/Logger.h"
+
 #include <array>
-#include <vector>
 #include <cmath>
-#include "Framework/Logger.h"
+#include <vector>
 // O2 includes
-#include "ReconstructionDataFormats/PID.h"
-#include "Framework/DataTypes.h"
 #include "DataFormatsTPC/BetheBlochAleph.h"
+#include "Framework/DataTypes.h"
+#include "ReconstructionDataFormats/PID.h"
 
 namespace o2::pid::tpc
 {
diff --git a/.conflict-side-0/Common/Core/TPCVDriftManager.h b/.conflict-side-0/Common/Core/TPCVDriftManager.h
index 5d35db5ea99..54f0f26a9f6 100644
--- a/.conflict-side-0/Common/Core/TPCVDriftManager.h
+++ b/.conflict-side-0/Common/Core/TPCVDriftManager.h
@@ -12,17 +12,17 @@
 #ifndef COMMON_CORE_TPCVDRIFTMANAGER_H_
 #define COMMON_CORE_TPCVDRIFTMANAGER_H_
 
-#include <string>
-
 #include "CCDB/BasicCCDBManager.h"
-#include "Framework/Logger.h"
-#include "Framework/DataTypes.h"
-#include "DataFormatsTPC/VDriftCorrFact.h"
 #include "CommonConstants/LHCConstants.h"
-#include "DataFormatsParameters/GRPLHCIFData.h"
 #include "DataFormatsParameters/GRPECSObject.h"
+#include "DataFormatsParameters/GRPLHCIFData.h"
+#include "DataFormatsTPC/VDriftCorrFact.h"
+#include "Framework/DataTypes.h"
+#include "Framework/Logger.h"
 #include "ReconstructionDataFormats/Track.h"
 
+#include <string>
+
 namespace o2::aod::common
 {
 
diff --git a/.conflict-side-0/Common/Core/TrackSelection.cxx b/.conflict-side-0/Common/Core/TrackSelection.cxx
index 717d7db77f5..1103b678024 100644
--- a/.conflict-side-0/Common/Core/TrackSelection.cxx
+++ b/.conflict-side-0/Common/Core/TrackSelection.cxx
@@ -13,9 +13,10 @@
 // Class for track selection
 //
 
-#include "Framework/Logger.h"
 #include "Common/Core/TrackSelection.h"
 
+#include "Framework/Logger.h"
+
 bool TrackSelection::FulfillsITSHitRequirements(uint8_t itsClusterMap) const
 {
   constexpr uint8_t bit = 1;
diff --git a/.conflict-side-0/Common/Core/TrackSelection.h b/.conflict-side-0/Common/Core/TrackSelection.h
index 19d77a198e1..94285fbdda8 100644
--- a/.conflict-side-0/Common/Core/TrackSelection.h
+++ b/.conflict-side-0/Common/Core/TrackSelection.h
@@ -16,13 +16,15 @@
 #ifndef COMMON_CORE_TRACKSELECTION_H_
 #define COMMON_CORE_TRACKSELECTION_H_
 
+#include "Rtypes.h"
+
+#include "Framework/DataTypes.h"
+#include "Framework/Logger.h"
+
 #include <set>
-#include <vector>
-#include <utility>
 #include <string>
-#include "Framework/Logger.h"
-#include "Framework/DataTypes.h"
-#include "Rtypes.h"
+#include <utility>
+#include <vector>
 
 class TrackSelection
 {
diff --git a/.conflict-side-0/Common/Core/TrackSelectionDefaults.cxx b/.conflict-side-0/Common/Core/TrackSelectionDefaults.cxx
index 2958718feba..3e659db0502 100644
--- a/.conflict-side-0/Common/Core/TrackSelectionDefaults.cxx
+++ b/.conflict-side-0/Common/Core/TrackSelectionDefaults.cxx
@@ -15,10 +15,12 @@
 /// \since 20-10-2020
 ///
 
-#include "Framework/DataTypes.h"
-#include "Common/Core/TrackSelection.h"
 #include "TrackSelectionDefaults.h"
 
+#include "Common/Core/TrackSelection.h"
+
+#include "Framework/DataTypes.h"
+
 // Default track selection requiring one hit in the SPD
 TrackSelection getGlobalTrackSelection()
 {
diff --git a/.conflict-side-0/Common/Core/TrackSelectionDefaults.h b/.conflict-side-0/Common/Core/TrackSelectionDefaults.h
index 72c666456ae..9dc2f1aa661 100644
--- a/.conflict-side-0/Common/Core/TrackSelectionDefaults.h
+++ b/.conflict-side-0/Common/Core/TrackSelectionDefaults.h
@@ -18,9 +18,10 @@
 #ifndef COMMON_CORE_TRACKSELECTIONDEFAULTS_H_
 #define COMMON_CORE_TRACKSELECTIONDEFAULTS_H_
 
-#include "Framework/DataTypes.h"
 #include "Common/Core/TrackSelection.h"
 
+#include "Framework/DataTypes.h"
+
 // Default track selection requiring one hit in the SPD
 TrackSelection getGlobalTrackSelection();
 
diff --git a/.conflict-side-0/Common/Core/TrackSelectorPID.h b/.conflict-side-0/Common/Core/TrackSelectorPID.h
index 214627a2d72..afda01c5a44 100644
--- a/.conflict-side-0/Common/Core/TrackSelectorPID.h
+++ b/.conflict-side-0/Common/Core/TrackSelectorPID.h
@@ -17,11 +17,11 @@
 #ifndef COMMON_CORE_TRACKSELECTORPID_H_
 #define COMMON_CORE_TRACKSELECTORPID_H_
 
-#include <TPDGCode.h>
-
 #include "Framework/Logger.h"
 #include "ReconstructionDataFormats/PID.h"
 
+#include <TPDGCode.h>
+
 /// Class for track selection using PID detectors
 
 struct TrackSelectorPID {
diff --git a/.conflict-side-0/Common/Core/trackUtilities.h b/.conflict-side-0/Common/Core/trackUtilities.h
index e67e0f82d6f..744647915f8 100644
--- a/.conflict-side-0/Common/Core/trackUtilities.h
+++ b/.conflict-side-0/Common/Core/trackUtilities.h
@@ -17,11 +17,13 @@
 #ifndef COMMON_CORE_TRACKUTILITIES_H_
 #define COMMON_CORE_TRACKUTILITIES_H_
 
-#include <utility> // std::move
+#include "Common/Core/RecoDecay.h"
+
 #include "CommonConstants/MathConstants.h"
 #include "ReconstructionDataFormats/Track.h"
 #include "ReconstructionDataFormats/Vertex.h"
-#include "Common/Core/RecoDecay.h"
+
+#include <utility> // std::move
 
 /// Extracts track parameters from a track.
 template <typename TrackPrecision = float, typename T>
diff --git a/.conflict-side-0/Common/DataModel/CaloClusters.h b/.conflict-side-0/Common/DataModel/CaloClusters.h
index 23a44371d80..9a83a92ccec 100644
--- a/.conflict-side-0/Common/DataModel/CaloClusters.h
+++ b/.conflict-side-0/Common/DataModel/CaloClusters.h
@@ -12,9 +12,10 @@
 #ifndef COMMON_DATAMODEL_CALOCLUSTERS_H_
 #define COMMON_DATAMODEL_CALOCLUSTERS_H_
 
-#include <vector>
 #include "Framework/AnalysisDataModel.h"
 
+#include <vector>
+
 namespace o2::aod
 {
 namespace calocluster
diff --git a/.conflict-side-0/Common/DataModel/EseTable.h b/.conflict-side-0/Common/DataModel/EseTable.h
index 68ffdff450a..defc3c750a5 100644
--- a/.conflict-side-0/Common/DataModel/EseTable.h
+++ b/.conflict-side-0/Common/DataModel/EseTable.h
@@ -17,10 +17,10 @@
 #ifndef COMMON_DATAMODEL_ESETABLE_H_
 #define COMMON_DATAMODEL_ESETABLE_H_
 
-#include <vector>
-
-#include "Framework/AnalysisTask.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+
+#include <vector>
 
 namespace o2::aod
 {
diff --git a/.conflict-side-0/Common/DataModel/EventSelection.h b/.conflict-side-0/Common/DataModel/EventSelection.h
index 77849d0d7cf..093ae4303c3 100644
--- a/.conflict-side-0/Common/DataModel/EventSelection.h
+++ b/.conflict-side-0/Common/DataModel/EventSelection.h
@@ -17,10 +17,11 @@
 #ifndef COMMON_DATAMODEL_EVENTSELECTION_H_
 #define COMMON_DATAMODEL_EVENTSELECTION_H_
 
-#include "Framework/AnalysisDataModel.h"
-#include "Common/CCDB/TriggerAliases.h"
 #include "Common/CCDB/EventSelectionParams.h"
 #include "Common/CCDB/RCTSelectionFlags.h"
+#include "Common/CCDB/TriggerAliases.h"
+
+#include "Framework/AnalysisDataModel.h"
 
 namespace o2::aod
 {
diff --git a/.conflict-side-0/Common/DataModel/McCollisionExtra.h b/.conflict-side-0/Common/DataModel/McCollisionExtra.h
index 14b11b9a4e8..4b0f20c92fa 100644
--- a/.conflict-side-0/Common/DataModel/McCollisionExtra.h
+++ b/.conflict-side-0/Common/DataModel/McCollisionExtra.h
@@ -14,15 +14,16 @@
 #ifndef COMMON_DATAMODEL_MCCOLLISIONEXTRA_H_
 #define COMMON_DATAMODEL_MCCOLLISIONEXTRA_H_
 
-#include <cmath>
 #include "Framework/AnalysisDataModel.h"
 
+#include <cmath>
+
 namespace o2::aod
 {
 namespace mccollisionprop
 {
-DECLARE_SOA_COLUMN(NumRecoCollision, numRecoCollision, int);     //! stores N times this PV was recoed
-DECLARE_SOA_COLUMN(BestCollisionIndex, bestCollisionIndex, int); //! stores N times this PV was recoed
+DECLARE_SOA_COLUMN(NumRecoCollision, numRecoCollision, int);             //! stores N times this PV was recoed
+DECLARE_SOA_COLUMN(BestCollisionIndex, bestCollisionIndex, int);         //! stores N times this PV was recoed
 DECLARE_SOA_COLUMN(BestCollisionCentFT0C, bestCollisionCentFT0C, float); //! stores best FT0C centrality
 
 // collision MC context (neighbours contain PoI?)
@@ -35,4 +36,4 @@ DECLARE_SOA_TABLE(McCollContexts, "AOD", "MCCOLLCONTEXT",
                   mccollisionprop::ForwardCollisionMap, mccollisionprop::BackwardCollisionMap);
 } // namespace o2::aod
 
-#endif // COMMON_DATAMODEL_MCCOLLISIONEXTRA_H_
\ No newline at end of file
+#endif // COMMON_DATAMODEL_MCCOLLISIONEXTRA_H_
diff --git a/.conflict-side-0/Common/DataModel/MftmchMatchingML.h b/.conflict-side-0/Common/DataModel/MftmchMatchingML.h
index f243411f3b7..56171cb052e 100644
--- a/.conflict-side-0/Common/DataModel/MftmchMatchingML.h
+++ b/.conflict-side-0/Common/DataModel/MftmchMatchingML.h
@@ -12,9 +12,10 @@
 #ifndef COMMON_DATAMODEL_MFTMCHMATCHINGML_H_
 #define COMMON_DATAMODEL_MFTMCHMATCHINGML_H_
 
-#include "Framework/AnalysisDataModel.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+
 namespace o2::aod
 {
 DECLARE_SOA_TABLE(FwdTracksML, "AOD", "FWDTRACKML",
diff --git a/.conflict-side-0/Common/DataModel/Multiplicity.h b/.conflict-side-0/Common/DataModel/Multiplicity.h
index 0ac2a0074c6..8b0bcc2f051 100644
--- a/.conflict-side-0/Common/DataModel/Multiplicity.h
+++ b/.conflict-side-0/Common/DataModel/Multiplicity.h
@@ -16,9 +16,10 @@
 #ifndef COMMON_DATAMODEL_MULTIPLICITY_H_
 #define COMMON_DATAMODEL_MULTIPLICITY_H_
 
-#include "Framework/AnalysisDataModel.h"
 #include "Common/DataModel/EventSelection.h"
 
+#include "Framework/AnalysisDataModel.h"
+
 namespace o2::aod
 {
 namespace mult
diff --git a/.conflict-side-0/Common/DataModel/OccupancyTables.h b/.conflict-side-0/Common/DataModel/OccupancyTables.h
index 9e14fd8f4f2..70db5b31793 100644
--- a/.conflict-side-0/Common/DataModel/OccupancyTables.h
+++ b/.conflict-side-0/Common/DataModel/OccupancyTables.h
@@ -14,11 +14,11 @@
 ///
 /// \author Rahul Verma (rahul.verma@iitb.ac.in) :: Marian I Ivanov (marian.ivanov@cern.ch)
 
-#include <vector>
-
 #include "Framework/ASoA.h"
 #include "Framework/AnalysisDataModel.h"
 
+#include <vector>
+
 #ifndef COMMON_DATAMODEL_OCCUPANCYTABLES_H_
 #define COMMON_DATAMODEL_OCCUPANCYTABLES_H_
 
diff --git a/.conflict-side-0/Common/DataModel/PIDResponse.h b/.conflict-side-0/Common/DataModel/PIDResponse.h
index eee2e4df2e3..f113f3a4c1f 100644
--- a/.conflict-side-0/Common/DataModel/PIDResponse.h
+++ b/.conflict-side-0/Common/DataModel/PIDResponse.h
@@ -19,9 +19,9 @@
 #ifndef COMMON_DATAMODEL_PIDRESPONSE_H_
 #define COMMON_DATAMODEL_PIDRESPONSE_H_
 
+#include "PIDResponseCombined.h"
 #include "PIDResponseTOF.h"
 #include "PIDResponseTPC.h"
-#include "PIDResponseCombined.h"
 
 namespace o2::aod
 {
diff --git a/.conflict-side-0/Common/DataModel/PIDResponseCombined.h b/.conflict-side-0/Common/DataModel/PIDResponseCombined.h
index 4b54d214838..e6f859ab692 100644
--- a/.conflict-side-0/Common/DataModel/PIDResponseCombined.h
+++ b/.conflict-side-0/Common/DataModel/PIDResponseCombined.h
@@ -24,8 +24,8 @@
 // O2 includes
 #include "Framework/ASoA.h"
 #include "Framework/AnalysisDataModel.h"
-#include "ReconstructionDataFormats/PID.h"
 #include "Framework/Logger.h"
+#include "ReconstructionDataFormats/PID.h"
 
 namespace o2::aod
 {
diff --git a/.conflict-side-0/Common/DataModel/PIDResponseTOF.h b/.conflict-side-0/Common/DataModel/PIDResponseTOF.h
index 5edfe931ad8..85beb113851 100644
--- a/.conflict-side-0/Common/DataModel/PIDResponseTOF.h
+++ b/.conflict-side-0/Common/DataModel/PIDResponseTOF.h
@@ -23,11 +23,12 @@
 #include <experimental/type_traits>
 
 // O2 includes
+#include "Common/Core/PID/PIDTOF.h"
+
 #include "Framework/ASoA.h"
 #include "Framework/AnalysisDataModel.h"
-#include "ReconstructionDataFormats/PID.h"
 #include "Framework/Logger.h"
-#include "Common/Core/PID/PIDTOF.h"
+#include "ReconstructionDataFormats/PID.h"
 
 namespace o2::aod
 {
diff --git a/.conflict-side-0/Common/DataModel/PIDResponseTPC.h b/.conflict-side-0/Common/DataModel/PIDResponseTPC.h
index a22d5c9c008..e5247b90432 100644
--- a/.conflict-side-0/Common/DataModel/PIDResponseTPC.h
+++ b/.conflict-side-0/Common/DataModel/PIDResponseTPC.h
@@ -25,8 +25,8 @@
 // O2 includes
 #include "Framework/ASoA.h"
 #include "Framework/AnalysisDataModel.h"
-#include "ReconstructionDataFormats/PID.h"
 #include "Framework/Logger.h"
+#include "ReconstructionDataFormats/PID.h"
 
 namespace o2::aod
 {
diff --git a/.conflict-side-0/Common/DataModel/Qvectors.h b/.conflict-side-0/Common/DataModel/Qvectors.h
index 423c2648e89..1ff0ceebabd 100644
--- a/.conflict-side-0/Common/DataModel/Qvectors.h
+++ b/.conflict-side-0/Common/DataModel/Qvectors.h
@@ -21,9 +21,10 @@
 #ifndef COMMON_DATAMODEL_QVECTORS_H_
 #define COMMON_DATAMODEL_QVECTORS_H_
 
-#include <vector>
 #include "Framework/AnalysisDataModel.h"
 
+#include <vector>
+
 namespace o2::aod
 {
 namespace qvec
diff --git a/.conflict-side-0/Common/LegacyDataQA/centqa.cxx b/.conflict-side-0/Common/LegacyDataQA/centqa.cxx
index 0d69be10754..00bb1fee419 100644
--- a/.conflict-side-0/Common/LegacyDataQA/centqa.cxx
+++ b/.conflict-side-0/Common/LegacyDataQA/centqa.cxx
@@ -22,13 +22,15 @@
 // - david.dobrigkeit.chinellato@cern.ch
 //
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Common/DataModel/McCollisionExtra.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/McCollisionExtra.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TH1F.h"
 #include "TH2F.h"
 
diff --git a/.conflict-side-0/Common/LegacyDataQA/otfv0qa.cxx b/.conflict-side-0/Common/LegacyDataQA/otfv0qa.cxx
index 8dc446d9a01..13ee2809bcd 100644
--- a/.conflict-side-0/Common/LegacyDataQA/otfv0qa.cxx
+++ b/.conflict-side-0/Common/LegacyDataQA/otfv0qa.cxx
@@ -9,13 +9,15 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/McCollisionExtra.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TH1F.h"
 #include "TH2F.h"
 
diff --git a/.conflict-side-0/Common/LegacyDataQA/pmdQa.cxx b/.conflict-side-0/Common/LegacyDataQA/pmdQa.cxx
index 9958fd26761..3d355f33f0b 100644
--- a/.conflict-side-0/Common/LegacyDataQA/pmdQa.cxx
+++ b/.conflict-side-0/Common/LegacyDataQA/pmdQa.cxx
@@ -15,21 +15,23 @@
 /// \author Abhi Modak (abhi.modak@cern.ch)
 /// \since May 17, 2025
 
-#include <cstdlib>
-#include <cmath>
-#include <vector>
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PmdTable.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
+#include "CCDB/BasicCCDBManager.h"
 #include "Framework/ASoA.h"
 #include "Framework/AnalysisDataModel.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/PmdTable.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "CCDB/BasicCCDBManager.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TH1F.h"
 #include "TH2F.h"
 
+#include <cmath>
+#include <cstdlib>
+#include <vector>
+
 using namespace o2;
 using namespace o2::aod::run2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Common/LegacyDataQA/tpcpidqa.cxx b/.conflict-side-0/Common/LegacyDataQA/tpcpidqa.cxx
index a67043fd342..fd9988f7251 100644
--- a/.conflict-side-0/Common/LegacyDataQA/tpcpidqa.cxx
+++ b/.conflict-side-0/Common/LegacyDataQA/tpcpidqa.cxx
@@ -18,12 +18,14 @@
 //
 // Warning: expected resolution is NOT provided.
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "TableHelper.h"
 
+#include "Common/DataModel/PIDResponse.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-side-0/Common/TableProducer/Converters/bcConverter.cxx b/.conflict-side-0/Common/TableProducer/Converters/bcConverter.cxx
index 54f9a90aa8b..a023c530236 100644
--- a/.conflict-side-0/Common/TableProducer/Converters/bcConverter.cxx
+++ b/.conflict-side-0/Common/TableProducer/Converters/bcConverter.cxx
@@ -8,9 +8,9 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Common/TableProducer/Converters/bcFlagsCreator.cxx b/.conflict-side-0/Common/TableProducer/Converters/bcFlagsCreator.cxx
index 972832716b5..6300998830c 100644
--- a/.conflict-side-0/Common/TableProducer/Converters/bcFlagsCreator.cxx
+++ b/.conflict-side-0/Common/TableProducer/Converters/bcFlagsCreator.cxx
@@ -8,9 +8,9 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Common/TableProducer/Converters/caloLabelConverter.cxx b/.conflict-side-0/Common/TableProducer/Converters/caloLabelConverter.cxx
index 0186e34f628..2200df1e1a6 100644
--- a/.conflict-side-0/Common/TableProducer/Converters/caloLabelConverter.cxx
+++ b/.conflict-side-0/Common/TableProducer/Converters/caloLabelConverter.cxx
@@ -8,9 +8,9 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Common/TableProducer/Converters/collisionConverter.cxx b/.conflict-side-0/Common/TableProducer/Converters/collisionConverter.cxx
index d3186ea462f..9f6da391425 100644
--- a/.conflict-side-0/Common/TableProducer/Converters/collisionConverter.cxx
+++ b/.conflict-side-0/Common/TableProducer/Converters/collisionConverter.cxx
@@ -8,9 +8,9 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Common/TableProducer/Converters/fddConverter.cxx b/.conflict-side-0/Common/TableProducer/Converters/fddConverter.cxx
index 50d47ade048..a5aaaffecf3 100644
--- a/.conflict-side-0/Common/TableProducer/Converters/fddConverter.cxx
+++ b/.conflict-side-0/Common/TableProducer/Converters/fddConverter.cxx
@@ -8,9 +8,9 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Common/TableProducer/Converters/hmpConverter.cxx b/.conflict-side-0/Common/TableProducer/Converters/hmpConverter.cxx
index da4eeeb7bca..2c8b5815868 100644
--- a/.conflict-side-0/Common/TableProducer/Converters/hmpConverter.cxx
+++ b/.conflict-side-0/Common/TableProducer/Converters/hmpConverter.cxx
@@ -12,9 +12,9 @@
 // HMPID converter to new format
 // to be used with Run 2 converted data and older AO2Ds
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Common/TableProducer/Converters/mcCollisionConverter.cxx b/.conflict-side-0/Common/TableProducer/Converters/mcCollisionConverter.cxx
index b965a092117..eb837e9cf22 100644
--- a/.conflict-side-0/Common/TableProducer/Converters/mcCollisionConverter.cxx
+++ b/.conflict-side-0/Common/TableProducer/Converters/mcCollisionConverter.cxx
@@ -8,9 +8,9 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Common/TableProducer/Converters/mcConverter.cxx b/.conflict-side-0/Common/TableProducer/Converters/mcConverter.cxx
index a78ac3158ea..8680bcb65dc 100644
--- a/.conflict-side-0/Common/TableProducer/Converters/mcConverter.cxx
+++ b/.conflict-side-0/Common/TableProducer/Converters/mcConverter.cxx
@@ -8,9 +8,9 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Common/TableProducer/Converters/mftTracksConverter.cxx b/.conflict-side-0/Common/TableProducer/Converters/mftTracksConverter.cxx
index 425bb0c6392..006e9bbe742 100644
--- a/.conflict-side-0/Common/TableProducer/Converters/mftTracksConverter.cxx
+++ b/.conflict-side-0/Common/TableProducer/Converters/mftTracksConverter.cxx
@@ -19,9 +19,9 @@
 
 /// \author L.Micheletti <luca.micheletti@cern.ch>
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Common/TableProducer/Converters/multMCExtrasConverter.cxx b/.conflict-side-0/Common/TableProducer/Converters/multMCExtrasConverter.cxx
index ac2c074ba1b..27eeaf78bcb 100644
--- a/.conflict-side-0/Common/TableProducer/Converters/multMCExtrasConverter.cxx
+++ b/.conflict-side-0/Common/TableProducer/Converters/multMCExtrasConverter.cxx
@@ -9,11 +9,12 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Common/DataModel/Multiplicity.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-side-0/Common/TableProducer/Converters/multsExtraConverter.cxx b/.conflict-side-0/Common/TableProducer/Converters/multsExtraConverter.cxx
index d62b34508b8..2e30ed2a266 100644
--- a/.conflict-side-0/Common/TableProducer/Converters/multsExtraConverter.cxx
+++ b/.conflict-side-0/Common/TableProducer/Converters/multsExtraConverter.cxx
@@ -9,11 +9,12 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Common/DataModel/Multiplicity.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-side-0/Common/TableProducer/Converters/run2TinyToFullPID.cxx b/.conflict-side-0/Common/TableProducer/Converters/run2TinyToFullPID.cxx
index 23b6c5a8cbf..098318e3c3a 100644
--- a/.conflict-side-0/Common/TableProducer/Converters/run2TinyToFullPID.cxx
+++ b/.conflict-side-0/Common/TableProducer/Converters/run2TinyToFullPID.cxx
@@ -18,12 +18,14 @@
 //
 // Warning: expected resolution is NOT provided.
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "TableHelper.h"
 
+#include "Common/DataModel/PIDResponse.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-side-0/Common/TableProducer/Converters/run2bcinfosConverter.cxx b/.conflict-side-0/Common/TableProducer/Converters/run2bcinfosConverter.cxx
index 6257d371824..06d5282a9ee 100644
--- a/.conflict-side-0/Common/TableProducer/Converters/run2bcinfosConverter.cxx
+++ b/.conflict-side-0/Common/TableProducer/Converters/run2bcinfosConverter.cxx
@@ -9,9 +9,9 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Common/TableProducer/Converters/run2tracksExtraConverter.cxx b/.conflict-side-0/Common/TableProducer/Converters/run2tracksExtraConverter.cxx
index 28ae54c4367..ffb9b9cf24e 100644
--- a/.conflict-side-0/Common/TableProducer/Converters/run2tracksExtraConverter.cxx
+++ b/.conflict-side-0/Common/TableProducer/Converters/run2tracksExtraConverter.cxx
@@ -9,9 +9,9 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Common/TableProducer/Converters/trackQA002Converter.cxx b/.conflict-side-0/Common/TableProducer/Converters/trackQA002Converter.cxx
index 566c998e1bc..2e74c50d8e9 100644
--- a/.conflict-side-0/Common/TableProducer/Converters/trackQA002Converter.cxx
+++ b/.conflict-side-0/Common/TableProducer/Converters/trackQA002Converter.cxx
@@ -8,11 +8,11 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include <limits>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include <limits>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Common/TableProducer/Converters/trackQA003Converter.cxx b/.conflict-side-0/Common/TableProducer/Converters/trackQA003Converter.cxx
index 56a6d3551e9..2447283f468 100644
--- a/.conflict-side-0/Common/TableProducer/Converters/trackQA003Converter.cxx
+++ b/.conflict-side-0/Common/TableProducer/Converters/trackQA003Converter.cxx
@@ -8,11 +8,11 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include <limits>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include <limits>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Common/TableProducer/Converters/trackQAConverter.cxx b/.conflict-side-0/Common/TableProducer/Converters/trackQAConverter.cxx
index bdfecbca8d0..fd8657ebcdd 100644
--- a/.conflict-side-0/Common/TableProducer/Converters/trackQAConverter.cxx
+++ b/.conflict-side-0/Common/TableProducer/Converters/trackQAConverter.cxx
@@ -8,11 +8,11 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include <limits>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include <limits>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Common/TableProducer/Converters/tracksExtraConverter.cxx b/.conflict-side-0/Common/TableProducer/Converters/tracksExtraConverter.cxx
index b097cb7c4a3..ed8b6c21db8 100644
--- a/.conflict-side-0/Common/TableProducer/Converters/tracksExtraConverter.cxx
+++ b/.conflict-side-0/Common/TableProducer/Converters/tracksExtraConverter.cxx
@@ -19,9 +19,9 @@
 
 /// \author F.Mazzaschi <fmazzasc@cern.ch>
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Common/TableProducer/Converters/tracksExtraV002Converter.cxx b/.conflict-side-0/Common/TableProducer/Converters/tracksExtraV002Converter.cxx
index a70ac8ea8a8..8c4c8a22d4a 100644
--- a/.conflict-side-0/Common/TableProducer/Converters/tracksExtraV002Converter.cxx
+++ b/.conflict-side-0/Common/TableProducer/Converters/tracksExtraV002Converter.cxx
@@ -9,9 +9,9 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Common/TableProducer/Converters/v0converter.cxx b/.conflict-side-0/Common/TableProducer/Converters/v0converter.cxx
index 849e35591e1..3131a4a5ad2 100644
--- a/.conflict-side-0/Common/TableProducer/Converters/v0converter.cxx
+++ b/.conflict-side-0/Common/TableProducer/Converters/v0converter.cxx
@@ -8,9 +8,9 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Common/TableProducer/Converters/zdcConverter.cxx b/.conflict-side-0/Common/TableProducer/Converters/zdcConverter.cxx
index 2c94d5ca46f..2b97f8ff102 100644
--- a/.conflict-side-0/Common/TableProducer/Converters/zdcConverter.cxx
+++ b/.conflict-side-0/Common/TableProducer/Converters/zdcConverter.cxx
@@ -12,9 +12,9 @@
 // ZDC converter to new format
 // to be used with Run 2 converted data and older AO2Ds
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 #include "ZDCBase/Constants.h"
 
 using namespace o2;
diff --git a/.conflict-side-0/Common/TableProducer/PID/pidBayes.cxx b/.conflict-side-0/Common/TableProducer/PID/pidBayes.cxx
index abedb281668..4654caf1580 100644
--- a/.conflict-side-0/Common/TableProducer/PID/pidBayes.cxx
+++ b/.conflict-side-0/Common/TableProducer/PID/pidBayes.cxx
@@ -16,29 +16,30 @@
 ///         Only the tables for the mass hypotheses requested are filled, the others are sent empty.
 ///
 
-#include <utility>
 #include <algorithm>
-#include <vector>
 #include <memory>
 #include <string>
+#include <utility>
+#include <vector>
 
 // O2 includes
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/Array2D.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "Common/Core/PID/TPCPIDResponse.h"
+#include "pidTOFBase.h"
+
 #include "Common/Core/PID/DetectorResponse.h"
-#include "Common/Core/PID/ParamBase.h"
 #include "Common/Core/PID/PIDTOF.h"
+#include "Common/Core/PID/ParamBase.h"
+#include "Common/Core/PID/TPCPIDResponse.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/PIDResponseCombined.h"
-#include "Common/DataModel/PIDResponseTPC.h"
 #include "Common/DataModel/PIDResponseTOF.h"
+#include "Common/DataModel/PIDResponseTPC.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "pidTOFBase.h"
+#include "CCDB/BasicCCDBManager.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/Array2D.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Common/TableProducer/PID/pidITS.cxx b/.conflict-side-0/Common/TableProducer/PID/pidITS.cxx
index 1a6cdbc5491..64c05ea41c9 100644
--- a/.conflict-side-0/Common/TableProducer/PID/pidITS.cxx
+++ b/.conflict-side-0/Common/TableProducer/PID/pidITS.cxx
@@ -19,22 +19,23 @@
 ///         Only the tables for the mass hypotheses requested are filled, the others are sent empty.
 ///
 
+#include <string>
 #include <utility>
 #include <vector>
-#include <string>
 
 // O2 includes
-#include "Framework/runDataProcessing.h"
+#include "CCDB/BasicCCDBManager.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "CCDB/BasicCCDBManager.h"
 #include "TOFBase/EventTimeMaker.h"
 
 // O2Physics includes
-#include "Common/DataModel/PIDResponseITS.h"
 #include "MetadataHelper.h"
 
+#include "Common/DataModel/PIDResponseITS.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-0/Common/TableProducer/PID/pidTOF.cxx b/.conflict-side-0/Common/TableProducer/PID/pidTOF.cxx
index 076cc0c26de..ab4b9c6ce02 100644
--- a/.conflict-side-0/Common/TableProducer/PID/pidTOF.cxx
+++ b/.conflict-side-0/Common/TableProducer/PID/pidTOF.cxx
@@ -17,10 +17,10 @@
 ///
 
 // O2 includes
-#include <CCDB/BasicCCDBManager.h>
-#include "TOFBase/EventTimeMaker.h"
 #include "Framework/AnalysisTask.h"
 #include "ReconstructionDataFormats/Track.h"
+#include "TOFBase/EventTimeMaker.h"
+#include <CCDB/BasicCCDBManager.h>
 
 // O2Physics includes
 #include "TableHelper.h"
diff --git a/.conflict-side-0/Common/TableProducer/PID/pidTOFBase.cxx b/.conflict-side-0/Common/TableProducer/PID/pidTOFBase.cxx
index f0f9722fc6b..2300535c274 100644
--- a/.conflict-side-0/Common/TableProducer/PID/pidTOFBase.cxx
+++ b/.conflict-side-0/Common/TableProducer/PID/pidTOFBase.cxx
@@ -15,25 +15,27 @@
 /// \brief  Base to build tasks for TOF PID tasks.
 ///
 
+#include <string>
 #include <utility>
 #include <vector>
-#include <string>
 
 // O2 includes
 #include "CCDB/BasicCCDBManager.h"
-#include "TOFBase/EventTimeMaker.h"
 #include "Framework/AnalysisTask.h"
 #include "ReconstructionDataFormats/Track.h"
+#include "TOFBase/EventTimeMaker.h"
 
 // O2Physics includes
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "TableHelper.h"
+#include "pidTOFBase.h"
+
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/FT0Corrected.h"
 #include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
-#include "TableHelper.h"
-#include "pidTOFBase.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Common/TableProducer/PID/pidTOFBase.h b/.conflict-side-0/Common/TableProducer/PID/pidTOFBase.h
index 44367eacb75..98189aa03b1 100644
--- a/.conflict-side-0/Common/TableProducer/PID/pidTOFBase.h
+++ b/.conflict-side-0/Common/TableProducer/PID/pidTOFBase.h
@@ -22,10 +22,11 @@
 #include <vector>
 
 // O2Physics
-#include "PID/ParamBase.h"
-#include "PID/PIDTOF.h"
-#include "Common/DataModel/PIDResponseTOF.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/PIDResponseTOF.h"
+
+#include "PID/PIDTOF.h"
+#include "PID/ParamBase.h"
 
 static constexpr int nSpecies = 9;
 static constexpr int nParameters = 1;
diff --git a/.conflict-side-0/Common/TableProducer/PID/pidTOFFull.cxx b/.conflict-side-0/Common/TableProducer/PID/pidTOFFull.cxx
index 6fec03a10ff..98bd612a166 100644
--- a/.conflict-side-0/Common/TableProducer/PID/pidTOFFull.cxx
+++ b/.conflict-side-0/Common/TableProducer/PID/pidTOFFull.cxx
@@ -17,10 +17,10 @@
 ///
 
 // O2 includes
-#include <CCDB/BasicCCDBManager.h>
-#include "TOFBase/EventTimeMaker.h"
 #include "Framework/AnalysisTask.h"
 #include "ReconstructionDataFormats/Track.h"
+#include "TOFBase/EventTimeMaker.h"
+#include <CCDB/BasicCCDBManager.h>
 
 // O2Physics includes
 #include "TableHelper.h"
diff --git a/.conflict-side-0/Common/TableProducer/PID/pidTOFbeta.cxx b/.conflict-side-0/Common/TableProducer/PID/pidTOFbeta.cxx
index d76d631bc4d..c8c6a65c22c 100644
--- a/.conflict-side-0/Common/TableProducer/PID/pidTOFbeta.cxx
+++ b/.conflict-side-0/Common/TableProducer/PID/pidTOFbeta.cxx
@@ -16,11 +16,13 @@
 ///
 
 // O2 includes
+#include "TableHelper.h"
+#include "pidTOFBase.h"
+
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
 #include "Framework/AnalysisTask.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "pidTOFBase.h"
-#include "TableHelper.h"
 
 // O2Physics includes
 #include "PID/PIDTOF.h"
diff --git a/.conflict-side-0/Common/TableProducer/caloClusterProducer.cxx b/.conflict-side-0/Common/TableProducer/caloClusterProducer.cxx
index 086885beb4c..d0336adcef4 100644
--- a/.conflict-side-0/Common/TableProducer/caloClusterProducer.cxx
+++ b/.conflict-side-0/Common/TableProducer/caloClusterProducer.cxx
@@ -14,35 +14,34 @@
 ///
 /// \author Dmitri Peresunko <Dmitri.Peresunko@cern.ch>
 
-#include <algorithm>
-#include <map>
-#include <memory>
-#include <string>
-#include <vector>
-
-#include "Framework/ConfigParamSpec.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/CaloClusters.h"
 #include "Common/Core/trackUtilities.h"
-#include "ReconstructionDataFormats/TrackParametrization.h"
-#include "DetectorsBase/Propagator.h"
+#include "Common/DataModel/CaloClusters.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "CommonUtils/NameConf.h"
 #include "CCDB/BasicCCDBManager.h"
-#include "SimulationDataFormat/MCTruthContainer.h"
-
-#include "DataFormatsParameters/GRPMagField.h"
+#include "CommonUtils/NameConf.h"
+#include "DataFormatsPHOS/BadChannelsMap.h"
+#include "DataFormatsPHOS/CalibParams.h"
 #include "DataFormatsPHOS/Cell.h"
 #include "DataFormatsPHOS/Cluster.h"
-#include "DataFormatsPHOS/TriggerRecord.h"
 #include "DataFormatsPHOS/MCLabel.h"
-#include "DataFormatsPHOS/BadChannelsMap.h"
-#include "DataFormatsPHOS/CalibParams.h"
+#include "DataFormatsPHOS/TriggerRecord.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/ConfigParamSpec.h"
+#include "Framework/runDataProcessing.h"
 #include "PHOSBase/Geometry.h"
 #include "PHOSReconstruction/Clusterer.h"
+#include "ReconstructionDataFormats/TrackParametrization.h"
+#include "SimulationDataFormat/MCTruthContainer.h"
+
+#include <algorithm>
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
 
 using namespace o2::framework;
 using namespace o2;
diff --git a/.conflict-side-0/Common/TableProducer/centralityTable.cxx b/.conflict-side-0/Common/TableProducer/centralityTable.cxx
index 9198f79499e..701d26f9ebb 100644
--- a/.conflict-side-0/Common/TableProducer/centralityTable.cxx
+++ b/.conflict-side-0/Common/TableProducer/centralityTable.cxx
@@ -15,25 +15,28 @@
 /// \author ALICE
 //
 
-#include <string>
-#include <vector>
-#include <algorithm>
-#include <map>
+#include "MetadataHelper.h"
+#include "TableHelper.h"
 
-#include <CCDB/BasicCCDBManager.h>
-#include <TH1F.h>
-#include <TFormula.h>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/HistogramRegistry.h"
-#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "MetadataHelper.h"
-#include "TableHelper.h"
+#include "Common/DataModel/Multiplicity.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include <CCDB/BasicCCDBManager.h>
+
 #include "TList.h"
+#include <TFormula.h>
+#include <TH1F.h>
+
+#include <algorithm>
+#include <map>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Common/TableProducer/eseTableProducer.cxx b/.conflict-side-0/Common/TableProducer/eseTableProducer.cxx
index 098bfbe400f..9f6619060fe 100644
--- a/.conflict-side-0/Common/TableProducer/eseTableProducer.cxx
+++ b/.conflict-side-0/Common/TableProducer/eseTableProducer.cxx
@@ -14,30 +14,29 @@
 ///
 /// \author Joachim C. K. B. Hansen
 
-#include <CCDB/BasicCCDBManager.h>
+#include "FFitWeights.h"
 
-#include <chrono>
-#include <string>
-#include <algorithm>
-#include <numeric>
-#include <vector>
-#include <tuple>
-#include <unordered_map>
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EseTable.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/Qvectors.h"
 
 #include "Framework/ASoA.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
 #include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include <CCDB/BasicCCDBManager.h>
 
-#include "Common/DataModel/EventSelection.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-
-#include "Common/DataModel/EseTable.h"
-#include "Common/DataModel/Qvectors.h"
-#include "FFitWeights.h"
+#include <algorithm>
+#include <chrono>
+#include <numeric>
+#include <string>
+#include <tuple>
+#include <unordered_map>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Common/TableProducer/eventSelection.cxx b/.conflict-side-0/Common/TableProducer/eventSelection.cxx
index 5ead8e80493..52bf23cda7b 100644
--- a/.conflict-side-0/Common/TableProducer/eventSelection.cxx
+++ b/.conflict-side-0/Common/TableProducer/eventSelection.cxx
@@ -14,35 +14,38 @@
 ///
 /// \author Evgeny Kryshen <evgeny.kryshen@cern.ch> and Igor Altsybeev <Igor.Altsybeev@cern.ch>
 
-#include <vector>
-#include <map>
-#include <string>
-#include <limits>
-
-#include "Framework/ConfigParamSpec.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Common/DataModel/EventSelection.h"
+
+#include "MetadataHelper.h"
+
 #include "Common/CCDB/EventSelectionParams.h"
 #include "Common/CCDB/TriggerAliases.h"
+
 #include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/LHCConstants.h"
-#include "Framework/HistogramRegistry.h"
+#include "DataFormatsCTP/Configuration.h"
+#include "DataFormatsCTP/Scalers.h"
 #include "DataFormatsFT0/Digit.h"
-#include "DataFormatsParameters/GRPLHCIFData.h"
-#include "DataFormatsParameters/GRPECSObject.h"
-#include "ITSMFTBase/DPLAlpideParam.h"
-#include "MetadataHelper.h"
-#include "DataFormatsParameters/AggregatedRunInfo.h"
 #include "DataFormatsITSMFT/NoiseMap.h" // missing include in TimeDeadMap.h
 #include "DataFormatsITSMFT/TimeDeadMap.h"
+#include "DataFormatsParameters/AggregatedRunInfo.h"
+#include "DataFormatsParameters/GRPECSObject.h"
+#include "DataFormatsParameters/GRPLHCIFData.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/ConfigParamSpec.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include "ITSMFTBase/DPLAlpideParam.h"
 #include "ITSMFTReconstruction/ChipMappingITS.h"
-#include "DataFormatsCTP/Configuration.h"
-#include "DataFormatsCTP/Scalers.h"
 
 #include "TH1D.h"
 
+#include <limits>
+#include <map>
+#include <string>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::aod::evsel;
diff --git a/.conflict-side-0/Common/TableProducer/ft0CorrectedTable.cxx b/.conflict-side-0/Common/TableProducer/ft0CorrectedTable.cxx
index a8a2787aa5a..694fed73c4c 100644
--- a/.conflict-side-0/Common/TableProducer/ft0CorrectedTable.cxx
+++ b/.conflict-side-0/Common/TableProducer/ft0CorrectedTable.cxx
@@ -9,22 +9,26 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <bitset>
-#include <string>
-#include "Framework/ConfigParamSpec.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Common/DataModel/FT0Corrected.h"
+#include "CollisionTypeHelper.h"
+
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/FT0Corrected.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/LHCConstants.h"
 #include "CommonConstants/PhysicsConstants.h"
 #include "DataFormatsFT0/Digit.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "CollisionTypeHelper.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/ConfigParamSpec.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TRandom3.h"
 
+#include <bitset>
+#include <string>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::aod;
diff --git a/.conflict-side-0/Common/TableProducer/fwdtrackToCollisionAssociator.cxx b/.conflict-side-0/Common/TableProducer/fwdtrackToCollisionAssociator.cxx
index 20d6e4c6a60..a8b6fa22baa 100644
--- a/.conflict-side-0/Common/TableProducer/fwdtrackToCollisionAssociator.cxx
+++ b/.conflict-side-0/Common/TableProducer/fwdtrackToCollisionAssociator.cxx
@@ -17,6 +17,7 @@
 #include "Common/Core/CollisionAssociation.h"
 #include "Common/DataModel/CollisionAssociationTables.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CommonConstants/LHCConstants.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
diff --git a/.conflict-side-0/Common/TableProducer/fwdtrackextension.cxx b/.conflict-side-0/Common/TableProducer/fwdtrackextension.cxx
index 4a78bf8de5f..965fca008f1 100644
--- a/.conflict-side-0/Common/TableProducer/fwdtrackextension.cxx
+++ b/.conflict-side-0/Common/TableProducer/fwdtrackextension.cxx
@@ -13,19 +13,20 @@
 // Task performing forward track DCA computation
 //
 
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonUtils/NameConf.h"
+#include "DetectorsBase/Propagator.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/Core/trackUtilities.h"
 #include "ReconstructionDataFormats/DCA.h"
-#include "DetectorsBase/Propagator.h"
-#include "CommonUtils/NameConf.h"
+#include "ReconstructionDataFormats/TrackFwd.h"
 
 #include "Math/SMatrix.h"
-#include "ReconstructionDataFormats/TrackFwd.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Common/TableProducer/match-mft-ft0.cxx b/.conflict-side-0/Common/TableProducer/match-mft-ft0.cxx
index a4b208a03c9..bc5e0feec12 100644
--- a/.conflict-side-0/Common/TableProducer/match-mft-ft0.cxx
+++ b/.conflict-side-0/Common/TableProducer/match-mft-ft0.cxx
@@ -18,31 +18,27 @@
 //        called aod::BCofMFT
 // \date 03/09/24
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
+#include "Common/Core/trackUtilities.h" //for getTrackPar()
 
-#include "MathUtils/Utils.h"
 #include "CommonConstants/LHCConstants.h"
-#include "Common/Core/trackUtilities.h"         //for getTrackPar()
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "MathUtils/Utils.h"
 #include "ReconstructionDataFormats/TrackFwd.h" //for propagate
 // https://github.com/AliceO2Group/AliceO2/blob/dev/DataFormats/Reconstruction/include/ReconstructionDataFormats/TrackFwd.h
-#include "CommonConstants/LHCConstants.h"
-#include "Math/MatrixFunctions.h"
-#include "Math/SMatrix.h"
+#include "Common/DataModel/MatchMFTFT0.h"
 
 #include "CCDB/BasicCCDBManager.h"
 #include "CCDB/CcdbApi.h"
-
-#include "DataFormatsParameters/GRPMagField.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "Field/MagneticField.h"
-#include "TGeoGlobalMagField.h"
-
+#include "CommonConstants/LHCConstants.h"
 #include "DataFormatsParameters/GRPMagField.h"
 #include "DetectorsBase/GeometryManager.h"
 #include "DetectorsBase/Propagator.h"
+#include "Field/MagneticField.h"
 
-#include "Common/DataModel/MatchMFTFT0.h"
+#include "Math/MatrixFunctions.h"
+#include "Math/SMatrix.h"
+#include "TGeoGlobalMagField.h"
 
 using SMatrix55 = ROOT::Math::SMatrix<double, 5, 5, ROOT::Math::MatRepSym<double, 5>>;
 using SMatrix5 = ROOT::Math::SVector<Double_t, 5>;
diff --git a/.conflict-side-0/Common/TableProducer/match-mft-mch-data-mc.cxx b/.conflict-side-0/Common/TableProducer/match-mft-mch-data-mc.cxx
index 11d59611772..1f330b45422 100644
--- a/.conflict-side-0/Common/TableProducer/match-mft-mch-data-mc.cxx
+++ b/.conflict-side-0/Common/TableProducer/match-mft-mch-data-mc.cxx
@@ -8,29 +8,31 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include <map>
-#include <string>
-#include <unordered_set>
-#include <unordered_map>
-#include <vector>
-
-#include "CCDB/BasicCCDBManager.h"
+#include "Common/DataModel/CollisionAssociationTables.h"
 #include "Common/DataModel/MatchMFTFT0.h"
 #include "Common/DataModel/MatchMFTMuonData.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsGlobalTracking/RecoContainer.h"
-#include "Common/DataModel/CollisionAssociationTables.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include "Field/MagneticField.h"
-#include "TGeoGlobalMagField.h"
-#include "DetectorsBase/Propagator.h"
 #include "DetectorsBase/GeometryManager.h"
-#include "MCHTracking/TrackExtrap.h"
+#include "DetectorsBase/Propagator.h"
+#include "Field/MagneticField.h"
 #include "GlobalTracking/MatchGlobalFwd.h"
+#include "MCHTracking/TrackExtrap.h"
+
 #include "Math/SMatrix.h"
 #include "Math/SVector.h"
+#include "TDatabasePDG.h"
+#include "TGeoGlobalMagField.h"
 #include "TLorentzVector.h"
 #include "TVector2.h"
-#include "TDatabasePDG.h"
+
+#include <map>
+#include <string>
+#include <unordered_map>
+#include <unordered_set>
+#include <vector>
 
 using namespace std;
 
@@ -40,9 +42,9 @@ using namespace o2::aod;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/DataTypes.h"
 #include "Framework/runDataProcessing.h"
 
diff --git a/.conflict-side-0/Common/TableProducer/match-mft-mch-data.cxx b/.conflict-side-0/Common/TableProducer/match-mft-mch-data.cxx
index 96471ddefab..eafcd54c51c 100644
--- a/.conflict-side-0/Common/TableProducer/match-mft-mch-data.cxx
+++ b/.conflict-side-0/Common/TableProducer/match-mft-mch-data.cxx
@@ -8,29 +8,31 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include <map>
-#include <string>
-#include <unordered_set>
-#include <unordered_map>
-#include <vector>
-
-#include "CCDB/BasicCCDBManager.h"
+#include "Common/DataModel/CollisionAssociationTables.h"
 #include "Common/DataModel/MatchMFTFT0.h"
 #include "Common/DataModel/MatchMFTMuonData.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsGlobalTracking/RecoContainer.h"
-#include "Common/DataModel/CollisionAssociationTables.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include "Field/MagneticField.h"
-#include "TGeoGlobalMagField.h"
-#include "DetectorsBase/Propagator.h"
 #include "DetectorsBase/GeometryManager.h"
-#include "MCHTracking/TrackExtrap.h"
+#include "DetectorsBase/Propagator.h"
+#include "Field/MagneticField.h"
 #include "GlobalTracking/MatchGlobalFwd.h"
+#include "MCHTracking/TrackExtrap.h"
+
 #include "Math/SMatrix.h"
 #include "Math/SVector.h"
+#include "TDatabasePDG.h"
+#include "TGeoGlobalMagField.h"
 #include "TLorentzVector.h"
 #include "TVector2.h"
-#include "TDatabasePDG.h"
+
+#include <map>
+#include <string>
+#include <unordered_map>
+#include <unordered_set>
+#include <vector>
 
 using namespace std;
 
@@ -40,9 +42,9 @@ using namespace o2::aod;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/DataTypes.h"
 #include "Framework/runDataProcessing.h"
 
diff --git a/.conflict-side-0/Common/TableProducer/mcCollsExtra.cxx b/.conflict-side-0/Common/TableProducer/mcCollsExtra.cxx
index 452930494ba..83523cf45d0 100644
--- a/.conflict-side-0/Common/TableProducer/mcCollsExtra.cxx
+++ b/.conflict-side-0/Common/TableProducer/mcCollsExtra.cxx
@@ -12,38 +12,40 @@
 // Quick and dirty task to correlate MC <-> data
 //
 
-#include <array>
-#include <cmath>
-#include <cstdlib>
-#include <vector>
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/McCollisionExtra.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
 #include "Math/Vector4D.h"
+#include <TDatabasePDG.h>
 #include <TFile.h>
 #include <TH2F.h>
-#include <TProfile.h>
 #include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
+#include <TProfile.h>
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/DataModel/McCollisionExtra.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Common/TableProducer/mftmchMatchingML.cxx b/.conflict-side-0/Common/TableProducer/mftmchMatchingML.cxx
index 4df90bbfdd1..78e1902d6b4 100644
--- a/.conflict-side-0/Common/TableProducer/mftmchMatchingML.cxx
+++ b/.conflict-side-0/Common/TableProducer/mftmchMatchingML.cxx
@@ -9,30 +9,36 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <math.h>
-#include <onnxruntime_cxx_api.h>
-#include <string>
-#include <regex>
-#include <TLorentzVector.h>
 #include "Common/DataModel/MftmchMatchingML.h"
+
+#include "Common/CCDB/EventSelectionParams.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+#include "Tools/ML/model.h"
+
+#include "CCDB/CcdbApi.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/CCDB/EventSelectionParams.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/Core/trackUtilities.h"
-#include "Common/Core/TrackSelection.h"
+#include "GlobalTracking/MatchGlobalFwd.h"
+#include "MCHTracking/TrackExtrap.h"
+#include "MCHTracking/TrackParam.h"
+#include "MFTTracking/Tracker.h"
 #include "ReconstructionDataFormats/TrackFwd.h"
+
 #include "Math/SMatrix.h"
-#include "DetectorsBase/Propagator.h"
-#include "MFTTracking/Tracker.h"
-#include "MCHTracking/TrackParam.h"
-#include "MCHTracking/TrackExtrap.h"
-#include "GlobalTracking/MatchGlobalFwd.h"
-#include "CCDB/CcdbApi.h"
-#include "Tools/ML/model.h"
+#include <TLorentzVector.h>
+
+#include <onnxruntime_cxx_api.h>
+
+#include <regex>
+#include <string>
+
+#include <math.h>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Common/TableProducer/multCentTable.cxx b/.conflict-side-0/Common/TableProducer/multCentTable.cxx
index 612125715cf..daed806ebb3 100644
--- a/.conflict-side-0/Common/TableProducer/multCentTable.cxx
+++ b/.conflict-side-0/Common/TableProducer/multCentTable.cxx
@@ -20,27 +20,29 @@
 //
 //===============================================================
 
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "MetadataHelper.h"
+
 #include "Common/Core/trackUtilities.h"
-#include "ReconstructionDataFormats/DCA.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "CommonUtils/NameConf.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/Tools/MultModule.h"
+#include "Common/Tools/StandardCCDBLoader.h"
+#include "Common/Tools/TrackPropagationModule.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "CCDB/CcdbApi.h"
+#include "CommonConstants/GeomConstants.h"
+#include "CommonUtils/NameConf.h"
+#include "DataFormatsCalibration/MeanVertexObject.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "DataFormatsCalibration/MeanVertexObject.h"
-#include "CommonConstants/GeomConstants.h"
-#include "Common/Tools/TrackPropagationModule.h"
-#include "Common/Tools/StandardCCDBLoader.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "MetadataHelper.h"
-#include "Common/Tools/MultModule.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/DCA.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Common/TableProducer/multiplicityExtraTable.cxx b/.conflict-side-0/Common/TableProducer/multiplicityExtraTable.cxx
index 001e75e6adb..13d9a43f3e7 100644
--- a/.conflict-side-0/Common/TableProducer/multiplicityExtraTable.cxx
+++ b/.conflict-side-0/Common/TableProducer/multiplicityExtraTable.cxx
@@ -8,20 +8,23 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include <CCDB/BasicCCDBManager.h> // megalinter thinks this is a C header...
-#include <bitset>
-#include "Framework/ConfigParamSpec.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "TableHelper.h"
+
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "DataFormatsFIT/Triggers.h"
-#include "TableHelper.h"
+
 #include "CCDB/CcdbApi.h"
 #include "CommonDataFormat/BunchFilling.h"
-#include "DataFormatsParameters/GRPObject.h"
+#include "DataFormatsFIT/Triggers.h"
 #include "DataFormatsParameters/GRPLHCIFData.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/ConfigParamSpec.h"
+#include "Framework/runDataProcessing.h"
+#include <CCDB/BasicCCDBManager.h> // megalinter thinks this is a C header...
+
+#include <bitset>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Common/TableProducer/multiplicityTable.cxx b/.conflict-side-0/Common/TableProducer/multiplicityTable.cxx
index 12cde8a9869..45a712e5803 100644
--- a/.conflict-side-0/Common/TableProducer/multiplicityTable.cxx
+++ b/.conflict-side-0/Common/TableProducer/multiplicityTable.cxx
@@ -15,26 +15,30 @@
 /// \author ALICE
 ///
 
-#include <vector>
-#include <algorithm>
-#include <map>
-#include <string>
+#include "MetadataHelper.h"
+#include "TableHelper.h"
 
-#include "Framework/ConfigParamSpec.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
+#include "PWGMM/Mult/DataModel/bestCollisionTable.h"
+
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/ConfigParamSpec.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "TableHelper.h"
-#include "MetadataHelper.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TList.h"
-#include "PWGMM/Mult/DataModel/bestCollisionTable.h"
+
+#include <algorithm>
+#include <map>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
@@ -100,9 +104,9 @@ struct MultiplicityTable {
   Produces<aod::PVMultZeqs> tablePVZeqs;        // 12
   Produces<aod::MultMCExtras> tableExtraMc;     // 13
   Produces<aod::Mult2MCExtras> tableExtraMult2MCExtras;
-  Produces<aod::MultHepMCHIs> multHepMCHIs;     // Not accounted for, produced using custom process function to avoid dependencies
-  Produces<aod::MFTMults> mftMults;             // Not accounted for, produced using custom process function to avoid dependencies
-  Produces<aod::MultsGlobal> multsGlobal;       // Not accounted for, produced based on process function processGlobalTrackingCounters
+  Produces<aod::MultHepMCHIs> multHepMCHIs; // Not accounted for, produced using custom process function to avoid dependencies
+  Produces<aod::MFTMults> mftMults;         // Not accounted for, produced using custom process function to avoid dependencies
+  Produces<aod::MultsGlobal> multsGlobal;   // Not accounted for, produced based on process function processGlobalTrackingCounters
 
   // For vertex-Z corrections in calibration
   Service<o2::ccdb::BasicCCDBManager> ccdb;
diff --git a/.conflict-side-0/Common/TableProducer/muonRealignment.cxx b/.conflict-side-0/Common/TableProducer/muonRealignment.cxx
index 58745af69a6..3d1516dd5fc 100644
--- a/.conflict-side-0/Common/TableProducer/muonRealignment.cxx
+++ b/.conflict-side-0/Common/TableProducer/muonRealignment.cxx
@@ -13,33 +13,34 @@
 /// \brief Task for muon re-alignment at analysis level
 /// \author Chi Zhang <chi.zhang@cern.ch>, CEA-Saclay
 
-#include <string>
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/ASoAHelpers.h"
+#include "Common/DataModel/CollisionAssociationTables.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/FwdTrackReAlignTables.h"
 
 #include "CCDB/BasicCCDBManager.h"
 #include "CCDB/CCDBTimeStampUtils.h"
-#include "CommonUtils/NameConf.h"
 #include "CommonUtils/ConfigurableParam.h"
+#include "CommonUtils/NameConf.h"
 #include "DataFormatsMCH/Cluster.h"
 #include "DataFormatsParameters/GRPObject.h"
-#include "DetectorsBase/GeometryManager.h"
 #include "DetectorsBase/GRPGeomHelper.h"
+#include "DetectorsBase/GeometryManager.h"
 #include "DetectorsBase/Propagator.h"
-#include "MathUtils/Cartesian.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "GlobalTracking/MatchGlobalFwd.h"
+#include "MCHBase/TrackerParam.h"
 #include "MCHGeometryTransformer/Transformations.h"
 #include "MCHTracking/Track.h"
 #include "MCHTracking/TrackExtrap.h"
-#include "MCHTracking/TrackParam.h"
 #include "MCHTracking/TrackFitter.h"
-#include "MCHBase/TrackerParam.h"
-#include "GlobalTracking/MatchGlobalFwd.h"
+#include "MCHTracking/TrackParam.h"
+#include "MathUtils/Cartesian.h"
 #include "ReconstructionDataFormats/TrackFwd.h"
-#include "Common/DataModel/FwdTrackReAlignTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/CollisionAssociationTables.h"
+
+#include <string>
 
 using namespace std;
 using namespace o2;
diff --git a/.conflict-side-0/Common/TableProducer/occupancyTableProducer.cxx b/.conflict-side-0/Common/TableProducer/occupancyTableProducer.cxx
index a700b394772..8f9c36bad2b 100644
--- a/.conflict-side-0/Common/TableProducer/occupancyTableProducer.cxx
+++ b/.conflict-side-0/Common/TableProducer/occupancyTableProducer.cxx
@@ -15,31 +15,29 @@
 ///         Ambg tracks were not used
 /// \author Rahul Verma (rahul.verma@iitb.ac.in) :: Marian I Ivanov (marian.ivanov@cern.ch)
 
-#include <vector>
-#include <unordered_map>
-#include <algorithm>
-#include <cmath>
-#include <string>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/O2DatabasePDGPlugin.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-
 #include "Common/DataModel/OccupancyTables.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
 #include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsFT0/Digit.h"
 #include "DataFormatsParameters/GRPLHCIFData.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
+#include <algorithm>
+#include <cmath>
+#include <string>
+#include <unordered_map>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Common/TableProducer/qVectorsTable.cxx b/.conflict-side-0/Common/TableProducer/qVectorsTable.cxx
index 9de8faf028f..b6d1e98d803 100644
--- a/.conflict-side-0/Common/TableProducer/qVectorsTable.cxx
+++ b/.conflict-side-0/Common/TableProducer/qVectorsTable.cxx
@@ -19,28 +19,27 @@
 ///
 
 // C++/ROOT includes.
+#include <TComplex.h>
+#include <TH3F.h>
+
 #include <chrono>
 #include <string>
 #include <vector>
-#include <TComplex.h>
-#include <TH3F.h>
 
 // o2Physics includes.
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-
 #include "Common/Core/EventPlaneHelper.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/FT0Corrected.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-
 #include "Common/DataModel/Qvectors.h"
-
-#include "Common/Core/TrackSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
 // o2 includes.
 #include "CCDB/BasicCCDBManager.h"
 #include "DetectorsCommonDataFormats/AlignParam.h"
diff --git a/.conflict-side-0/Common/TableProducer/timestamp.cxx b/.conflict-side-0/Common/TableProducer/timestamp.cxx
index 40ab7000772..a3d071cf305 100644
--- a/.conflict-side-0/Common/TableProducer/timestamp.cxx
+++ b/.conflict-side-0/Common/TableProducer/timestamp.cxx
@@ -16,14 +16,16 @@
 /// \brief  A task to fill the timestamp table from run number.
 ///         Uses headers from CCDB
 ///
-#include <vector>
-#include <map>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
+#include "MetadataHelper.h"
+
 #include "CCDB/BasicCCDBManager.h"
 #include "CommonDataFormat/InteractionRecord.h"
 #include "DetectorsRaw/HBFUtils.h"
-#include "MetadataHelper.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include <map>
+#include <vector>
 
 using namespace o2::framework;
 using namespace o2::header;
@@ -32,15 +34,15 @@ using namespace o2;
 o2::common::core::MetadataHelper metadataInfo; // Metadata helper
 
 struct TimestampTask {
-  Produces<aod::Timestamps> timestampTable;  /// Table with SOR timestamps produced by the task
-  Service<o2::ccdb::BasicCCDBManager> ccdb;  /// CCDB manager to access orbit-reset timestamp
-  o2::ccdb::CcdbApi ccdb_api;                /// API to access CCDB headers
+  Produces<aod::Timestamps> timestampTable; /// Table with SOR timestamps produced by the task
+  Service<o2::ccdb::BasicCCDBManager> ccdb; /// CCDB manager to access orbit-reset timestamp
+  o2::ccdb::CcdbApi ccdb_api;               /// API to access CCDB headers
   Configurable<bool> fatalOnInvalidTimestamp{"fatalOnInvalidTimestamp", false, "Generate fatal error for invalid timestamps"};
-  std::map<int, int64_t> mapRunToOrbitReset; /// Cache of orbit reset timestamps
+  std::map<int, int64_t> mapRunToOrbitReset;                      /// Cache of orbit reset timestamps
   std::map<int, std::pair<int64_t, int64_t>> mapRunToRunDuration; /// Cache of run duration timestamps
-  int lastRunNumber = 0;                     /// Last run number processed
-  int64_t orbitResetTimestamp = 0;           /// Orbit-reset timestamp in us
-  std::pair<int64_t, int64_t> runDuration;   /// Pair of SOR and EOR timestamps
+  int lastRunNumber = 0;                                          /// Last run number processed
+  int64_t orbitResetTimestamp = 0;                                /// Orbit-reset timestamp in us
+  std::pair<int64_t, int64_t> runDuration;                        /// Pair of SOR and EOR timestamps
 
   // Configurables
   Configurable<bool> verbose{"verbose", false, "verbose mode"};
diff --git a/.conflict-side-0/Common/TableProducer/trackDcaCovFillerRun2.cxx b/.conflict-side-0/Common/TableProducer/trackDcaCovFillerRun2.cxx
index d07833ae9e0..ca56615dfee 100644
--- a/.conflict-side-0/Common/TableProducer/trackDcaCovFillerRun2.cxx
+++ b/.conflict-side-0/Common/TableProducer/trackDcaCovFillerRun2.cxx
@@ -15,12 +15,14 @@
 // Run 2 AO2Ds cannot have their dcacov filled by the current track-propagation workflow as the workflow isn't designed for them, given Run 2 tracks are already propagated to the PV.
 // This task fills the DCA Cov (and DCA) tables for Run 2 tracks by "propagating" the tracks (though given they are already at the PV it doesn't actually do the propagation) and retrieving the DCA and DCA cov given by the propagateToDCABxByBz function
 
-#include <string>
-
 #include "TableHelper.h"
+
 #include "Common/Tools/TrackTuner.h"
+
 #include "DataFormatsParameters/GRPObject.h"
 
+#include <string>
+
 using namespace o2;
 using namespace o2::framework;
 // using namespace o2::framework::expressions;
diff --git a/.conflict-side-0/Common/TableProducer/trackPropagation.cxx b/.conflict-side-0/Common/TableProducer/trackPropagation.cxx
index e1b6528ce53..dbe1c93a56c 100644
--- a/.conflict-side-0/Common/TableProducer/trackPropagation.cxx
+++ b/.conflict-side-0/Common/TableProducer/trackPropagation.cxx
@@ -14,6 +14,7 @@
 //
 
 #include "TableHelper.h"
+
 #include "Common/Tools/TrackTuner.h"
 
 // The Run 3 AO2D stores the tracks at the point of innermost update. For a track with ITS this is the innermost (or second innermost)
diff --git a/.conflict-side-0/Common/TableProducer/trackPropagationTester.cxx b/.conflict-side-0/Common/TableProducer/trackPropagationTester.cxx
index 694ff77d3c0..7b851aa1ce0 100644
--- a/.conflict-side-0/Common/TableProducer/trackPropagationTester.cxx
+++ b/.conflict-side-0/Common/TableProducer/trackPropagationTester.cxx
@@ -23,24 +23,25 @@
 //
 //===============================================================
 
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/Core/trackUtilities.h"
-#include "ReconstructionDataFormats/DCA.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "CommonUtils/NameConf.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/Tools/StandardCCDBLoader.h"
+#include "Common/Tools/TrackPropagationModule.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "CCDB/CcdbApi.h"
+#include "CommonConstants/GeomConstants.h"
+#include "CommonUtils/NameConf.h"
+#include "DataFormatsCalibration/MeanVertexObject.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "DataFormatsCalibration/MeanVertexObject.h"
-#include "CommonConstants/GeomConstants.h"
-#include "Common/Tools/TrackPropagationModule.h"
-#include "Common/Tools/StandardCCDBLoader.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/DCA.h"
 
 // The Run 3 AO2D stores the tracks at the point of innermost update. For a track with ITS this is the innermost (or second innermost)
 // ITS layer. For a track without ITS, this is the TPC inner wall or for loopers in the TPC even a radius beyond that.
diff --git a/.conflict-side-0/Common/TableProducer/trackToCollisionAssociator.cxx b/.conflict-side-0/Common/TableProducer/trackToCollisionAssociator.cxx
index 62d90edaa9f..7c0e4fe147c 100644
--- a/.conflict-side-0/Common/TableProducer/trackToCollisionAssociator.cxx
+++ b/.conflict-side-0/Common/TableProducer/trackToCollisionAssociator.cxx
@@ -18,6 +18,7 @@
 #include "Common/Core/CollisionAssociation.h"
 #include "Common/DataModel/CollisionAssociationTables.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
diff --git a/.conflict-side-0/Common/TableProducer/trackextension.cxx b/.conflict-side-0/Common/TableProducer/trackextension.cxx
index 210f9adc122..1bfd9f700bb 100644
--- a/.conflict-side-0/Common/TableProducer/trackextension.cxx
+++ b/.conflict-side-0/Common/TableProducer/trackextension.cxx
@@ -13,17 +13,18 @@
 // Task performing basic track selection.
 //
 
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Multiplicity.h"
 #include "Common/Core/trackUtilities.h"
-#include "ReconstructionDataFormats/DCA.h"
-#include "DetectorsBase/Propagator.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CommonUtils/NameConf.h"
 #include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/DCA.h"
 #include <CCDB/BasicCCDBManager.h>
 
 using namespace o2;
diff --git a/.conflict-side-0/Common/TableProducer/trackselection.cxx b/.conflict-side-0/Common/TableProducer/trackselection.cxx
index 8ce5a88e0bd..505a24af68b 100644
--- a/.conflict-side-0/Common/TableProducer/trackselection.cxx
+++ b/.conflict-side-0/Common/TableProducer/trackselection.cxx
@@ -17,14 +17,17 @@
 /// \brief Task performing basic track selection.
 ///
 
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Common/Core/TrackSelection.h"
+
+#include "TableHelper.h"
+
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/Core/trackUtilities.h"
-#include "TableHelper.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Common/TableProducer/weakDecayIndices.cxx b/.conflict-side-0/Common/TableProducer/weakDecayIndices.cxx
index b2937e1c8a5..50358f9f82a 100644
--- a/.conflict-side-0/Common/TableProducer/weakDecayIndices.cxx
+++ b/.conflict-side-0/Common/TableProducer/weakDecayIndices.cxx
@@ -8,9 +8,9 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Common/TableProducer/zdcTaskInterCalib.cxx b/.conflict-side-0/Common/TableProducer/zdcTaskInterCalib.cxx
index 78054580b81..c4ed223b67e 100644
--- a/.conflict-side-0/Common/TableProducer/zdcTaskInterCalib.cxx
+++ b/.conflict-side-0/Common/TableProducer/zdcTaskInterCalib.cxx
@@ -13,17 +13,18 @@
 /// \brief Task for ZDC tower inter-calibration
 /// \author chiara.oppedisano@cern.ch
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/CCDB/EventSelectionParams.h"
 #include "Common/CCDB/TriggerAliases.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/ZDCInterCalib.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TH1F.h"
 #include "TH2F.h"
 
diff --git a/.conflict-side-0/Common/Tasks/centralityQa.cxx b/.conflict-side-0/Common/Tasks/centralityQa.cxx
index 9e39194415c..8fa08f047cb 100644
--- a/.conflict-side-0/Common/Tasks/centralityQa.cxx
+++ b/.conflict-side-0/Common/Tasks/centralityQa.cxx
@@ -8,12 +8,14 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TH1F.h"
 
 using namespace o2;
diff --git a/.conflict-side-0/Common/Tasks/checkDataModel.cxx b/.conflict-side-0/Common/Tasks/checkDataModel.cxx
index 33b059e870b..17fad881f68 100644
--- a/.conflict-side-0/Common/Tasks/checkDataModel.cxx
+++ b/.conflict-side-0/Common/Tasks/checkDataModel.cxx
@@ -25,8 +25,8 @@ void customize(std::vector<ConfigParamSpec>& workflowOptions)
   // workflowOptions.push_back(ConfigParamSpec{"isMC", VariantType::Bool, false, {"Check also MC tables if set"}});
 }
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 using namespace o2::framework::expressions;
 
 template <typename Table>
diff --git a/.conflict-side-0/Common/Tasks/checkDataModelMC.cxx b/.conflict-side-0/Common/Tasks/checkDataModelMC.cxx
index fb2762a02b7..14cf55589d7 100644
--- a/.conflict-side-0/Common/Tasks/checkDataModelMC.cxx
+++ b/.conflict-side-0/Common/Tasks/checkDataModelMC.cxx
@@ -13,8 +13,8 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Common/Tasks/cpvQa.cxx b/.conflict-side-0/Common/Tasks/cpvQa.cxx
index e549d89e33d..badf7e7adbd 100644
--- a/.conflict-side-0/Common/Tasks/cpvQa.cxx
+++ b/.conflict-side-0/Common/Tasks/cpvQa.cxx
@@ -13,9 +13,9 @@
 /// \author Sergey Evdokimov
 /// \since 25.10.2022
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Common/Tasks/evtPlanesResolution.cxx b/.conflict-side-0/Common/Tasks/evtPlanesResolution.cxx
index e493ff3f00e..741194a2c64 100644
--- a/.conflict-side-0/Common/Tasks/evtPlanesResolution.cxx
+++ b/.conflict-side-0/Common/Tasks/evtPlanesResolution.cxx
@@ -18,25 +18,26 @@
 ///
 
 // C++/ROOT includes.
+#include <TComplex.h>
+#include <TH1F.h>
+#include <TMath.h>
+#include <TProfile.h>
+
 #include <chrono>
 #include <string>
 #include <vector>
-#include <TComplex.h>
-#include <TProfile.h>
-#include <TMath.h>
-#include <TH1F.h>
 
 // o2Physics includes.
+#include "Common/Core/EventPlaneHelper.h"
+#include "Common/DataModel/EvtPlanes.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StaticFor.h"
-
-#include "Common/DataModel/EvtPlanes.h"
-#include "Common/Core/EventPlaneHelper.h"
+#include "Framework/runDataProcessing.h"
 
 // o2 includes.
 
@@ -146,7 +147,7 @@ struct evtPlanesResolution {
         fillHistosEvtPl<7>(evPl);
         break;
     } // End switch(centBin)
-  }   // End void process(...)
+  } // End void process(...)
 };
 
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
diff --git a/.conflict-side-0/Common/Tasks/flowTest.cxx b/.conflict-side-0/Common/Tasks/flowTest.cxx
index bb27c0cc504..f70831d5c9a 100644
--- a/.conflict-side-0/Common/Tasks/flowTest.cxx
+++ b/.conflict-side-0/Common/Tasks/flowTest.cxx
@@ -13,20 +13,21 @@
 // cross-PWG effort in tracking studies
 // includes basic tracking, V0s and Cascades
 
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGMM/Mult/DataModel/Index.h" // for Particles2Tracks table
+
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPObject.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-
-#include "PWGMM/Mult/DataModel/Index.h" // for Particles2Tracks table
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "ReconstructionDataFormats/Track.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Common/Tasks/ft0Qa.cxx b/.conflict-side-0/Common/Tasks/ft0Qa.cxx
index f7dcb8d75c4..6b200c6092f 100644
--- a/.conflict-side-0/Common/Tasks/ft0Qa.cxx
+++ b/.conflict-side-0/Common/Tasks/ft0Qa.cxx
@@ -9,17 +9,20 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <bitset>
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/FT0Corrected.h"
 #include "Common/DataModel/Multiplicity.h"
+
 #include "DataFormatsFT0/Digit.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
+
 #include "TH1F.h"
 #include "TH2F.h"
 
+#include <bitset>
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-side-0/Common/Tasks/integrationTest.cxx b/.conflict-side-0/Common/Tasks/integrationTest.cxx
index 04e0ad4778e..4768814154a 100644
--- a/.conflict-side-0/Common/Tasks/integrationTest.cxx
+++ b/.conflict-side-0/Common/Tasks/integrationTest.cxx
@@ -15,17 +15,18 @@
 //
 // Includes further QA if option enabled
 
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPObject.h"
 #include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "ReconstructionDataFormats/Track.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Common/Tasks/integrationTestCCDB.cxx b/.conflict-side-0/Common/Tasks/integrationTestCCDB.cxx
index 33dbc6dd3e4..1966ca70126 100644
--- a/.conflict-side-0/Common/Tasks/integrationTestCCDB.cxx
+++ b/.conflict-side-0/Common/Tasks/integrationTestCCDB.cxx
@@ -22,19 +22,20 @@
 //
 // +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPObject.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include "DetectorsBase/Propagator.h"
+#include "DataFormatsParameters/GRPObject.h"
 #include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "ReconstructionDataFormats/Track.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Common/Tasks/multiplicityDerivedQa.cxx b/.conflict-side-0/Common/Tasks/multiplicityDerivedQa.cxx
index 78f229fa2d6..64fe84840d3 100644
--- a/.conflict-side-0/Common/Tasks/multiplicityDerivedQa.cxx
+++ b/.conflict-side-0/Common/Tasks/multiplicityDerivedQa.cxx
@@ -12,13 +12,15 @@
 // This code does QA based on a saved derived dataset using the
 // tables provided by multiplicityTable.
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/McCollisionExtra.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TH1F.h"
 #include "TH2F.h"
 
diff --git a/.conflict-side-0/Common/Tasks/multiplicityQa.cxx b/.conflict-side-0/Common/Tasks/multiplicityQa.cxx
index 3fc2374c2cc..6b8a10d6f5f 100644
--- a/.conflict-side-0/Common/Tasks/multiplicityQa.cxx
+++ b/.conflict-side-0/Common/Tasks/multiplicityQa.cxx
@@ -22,13 +22,15 @@
 // - david.dobrigkeit.chinellato@cern.ch
 //
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/McCollisionExtra.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TH1F.h"
 #include "TH2F.h"
 
diff --git a/.conflict-side-0/Common/Tasks/orbitRangeTask.cxx b/.conflict-side-0/Common/Tasks/orbitRangeTask.cxx
index 250751c25ba..5cfb8c44f13 100644
--- a/.conflict-side-0/Common/Tasks/orbitRangeTask.cxx
+++ b/.conflict-side-0/Common/Tasks/orbitRangeTask.cxx
@@ -11,11 +11,13 @@
 
 // This task finds minimum and maximum orbit among all processed bcs
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "CommonConstants/LHCConstants.h"
 #include "OrbitRange.h"
+
+#include "CommonConstants/LHCConstants.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TMath.h"
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Common/Tasks/propagatorQa.cxx b/.conflict-side-0/Common/Tasks/propagatorQa.cxx
index f978f8bc564..47280cbd44e 100644
--- a/.conflict-side-0/Common/Tasks/propagatorQa.cxx
+++ b/.conflict-side-0/Common/Tasks/propagatorQa.cxx
@@ -14,20 +14,22 @@
 // Work in progress! More to follow, use at your own peril
 //
 
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "trackSelectionRequest.h"
+
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
 #include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
 #include "DetectorsBase/Propagator.h"
-#include "trackSelectionRequest.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "ReconstructionDataFormats/Track.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Common/Tasks/qVectorsCorrection.cxx b/.conflict-side-0/Common/Tasks/qVectorsCorrection.cxx
index 10e37a4c210..9400fa185c5 100644
--- a/.conflict-side-0/Common/Tasks/qVectorsCorrection.cxx
+++ b/.conflict-side-0/Common/Tasks/qVectorsCorrection.cxx
@@ -18,31 +18,31 @@
 ///
 
 // C++/ROOT includes.
-#include <chrono>
-#include <string>
-#include <vector>
 #include <TComplex.h>
 #include <TH1F.h>
 #include <TH2D.h>
 #include <TMath.h>
 #include <TVector2.h>
 
+#include <chrono>
+#include <string>
+#include <vector>
+
 // o2Physics includes.
+#include "Common/Core/EventPlaneHelper.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Qvectors.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StaticFor.h"
-
-#include "Common/DataModel/Qvectors.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/Core/EventPlaneHelper.h"
-#include "Common/Core/TrackSelection.h"
-
-#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/runDataProcessing.h"
 
 // o2 includes.
 
diff --git a/.conflict-side-0/Common/Tasks/trackqa.cxx b/.conflict-side-0/Common/Tasks/trackqa.cxx
index d10d42af8da..53f73517c83 100644
--- a/.conflict-side-0/Common/Tasks/trackqa.cxx
+++ b/.conflict-side-0/Common/Tasks/trackqa.cxx
@@ -13,15 +13,16 @@
 // Task producing basic tracking qa histograms
 //
 
-#include <utility> // std::swap
-#include <vector>
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/Core/TrackSelectionDefaults.h"
+
+#include <utility> // std::swap
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Common/Tasks/validation.cxx b/.conflict-side-0/Common/Tasks/validation.cxx
index 5c464aebb30..f3b79197d16 100644
--- a/.conflict-side-0/Common/Tasks/validation.cxx
+++ b/.conflict-side-0/Common/Tasks/validation.cxx
@@ -8,15 +8,16 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
 
 #include <TFile.h>
 #include <TH1F.h>
-#include <cmath>
+
 #include <array>
+#include <cmath>
 namespace o2::aod
 {
 } // namespace o2::aod
diff --git a/.conflict-side-0/Common/Tools/MultModule.h b/.conflict-side-0/Common/Tools/MultModule.h
index 1a445cb186a..3a372670e04 100644
--- a/.conflict-side-0/Common/Tools/MultModule.h
+++ b/.conflict-side-0/Common/Tools/MultModule.h
@@ -16,23 +16,28 @@
 #ifndef COMMON_TOOLS_MULTMODULE_H_
 #define COMMON_TOOLS_MULTMODULE_H_
 
-#include <vector>
-#include <memory>
-#include <cstdlib>
-#include <cmath>
-#include <array>
-#include <string>
-#include <map>
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/Configurable.h"
-#include "Framework/HistogramSpec.h"
 #include "TableHelper.h"
+
+#include "PWGMM/Mult/DataModel/bestCollisionTable.h"
+
 #include "Common/Core/TPCVDriftManager.h"
-#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/Centrality.h"
-#include "PWGMM/Mult/DataModel/bestCollisionTable.h"
+#include "Common/DataModel/Multiplicity.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/Configurable.h"
+#include "Framework/HistogramSpec.h"
+
 #include "TFormula.h"
 
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
+
 //__________________________________________
 // MultModule
 
diff --git a/.conflict-side-0/Common/Tools/Multiplicity/multCalibrator.cxx b/.conflict-side-0/Common/Tools/Multiplicity/multCalibrator.cxx
index e9931c0389f..38959bef8c9 100644
--- a/.conflict-side-0/Common/Tools/Multiplicity/multCalibrator.cxx
+++ b/.conflict-side-0/Common/Tools/Multiplicity/multCalibrator.cxx
@@ -16,16 +16,17 @@
 // - victor.gonzalez@cern.ch
 // - david.dobrigkeit.chinellato@cern.ch
 //
-#include "TList.h"
+#include "multCalibrator.h"
+
+#include "TArrayF.h"
+#include "TArrayL64.h"
 #include "TDirectory.h"
 #include "TFile.h"
-#include "TH1F.h"
 #include "TH1D.h"
+#include "TH1F.h"
+#include "TList.h"
 #include "TProfile.h"
 #include "TStopwatch.h"
-#include "TArrayL64.h"
-#include "TArrayF.h"
-#include "multCalibrator.h"
 
 using namespace std;
 
@@ -100,7 +101,7 @@ Bool_t multCalibrator::Calibrate()
     return kFALSE;
   }
 
-  //Step 1: verify if input file contains desired histograms
+  // Step 1: verify if input file contains desired histograms
   TH1D* hRaw[kNCentEstim];
   for (Int_t iv = 0; iv < kNCentEstim; iv++) {
     hRaw[iv] = (TH1D*)fileInput->Get(Form("multiplicity-qa/multiplicityQa/h%s", fCentEstimName[iv].Data()));
@@ -112,7 +113,7 @@ Bool_t multCalibrator::Calibrate()
 
   cout << "Histograms loaded! Will now calibrate..." << endl;
 
-  //Create output file
+  // Create output file
   TFile* fOut = new TFile(fOutputFileName.Data(), "RECREATE");
   TH1F* hCalib[kNCentEstim];
   for (Int_t iv = 0; iv < kNCentEstim; iv++) {
@@ -129,7 +130,7 @@ Bool_t multCalibrator::Calibrate()
 
 Double_t multCalibrator::GetRawMax(TH1* histo)
 {
-  //This function gets the max X value (right edge) which is filled.
+  // This function gets the max X value (right edge) which is filled.
   for (Int_t ii = histo->GetNbinsX(); ii > 0; ii--) {
     if (histo->GetBinContent(ii) < 1e-10)
       return histo->GetBinLowEdge(ii + 1);
@@ -139,24 +140,24 @@ Double_t multCalibrator::GetRawMax(TH1* histo)
 
 Double_t multCalibrator::GetBoundaryForPercentile(TH1* histo, Double_t lPercentileRequested, Double_t& lPrecisionEstimate)
 {
-  //This function returns the boundary for a specific percentile.
-  //It uses a linear interpolation in an attempt to get more precision
-  //than the binning of the histogram used for quantiling.
+  // This function returns the boundary for a specific percentile.
+  // It uses a linear interpolation in an attempt to get more precision
+  // than the binning of the histogram used for quantiling.
   //
-  //It also estimates a certain level of precision of the procedure
-  //by explicitly comparing the bin content of the bins around the boundary
-  //with the entire cross section, effectively reporting back a percentage
-  //that corresponds to those bins. If this percentage is O(percentile bin
-  //width requested), then the user should worry and we print out a warning.
+  // It also estimates a certain level of precision of the procedure
+  // by explicitly comparing the bin content of the bins around the boundary
+  // with the entire cross section, effectively reporting back a percentage
+  // that corresponds to those bins. If this percentage is O(percentile bin
+  // width requested), then the user should worry and we print out a warning.
 
   const Double_t lPrecisionConstant = 2.0;
 
   Double_t lRawMax = GetRawMax(histo);
 
   if (lPercentileRequested < 1e-7)
-    return lRawMax; //safeguard
+    return lRawMax; // safeguard
   if (lPercentileRequested > 100 - 1e-7)
-    return 0.0; //safeguard
+    return 0.0; // safeguard
 
   Double_t lReturnValue = 0.0;
   Double_t lPercentile = 100.0 - lPercentileRequested;
@@ -182,7 +183,7 @@ Double_t multCalibrator::GetBoundaryForPercentile(TH1* histo, Double_t lPercenti
   for (Long_t ibin = lFirstBin; ibin < lNBins; ibin++) {
     lCount += histo->GetBinContent(ibin);
     if (lCount >= lCountDesired) {
-      //Found bin I am looking for!
+      // Found bin I am looking for!
       Double_t lWidth = histo->GetBinWidth(ibin);
       Double_t lLeftPercentile = 100. * (lCount - histo->GetBinContent(ibin)) / lHadronicTotal;
       Double_t lRightPercentile = 100. * lCount / lHadronicTotal;
@@ -200,12 +201,12 @@ Double_t multCalibrator::GetBoundaryForPercentile(TH1* histo, Double_t lPercenti
 //________________________________________________________________
 void multCalibrator::SetStandardAdaptiveBoundaries()
 {
-  //Function to set standard adaptive boundaries
-  //Typically used in pp, goes to 0.001% binning for highest multiplicity
+  // Function to set standard adaptive boundaries
+  // Typically used in pp, goes to 0.001% binning for highest multiplicity
   lNDesiredBoundaries = 0;
   lDesiredBoundaries = new Double_t[1100];
   lDesiredBoundaries[0] = 100;
-  //From Low To High Multiplicity
+  // From Low To High Multiplicity
   for (Int_t ib = 1; ib < 91; ib++) {
     lNDesiredBoundaries++;
     lDesiredBoundaries[lNDesiredBoundaries] = lDesiredBoundaries[lNDesiredBoundaries - 1] - 1.0;
@@ -229,12 +230,12 @@ void multCalibrator::SetStandardAdaptiveBoundaries()
 //________________________________________________________________
 void multCalibrator::SetStandardOnePercentBoundaries()
 {
-  //Function to set standard adaptive boundaries
-  //Typically used in pp, goes to 0.001% binning for highest multiplicity
+  // Function to set standard adaptive boundaries
+  // Typically used in pp, goes to 0.001% binning for highest multiplicity
   lNDesiredBoundaries = 101;
   lDesiredBoundaries = new Double_t[101];
   lDesiredBoundaries[0] = 100;
-  //From Low To High Multiplicity
+  // From Low To High Multiplicity
   for (Int_t ib = 1; ib < 101; ib++)
     lDesiredBoundaries[ib] = lDesiredBoundaries[ib - 1] - 1.0;
   cout << "Set standard 1%-wide percentile boundaries! Nboundaries: " << lNDesiredBoundaries << endl;
@@ -243,10 +244,10 @@ void multCalibrator::SetStandardOnePercentBoundaries()
 //________________________________________________________________
 TH1F* multCalibrator::GetCalibrationHistogram(TH1* histoRaw, TString lHistoName)
 {
-  //This function returns a calibration histogram
+  // This function returns a calibration histogram
   //(pp or p-Pb like, no anchor point considered)
 
-  //Reset + recreate precision histogram
+  // Reset + recreate precision histogram
   ResetPrecisionHistogram();
 
   // Consistency check
@@ -256,10 +257,10 @@ TH1F* multCalibrator::GetCalibrationHistogram(TH1* histoRaw, TString lHistoName)
     cout << "Last boundary: " << lDesiredBoundaries[0] << endl;
   }
 
-  //Aux vars
+  // Aux vars
   Double_t lMiddleOfBins[1000];
   for (Long_t lB = 1; lB < lNDesiredBoundaries; lB++) {
-    //place squarely at the middle to ensure it's all fine
+    // place squarely at the middle to ensure it's all fine
     lMiddleOfBins[lB - 1] = 0.5 * (lDesiredBoundaries[lB] + lDesiredBoundaries[lB - 1]);
   }
   Double_t lBounds[lNDesiredBoundaries + 1];
@@ -276,7 +277,7 @@ TH1F* multCalibrator::GetCalibrationHistogram(TH1* histoRaw, TString lHistoName)
     lBounds[lDisplacedii] = GetBoundaryForPercentile(histoRaw, lDesiredBoundaries[ii], lPrecision[ii]);
     TString lPrecisionString = "(Precision OK)";
     if (ii != 0 && ii != lNDesiredBoundaries - 1) {
-      //check precision, please
+      // check precision, please
       if (lPrecision[ii] / TMath::Abs(lDesiredBoundaries[ii + 1] - lDesiredBoundaries[ii]) > fkPrecisionWarningThreshold)
         lPrecisionString = "(WARNING: BINNING MAY LEAD TO IMPRECISION!)";
       if (lPrecision[ii] / TMath::Abs(lDesiredBoundaries[ii - 1] - lDesiredBoundaries[ii]) > fkPrecisionWarningThreshold)
@@ -302,8 +303,8 @@ void multCalibrator::ResetPrecisionHistogram()
     delete fPrecisionHistogram;
     fPrecisionHistogram = 0x0;
   }
-  if (lNDesiredBoundaries > 0) { //only if initialized
-    //invert boundaries, please
+  if (lNDesiredBoundaries > 0) { // only if initialized
+    // invert boundaries, please
     Double_t lInverseDesiredBoundaries[1100];
     for (Int_t ii = 0; ii < lNDesiredBoundaries; ii++) {
       lInverseDesiredBoundaries[ii] = lDesiredBoundaries[lNDesiredBoundaries - (ii + 1)];
diff --git a/.conflict-side-0/Common/Tools/Multiplicity/multCalibrator.h b/.conflict-side-0/Common/Tools/Multiplicity/multCalibrator.h
index b5c618bdc3d..27e530983df 100644
--- a/.conflict-side-0/Common/Tools/Multiplicity/multCalibrator.h
+++ b/.conflict-side-0/Common/Tools/Multiplicity/multCalibrator.h
@@ -19,30 +19,30 @@
 #ifndef MULTCALIBRATOR_H
 #define MULTCALIBRATOR_H
 
+#include "TH1D.h"
+#include "TNamed.h"
+
 #include <iostream>
 #include <map>
 
-#include "TNamed.h"
-#include "TH1D.h"
-
 class multCalibrator : public TNamed
 {
 
  public:
-  //Constructors/Destructor
+  // Constructors/Destructor
   multCalibrator();
   multCalibrator(const char* name, const char* title = "Multiplicity Calibration Class");
   ~multCalibrator();
 
-  //void    Print(Option_t *option="") const;
+  // void    Print(Option_t *option="") const;
 
   //_________________________________________________________________________
-  //Interface: steering functions to be used in calibration macro
+  // Interface: steering functions to be used in calibration macro
 
-  //Set Filenames
+  // Set Filenames
   void SetInputFile(TString lFile) { fInputFileName = lFile.Data(); }
   void SetOutputFile(TString lFile) { fOutputFileName = lFile.Data(); }
-  //Set Boundaries to find
+  // Set Boundaries to find
   void SetBoundaries(Long_t lNB, Double_t* lB)
   {
     if (lNB < 2 || lNB > 1e+6) {
@@ -56,24 +56,24 @@ class multCalibrator : public TNamed
   void SetAnchorPointRaw(Float_t lRaw) { fAnchorPointValue = lRaw; }
   void SetAnchorPointPercentage(Float_t lPer) { fAnchorPointPercentage = lPer; }
 
-  void SetStandardAdaptiveBoundaries();   //standard adaptive (pp-like)
-  void SetStandardOnePercentBoundaries(); //standard 1% (Pb-Pb like)
+  void SetStandardAdaptiveBoundaries();   // standard adaptive (pp-like)
+  void SetStandardOnePercentBoundaries(); // standard 1% (Pb-Pb like)
 
-  //Master Function in this Class: To be called once filenames are set
+  // Master Function in this Class: To be called once filenames are set
   Bool_t Calibrate();
 
-  //Aux function. Keep public, accessible outside as rather useful utility
+  // Aux function. Keep public, accessible outside as rather useful utility
   TH1F* GetCalibrationHistogram(TH1* histoRaw, TString lHistoName = "hCalib");
 
-  //Auxiliary functions
+  // Auxiliary functions
   Double_t GetRawMax(TH1* histo);
   Double_t GetBoundaryForPercentile(TH1* histo, Double_t lPercentileRequested, Double_t& lPrecisionEstimate);
 
-  //Precision bookkeeping
-  TH1D* GetPrecisionHistogram() { return fPrecisionHistogram; }; //gets precision histogram from current object
-  void ResetPrecisionHistogram();                                //Reset precision histogram, if it exists
+  // Precision bookkeeping
+  TH1D* GetPrecisionHistogram() { return fPrecisionHistogram; }; // gets precision histogram from current object
+  void ResetPrecisionHistogram();                                // Reset precision histogram, if it exists
 
-  //Aliases for centrality estimators
+  // Aliases for centrality estimators
   enum fCentEstim {
     kCentRawV0M = 0,
     kCentRawT0M,
@@ -89,7 +89,7 @@ class multCalibrator : public TNamed
   static const TString fCentEstimName[kNCentEstim]; //! name (internal)
 
  private:
-  //Calibration Boundaries to locate
+  // Calibration Boundaries to locate
   Double_t* lDesiredBoundaries;
   Long_t lNDesiredBoundaries;
   Double_t fkPrecisionWarningThreshold;
@@ -105,7 +105,7 @@ class multCalibrator : public TNamed
   // TList object for storing histograms
   TList* fCalibHists;
 
-  TH1D* fPrecisionHistogram; //for bookkeeping of precision report
+  TH1D* fPrecisionHistogram; // for bookkeeping of precision report
 
   ClassDef(multCalibrator, 1);
   //(this classdef is only for bookkeeping, class will not usually
diff --git a/.conflict-side-0/Common/Tools/Multiplicity/multGlauberNBDFitter.cxx b/.conflict-side-0/Common/Tools/Multiplicity/multGlauberNBDFitter.cxx
index a765db72448..91a71b78eaf 100644
--- a/.conflict-side-0/Common/Tools/Multiplicity/multGlauberNBDFitter.cxx
+++ b/.conflict-side-0/Common/Tools/Multiplicity/multGlauberNBDFitter.cxx
@@ -26,13 +26,14 @@
  **********************************************/
 
 #include "multGlauberNBDFitter.h"
-#include "TList.h"
-#include "TFile.h"
+
 #include "TF1.h"
+#include "TFile.h"
+#include "TFitResult.h"
+#include "TList.h"
+#include "TProfile.h"
 #include "TStopwatch.h"
 #include "TVirtualFitter.h"
-#include "TProfile.h"
-#include "TFitResult.h"
 
 using namespace std;
 
@@ -63,14 +64,14 @@ multGlauberNBDFitter::multGlauberNBDFitter() : TNamed(),
   fNcoll = new Double_t[fMaxNpNcPairs];
   fContent = new Long_t[fMaxNpNcPairs];
 
-  //Ancestor histo
+  // Ancestor histo
   fhNanc = new TH1D("fhNanc", "", 1000, -0.5, 999.5);
 
-  //NBD
+  // NBD
   fNBD = new TF1("fNBD", "ROOT::Math::negative_binomial_pdf(x,[0],[1])", 0, 45000);
   fNBD->SetNpx(45000);
 
-  //master function
+  // master function
   fGlauberNBD = new TF1("fGlauberNBD", this, &multGlauberNBDFitter::ProbDistrib,
                         0, 50000, 4, "multGlauberNBDFitter", "ProbDistrib");
   fGlauberNBD->SetParameter(0, fMu);
@@ -105,19 +106,19 @@ multGlauberNBDFitter::multGlauberNBDFitter(const char* name, const char* title)
                                                                                   fFitOptions("R0"),
                                                                                   fFitNpx(5000)
 {
-  //Named constructor
+  // Named constructor
   fNpart = new Double_t[fMaxNpNcPairs];
   fNcoll = new Double_t[fMaxNpNcPairs];
   fContent = new Long_t[fMaxNpNcPairs];
 
-  //Ancestor histo
-  //fhNanc = new TH1D("fhNanc", "", fAncestorMode==2?10000:1000, -0.5, 999.5);
+  // Ancestor histo
+  // fhNanc = new TH1D("fhNanc", "", fAncestorMode==2?10000:1000, -0.5, 999.5);
 
-  //NBD
+  // NBD
   fNBD = new TF1("fNBD", "ROOT::Math::negative_binomial_pdf(x,[0],[1])", 0, 45000);
   fNBD->SetNpx(45000);
 
-  //master function
+  // master function
   fGlauberNBD = new TF1("fGlauberNBD", this, &multGlauberNBDFitter::ProbDistrib,
                         0, 50000, 5, "multGlauberNBDFitter", "ProbDistrib");
   fGlauberNBD->SetParameter(0, fMu);
@@ -157,18 +158,18 @@ multGlauberNBDFitter::~multGlauberNBDFitter()
 
 //______________________________________________________
 Double_t multGlauberNBDFitter::ProbDistrib(Double_t* x, Double_t* par)
-//Master fitter function
+// Master fitter function
 {
   Double_t lMultValue = x[0];
   Double_t lProbability = 0.0;
   ffChanged = kTRUE;
   const Double_t lAlmost0 = 1.e-13;
-  //Comment this line in order to make the code evaluate Nancestor all the time
+  // Comment this line in order to make the code evaluate Nancestor all the time
   if (TMath::Abs(fCurrentf - par[2]) < lAlmost0)
     ffChanged = kFALSE;
 
   //______________________________________________________
-  //Recalculate the ancestor distribution in case f changed
+  // Recalculate the ancestor distribution in case f changed
   if (ffChanged) {
     fCurrentf = par[2];
     fhNanc->Reset();
@@ -192,12 +193,12 @@ Double_t multGlauberNBDFitter::ProbDistrib(Double_t* x, Double_t* par)
     fhNanc->Scale(1. / fhNanc->Integral());
   }
   //______________________________________________________
-  //Actually evaluate function
+  // Actually evaluate function
   Int_t lStartBin = fhNanc->FindBin(0.0) + 1;
   for (Long_t iNanc = lStartBin; iNanc < fhNanc->GetNbinsX() + 1; iNanc++) {
     Double_t lNancestors = fhNanc->GetBinCenter(iNanc);
     Double_t lNancestorCount = fhNanc->GetBinContent(iNanc);
-    //if(lNancestorCount<1e-12&&lNancestors>10) break;
+    // if(lNancestorCount<1e-12&&lNancestors>10) break;
 
     // allow for variable mu in case requested
     Double_t lThisMu = (((Double_t)lNancestors)) * (par[0] + par[4] * lNancestors);
@@ -279,7 +280,7 @@ void multGlauberNBDFitter::InitAncestor()
 Bool_t multGlauberNBDFitter::DoFit()
 {
   InitAncestor();
-  //Try very hard, please
+  // Try very hard, please
   TVirtualFitter::SetMaxIterations(5000000);
   if (!InitializeNpNc()) {
     cout << "---> Initialization of Npart x Ncoll correlation info failed!" << endl;
@@ -317,12 +318,12 @@ Bool_t multGlauberNBDFitter::DoFit()
 //________________________________________________________________
 Bool_t multGlauberNBDFitter::InitializeNpNc()
 {
-  //This function initializes fhNpNc
-  //Warning: X == Npart, Y == Ncoll
+  // This function initializes fhNpNc
+  // Warning: X == Npart, Y == Ncoll
   Bool_t lReturnValue = kFALSE;
   if (fhNpNc) {
     fNNpNcPairs = 0;
-    //Sweep all allowed values of Npart, Ncoll; find counters
+    // Sweep all allowed values of Npart, Ncoll; find counters
     for (int xbin = 1; xbin < 500; xbin++) {
       for (int ybin = 1; ybin < 3000; ybin++) {
         if (fhNpNc->GetBinContent(fhNpNc->FindBin(xbin, ybin)) != 0) {
@@ -345,12 +346,12 @@ Bool_t multGlauberNBDFitter::InitializeNpNc()
 //________________________________________________________________
 Double_t multGlauberNBDFitter::ContinuousNBD(Double_t n, Double_t mu, Double_t k)
 {
-  //Adaptation of the negative binomial distribution
-  //for non-integer arguments: analytical continuation
+  // Adaptation of the negative binomial distribution
+  // for non-integer arguments: analytical continuation
   //
-  //This function would actually also be fine with integers;
-  //in fact it is equivalent to that if 'n' is typecast as
-  //an integer prior to use
+  // This function would actually also be fine with integers;
+  // in fact it is equivalent to that if 'n' is typecast as
+  // an integer prior to use
 
   Double_t F;
   Double_t f;
@@ -390,10 +391,10 @@ void multGlauberNBDFitter::CalculateAvNpNc(TProfile* lNPartProf, TProfile* lNCol
   cout << "Glauber NBD norm ..........: " << fnorm << endl;
   cout << "Glauber NBD dmu/dNanc .....: " << fdMu << endl;
 
-  //2-fold nested loop:
-  // + looping over all Nancestor combinations
-  // + looping over all possible final multiplicities
-  // ^---> final product already multiplicity-binned
+  // 2-fold nested loop:
+  //  + looping over all Nancestor combinations
+  //  + looping over all possible final multiplicities
+  //  ^---> final product already multiplicity-binned
 
   //______________________________________________________
   if (lLoRange < -1 && lHiRange < -1) {
diff --git a/.conflict-side-0/Common/Tools/Multiplicity/multGlauberNBDFitter.h b/.conflict-side-0/Common/Tools/Multiplicity/multGlauberNBDFitter.h
index 42d5cab046f..effd18e843f 100644
--- a/.conflict-side-0/Common/Tools/Multiplicity/multGlauberNBDFitter.h
+++ b/.conflict-side-0/Common/Tools/Multiplicity/multGlauberNBDFitter.h
@@ -12,56 +12,57 @@
 #ifndef MULTGLAUBERNBDFITTER_H
 #define MULTGLAUBERNBDFITTER_H
 
-#include <iostream>
-#include "TNamed.h"
 #include "TF1.h"
 #include "TH1.h"
 #include "TH1D.h"
 #include "TH2.h"
+#include "TNamed.h"
 #include "TProfile.h"
 
+#include <iostream>
+
 class multGlauberNBDFitter : public TNamed
 {
 
  public:
-  //basic functionality
+  // basic functionality
   multGlauberNBDFitter();
   multGlauberNBDFitter(const char* name, const char* title = "Glauber+NBD fitter");
   ~multGlauberNBDFitter();
 
-  //Master fitter function
+  // Master fitter function
   Double_t ProbDistrib(Double_t* x, Double_t* par);
 
   void InitAncestor();
 
-  //Do Fit: where everything happens
+  // Do Fit: where everything happens
   Bool_t DoFit();
 
-  //Set input characteristics: the 2D plot with Npart, Nanc
+  // Set input characteristics: the 2D plot with Npart, Nanc
   Bool_t SetNpartNcollCorrelation(TH2* hNpNc);
 
-  //Set main input to be fitted (the V0M distribution)
+  // Set main input to be fitted (the V0M distribution)
   Bool_t SetInputV0M(TH1* hV0M);
 
-  //Interface to get funtions if asked to
+  // Interface to get funtions if asked to
   TF1* GetNBD();
   TF1* GetGlauberNBD();
 
-  //Helper
+  // Helper
   Bool_t InitializeNpNc();
 
-  //Interface for debug
+  // Interface for debug
   void SetAncestorMode(Int_t lAncMode = 0) { fAncestorMode = lAncMode; }
   Int_t GetAncestorMode() { return fAncestorMode; }
   TH1D* GetAncestorHistogram() { return fhNanc; }
 
-  //Interface to set vals
+  // Interface to set vals
   void SetMu(Double_t lVal) { fMu = lVal; }
   void Setk(Double_t lVal) { fk = lVal; }
   void Setf(Double_t lVal) { ff = lVal; }
   void SetNorm(Double_t lVal) { fnorm = lVal; }
 
-  //Interface to get vals
+  // Interface to get vals
   Double_t GetMu() { return fMu; }
   Double_t Getk() { return fk; }
   Double_t Getf() { return ff; }
@@ -71,41 +72,41 @@ class multGlauberNBDFitter : public TNamed
   void SetFitOptions(TString lOpt);
   void SetFitNpx(Long_t lNpx);
 
-  //For ancestor mode 2
+  // For ancestor mode 2
   Double_t ContinuousNBD(Double_t n, Double_t mu, Double_t k);
 
-  //For estimating Npart, Ncoll in multiplicity bins
+  // For estimating Npart, Ncoll in multiplicity bins
   void CalculateAvNpNc(TProfile* lNPartProf, TProfile* lNCollProf, TH2F* lNPart2DPlot, TH2F* lNColl2DPlot, TH1F* hPercentileMap, Double_t lLoRange = -1, Double_t lHiRange = -1);
 
-  //void    Print(Option_t *option="") const;
+  // void    Print(Option_t *option="") const;
 
  private:
-  //This function serves as the (analytical) NBD
+  // This function serves as the (analytical) NBD
   TF1* fNBD;
 
-  //This function is the key fitting function
+  // This function is the key fitting function
   TF1* fGlauberNBD;
 
-  //Reference histo
-  TH1D* fhNanc; //basic ancestor distribution
-  TH2* fhNpNc;  //correlation between Npart and Ncoll
-  TH1* fhV0M;   //basic ancestor distribution
+  // Reference histo
+  TH1D* fhNanc; // basic ancestor distribution
+  TH2* fhNpNc;  // correlation between Npart and Ncoll
+  TH1* fhV0M;   // basic ancestor distribution
 
-  //Fitting utilities
+  // Fitting utilities
   Bool_t ffChanged;
   Double_t fCurrentf;
 
-  //0: truncation, 1: rounding, 2: analytical continuation
+  // 0: truncation, 1: rounding, 2: analytical continuation
   Int_t fAncestorMode;
 
-  //Buffer for (Npart, Ncoll) pairs in memory
+  // Buffer for (Npart, Ncoll) pairs in memory
   Double_t* fNpart;
   Double_t* fNcoll;
   Long_t* fContent;
-  Long_t fNNpNcPairs; //number of pairs to use
+  Long_t fNNpNcPairs; // number of pairs to use
   Long_t fMaxNpNcPairs;
 
-  //The actual output: mu, k, f, norm
+  // The actual output: mu, k, f, norm
   Double_t fMu;
   Double_t fdMu; // variable mu option
   Double_t fk;
diff --git a/.conflict-side-0/Common/Tools/Multiplicity/multMCCalibrator.cxx b/.conflict-side-0/Common/Tools/Multiplicity/multMCCalibrator.cxx
index 5b490daf77d..f0960da4b07 100644
--- a/.conflict-side-0/Common/Tools/Multiplicity/multMCCalibrator.cxx
+++ b/.conflict-side-0/Common/Tools/Multiplicity/multMCCalibrator.cxx
@@ -16,18 +16,20 @@
 // - victor.gonzalez@cern.ch
 // - david.dobrigkeit.chinellato@cern.ch
 //
-#include "TList.h"
+#include "multMCCalibrator.h"
+
+#include "multCalibrator.h"
+
+#include "TArrayF.h"
+#include "TArrayL64.h"
 #include "TDirectory.h"
-#include "TFile.h"
 #include "TF1.h"
-#include "TH1F.h"
+#include "TFile.h"
 #include "TH1D.h"
+#include "TH1F.h"
+#include "TList.h"
 #include "TProfile.h"
 #include "TStopwatch.h"
-#include "TArrayL64.h"
-#include "TArrayF.h"
-#include "multCalibrator.h"
-#include "multMCCalibrator.h"
 
 using namespace std;
 
@@ -79,11 +81,11 @@ Bool_t multMCCalibrator::Calibrate()
   cout << " * Output File............: " << fOutputFileName.Data() << endl;
   cout << endl;
 
-  //Opening data and simulation file...
+  // Opening data and simulation file...
   TFile* fileData = new TFile(fDataInputFileName.Data(), "READ");
   TFile* fileSim = new TFile(fSimInputFileName.Data(), "READ");
 
-  //Step 1: verify if input file contains desired histograms
+  // Step 1: verify if input file contains desired histograms
   TProfile* hProfData[multCalibrator::kNCentEstim];
   TProfile* hProfSim[multCalibrator::kNCentEstim];
   cout << " * acquiring input profiles..." << endl;
@@ -135,14 +137,14 @@ Bool_t multMCCalibrator::Calibrate()
 //________________________________________________________________
 TF1* multMCCalibrator::GetFit(TProfile* fProf, Bool_t lQuadratic)
 {
-  TString fFormula = "[0]*x"; //old/deprecated (avoid if possible, please)
+  TString fFormula = "[0]*x"; // old/deprecated (avoid if possible, please)
   if (lQuadratic)
     fFormula = "[0]+[1]*TMath::Power(x,[2])";
 
   // Function to return fit function to profile for posterior inversion
   TF1* fit = new TF1(Form("%s_fit", fProf->GetName()), fFormula.Data(), fProf->GetBinLowEdge(1), fProf->GetBinLowEdge(fProf->GetNbinsX()));
 
-  //Guesstimate inclination from data points in profile
+  // Guesstimate inclination from data points in profile
   Double_t lMeanInclination = 0;
   Long_t lInclinationCount = 0;
   for (Int_t ii = 2; ii < fProf->GetNbinsX(); ii++) {
@@ -158,7 +160,7 @@ TF1* multMCCalibrator::GetFit(TProfile* fProf, Bool_t lQuadratic)
   if (lInclinationCount >= 5)
     lMeanInclination /= lInclinationCount;
 
-  //Give it a little nudge, cause life's hard
+  // Give it a little nudge, cause life's hard
   fit->SetParameter(0, 0.0);
   fit->SetParameter(1, lMeanInclination);
   fit->SetParameter(2, 1.0);
diff --git a/.conflict-side-0/Common/Tools/Multiplicity/multMCCalibrator.h b/.conflict-side-0/Common/Tools/Multiplicity/multMCCalibrator.h
index f88bddf98c3..4e19d38acd1 100644
--- a/.conflict-side-0/Common/Tools/Multiplicity/multMCCalibrator.h
+++ b/.conflict-side-0/Common/Tools/Multiplicity/multMCCalibrator.h
@@ -19,31 +19,32 @@
 #ifndef MULTMCCALIBRATOR_H
 #define MULTMCCALIBRATOR_H
 
-#include <iostream>
-#include "TNamed.h"
 #include "TF1.h"
 #include "TH1D.h"
+#include "TNamed.h"
 #include "TProfile.h"
+
+#include <iostream>
 #include <map>
 
 class multMCCalibrator : public TNamed
 {
 
  public:
-  //Constructors/Destructor
+  // Constructors/Destructor
   multMCCalibrator();
   multMCCalibrator(const char* name, const char* title = "MC Multiplicity Calibration Class");
   ~multMCCalibrator();
 
   //_________________________________________________________________________
-  //Interface: steering functions to be used in calibration macro
+  // Interface: steering functions to be used in calibration macro
 
-  //Set Filenames
+  // Set Filenames
   void SetDataInputFile(TString lFile) { fDataInputFileName = lFile.Data(); }
   void SetSimInputFile(TString lFile) { fSimInputFileName = lFile.Data(); }
   void SetOutputFile(TString lFile) { fOutputFileName = lFile.Data(); }
 
-  //Master Function in this Class: To be called once filenames are set
+  // Master Function in this Class: To be called once filenames are set
   Bool_t Calibrate();
 
   TF1* GetFit(TProfile* fProf, Bool_t lQuadratic = kTRUE);
diff --git a/.conflict-side-0/Common/Tools/PID/checkPidPacking.cxx b/.conflict-side-0/Common/Tools/PID/checkPidPacking.cxx
index 84f72c4f48c..6416ab50669 100644
--- a/.conflict-side-0/Common/Tools/PID/checkPidPacking.cxx
+++ b/.conflict-side-0/Common/Tools/PID/checkPidPacking.cxx
@@ -16,14 +16,15 @@
 /// \since  03/05/2024
 ///
 
-#include <string>
-
 #include "Common/DataModel/PIDResponseTOF.h"
 #include "Common/DataModel/PIDResponseTPC.h"
-#include "TH1F.h"
+
 #include "TCanvas.h"
+#include "TH1F.h"
 #include "TRandom.h"
 
+#include <string>
+
 using namespace o2;
 
 template <typename T>
diff --git a/.conflict-side-0/Common/Tools/PID/handleParamBase.h b/.conflict-side-0/Common/Tools/PID/handleParamBase.h
index 01c2a66ab8b..263f05a1f0b 100644
--- a/.conflict-side-0/Common/Tools/PID/handleParamBase.h
+++ b/.conflict-side-0/Common/Tools/PID/handleParamBase.h
@@ -19,13 +19,16 @@
 #ifndef COMMON_TOOLS_PID_HANDLEPARAMBASE_H_
 #define COMMON_TOOLS_PID_HANDLEPARAMBASE_H_
 
-#include <map>
-#include <string>
 #include "CCDB/CcdbApi.h"
-#include <boost/program_options.hpp>
 #include "Framework/Logger.h"
+
 #include "TFile.h"
 
+#include <boost/program_options.hpp>
+
+#include <map>
+#include <string>
+
 // Global executable arguments
 namespace bpo = boost::program_options;
 bpo::variables_map arguments;             // Command line arguments
diff --git a/.conflict-side-0/Common/Tools/PID/handleParamTPCResponse.cxx b/.conflict-side-0/Common/Tools/PID/handleParamTPCResponse.cxx
index 64741503fae..abe70d1e1ba 100644
--- a/.conflict-side-0/Common/Tools/PID/handleParamTPCResponse.cxx
+++ b/.conflict-side-0/Common/Tools/PID/handleParamTPCResponse.cxx
@@ -14,14 +14,19 @@
 /// \author Jeremy Wilkinson
 /// \brief exec for writing and reading TPC PID Response object
 
+#include "handleParamBase.h"
+
+#include "Common/Core/PID/TPCPIDResponse.h"
+
+#include "Algorithm/RangeTokenizer.h"
+
+#include "TFile.h"
+
+#include <boost/algorithm/string.hpp>
+
 #include <array>
 #include <fstream>
 #include <sstream>
-#include <boost/algorithm/string.hpp>
-#include "TFile.h"
-#include "Common/Core/PID/TPCPIDResponse.h"
-#include "handleParamBase.h"
-#include "Algorithm/RangeTokenizer.h"
 using namespace o2::pid::tpc;
 
 bool initOptionsAndParse(bpo::options_description& options, int argc, char* argv[])
diff --git a/.conflict-side-0/Common/Tools/StandardCCDBLoader.h b/.conflict-side-0/Common/Tools/StandardCCDBLoader.h
index 6ba4c9be9a1..ac9bc97a950 100644
--- a/.conflict-side-0/Common/Tools/StandardCCDBLoader.h
+++ b/.conflict-side-0/Common/Tools/StandardCCDBLoader.h
@@ -16,12 +16,13 @@
 #ifndef COMMON_TOOLS_STANDARDCCDBLOADER_H_
 #define COMMON_TOOLS_STANDARDCCDBLOADER_H_
 
-#include <string>
-#include <cstdlib>
-#include <cmath>
-#include <array>
 #include "Framework/AnalysisDataModel.h"
 
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <string>
+
 //__________________________________________
 // Standard class to load stuff
 // such as matLUT, B and mean Vertex
diff --git a/.conflict-side-0/Common/Tools/TrackPropagationModule.h b/.conflict-side-0/Common/Tools/TrackPropagationModule.h
index fb957a87b9d..edaf8130b3d 100644
--- a/.conflict-side-0/Common/Tools/TrackPropagationModule.h
+++ b/.conflict-side-0/Common/Tools/TrackPropagationModule.h
@@ -16,16 +16,19 @@
 #ifndef COMMON_TOOLS_TRACKPROPAGATIONMODULE_H_
 #define COMMON_TOOLS_TRACKPROPAGATIONMODULE_H_
 
-#include <memory>
-#include <cstdlib>
-#include <cmath>
-#include <array>
-#include <string>
+#include "TableHelper.h"
+
+#include "Common/Tools/TrackTuner.h"
+
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/Configurable.h"
 #include "Framework/HistogramSpec.h"
-#include "Common/Tools/TrackTuner.h"
-#include "TableHelper.h"
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <memory>
+#include <string>
 
 //__________________________________________
 // track propagation module
diff --git a/.conflict-side-0/Common/Tools/TrackTuner.h b/.conflict-side-0/Common/Tools/TrackTuner.h
index 26937eb9131..aa951a4802f 100644
--- a/.conflict-side-0/Common/Tools/TrackTuner.h
+++ b/.conflict-side-0/Common/Tools/TrackTuner.h
@@ -18,35 +18,38 @@
 #ifndef COMMON_TOOLS_TRACKTUNER_H_
 #define COMMON_TOOLS_TRACKTUNER_H_
 
-#include <map>
-#include <memory>
-#include <string>
-#include <utility>
-#include <vector>
-#include <algorithm>
-#include <numbers>
-#include <fmt/core.h>
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
 #include "CCDB/BasicCCDBManager.h"
 #include "CCDB/CcdbApi.h"
 #include "CommonConstants/GeomConstants.h"
-#include "Common/Core/trackUtilities.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "CommonUtils/NameConf.h"
 #include "DataFormatsCalibration/MeanVertexObject.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include "DetectorsBase/Propagator.h"
 #include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/Configurable.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/DCA.h"
 #include "ReconstructionDataFormats/Track.h"
+
 #include <TGraphErrors.h>
 
+#include <fmt/core.h>
+
+#include <algorithm>
+#include <map>
+#include <memory>
+#include <numbers>
+#include <string>
+#include <utility>
+#include <vector>
+
 namespace o2::aod
 {
 namespace track_tuner
diff --git a/.conflict-side-0/Common/Tools/aodDataModelGraph.cxx b/.conflict-side-0/Common/Tools/aodDataModelGraph.cxx
index da854a700f5..c051a5dccc3 100644
--- a/.conflict-side-0/Common/Tools/aodDataModelGraph.cxx
+++ b/.conflict-side-0/Common/Tools/aodDataModelGraph.cxx
@@ -9,19 +9,23 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <fmt/printf.h>
-#include <utility>
-#include <string>
-#include <cstdio>
-#include "Framework/AnalysisDataModel.h"
 #include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGJE/DataModel/Jet.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponseTOF.h"
 #include "Common/DataModel/PIDResponseTPC.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "PWGJE/DataModel/Jet.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Framework/AnalysisDataModel.h"
+
+#include <fmt/printf.h>
+
+#include <cstdio>
+#include <string>
+#include <utility>
 
 using namespace o2::framework;
 using namespace o2::aod;
diff --git a/.conflict-side-0/Common/Tools/trackSelectionRequest.cxx b/.conflict-side-0/Common/Tools/trackSelectionRequest.cxx
index ed82f1ff7bf..e9d2ebbeca7 100644
--- a/.conflict-side-0/Common/Tools/trackSelectionRequest.cxx
+++ b/.conflict-side-0/Common/Tools/trackSelectionRequest.cxx
@@ -12,7 +12,9 @@
 // see header for a more detailed description.
 
 #include "trackSelectionRequest.h"
+
 #include "Framework/Logger.h"
+
 #include <iostream>
 
 std::ostream& operator<<(std::ostream& os, trackSelectionRequest const& c)
diff --git a/.conflict-side-0/Common/Tools/trackSelectionRequest.h b/.conflict-side-0/Common/Tools/trackSelectionRequest.h
index 123392611f0..38f4026c1b3 100644
--- a/.conflict-side-0/Common/Tools/trackSelectionRequest.h
+++ b/.conflict-side-0/Common/Tools/trackSelectionRequest.h
@@ -24,10 +24,12 @@
 #ifndef TRACKSELECTIONREQUEST_H
 #define TRACKSELECTIONREQUEST_H
 
-#include <iosfwd>
-#include <Rtypes.h>
 #include <TMath.h>
 
+#include <Rtypes.h>
+
+#include <iosfwd>
+
 class trackSelectionRequest
 {
  public:
diff --git a/.conflict-side-0/DPG/Tasks/AOTEvent/dEdxVsOccupancyWithTrackQAinfo.cxx b/.conflict-side-0/DPG/Tasks/AOTEvent/dEdxVsOccupancyWithTrackQAinfo.cxx
index c87fd48bc99..a9e90a1b33a 100644
--- a/.conflict-side-0/DPG/Tasks/AOTEvent/dEdxVsOccupancyWithTrackQAinfo.cxx
+++ b/.conflict-side-0/DPG/Tasks/AOTEvent/dEdxVsOccupancyWithTrackQAinfo.cxx
@@ -14,31 +14,32 @@
 ///
 /// \author Igor Altsybeev <Igor.Altsybeev@cern.ch>
 
-#include <vector>
-#include <map>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/CCDB/EventSelectionParams.h"
 #include "Common/CCDB/ctpRateFetcher.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "Framework/HistogramRegistry.h"
-#include "CommonDataFormat/BunchFilling.h"
-#include "DataFormatsParameters/GRPLHCIFData.h"
-#include "DataFormatsParameters/GRPECSObject.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonDataFormat/BunchFilling.h"
 #include "DataFormatsParameters/AggregatedRunInfo.h"
+#include "DataFormatsParameters/GRPECSObject.h"
+#include "DataFormatsParameters/GRPLHCIFData.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 
 #include "TH1F.h"
 #include "TH2F.h"
 #include "TH3.h"
 
+#include <map>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::aod::evsel;
diff --git a/.conflict-side-0/DPG/Tasks/AOTEvent/detectorOccupancyQa.cxx b/.conflict-side-0/DPG/Tasks/AOTEvent/detectorOccupancyQa.cxx
index 123cbd0e442..ec133b1bcea 100644
--- a/.conflict-side-0/DPG/Tasks/AOTEvent/detectorOccupancyQa.cxx
+++ b/.conflict-side-0/DPG/Tasks/AOTEvent/detectorOccupancyQa.cxx
@@ -14,30 +14,31 @@
 ///
 /// \author Igor Altsybeev <Igor.Altsybeev@cern.ch>
 
-#include <vector>
-#include <map>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/CCDB/EventSelectionParams.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "Framework/HistogramRegistry.h"
-#include "CommonDataFormat/BunchFilling.h"
-#include "DataFormatsParameters/GRPLHCIFData.h"
-#include "DataFormatsParameters/GRPECSObject.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonDataFormat/BunchFilling.h"
 #include "DataFormatsParameters/AggregatedRunInfo.h"
+#include "DataFormatsParameters/GRPECSObject.h"
+#include "DataFormatsParameters/GRPLHCIFData.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 
 #include "TH1F.h"
 #include "TH2F.h"
 #include "TH3.h"
 
+#include <map>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::aod::evsel;
diff --git a/.conflict-side-0/DPG/Tasks/AOTEvent/eventSelectionQa.cxx b/.conflict-side-0/DPG/Tasks/AOTEvent/eventSelectionQa.cxx
index 52ec04b0f2e..216522f528c 100644
--- a/.conflict-side-0/DPG/Tasks/AOTEvent/eventSelectionQa.cxx
+++ b/.conflict-side-0/DPG/Tasks/AOTEvent/eventSelectionQa.cxx
@@ -14,31 +14,33 @@
 ///
 /// \author Evgeny Kryshen <evgeny.kryshen@cern.ch>
 
-#include <map>
-#include <vector>
-#include <string>
-#include <unordered_map>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/CCDB/EventSelectionParams.h"
+#include "Common/DataModel/EventSelection.h"
+
 #include "CCDB/BasicCCDBManager.h"
-#include "Framework/HistogramRegistry.h"
 #include "CommonDataFormat/BunchFilling.h"
-#include "DataFormatsParameters/GRPLHCIFData.h"
-#include "DataFormatsParameters/GRPECSObject.h"
-#include "DataFormatsParameters/AggregatedRunInfo.h"
 #include "DataFormatsITSMFT/NoiseMap.h" // missing include in TimeDeadMap.h
-#include "DataFormatsITSMFT/TimeDeadMap.h"
 #include "DataFormatsITSMFT/ROFRecord.h"
-#include "ReconstructionDataFormats/Vertex.h"
+#include "DataFormatsITSMFT/TimeDeadMap.h"
+#include "DataFormatsParameters/AggregatedRunInfo.h"
+#include "DataFormatsParameters/GRPECSObject.h"
+#include "DataFormatsParameters/GRPLHCIFData.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 #include "ITSMFTBase/DPLAlpideParam.h"
 #include "ITSMFTReconstruction/ChipMappingITS.h"
+#include "ReconstructionDataFormats/Vertex.h"
+
 #include "TH1F.h"
 #include "TH2F.h"
 
+#include <map>
+#include <string>
+#include <unordered_map>
+#include <vector>
+
 using namespace o2::framework;
 using namespace o2;
 using namespace o2::aod::evsel;
diff --git a/.conflict-side-0/DPG/Tasks/AOTEvent/lumiQa.cxx b/.conflict-side-0/DPG/Tasks/AOTEvent/lumiQa.cxx
index 254e58f0b67..6f27ce2cb31 100644
--- a/.conflict-side-0/DPG/Tasks/AOTEvent/lumiQa.cxx
+++ b/.conflict-side-0/DPG/Tasks/AOTEvent/lumiQa.cxx
@@ -9,15 +9,16 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "CCDB/BasicCCDBManager.h"
-#include "Framework/HistogramRegistry.h"
-#include "DataFormatsParameters/GRPLHCIFData.h"
 #include "DataFormatsFT0/Digit.h"
-#include "TList.h"
+#include "DataFormatsParameters/GRPLHCIFData.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TH1.h"
+#include "TList.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/DPG/Tasks/AOTEvent/matchingQa.cxx b/.conflict-side-0/DPG/Tasks/AOTEvent/matchingQa.cxx
index 3b266f047e9..944db040d8c 100644
--- a/.conflict-side-0/DPG/Tasks/AOTEvent/matchingQa.cxx
+++ b/.conflict-side-0/DPG/Tasks/AOTEvent/matchingQa.cxx
@@ -9,14 +9,15 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
+#include "MetadataHelper.h"
+
 #include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsFT0/Digit.h"
 #include "DataFormatsParameters/GRPLHCIFData.h"
-#include "MetadataHelper.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/DPG/Tasks/AOTEvent/rofBorderQa.cxx b/.conflict-side-0/DPG/Tasks/AOTEvent/rofBorderQa.cxx
index 83f704960b6..a2a071e9e0d 100644
--- a/.conflict-side-0/DPG/Tasks/AOTEvent/rofBorderQa.cxx
+++ b/.conflict-side-0/DPG/Tasks/AOTEvent/rofBorderQa.cxx
@@ -12,27 +12,26 @@
 /// \brief QA task to study ROF border effect for different event, track and particle selection parameters
 /// \author Igor Altsybeev, Igor.Altsybeev@cern.ch
 
-#include <iostream>
-#include <string>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
+#include "Common/CCDB/EventSelectionParams.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/FT0Corrected.h"
 #include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/CCDB/EventSelectionParams.h"
 
 #include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPObject.h"
+#include "DataFormatsFT0/Digit.h"
 #include "DataFormatsParameters/GRPECSObject.h"
 #include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
-#include "Common/DataModel/FT0Corrected.h"
-#include "DataFormatsFT0/Digit.h"
+#include <iostream>
+#include <string>
 
 using namespace std;
 using namespace o2;
diff --git a/.conflict-side-0/DPG/Tasks/AOTEvent/rofOccupancyQa.cxx b/.conflict-side-0/DPG/Tasks/AOTEvent/rofOccupancyQa.cxx
index cbc8d7d56d1..c2040ac3e6e 100644
--- a/.conflict-side-0/DPG/Tasks/AOTEvent/rofOccupancyQa.cxx
+++ b/.conflict-side-0/DPG/Tasks/AOTEvent/rofOccupancyQa.cxx
@@ -14,20 +14,21 @@
 ///
 /// \author Igor Altsybeev <Igor.Altsybeev@cern.ch>
 
-#include <vector>
-
-#include "Framework/ConfigParamSpec.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/CCDB/EventSelectionParams.h"
+#include "Common/DataModel/EventSelection.h"
+
 #include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/LHCConstants.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/ConfigParamSpec.h"
 #include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+
+#include <vector>
 // #include "DataFormatsParameters/GRPLHCIFData.h"
-#include "ITSMFTBase/DPLAlpideParam.h"
 #include "DataFormatsParameters/AggregatedRunInfo.h"
+#include "ITSMFTBase/DPLAlpideParam.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/DPG/Tasks/AOTEvent/timeDependentQa.cxx b/.conflict-side-0/DPG/Tasks/AOTEvent/timeDependentQa.cxx
index 61fbb690e6c..497a2a4d986 100644
--- a/.conflict-side-0/DPG/Tasks/AOTEvent/timeDependentQa.cxx
+++ b/.conflict-side-0/DPG/Tasks/AOTEvent/timeDependentQa.cxx
@@ -14,27 +14,28 @@
 ///
 /// \author Evgeny Kryshen <evgeny.kryshen@cern.ch> and Igor Altsybeev <Igor.Altsybeev@cern.ch>
 
-#include <map>
-#include <vector>
-#include <string>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/CCDB/EventSelectionParams.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/CCDB/ctpRateFetcher.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "TPCCalibration/TPCMShapeCorrection.h"
-#include "DataFormatsParameters/AggregatedRunInfo.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsITSMFT/ROFRecord.h"
+#include "DataFormatsParameters/AggregatedRunInfo.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Vertex.h"
+#include "TPCCalibration/TPCMShapeCorrection.h"
 
 #include "TTree.h"
 
+#include <map>
+#include <string>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::aod::evsel;
diff --git a/.conflict-side-0/DPG/Tasks/AOTTrack/MonitorFilterBit.cxx b/.conflict-side-0/DPG/Tasks/AOTTrack/MonitorFilterBit.cxx
index b8fb6679b1c..5eed1a42ce0 100644
--- a/.conflict-side-0/DPG/Tasks/AOTTrack/MonitorFilterBit.cxx
+++ b/.conflict-side-0/DPG/Tasks/AOTTrack/MonitorFilterBit.cxx
@@ -15,12 +15,13 @@
 /// \brief Task performing basic checks on filter-bit selections.
 ///
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/Core/RecoDecay.h"
-#include "Framework/ASoAHelpers.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/DPG/Tasks/AOTTrack/PID/Combined/qaPIDWithV0s.cxx b/.conflict-side-0/DPG/Tasks/AOTTrack/PID/Combined/qaPIDWithV0s.cxx
index 3f1ed2a8640..3bc6803d041 100644
--- a/.conflict-side-0/DPG/Tasks/AOTTrack/PID/Combined/qaPIDWithV0s.cxx
+++ b/.conflict-side-0/DPG/Tasks/AOTTrack/PID/Combined/qaPIDWithV0s.cxx
@@ -16,18 +16,20 @@
 /// \brief  Task to monitor the PID performance making use of V0s
 ///
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/DPG/Tasks/AOTTrack/PID/HMPID/analysisHMPID.cxx b/.conflict-side-0/DPG/Tasks/AOTTrack/PID/HMPID/analysisHMPID.cxx
index c5a6b9d0597..6501fa74ed4 100644
--- a/.conflict-side-0/DPG/Tasks/AOTTrack/PID/HMPID/analysisHMPID.cxx
+++ b/.conflict-side-0/DPG/Tasks/AOTTrack/PID/HMPID/analysisHMPID.cxx
@@ -10,23 +10,24 @@
 // or submit itself to any jurisdiction.
 
 // O2 includes
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "ReconstructionDataFormats/TrackParametrization.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/Core/PID/PIDTOF.h"
-#include "Common/TableProducer/PID/pidTOFBase.h"
-#include "ReconstructionDataFormats/PID.h"
 #include "Common/Core/trackUtilities.h"
-#include "ReconstructionDataFormats/DCA.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/ASoA.h"
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/TableProducer/PID/pidTOFBase.h"
+
+#include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/DCA.h"
+#include "ReconstructionDataFormats/PID.h"
+#include "ReconstructionDataFormats/Track.h"
+#include "ReconstructionDataFormats/TrackParametrization.h"
 
 #include <TTree.h>
 
diff --git a/.conflict-side-0/DPG/Tasks/AOTTrack/PID/HMPID/qaHMPID.cxx b/.conflict-side-0/DPG/Tasks/AOTTrack/PID/HMPID/qaHMPID.cxx
index a4e01d6a980..b7e3da0df41 100644
--- a/.conflict-side-0/DPG/Tasks/AOTTrack/PID/HMPID/qaHMPID.cxx
+++ b/.conflict-side-0/DPG/Tasks/AOTTrack/PID/HMPID/qaHMPID.cxx
@@ -10,23 +10,24 @@
 // or submit itself to any jurisdiction.
 
 // O2 includes
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "ReconstructionDataFormats/TrackParametrization.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/Core/PID/PIDTOF.h"
-#include "Common/TableProducer/PID/pidTOFBase.h"
-#include "ReconstructionDataFormats/PID.h"
 #include "Common/Core/trackUtilities.h"
-#include "ReconstructionDataFormats/DCA.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/ASoA.h"
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/TableProducer/PID/pidTOFBase.h"
+
+#include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/DCA.h"
+#include "ReconstructionDataFormats/PID.h"
+#include "ReconstructionDataFormats/Track.h"
+#include "ReconstructionDataFormats/TrackParametrization.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFBeta.cxx b/.conflict-side-0/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFBeta.cxx
index 60ad0a9ab38..7661990a12b 100644
--- a/.conflict-side-0/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFBeta.cxx
+++ b/.conflict-side-0/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFBeta.cxx
@@ -15,16 +15,17 @@
 /// \brief  Task to produce the TOF QA plots for Beta
 ///
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/StaticFor.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/FT0Corrected.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/TableProducer/PID/pidTOFBase.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-0/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFBetaImp.cxx b/.conflict-side-0/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFBetaImp.cxx
index f503ab1d92d..ad445323605 100644
--- a/.conflict-side-0/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFBetaImp.cxx
+++ b/.conflict-side-0/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFBetaImp.cxx
@@ -15,16 +15,17 @@
 /// \brief  Task to produce the TOF QA plots for Beta. Version using dynamic columns. Interim solution for test and benchmarking
 ///
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/StaticFor.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/FT0Corrected.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/TableProducer/PID/pidTOFBase.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-0/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFEvTime.cxx b/.conflict-side-0/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFEvTime.cxx
index 204bff837fb..2e57d875f3e 100644
--- a/.conflict-side-0/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFEvTime.cxx
+++ b/.conflict-side-0/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFEvTime.cxx
@@ -15,20 +15,21 @@
 /// \brief  Tasks of the TOF PID quantities for the event times
 ///
 
-#include "TEfficiency.h"
-#include "THashList.h"
-
-#include "Framework/HistogramRegistry.h"
-#include "Framework/StaticFor.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/FT0Corrected.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/TableProducer/PID/pidTOFBase.h"
-#include "Framework/runDataProcessing.h"
+
 #include "CommonConstants/LHCConstants.h"
 #include "DataFormatsFT0/Digit.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TEfficiency.h"
+#include "THashList.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFMC.cxx b/.conflict-side-0/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFMC.cxx
index 73d1c72ad1e..8f35b228191 100644
--- a/.conflict-side-0/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFMC.cxx
+++ b/.conflict-side-0/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFMC.cxx
@@ -16,11 +16,12 @@
 ///
 
 // O2 includes
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/StaticFor.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Framework/runDataProcessing.h"
 
 using namespace o2;
diff --git a/.conflict-side-0/DPG/Tasks/AOTTrack/PID/TPC/qaPIDTPC.cxx b/.conflict-side-0/DPG/Tasks/AOTTrack/PID/TPC/qaPIDTPC.cxx
index 2794070498d..819b26a74c0 100644
--- a/.conflict-side-0/DPG/Tasks/AOTTrack/PID/TPC/qaPIDTPC.cxx
+++ b/.conflict-side-0/DPG/Tasks/AOTTrack/PID/TPC/qaPIDTPC.cxx
@@ -15,13 +15,14 @@
 /// \brief  Implementation for QA tasks of the TPC PID quantities
 ///
 
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/StaticFor.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/PIDResponse.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/DPG/Tasks/AOTTrack/PID/TPC/qaPIDTPCMC.cxx b/.conflict-side-0/DPG/Tasks/AOTTrack/PID/TPC/qaPIDTPCMC.cxx
index 993c2f7b24c..a84e874af6f 100644
--- a/.conflict-side-0/DPG/Tasks/AOTTrack/PID/TPC/qaPIDTPCMC.cxx
+++ b/.conflict-side-0/DPG/Tasks/AOTTrack/PID/TPC/qaPIDTPCMC.cxx
@@ -16,10 +16,11 @@
 ///
 
 // O2 includes
+#include "Common/DataModel/PIDResponse.h"
+
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/StaticFor.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Framework/runDataProcessing.h"
 
 using namespace o2;
diff --git a/.conflict-side-0/DPG/Tasks/AOTTrack/PID/TPC/qaPIDTPCSignal.cxx b/.conflict-side-0/DPG/Tasks/AOTTrack/PID/TPC/qaPIDTPCSignal.cxx
index bf8492b8036..44e12f36e3a 100644
--- a/.conflict-side-0/DPG/Tasks/AOTTrack/PID/TPC/qaPIDTPCSignal.cxx
+++ b/.conflict-side-0/DPG/Tasks/AOTTrack/PID/TPC/qaPIDTPCSignal.cxx
@@ -16,12 +16,13 @@
 /// \brief  Implementation for QA tasks of the TPC signal (lite task, refer to qaPIDTPC.cxx for full TPC QA for PID)
 ///
 
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/StaticFor.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/DPG/Tasks/AOTTrack/V0Cascades/perfK0sResolution.cxx b/.conflict-side-0/DPG/Tasks/AOTTrack/V0Cascades/perfK0sResolution.cxx
index 91effcc47b4..5a2a7aa0a21 100644
--- a/.conflict-side-0/DPG/Tasks/AOTTrack/V0Cascades/perfK0sResolution.cxx
+++ b/.conflict-side-0/DPG/Tasks/AOTTrack/V0Cascades/perfK0sResolution.cxx
@@ -9,22 +9,24 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <string>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "ReconstructionDataFormats/PID.h"
-#include "Common/Core/trackUtilities.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/Tools/TrackTuner.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/PID.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <string>
+
 using namespace o2;
 using namespace o2::track;
 using namespace o2::framework;
diff --git a/.conflict-side-0/DPG/Tasks/AOTTrack/V0Cascades/qaCascades.cxx b/.conflict-side-0/DPG/Tasks/AOTTrack/V0Cascades/qaCascades.cxx
index 4e42b50da2a..eed88c54dc2 100644
--- a/.conflict-side-0/DPG/Tasks/AOTTrack/V0Cascades/qaCascades.cxx
+++ b/.conflict-side-0/DPG/Tasks/AOTTrack/V0Cascades/qaCascades.cxx
@@ -16,20 +16,22 @@
 /// \brief  QA task for basic quantities on cascades
 ///
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/DPG/Tasks/AOTTrack/V0Cascades/qaEfficiencyV0s.cxx b/.conflict-side-0/DPG/Tasks/AOTTrack/V0Cascades/qaEfficiencyV0s.cxx
index a728b252007..bf09dd8f6b0 100644
--- a/.conflict-side-0/DPG/Tasks/AOTTrack/V0Cascades/qaEfficiencyV0s.cxx
+++ b/.conflict-side-0/DPG/Tasks/AOTTrack/V0Cascades/qaEfficiencyV0s.cxx
@@ -18,22 +18,24 @@
 ///
 
 // O2 includes
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/DCA.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 
 // ROOT includes
-#include "TPDGCode.h"
 #include "TEfficiency.h"
 #include "THashList.h"
+#include "TPDGCode.h"
 
 using namespace o2::framework;
 static constexpr int nSpecies = 2; // One per PDG
diff --git a/.conflict-side-0/DPG/Tasks/AOTTrack/V0Cascades/qaK0sTrackingEfficiency.cxx b/.conflict-side-0/DPG/Tasks/AOTTrack/V0Cascades/qaK0sTrackingEfficiency.cxx
index 6ee7c4e7a5c..75189988459 100644
--- a/.conflict-side-0/DPG/Tasks/AOTTrack/V0Cascades/qaK0sTrackingEfficiency.cxx
+++ b/.conflict-side-0/DPG/Tasks/AOTTrack/V0Cascades/qaK0sTrackingEfficiency.cxx
@@ -9,18 +9,20 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/DPG/Tasks/AOTTrack/V0Cascades/qaLamMomResolution.cxx b/.conflict-side-0/DPG/Tasks/AOTTrack/V0Cascades/qaLamMomResolution.cxx
index 9ee92d0a509..778ac59f79d 100644
--- a/.conflict-side-0/DPG/Tasks/AOTTrack/V0Cascades/qaLamMomResolution.cxx
+++ b/.conflict-side-0/DPG/Tasks/AOTTrack/V0Cascades/qaLamMomResolution.cxx
@@ -14,23 +14,26 @@
 /// \author Carolina Reetz c.reetz@cern.ch
 /// \brief  QA task to study momentum resolution of Lambda daughter tracks
 
-#include <string>
+#include "DPG/Tasks/AOTTrack/V0Cascades/qaLamMomResolution.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "ReconstructionDataFormats/PID.h"
-#include "Common/Core/trackUtilities.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "DPG/Tasks/AOTTrack/V0Cascades/qaLamMomResolution.h"
+
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/Tools/TrackTuner.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/PID.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <string>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
@@ -540,8 +543,8 @@ struct qaLamMomResolution {
             }
           }
         } // end Anti-Lambda
-      }   // end MC
-    }     // end V0 loop
+      } // end MC
+    } // end V0 loop
   }
   PROCESS_SWITCH(qaLamMomResolution, processMC, "Process MC", true);
 };
diff --git a/.conflict-side-0/DPG/Tasks/AOTTrack/V0Cascades/qaLamMomResolution.h b/.conflict-side-0/DPG/Tasks/AOTTrack/V0Cascades/qaLamMomResolution.h
index 603195404d4..67b8620ab6b 100644
--- a/.conflict-side-0/DPG/Tasks/AOTTrack/V0Cascades/qaLamMomResolution.h
+++ b/.conflict-side-0/DPG/Tasks/AOTTrack/V0Cascades/qaLamMomResolution.h
@@ -14,10 +14,11 @@
 #ifndef DPG_TASKS_AOTTRACK_V0CASCADES_QALAMMOMRESOLUTION_H_
 #define DPG_TASKS_AOTTRACK_V0CASCADES_QALAMMOMRESOLUTION_H_
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Common/Core/trackUtilities.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+
 namespace o2::aod
 {
 namespace qaLamMomResolution
diff --git a/.conflict-side-0/DPG/Tasks/AOTTrack/qaDcaMC.cxx b/.conflict-side-0/DPG/Tasks/AOTTrack/qaDcaMC.cxx
index 4054c59b33a..7e76026fed6 100644
--- a/.conflict-side-0/DPG/Tasks/AOTTrack/qaDcaMC.cxx
+++ b/.conflict-side-0/DPG/Tasks/AOTTrack/qaDcaMC.cxx
@@ -16,22 +16,24 @@
 ///
 
 // O2 includes
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/DCA.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
 
 // ROOT includes
-#include "TPDGCode.h"
 #include "TEfficiency.h"
 #include "THashList.h"
+#include "TPDGCode.h"
 
 using namespace o2::framework;
 
diff --git a/.conflict-side-0/DPG/Tasks/AOTTrack/qaEfficiency.cxx b/.conflict-side-0/DPG/Tasks/AOTTrack/qaEfficiency.cxx
index a55d205ed57..13703e3d92d 100644
--- a/.conflict-side-0/DPG/Tasks/AOTTrack/qaEfficiency.cxx
+++ b/.conflict-side-0/DPG/Tasks/AOTTrack/qaEfficiency.cxx
@@ -17,27 +17,29 @@
 ///
 
 // O2 includes
-#include <memory>
-#include <vector>
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/DCA.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
-#include "Common/Core/RecoDecay.h"
+
+#include <memory>
+#include <vector>
 
 // ROOT includes
-#include "TPDGCode.h"
 #include "TEfficiency.h"
 #include "THashList.h"
+#include "TPDGCode.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/DPG/Tasks/AOTTrack/qaEventTrack.cxx b/.conflict-side-0/DPG/Tasks/AOTTrack/qaEventTrack.cxx
index 09590267ed8..8bc884208cb 100644
--- a/.conflict-side-0/DPG/Tasks/AOTTrack/qaEventTrack.cxx
+++ b/.conflict-side-0/DPG/Tasks/AOTTrack/qaEventTrack.cxx
@@ -23,19 +23,20 @@
 
 #include "qaEventTrack.h"
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "ReconstructionDataFormats/DCA.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/Core/TrackSelectionDefaults.h"
 #include "Common/TableProducer/PID/pidTOFBase.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/DCA.h"
+
 #include <string>
 #include <vector>
 
diff --git a/.conflict-side-0/DPG/Tasks/AOTTrack/qaEventTrack.h b/.conflict-side-0/DPG/Tasks/AOTTrack/qaEventTrack.h
index e2230e37c87..274ec3d1d31 100644
--- a/.conflict-side-0/DPG/Tasks/AOTTrack/qaEventTrack.h
+++ b/.conflict-side-0/DPG/Tasks/AOTTrack/qaEventTrack.h
@@ -17,10 +17,11 @@
 /// \brief  Header file for QA tasks for the track and the event properties.
 ///
 
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
 
 // Output table declaration
 namespace o2::aod
diff --git a/.conflict-side-0/DPG/Tasks/AOTTrack/qaEventTrackLite.cxx b/.conflict-side-0/DPG/Tasks/AOTTrack/qaEventTrackLite.cxx
index eecb5d7c240..a5d381960b9 100644
--- a/.conflict-side-0/DPG/Tasks/AOTTrack/qaEventTrackLite.cxx
+++ b/.conflict-side-0/DPG/Tasks/AOTTrack/qaEventTrackLite.cxx
@@ -20,17 +20,18 @@
 
 #include "qaEventTrack.h"
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisDataModel.h"
-#include "ReconstructionDataFormats/DCA.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/Core/TrackSelectionDefaults.h"
+
 #include "DataFormatsTPC/BetheBlochAleph.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/DCA.h"
 #include "ReconstructionDataFormats/PID.h"
 
 #include "TF1.h"
diff --git a/.conflict-side-0/DPG/Tasks/AOTTrack/qaEventTrackLiteProducer.cxx b/.conflict-side-0/DPG/Tasks/AOTTrack/qaEventTrackLiteProducer.cxx
index 0184d5b39f0..945f6ec08f1 100644
--- a/.conflict-side-0/DPG/Tasks/AOTTrack/qaEventTrackLiteProducer.cxx
+++ b/.conflict-side-0/DPG/Tasks/AOTTrack/qaEventTrackLiteProducer.cxx
@@ -19,22 +19,24 @@
 
 #include "qaEventTrack.h"
 
-#include <vector>
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/McCollisionExtra.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/TableProducer/PID/pidTOFBase.h"
 
-#include "TRandom.h"
+#include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisDataModel.h"
 #include "ReconstructionDataFormats/DCA.h"
-#include "Common/Core/trackUtilities.h"
-#include "Common/DataModel/McCollisionExtra.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/TableProducer/PID/pidTOFBase.h"
+
+#include "TRandom.h"
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/DPG/Tasks/AOTTrack/qaFakeHits.cxx b/.conflict-side-0/DPG/Tasks/AOTTrack/qaFakeHits.cxx
index 1da3a6a6674..88a794770cc 100644
--- a/.conflict-side-0/DPG/Tasks/AOTTrack/qaFakeHits.cxx
+++ b/.conflict-side-0/DPG/Tasks/AOTTrack/qaFakeHits.cxx
@@ -17,17 +17,19 @@
 ///
 
 // O2 includes
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/DCA.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
 
 using namespace o2::framework;
 // Particle information
diff --git a/.conflict-side-0/DPG/Tasks/AOTTrack/qaMatchEff.cxx b/.conflict-side-0/DPG/Tasks/AOTTrack/qaMatchEff.cxx
index 704d3fa89ad..7b289d68de3 100644
--- a/.conflict-side-0/DPG/Tasks/AOTTrack/qaMatchEff.cxx
+++ b/.conflict-side-0/DPG/Tasks/AOTTrack/qaMatchEff.cxx
@@ -21,20 +21,21 @@
 //
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "CommonConstants/MathConstants.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "CommonConstants/MathConstants.h"
 //
 #include "Framework/AnalysisTask.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/runDataProcessing.h"
 //
+#include <set>
 #include <string>
 #include <vector>
-#include <set>
 //
 namespace extConfPar
 {
diff --git a/.conflict-side-0/DPG/Tasks/AOTTrack/qaPrimVtxVsTime.cxx b/.conflict-side-0/DPG/Tasks/AOTTrack/qaPrimVtxVsTime.cxx
index dd66692a4e2..1ac1b97b5c1 100644
--- a/.conflict-side-0/DPG/Tasks/AOTTrack/qaPrimVtxVsTime.cxx
+++ b/.conflict-side-0/DPG/Tasks/AOTTrack/qaPrimVtxVsTime.cxx
@@ -10,16 +10,18 @@
 // or submit itself to any jurisdiction.
 /// \author Mattia Faggin <mattia.faggin@cern.ch>, Padova University and INFN
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/CCDB/EventSelectionParams.h"
+#include "Common/DataModel/EventSelection.h"
+
 #include "CCDB/BasicCCDBManager.h"
-#include "Framework/HistogramRegistry.h"
 #include "CommonDataFormat/BunchFilling.h"
-#include "DataFormatsParameters/GRPLHCIFData.h"
 #include "DataFormatsParameters/GRPECSObject.h"
+#include "DataFormatsParameters/GRPLHCIFData.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TH1F.h"
 #include "TH2F.h"
 
diff --git a/.conflict-side-0/DPG/Tasks/AOTTrack/qaSignChargeMC.cxx b/.conflict-side-0/DPG/Tasks/AOTTrack/qaSignChargeMC.cxx
index e40dd0e76e9..d8ad1bf21bc 100644
--- a/.conflict-side-0/DPG/Tasks/AOTTrack/qaSignChargeMC.cxx
+++ b/.conflict-side-0/DPG/Tasks/AOTTrack/qaSignChargeMC.cxx
@@ -18,9 +18,9 @@
 
 // O2 includes
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2::framework;
 
diff --git a/.conflict-side-0/DPG/Tasks/AOTTrack/qaTrackSelection.cxx b/.conflict-side-0/DPG/Tasks/AOTTrack/qaTrackSelection.cxx
index f7ea3dd2f53..bf9f732d5c1 100644
--- a/.conflict-side-0/DPG/Tasks/AOTTrack/qaTrackSelection.cxx
+++ b/.conflict-side-0/DPG/Tasks/AOTTrack/qaTrackSelection.cxx
@@ -17,14 +17,15 @@
 ///
 
 // O2 includes
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/HistogramRegistry.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2::framework;
 
 struct QaTrackCuts {
diff --git a/.conflict-side-0/DPG/Tasks/AOTTrack/qaTrackSplitting.cxx b/.conflict-side-0/DPG/Tasks/AOTTrack/qaTrackSplitting.cxx
index 3125f1e7c03..c8abc81ae7e 100644
--- a/.conflict-side-0/DPG/Tasks/AOTTrack/qaTrackSplitting.cxx
+++ b/.conflict-side-0/DPG/Tasks/AOTTrack/qaTrackSplitting.cxx
@@ -15,13 +15,14 @@
 /// \brief  Task to analyse the numbers of particles reconstructed more than once
 ///
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/HistogramRegistry.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-0/DPG/Tasks/FDD/qaFDD.cxx b/.conflict-side-0/DPG/Tasks/FDD/qaFDD.cxx
index c985d7dbb9d..37914166c8e 100644
--- a/.conflict-side-0/DPG/Tasks/FDD/qaFDD.cxx
+++ b/.conflict-side-0/DPG/Tasks/FDD/qaFDD.cxx
@@ -9,19 +9,20 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Common/DataModel/EventSelection.h"
-#include "DataFormatsFDD/Digit.h"
-#include "DataFormatsFIT/Triggers.h"
 #include "Common/DataModel/FT0Corrected.h"
 
+#include "CCDB/BasicCCDBManager.h"
 #include "CCDB/CcdbApi.h"
 #include "CommonDataFormat/BunchFilling.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPObject.h"
+#include "DataFormatsFDD/Digit.h"
+#include "DataFormatsFIT/Triggers.h"
 #include "DataFormatsParameters/GRPLHCIFData.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TH1F.h"
 #include "TH2F.h"
 
diff --git a/.conflict-side-0/DPG/Tasks/FT0/ft0AnalysisTask.cxx b/.conflict-side-0/DPG/Tasks/FT0/ft0AnalysisTask.cxx
index a7d487fbdff..498847b65cd 100644
--- a/.conflict-side-0/DPG/Tasks/FT0/ft0AnalysisTask.cxx
+++ b/.conflict-side-0/DPG/Tasks/FT0/ft0AnalysisTask.cxx
@@ -9,19 +9,20 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <bitset>
-#include <map>
-#include <string>
-#include <numeric>
-
-#include "TH1.h"
-
 #include "Common/DataModel/EventSelection.h"
+
 #include "DataFormatsFT0/Digit.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
 
+#include "TH1.h"
+
+#include <bitset>
+#include <map>
+#include <numeric>
+#include <string>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::aod::evsel;
diff --git a/.conflict-side-0/DPG/Tasks/FT0/qaFT0TrgBased.cxx b/.conflict-side-0/DPG/Tasks/FT0/qaFT0TrgBased.cxx
index 35a2c2cc884..89bfed1dfe5 100644
--- a/.conflict-side-0/DPG/Tasks/FT0/qaFT0TrgBased.cxx
+++ b/.conflict-side-0/DPG/Tasks/FT0/qaFT0TrgBased.cxx
@@ -13,20 +13,13 @@
 /// \author Uliana Dmitrieva uliana.dmitrieva@cern.ch
 /// \brief  FT0 QA
 
-#include <bitset>
-#include <cstddef>
-#include <cstdint>
-#include <map>
-#include <string>
-#include <vector>
-
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/FT0Corrected.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "DataFormatsFT0/Digit.h"
 
 #include "CommonConstants/LHCConstants.h"
 #include "DataFormatsFIT/Triggers.h"
+#include "DataFormatsFT0/Digit.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
@@ -34,6 +27,13 @@
 #include "Framework/InitContext.h"
 #include "Framework/runDataProcessing.h"
 
+#include <bitset>
+#include <cstddef>
+#include <cstdint>
+#include <map>
+#include <string>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-side-0/DPG/Tasks/FV0/qaFV0.cxx b/.conflict-side-0/DPG/Tasks/FV0/qaFV0.cxx
index 295f981b0b7..fda2bc3b9c4 100644
--- a/.conflict-side-0/DPG/Tasks/FV0/qaFV0.cxx
+++ b/.conflict-side-0/DPG/Tasks/FV0/qaFV0.cxx
@@ -13,13 +13,6 @@
 /// \author Andreas Molander andreas.molander@cern.ch
 /// \brief  FV0 QA
 
-#include <bitset>
-#include <cstddef>
-#include <cstdint>
-#include <string>
-#include <map>
-#include <vector>
-
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
 
@@ -27,14 +20,21 @@
 #include "DataFormatsFIT/Triggers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/InitContext.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/HistogramSpec.h"
+#include "Framework/InitContext.h"
 #include "Framework/runDataProcessing.h"
 
 #include "TH1F.h"
 #include "TH2F.h"
 
+#include <bitset>
+#include <cstddef>
+#include <cstdint>
+#include <map>
+#include <string>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-side-0/DPG/Tasks/ITS/itsImpParStudies.cxx b/.conflict-side-0/DPG/Tasks/ITS/itsImpParStudies.cxx
index 67fba3b4989..6ed71d41aa5 100644
--- a/.conflict-side-0/DPG/Tasks/ITS/itsImpParStudies.cxx
+++ b/.conflict-side-0/DPG/Tasks/ITS/itsImpParStudies.cxx
@@ -10,33 +10,32 @@
 // or submit itself to any jurisdiction.
 /// \author Samuele Cattaruzzi <samuele.cattaruzzi@cern.ch>
 
-#include <string>
-
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "ReconstructionDataFormats/DCA.h"
+#include "Common/Core/TrackSelection.h"
 #include "Common/Core/trackUtilities.h" // for propagation to primary vertex
-
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "CommonUtils/NameConf.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Common/Core/TrackSelection.h"
-#include "DetectorsVertexing/PVertexer.h"
-#include "ReconstructionDataFormats/Vertex.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "Framework/RunningWorkflowInfo.h"
 #include "CCDB/CcdbApi.h"
-#include "DataFormatsCalibration/MeanVertexObject.h"
 #include "CommonConstants/GeomConstants.h"
+#include "CommonUtils/NameConf.h"
+#include "DataFormatsCalibration/MeanVertexObject.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "DetectorsVertexing/PVertexer.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "ReconstructionDataFormats/DCA.h"
+#include "ReconstructionDataFormats/Vertex.h"
 
 #include "iostream"
-#include "vector"
 #include "set"
+#include "vector"
+#include <string>
 
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-0/DPG/Tasks/Monitor/MC/taskMcSimpleQC.cxx b/.conflict-side-0/DPG/Tasks/Monitor/MC/taskMcSimpleQC.cxx
index 5f285fcc2b4..cb773c8beb2 100644
--- a/.conflict-side-0/DPG/Tasks/Monitor/MC/taskMcSimpleQC.cxx
+++ b/.conflict-side-0/DPG/Tasks/Monitor/MC/taskMcSimpleQC.cxx
@@ -12,12 +12,13 @@
 /// \brief Simple QC task to run
 /// \author Fabrizio Grosa, fabrizio.grosa@cern.ch (CERN)
 
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::aod;
@@ -36,7 +37,7 @@ struct mcSimpleQc {
       {"histNumGlobalTracks", ";#it{N}_{global tracks};entries", {HistType::kTH1F, {{200, -0.5, 200.}}}},                               //
       {"histNumPvContributors", ";#it{N}_{PV contributors};entries", {HistType::kTH1F, {{200, -0.5, 200.}}}},                           //
       {"histFracAmbiguousTracks", ";#it{N}_{ambiguous tracks} / #it{N}_{tracks};entries", {HistType::kTH1F, {{100, 0., 1.}}}}           //
-    }                                                                                                                                   //
+    } //
   };
 
   using CollisionsWithMCLabels = soa::Join<aod::Collisions, aod::McCollisionLabels>;
@@ -84,4 +85,5 @@ struct mcSimpleQc {
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
   return WorkflowSpec{adaptAnalysisTask<mcSimpleQc>(cfgc)};
-}
\ No newline at end of file
+}
+ 
\ No newline at end of file
diff --git a/.conflict-side-0/DPG/Tasks/TOF/tofOfflineCalib.cxx b/.conflict-side-0/DPG/Tasks/TOF/tofOfflineCalib.cxx
index ccfea13f1b1..cae7f462dec 100644
--- a/.conflict-side-0/DPG/Tasks/TOF/tofOfflineCalib.cxx
+++ b/.conflict-side-0/DPG/Tasks/TOF/tofOfflineCalib.cxx
@@ -16,15 +16,16 @@
 /// \brief  Task to produce calibration objects for the TOF. Based on AO2D or TOF skimmed data
 ///
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "tofSkimsTableCreator.h"
+
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/FT0Corrected.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "tofSkimsTableCreator.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/DPG/Tasks/TOF/tofSkimsTableCreator.cxx b/.conflict-side-0/DPG/Tasks/TOF/tofSkimsTableCreator.cxx
index 1c2d1a79608..9b4ed496252 100644
--- a/.conflict-side-0/DPG/Tasks/TOF/tofSkimsTableCreator.cxx
+++ b/.conflict-side-0/DPG/Tasks/TOF/tofSkimsTableCreator.cxx
@@ -16,15 +16,16 @@
 /// \brief  Task to defined the skimmed data format for the TOF skims
 ///
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "tofSkimsTableCreator.h"
+
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/FT0Corrected.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "tofSkimsTableCreator.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/DPG/Tasks/TOF/tofSkimsTableCreator.h b/.conflict-side-0/DPG/Tasks/TOF/tofSkimsTableCreator.h
index 4f0ec48ed06..aa79ae4cdf5 100644
--- a/.conflict-side-0/DPG/Tasks/TOF/tofSkimsTableCreator.h
+++ b/.conflict-side-0/DPG/Tasks/TOF/tofSkimsTableCreator.h
@@ -19,9 +19,10 @@
 #ifndef DPG_TASKS_TOF_TOFSKIMSTABLECREATOR_H_
 #define DPG_TASKS_TOF_TOFSKIMSTABLECREATOR_H_
 
-#include "Common/TableProducer/PID/pidTOFBase.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/FT0Corrected.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/TableProducer/PID/pidTOFBase.h"
+
 #include "Framework/AnalysisDataModel.h"
 
 namespace o2::aod
diff --git a/.conflict-side-0/DPG/Tasks/TPC/tpcSkimsTableCreator.h b/.conflict-side-0/DPG/Tasks/TPC/tpcSkimsTableCreator.h
index decb3a9de60..583e38efd32 100644
--- a/.conflict-side-0/DPG/Tasks/TPC/tpcSkimsTableCreator.h
+++ b/.conflict-side-0/DPG/Tasks/TPC/tpcSkimsTableCreator.h
@@ -19,11 +19,12 @@
 #ifndef DPG_TASKS_TPC_TPCSKIMSTABLECREATOR_H_
 #define DPG_TASKS_TPC_TPCSKIMSTABLECREATOR_H_
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/PIDResponse.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+
 namespace o2::aod
 {
 namespace tpcskims
diff --git a/.conflict-side-0/DPG/Tasks/TPC/tpcTreeCreatorLight.cxx b/.conflict-side-0/DPG/Tasks/TPC/tpcTreeCreatorLight.cxx
index 807c85ba414..d17d850a9da 100644
--- a/.conflict-side-0/DPG/Tasks/TPC/tpcTreeCreatorLight.cxx
+++ b/.conflict-side-0/DPG/Tasks/TPC/tpcTreeCreatorLight.cxx
@@ -17,7 +17,9 @@
 /// \author Jeremy Wilkinson <jeremy.wilkinson@cern.ch>
 
 #include "tpcTreeCreatorLight.h"
+
 #include <CCDB/BasicCCDBManager.h>
+
 #include <cmath>
 /// ROOT
 #include "TRandom3.h"
@@ -27,10 +29,10 @@
 #include "Framework/runDataProcessing.h"
 /// O2Physics
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
 
 using namespace o2;
 using namespace o2::framework;
@@ -197,8 +199,8 @@ struct TreeWriterTPCTOF {
       }
 
     } /// Loop tracks
-  }   /// process
-};    /// struct TreeWriterTPCTOF
+  } /// process
+}; /// struct TreeWriterTPCTOF
 
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
diff --git a/.conflict-side-0/DPG/Tasks/TPC/tpcTreeCreatorLight.h b/.conflict-side-0/DPG/Tasks/TPC/tpcTreeCreatorLight.h
index df02c1de1ec..f8d806da5da 100644
--- a/.conflict-side-0/DPG/Tasks/TPC/tpcTreeCreatorLight.h
+++ b/.conflict-side-0/DPG/Tasks/TPC/tpcTreeCreatorLight.h
@@ -17,11 +17,12 @@
 #ifndef DPG_TASKS_TPC_TPCTREECREATORLIGHT_H_
 #define DPG_TASKS_TPC_TPCTREECREATORLIGHT_H_
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/PIDResponse.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+
 enum ParticleSpecies {
   kPionTrack = BIT(0),
   kKaonTrack = BIT(1),
diff --git a/.conflict-side-0/EventFiltering/PWGCF/CFFilter.cxx b/.conflict-side-0/EventFiltering/PWGCF/CFFilter.cxx
index 7219ba03d45..30dbfe6f071 100644
--- a/.conflict-side-0/EventFiltering/PWGCF/CFFilter.cxx
+++ b/.conflict-side-0/EventFiltering/PWGCF/CFFilter.cxx
@@ -14,27 +14,27 @@
 ///
 /// \author Laura Serksnyte, TU München, laura.serksnyte@cern.ch
 
-#include <string>
-
-#include "../filterTables.h"
 #include "../../PWGCF/FemtoDream/FemtoUtils.h"
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/HistogramRegistry.h"
+#include "../filterTables.h"
 
 #include "PWGCF/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoDream/FemtoDreamParticleHisto.h"
+#include "PWGCF/FemtoDream/FemtoDreamContainer.h"
+#include "PWGCF/FemtoDream/FemtoDreamDetaDphiStar.h"
 #include "PWGCF/FemtoDream/FemtoDreamMath.h"
 #include "PWGCF/FemtoDream/FemtoDreamPairCleaner.h"
-#include "PWGCF/FemtoDream/FemtoDreamDetaDphiStar.h"
-#include "PWGCF/FemtoDream/FemtoDreamContainer.h"
+#include "PWGCF/FemtoDream/FemtoDreamParticleHisto.h"
 
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+
+#include <string>
+
 namespace
 {
 
diff --git a/.conflict-side-0/EventFiltering/PWGCF/CFFilterAll.cxx b/.conflict-side-0/EventFiltering/PWGCF/CFFilterAll.cxx
index efc7625b215..512c6d48f32 100644
--- a/.conflict-side-0/EventFiltering/PWGCF/CFFilterAll.cxx
+++ b/.conflict-side-0/EventFiltering/PWGCF/CFFilterAll.cxx
@@ -14,36 +14,36 @@
 ///
 /// \author Laura Serksnyte, TU München, laura.serksnyte@cern.ch; Anton Riedel, TU München, anton.riedel@cern.ch; Maximilian Korwieser, TU Munich, maximilian.korwieser@cern.ch
 
-#include <string>
-#include <vector>
-
 #include "../filterTables.h"
 
-#include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "DetectorsBase/Propagator.h"
+#include "PWGLF/Utils/strangenessBuilderHelper.h"
 
-#include "fairlogger/Logger.h"
+#include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/PIDResponseITS.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/Core/RecoDecay.h"
 
+#include "CCDB/BasicCCDBManager.h"
+#include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DetectorsBase/Propagator.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/Configurable.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
 
-#include "PWGLF/Utils/strangenessBuilderHelper.h"
-
 #include "Math/GenVector/Boost.h"
 #include "Math/Vector4D.h"
 #include "TMath.h"
 
+#include "fairlogger/Logger.h"
+
+#include <string>
+#include <vector>
+
 using namespace o2;
 using namespace o2::aod;
 using namespace o2::framework;
diff --git a/.conflict-side-0/EventFiltering/PWGCF/CFFilterPPPhi.cxx b/.conflict-side-0/EventFiltering/PWGCF/CFFilterPPPhi.cxx
index 623b5cb9086..1c849a7707b 100644
--- a/.conflict-side-0/EventFiltering/PWGCF/CFFilterPPPhi.cxx
+++ b/.conflict-side-0/EventFiltering/PWGCF/CFFilterPPPhi.cxx
@@ -14,29 +14,32 @@
 ///
 /// \author Anton Riedel, TU München, anton.riedel@cern.ch
 
-#include <Math/GenVector/Boost.h>
-#include <Math/Vector4D.h>
-#include <TMath.h>
-#include <iostream>
-#include <iterator>
-#include <string>
-
 #include "../filterTables.h"
 
-#include "Framework/Configurable.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonConstants/MathConstants.h"
+#include "DataFormatsTPC/BetheBlochAleph.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/Configurable.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
+
+#include <Math/GenVector/Boost.h>
+#include <Math/Vector4D.h>
+#include <TMath.h>
+
 #include "fairlogger/Logger.h"
-#include "CommonConstants/MathConstants.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "DataFormatsTPC/BetheBlochAleph.h"
+
+#include <iostream>
+#include <iterator>
+#include <string>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/EventFiltering/PWGCF/CFFilterQA.cxx b/.conflict-side-0/EventFiltering/PWGCF/CFFilterQA.cxx
index 372b3387dc1..2108c7bc0d7 100644
--- a/.conflict-side-0/EventFiltering/PWGCF/CFFilterQA.cxx
+++ b/.conflict-side-0/EventFiltering/PWGCF/CFFilterQA.cxx
@@ -14,33 +14,36 @@
 ///
 /// \author Laura Serksnyte, TU München, laura.serksnyte@cern.ch; Anton Riedel, TU München, anton.riedel@cern.ch
 
-#include <Framework/Configurable.h>
-#include <Math/GenVector/Boost.h>
-#include <Math/Vector4D.h>
-#include <TMath.h>
-#include <cstdint>
-#include <iostream>
-#include <iterator>
-#include <string>
-
 #include "../filterTables.h"
 
-#include "Framework/ASoAHelpers.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
-#include "CommonConstants/MathConstants.h"
+#include "PWGCF/DataModel/FemtoDerived.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGCF/DataModel/FemtoDerived.h"
-#include "DataFormatsTPC/BetheBlochAleph.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
 #include "CCDB/CcdbApi.h"
+#include "CommonConstants/MathConstants.h"
+#include "DataFormatsTPC/BetheBlochAleph.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include <Framework/Configurable.h>
+
+#include <Math/GenVector/Boost.h>
+#include <Math/Vector4D.h>
+#include <TMath.h>
+
+#include <cstdint>
+#include <iostream>
+#include <iterator>
+#include <string>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/EventFiltering/PWGCF/CFFilterTwoN.cxx b/.conflict-side-0/EventFiltering/PWGCF/CFFilterTwoN.cxx
index 2d2b64a1088..03d14a4713e 100644
--- a/.conflict-side-0/EventFiltering/PWGCF/CFFilterTwoN.cxx
+++ b/.conflict-side-0/EventFiltering/PWGCF/CFFilterTwoN.cxx
@@ -14,29 +14,28 @@
 ///
 /// \author Anton Riedel, TU München, anton.riedel@cern.ch
 
-#include <Framework/Configurable.h>
-#include <TMath.h>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/HistogramRegistry.h"
-
-#include "../filterTables.h"
 #include "../../PWGCF/FemtoDream/FemtoUtils.h"
+#include "../filterTables.h"
 
 #include "PWGCF/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoDream/FemtoDreamParticleHisto.h"
-#include "PWGCF/FemtoDream/FemtoDreamPairCleaner.h"
 #include "PWGCF/FemtoDream/FemtoDreamContainer.h"
+#include "PWGCF/FemtoDream/FemtoDreamDetaDphiStar.h"
 #include "PWGCF/FemtoDream/FemtoDreamMath.h"
 #include "PWGCF/FemtoDream/FemtoDreamPairCleaner.h"
-#include "PWGCF/FemtoDream/FemtoDreamDetaDphiStar.h"
-#include "PWGCF/FemtoDream/FemtoDreamContainer.h"
+#include "PWGCF/FemtoDream/FemtoDreamParticleHisto.h"
 
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
+
 #include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include <Framework/Configurable.h>
+
+#include <TMath.h>
 
 #include <vector>
 
diff --git a/.conflict-side-0/EventFiltering/PWGEM/EMPhotonFilter.cxx b/.conflict-side-0/EventFiltering/PWGEM/EMPhotonFilter.cxx
index a254c7245a1..119e36daa69 100644
--- a/.conflict-side-0/EventFiltering/PWGEM/EMPhotonFilter.cxx
+++ b/.conflict-side-0/EventFiltering/PWGEM/EMPhotonFilter.cxx
@@ -12,16 +12,19 @@
 // \brief software trigger for EM photon
 // \author daiki.sekihata@cern.ch
 
-#include "Math/Vector4D.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/CaloClusters.h"
-#include "DataFormatsPHOS/TriggerRecord.h"
 #include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+
+#include "Common/DataModel/CaloClusters.h"
 #include "EventFiltering/filterTables.h"
+
+#include "DataFormatsPHOS/TriggerRecord.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+
+#include "Math/Vector4D.h"
 
 using namespace o2;
 using namespace o2::soa;
diff --git a/.conflict-side-0/EventFiltering/PWGEM/EMPhotonFilterQC.cxx b/.conflict-side-0/EventFiltering/PWGEM/EMPhotonFilterQC.cxx
index de4d59f00da..d03bcd50908 100644
--- a/.conflict-side-0/EventFiltering/PWGEM/EMPhotonFilterQC.cxx
+++ b/.conflict-side-0/EventFiltering/PWGEM/EMPhotonFilterQC.cxx
@@ -12,18 +12,21 @@
 // \brief Quick QC task for CEFP for EM photon
 // \author daiki.sekihata@cern.ch
 
-#include "Math/Vector4D.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/CaloClusters.h"
-#include "DataFormatsPHOS/TriggerRecord.h"
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
 #include "PWGEM/PhotonMeson/Core/CutsLibrary.h"
+#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+
+#include "Common/DataModel/CaloClusters.h"
 #include "EventFiltering/filterTables.h"
+
+#include "DataFormatsPHOS/TriggerRecord.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+
+#include "Math/Vector4D.h"
 
 using namespace o2;
 using namespace o2::soa;
diff --git a/.conflict-side-0/EventFiltering/PWGEM/HeavyNeutralMesonFilter.cxx b/.conflict-side-0/EventFiltering/PWGEM/HeavyNeutralMesonFilter.cxx
index 6909d1561ee..46f86de11f0 100644
--- a/.conflict-side-0/EventFiltering/PWGEM/HeavyNeutralMesonFilter.cxx
+++ b/.conflict-side-0/EventFiltering/PWGEM/HeavyNeutralMesonFilter.cxx
@@ -16,32 +16,34 @@
 /// \author Nicolas Strangmann (nicolas.strangmann@cern.ch) - Goethe University Frankfurt; Maximilian Korwieser (maximilian.korwieser@cern.ch) - Technical University Munich
 ///
 
-#include <vector>
-#include <iterator>
-#include <string>
-
-#include "Math/GenVector/Boost.h"
-#include "Math/Vector4D.h"
-#include "TMath.h"
-#include "TRandom3.h"
-
 #include "PWGEM/PhotonMeson/Utils/HNMUtilities.h"
 #include "PWGJE/DataModel/EMCALMatchedCollisions.h"
 
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/PIDResponseITS.h"
-#include "fairlogger/Logger.h"
-#include "Framework/Configurable.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonConstants/MathConstants.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/Configurable.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
-#include "CommonConstants/MathConstants.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
+
+#include "Math/GenVector/Boost.h"
+#include "Math/Vector4D.h"
+#include "TMath.h"
+#include "TRandom3.h"
+
+#include "fairlogger/Logger.h"
+
+#include <iterator>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/EventFiltering/PWGHF/HFFilterPrepareMLSamples.cxx b/.conflict-side-0/EventFiltering/PWGHF/HFFilterPrepareMLSamples.cxx
index b7a9637ba10..cfbcb6573da 100644
--- a/.conflict-side-0/EventFiltering/PWGHF/HFFilterPrepareMLSamples.cxx
+++ b/.conflict-side-0/EventFiltering/PWGHF/HFFilterPrepareMLSamples.cxx
@@ -28,8 +28,6 @@
 #include "Common/DataModel/PIDResponseTPC.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
-#include <onnxruntime_cxx_api.h>
-
 #include <CCDB/BasicCCDBManager.h>
 #include <CCDB/CcdbApi.h>
 #include <CommonConstants/PhysicsConstants.h>
@@ -46,6 +44,8 @@
 
 #include <TPDGCode.h>
 
+#include <onnxruntime_cxx_api.h>
+
 #include <Rtypes.h>
 
 #include <array>
diff --git a/.conflict-side-0/EventFiltering/PWGJE/fullJetFilter.cxx b/.conflict-side-0/EventFiltering/PWGJE/fullJetFilter.cxx
index 25096b7bb7a..d8d851fde88 100644
--- a/.conflict-side-0/EventFiltering/PWGJE/fullJetFilter.cxx
+++ b/.conflict-side-0/EventFiltering/PWGJE/fullJetFilter.cxx
@@ -12,35 +12,36 @@
 // Full Jet Filter
 // Author: Gijs van Weelden
 
-#include <array>
-#include <cmath>
-#include <string>
-#include <string_view>
-#include <TMath.h>
+#include "../filterTables.h"
 
-#include <boost/algorithm/string/case_conv.hpp>
+#include "PWGJE/Core/FastJetUtilities.h"
+#include "PWGJE/Core/JetFinder.h"
+#include "PWGJE/DataModel/EMCALClusters.h"
+#include "PWGJE/DataModel/Jet.h"
+
+#include "Common/CCDB/TriggerAliases.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
 #include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsCTP/Configuration.h"
 #include "EMCALBase/Geometry.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoA.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/CCDB/TriggerAliases.h"
+#include <TMath.h>
 
-#include "PWGJE/DataModel/Jet.h"
-#include "PWGJE/DataModel/EMCALClusters.h"
-#include "PWGJE/Core/JetFinder.h"
-#include "PWGJE/Core/FastJetUtilities.h"
+#include <boost/algorithm/string/case_conv.hpp>
 
-#include "../filterTables.h"
+#include <array>
+#include <cmath>
+#include <string>
+#include <string_view>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/EventFiltering/PWGJE/jetFilter.cxx b/.conflict-side-0/EventFiltering/PWGJE/jetFilter.cxx
index 277f749d22b..d147a4a6849 100644
--- a/.conflict-side-0/EventFiltering/PWGJE/jetFilter.cxx
+++ b/.conflict-side-0/EventFiltering/PWGJE/jetFilter.cxx
@@ -11,32 +11,32 @@
 
 // Author: Filip Krizek
 
-#include <TMath.h>
-#include <cmath>
-#include <string>
-#include <vector>
+#include "../filterTables.h"
 
-#include "Framework/ASoA.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "ReconstructionDataFormats/Track.h"
+#include "PWGJE/Core/FastJetUtilities.h"
+#include "PWGJE/Core/JetBkgSubUtils.h"
+#include "PWGJE/Core/JetFinder.h"
+#include "PWGJE/DataModel/EMCALClusters.h"
+#include "PWGJE/DataModel/Jet.h"
 
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
-#include "PWGJE/Core/JetFinder.h"
-#include "PWGJE/Core/FastJetUtilities.h"
-#include "PWGJE/Core/JetBkgSubUtils.h"
-#include "PWGJE/DataModel/EMCALClusters.h"
-#include "PWGJE/DataModel/Jet.h"
+#include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
-#include "../filterTables.h"
+#include <TMath.h>
 
-#include "Framework/HistogramRegistry.h"
+#include <cmath>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/EventFiltering/PWGJE/jetHFFilter.cxx b/.conflict-side-0/EventFiltering/PWGJE/jetHFFilter.cxx
index 6657e785751..61f627256c5 100644
--- a/.conflict-side-0/EventFiltering/PWGJE/jetHFFilter.cxx
+++ b/.conflict-side-0/EventFiltering/PWGJE/jetHFFilter.cxx
@@ -11,31 +11,31 @@
 
 // Author: Nima Zardoshti
 
-#include <TMath.h>
-#include <cmath>
-#include <string>
+#include "../filterTables.h"
 
-#include "Framework/ASoA.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "ReconstructionDataFormats/Track.h"
+#include "PWGJE/Core/FastJetUtilities.h"
+#include "PWGJE/Core/JetBkgSubUtils.h"
+#include "PWGJE/Core/JetFinder.h"
+#include "PWGJE/DataModel/EMCALClusters.h"
+#include "PWGJE/DataModel/Jet.h"
 
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
-#include "PWGJE/Core/JetFinder.h"
-#include "PWGJE/Core/FastJetUtilities.h"
-#include "PWGJE/Core/JetBkgSubUtils.h"
-#include "PWGJE/DataModel/EMCALClusters.h"
-#include "PWGJE/DataModel/Jet.h"
+#include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
-#include "../filterTables.h"
+#include <TMath.h>
 
-#include "Framework/HistogramRegistry.h"
+#include <cmath>
+#include <string>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/EventFiltering/PWGLF/filterdoublephi.cxx b/.conflict-side-0/EventFiltering/PWGLF/filterdoublephi.cxx
index 0ee9f34b535..5b92f2ff092 100644
--- a/.conflict-side-0/EventFiltering/PWGLF/filterdoublephi.cxx
+++ b/.conflict-side-0/EventFiltering/PWGLF/filterdoublephi.cxx
@@ -14,37 +14,41 @@
 ///
 /// \author Sourav Kundu, sourav.kundu@cern.ch
 
+#include "../filterTables.h"
+
+#include "PWGLF/DataModel/ReducedDoublePhiTables.h"
+
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/PIDResponseITS.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
+#include "CommonConstants/MathConstants.h"
+#include "DataFormatsTPC/BetheBlochAleph.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 #include <Framework/Configurable.h>
+
 #include <Math/GenVector/Boost.h>
 #include <Math/Vector4D.h>
+#include <TDatabasePDG.h> // FIXME
 #include <TMath.h>
+#include <TPDGCode.h> // FIXME
+
 #include <fairlogger/Logger.h>
-#include <TDatabasePDG.h> // FIXME
-#include <TPDGCode.h>     // FIXME
 
 #include <iostream>
 #include <iterator>
 #include <string>
 #include <vector>
 
-#include "../filterTables.h"
-#include "PWGLF/DataModel/ReducedDoublePhiTables.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
-#include "CommonConstants/MathConstants.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "DataFormatsTPC/BetheBlochAleph.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "CCDB/CcdbApi.h"
-#include "Common/DataModel/PIDResponseITS.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-0/EventFiltering/PWGLF/filterf1proton.cxx b/.conflict-side-0/EventFiltering/PWGLF/filterf1proton.cxx
index abdfe9c272a..4a679fc22b8 100644
--- a/.conflict-side-0/EventFiltering/PWGLF/filterf1proton.cxx
+++ b/.conflict-side-0/EventFiltering/PWGLF/filterf1proton.cxx
@@ -14,43 +14,48 @@
 ///
 /// \author Sourav Kundu, sourav.kundu@cern.ch
 
+#include "../filterTables.h"
+
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/Utils/strangenessBuilderHelper.h"
+
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
+#include "CommonConstants/MathConstants.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DataFormatsTPC/BetheBlochAleph.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+#include "ReconstructionDataFormats/TrackParametrization.h"
 #include <Framework/Configurable.h>
+
 #include <Math/GenVector/Boost.h>
 #include <Math/Vector4D.h>
 #include <TLorentzVector.h>
 #include <TMath.h>
+
 #include <fairlogger/Logger.h>
+
 #include <iostream>
 #include <iterator>
 #include <string>
 #include <vector>
 
-#include "DataFormatsParameters/GRPMagField.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "ReconstructionDataFormats/TrackParametrization.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "../filterTables.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
-#include "CommonConstants/MathConstants.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/Utils/strangenessBuilderHelper.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "DataFormatsTPC/BetheBlochAleph.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "CCDB/CcdbApi.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-0/EventFiltering/PWGLF/nucleiFilter.cxx b/.conflict-side-0/EventFiltering/PWGLF/nucleiFilter.cxx
index 54f3ed507ad..bd82fd3c2f8 100644
--- a/.conflict-side-0/EventFiltering/PWGLF/nucleiFilter.cxx
+++ b/.conflict-side-0/EventFiltering/PWGLF/nucleiFilter.cxx
@@ -10,37 +10,38 @@
 // or submit itself to any jurisdiction.
 // O2 includes
 
-#include <cmath>
-#include <string>
+#include "../filterTables.h"
 
-#include "Math/Vector4D.h"
-#include "Math/GenVector/Boost.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/DataModel/Vtx3BodyTables.h"
+#include "PWGLF/DataModel/pidTOFGeneric.h"
+
+#include "Common/Core/PID/PIDTOF.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DataFormatsTOF/ParameterContainers.h"
 #include "DataFormatsTPC/BetheBlochAleph.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
 
-#include "PWGLF/DataModel/Vtx3BodyTables.h"
-#include "../filterTables.h"
+#include "Math/GenVector/Boost.h"
+#include "Math/Vector4D.h"
 
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/trackUtilities.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "DataFormatsTOF/ParameterContainers.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "PWGLF/DataModel/pidTOFGeneric.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "Common/Core/PID/PIDTOF.h"
+#include <cmath>
+#include <string>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/EventFiltering/PWGLF/strangenessFilter.cxx b/.conflict-side-0/EventFiltering/PWGLF/strangenessFilter.cxx
index ceabf8eddfb..e54fb617c1a 100644
--- a/.conflict-side-0/EventFiltering/PWGLF/strangenessFilter.cxx
+++ b/.conflict-side-0/EventFiltering/PWGLF/strangenessFilter.cxx
@@ -14,32 +14,37 @@
 /// \author Francesca Ercolessi (francesca.ercolessi@cern.ch)
 /// \since June 1, 2021
 
-#include <cmath>
-#include "TVector3.h"
+#include "../filterTables.h"
+
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/Utils/strangenessBuilderHelper.h"
+
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "DCAFitter/DCAFitterN.h"
 #include "DataFormatsParameters/GRPMagField.h"
 #include "DataFormatsParameters/GRPObject.h"
-#include "DCAFitter/DCAFitterN.h"
 #include "DetectorsBase/Propagator.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
 #include "ReconstructionDataFormats/TrackParametrization.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "../filterTables.h"
-#include "PWGLF/Utils/strangenessBuilderHelper.h"
+
+#include "TVector3.h"
+
+#include <cmath>
 
 using namespace o2;
 using namespace o2::framework;
@@ -778,7 +783,7 @@ struct strangenessFilter {
     }
 
     for (auto& casc : cascadesBase) { // loop over cascades
-      hCandidate->Fill(0.5); // All candidates
+      hCandidate->Fill(0.5);          // All candidates
 
       const auto bachTrack = casc.bachelor_as<TrackCandidates>();
       const auto v0Dau = casc.v0_as<o2::aod::V0s>();
diff --git a/.conflict-side-0/EventFiltering/PWGUD/diffractionBCFilter.cxx b/.conflict-side-0/EventFiltering/PWGUD/diffractionBCFilter.cxx
index c6ce85ec845..d07fe3c0948 100644
--- a/.conflict-side-0/EventFiltering/PWGUD/diffractionBCFilter.cxx
+++ b/.conflict-side-0/EventFiltering/PWGUD/diffractionBCFilter.cxx
@@ -14,13 +14,15 @@
 // \author P. Buehler, paul.buehler@oeaw.ac.at
 // \since December, 2022
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "PWGUD/TableProducer/DGBCCandProducer.h"
+#include "../filterTables.h"
+
 #include "PWGUD/Core/DGCutparHolder.h"
 #include "PWGUD/Core/DGSelector.h"
 #include "PWGUD/Core/UDHelpers.h"
-#include "../filterTables.h"
+#include "PWGUD/TableProducer/DGBCCandProducer.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/EventFiltering/PWGUD/diffractionFilter.cxx b/.conflict-side-0/EventFiltering/PWGUD/diffractionFilter.cxx
index c5adfcf90c5..07bbf115535 100644
--- a/.conflict-side-0/EventFiltering/PWGUD/diffractionFilter.cxx
+++ b/.conflict-side-0/EventFiltering/PWGUD/diffractionFilter.cxx
@@ -14,14 +14,17 @@
 // \author P. Buehler, paul.buehler@oeaw.ac.at
 // \since June 1, 2021
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/StaticFor.h"
-#include "Common/DataModel/EventSelection.h"
+#include "../filterTables.h"
+
 #include "PWGUD/Core/DGCutparHolder.h"
 #include "PWGUD/Core/DGSelector.h"
 #include "PWGUD/Core/UDHelpers.h"
-#include "../filterTables.h"
+
+#include "Common/DataModel/EventSelection.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/EventFiltering/cefpTask.cxx b/.conflict-side-0/EventFiltering/cefpTask.cxx
index 64cf4435b85..584c8292903 100644
--- a/.conflict-side-0/EventFiltering/cefpTask.cxx
+++ b/.conflict-side-0/EventFiltering/cefpTask.cxx
@@ -10,6 +10,19 @@
 // or submit itself to any jurisdiction.
 // O2 includes
 
+#include "filterTables.h"
+
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonConstants/LHCConstants.h"
+#include "CommonDataFormat/InteractionRecord.h"
+#include "DataFormatsCTP/Scalers.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+
 #include <fmt/format.h>
 #include <rapidjson/document.h>
 #include <rapidjson/filereadstream.h>
@@ -18,21 +31,9 @@
 #include <random>
 #include <string>
 #include <string_view>
-#include <vector>
 #include <unordered_map>
 #include <utility>
-
-#include "filterTables.h"
-
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/HistogramRegistry.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "CommonConstants/LHCConstants.h"
-#include "CommonDataFormat/InteractionRecord.h"
-#include "DataFormatsCTP/Scalers.h"
+#include <vector>
 
 // we need to add workflow options before including Framework/runDataProcessing
 void customize(std::vector<o2::framework::ConfigParamSpec>& workflowOptions)
diff --git a/.conflict-side-0/EventFiltering/filterTables.h b/.conflict-side-0/EventFiltering/filterTables.h
index 1371d152e75..1ae7472fea6 100644
--- a/.conflict-side-0/EventFiltering/filterTables.h
+++ b/.conflict-side-0/EventFiltering/filterTables.h
@@ -12,10 +12,10 @@
 #define EVENTFILTERING_FILTERTABLES_H_
 
 #include <array>
-#include <unordered_map>
+#include <cstdint>
 #include <string>
+#include <unordered_map>
 #include <vector>
-#include <cstdint>
 
 namespace o2::aod
 {
diff --git a/.conflict-side-0/EventFiltering/macros/checkBCRange.C b/.conflict-side-0/EventFiltering/macros/checkBCRange.C
index 9bcc14981f4..76bdab016b0 100644
--- a/.conflict-side-0/EventFiltering/macros/checkBCRange.C
+++ b/.conflict-side-0/EventFiltering/macros/checkBCRange.C
@@ -10,12 +10,13 @@
 // or submit itself to any jurisdiction.
 // O2 includes
 
-#include <iostream>
+#include "CommonDataFormat/IRFrame.h"
+#include "CommonDataFormat/InteractionRecord.h"
+
 #include <TFile.h>
 #include <TTree.h>
 
-#include "CommonDataFormat/InteractionRecord.h"
-#include "CommonDataFormat/IRFrame.h"
+#include <iostream>
 
 using o2::InteractionRecord;
 using o2::dataformats::IRFrame;
diff --git a/.conflict-side-0/EventFiltering/macros/checkBCrangesSkimming.C b/.conflict-side-0/EventFiltering/macros/checkBCrangesSkimming.C
index f71212238c3..078aac59999 100644
--- a/.conflict-side-0/EventFiltering/macros/checkBCrangesSkimming.C
+++ b/.conflict-side-0/EventFiltering/macros/checkBCrangesSkimming.C
@@ -10,16 +10,18 @@
 // or submit itself to any jurisdiction.
 // O2 includes
 
-#include <cmath>
-#include <vector>
-#include <regex>
-#include <iostream>
+#include "CommonDataFormat/IRFrame.h"
+#include "CommonDataFormat/InteractionRecord.h"
+
 #include <TFile.h>
 #include <TGrid.h>
 #include <TH1.h>
 #include <TTree.h>
-#include "CommonDataFormat/InteractionRecord.h"
-#include "CommonDataFormat/IRFrame.h"
+
+#include <cmath>
+#include <iostream>
+#include <regex>
+#include <vector>
 
 using o2::InteractionRecord;
 using o2::dataformats::IRFrame;
diff --git a/.conflict-side-0/EventFiltering/macros/checkSkimming.C b/.conflict-side-0/EventFiltering/macros/checkSkimming.C
index 5496f303873..d7888dbd43e 100644
--- a/.conflict-side-0/EventFiltering/macros/checkSkimming.C
+++ b/.conflict-side-0/EventFiltering/macros/checkSkimming.C
@@ -10,15 +10,15 @@
 // or submit itself to any jurisdiction.
 
 #include <TCanvas.h>
-#include <TH1.h>
 #include <TFile.h>
+#include <TH1.h>
 #include <TStyle.h>
 
 #include <fstream>
 #include <iostream>
-#include <vector>
-#include <string>
 #include <regex>
+#include <string>
+#include <vector>
 
 void checkSkimming(std::string original_path = "AnalysisResults.root", std::string skimmed_path = "AnalysisResults_skimmed.root", TFile* outputFile = nullptr, bool skipDownscaled = true)
 {
@@ -129,4 +129,5 @@ void checkSkimming(std::string listName = "period.txt", bool skipDownscaled = tr
     counter++;
   }
   outputFile->Close();
-}
\ No newline at end of file
+}
+ 
\ No newline at end of file
diff --git a/.conflict-side-0/EventFiltering/macros/splitFile.C b/.conflict-side-0/EventFiltering/macros/splitFile.C
index b38149dca42..51da9f1aae7 100644
--- a/.conflict-side-0/EventFiltering/macros/splitFile.C
+++ b/.conflict-side-0/EventFiltering/macros/splitFile.C
@@ -10,12 +10,13 @@
 // or submit itself to any jurisdiction.
 // O2 includes
 
-#include <iostream>
-#include <string>
-#include "TFile.h"
 #include "TDirectory.h"
+#include "TFile.h"
 #include "TTree.h"
 
+#include <iostream>
+#include <string>
+
 void splitFile(const char* inputFileName = "bcSelection.root", const char* outputFileName1 = "bcRanges.root")
 {
   // Open the input ROOT file
diff --git a/.conflict-side-0/EventFiltering/macros/uploadOTSobjects.C b/.conflict-side-0/EventFiltering/macros/uploadOTSobjects.C
index 2a9be2de17e..0e950545aaf 100644
--- a/.conflict-side-0/EventFiltering/macros/uploadOTSobjects.C
+++ b/.conflict-side-0/EventFiltering/macros/uploadOTSobjects.C
@@ -10,13 +10,10 @@
 // or submit itself to any jurisdiction.
 //
 
-#include <fstream>
-#include <iostream>
-#include <vector>
-#include <string>
-#include <map>
-#include <array>
-#include <cmath>
+#include "EventFiltering/ZorroHelper.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonConstants/LHCConstants.h"
 
 #include "TFile.h"
 #include "TGrid.h"
@@ -25,9 +22,13 @@
 #include "TSystem.h"
 #include "TTree.h"
 
-#include "CCDB/BasicCCDBManager.h"
-#include "EventFiltering/ZorroHelper.h"
-#include "CommonConstants/LHCConstants.h"
+#include <array>
+#include <cmath>
+#include <fstream>
+#include <iostream>
+#include <map>
+#include <string>
+#include <vector>
 
 constexpr uint32_t chunkSize = 1000000;
 
diff --git a/.conflict-side-0/EventFiltering/selectBCRange.cxx b/.conflict-side-0/EventFiltering/selectBCRange.cxx
index 8a2d200e8e6..99261d38b4a 100644
--- a/.conflict-side-0/EventFiltering/selectBCRange.cxx
+++ b/.conflict-side-0/EventFiltering/selectBCRange.cxx
@@ -9,16 +9,17 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
+#include "filterTables.h"
+
 #include "Common/DataModel/EventSelection.h"
+
 #include "CommonConstants/LHCConstants.h"
-#include "CommonDataFormat/InteractionRecord.h"
 #include "CommonDataFormat/IRFrame.h"
+#include "CommonDataFormat/InteractionRecord.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/Logger.h"
 #include "Framework/runDataProcessing.h"
 
-#include "filterTables.h"
-
 using namespace o2;
 using namespace o2::framework;
 using o2::dataformats::IRFrame;
diff --git a/.conflict-side-0/PWGCF/Core/AnalysisConfigurableCuts.h b/.conflict-side-0/PWGCF/Core/AnalysisConfigurableCuts.h
index 886d78c95fe..65288471902 100644
--- a/.conflict-side-0/PWGCF/Core/AnalysisConfigurableCuts.h
+++ b/.conflict-side-0/PWGCF/Core/AnalysisConfigurableCuts.h
@@ -11,12 +11,14 @@
 #ifndef PWGCF_CORE_ANALYSISCONFIGURABLECUTS_H_
 #define PWGCF_CORE_ANALYSISCONFIGURABLECUTS_H_
 
+#include <TMath.h>
+#include <TNamed.h>
+#include <TObject.h>
+
+#include <Rtypes.h>
+
 #include <string>
 #include <vector>
-#include <Rtypes.h>
-#include <TObject.h>
-#include <TNamed.h>
-#include <TMath.h>
 
 namespace o2
 {
diff --git a/.conflict-side-0/PWGCF/Core/CorrelationContainer.cxx b/.conflict-side-0/PWGCF/Core/CorrelationContainer.cxx
index 1421288bd18..9ef399d2acb 100644
--- a/.conflict-side-0/PWGCF/Core/CorrelationContainer.cxx
+++ b/.conflict-side-0/PWGCF/Core/CorrelationContainer.cxx
@@ -15,20 +15,22 @@
 // Author: Jan Fiete Grosse-Oetringhaus
 
 #include "PWGCF/Core/CorrelationContainer.h"
-#include "Framework/StepTHn.h"
+
+#include "CommonConstants/MathConstants.h"
+#include "Framework/HistogramSpec.h"
 #include "Framework/Logger.h"
-#include "THnSparse.h"
-#include "TMath.h"
-#include "TList.h"
+#include "Framework/StepTHn.h"
+
+#include "TCanvas.h"
 #include "TCollection.h"
+#include "TF1.h"
 #include "TH1D.h"
 #include "TH2D.h"
 #include "TH3D.h"
-#include "TCanvas.h"
-#include "TF1.h"
 #include "THn.h"
-#include "Framework/HistogramSpec.h"
-#include "CommonConstants/MathConstants.h"
+#include "THnSparse.h"
+#include "TList.h"
+#include "TMath.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGCF/Core/CorrelationContainer.h b/.conflict-side-0/PWGCF/Core/CorrelationContainer.h
index b037b7d7ad4..7d30c042de0 100644
--- a/.conflict-side-0/PWGCF/Core/CorrelationContainer.h
+++ b/.conflict-side-0/PWGCF/Core/CorrelationContainer.h
@@ -14,9 +14,10 @@
 
 // encapsulate histogram and corrections for correlation analysis
 
+#include "Framework/HistogramSpec.h"
+
 #include "TNamed.h"
 #include "TString.h"
-#include "Framework/HistogramSpec.h"
 
 class TH1;
 class TH1F;
diff --git a/.conflict-side-0/PWGCF/Core/PairCuts.h b/.conflict-side-0/PWGCF/Core/PairCuts.h
index b90094f30e2..a65647f1d65 100644
--- a/.conflict-side-0/PWGCF/Core/PairCuts.h
+++ b/.conflict-side-0/PWGCF/Core/PairCuts.h
@@ -12,11 +12,11 @@
 #ifndef O2_ANALYSIS_PAIRCUTS_H
 #define O2_ANALYSIS_PAIRCUTS_H
 
-#include <cmath>
-
-#include "Framework/Logger.h"
-#include "Framework/HistogramRegistry.h"
 #include "CommonConstants/MathConstants.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/Logger.h"
+
+#include <cmath>
 
 // Functions which cut on particle pairs (decays, conversions, two-track cuts)
 //
@@ -147,7 +147,7 @@ bool PairCuts::twoTrackCut(T const& track1, T const& track2, int magField)
       }
 
       if (dphistarminabs < mTwoTrackDistance && std::fabs(deta) < mTwoTrackDistance) {
-        //LOGF(debug, "Removed track pair %ld %ld with %f %f %f %f %d %f %f %d %d", track1.index(), track2.index(), deta, dphistarminabs, track1.phi2(), track1.pt(), track1.sign(), track2.phi2(), track2.pt(), track2.sign(), magField);
+        // LOGF(debug, "Removed track pair %ld %ld with %f %f %f %f %d %f %f %d %d", track1.index(), track2.index(), deta, dphistarminabs, track1.phi2(), track1.pt(), track1.sign(), track2.phi2(), track2.pt(), track2.sign(), magField);
         return true;
       }
 
@@ -163,7 +163,7 @@ bool PairCuts::twoTrackCut(T const& track1, T const& track2, int magField)
 template <typename T>
 bool PairCuts::conversionCut(T const& track1, T const& track2, Particle conv, double cut)
 {
-  //LOGF(info, "pt is %f %f", track1.pt(), track2.pt());
+  // LOGF(info, "pt is %f %f", track1.pt(), track2.pt());
 
   if (cut < 0) {
     return false;
@@ -304,7 +304,7 @@ double PairCuts::getInvMassSquaredFast(T const& track1, double m0_1, T const& tr
 
   double mass2 = m0_1 * m0_1 + m0_2 * m0_2 + 2.0f * (std::sqrt(e1squ * e2squ) - (pt1 * pt2 * (cosDeltaPhi + 1.0f / tantheta1 / tantheta2)));
 
-  //LOGF(debug, "%f %f %f %f %f %f %f %f %f", pt1, eta1, phi1, pt2, eta2, phi2, m0_1, m0_2, mass2);
+  // LOGF(debug, "%f %f %f %f %f %f %f %f %f", pt1, eta1, phi1, pt2, eta2, phi2, m0_1, m0_2, mass2);
 
   return mass2;
 }
diff --git a/.conflict-side-0/PWGCF/DataModel/FemtoDerived.h b/.conflict-side-0/PWGCF/DataModel/FemtoDerived.h
index 4caf0166303..7e916d543ff 100644
--- a/.conflict-side-0/PWGCF/DataModel/FemtoDerived.h
+++ b/.conflict-side-0/PWGCF/DataModel/FemtoDerived.h
@@ -12,18 +12,21 @@
 #ifndef PWGCF_DATAMODEL_FEMTODERIVED_H_
 #define PWGCF_DATAMODEL_FEMTODERIVED_H_
 
-#include <cmath>
-#include "Framework/ASoA.h"
-#include "MathUtils/Utils.h"
-#include "Framework/DataTypes.h"
 #include "PWGHF/Core/HfHelper.h"
 #include "PWGHF/DataModel/CandidateReconstructionTables.h"
 #include "PWGHF/DataModel/CandidateSelectionTables.h"
+
 #include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoA.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/DataTypes.h"
 #include "Framework/Expressions.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
+#include "MathUtils/Utils.h"
+
+#include <cmath>
 
 namespace o2::aod
 {
diff --git a/.conflict-side-0/PWGCF/DataModel/SPTableZDC.h b/.conflict-side-0/PWGCF/DataModel/SPTableZDC.h
index fcafff23c90..19896dd0c32 100644
--- a/.conflict-side-0/PWGCF/DataModel/SPTableZDC.h
+++ b/.conflict-side-0/PWGCF/DataModel/SPTableZDC.h
@@ -14,13 +14,14 @@
 #ifndef PWGCF_DATAMODEL_SPTABLEZDC_H_
 #define PWGCF_DATAMODEL_SPTABLEZDC_H_
 
-#include <cmath>
-
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/Core/RecoDecay.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/AnalysisDataModel.h"
 
+#include <cmath>
+
 namespace o2::aod
 {
 namespace sptablezdc
diff --git a/.conflict-side-0/PWGCF/EbyEFluctuations/Tasks/Diff_pT_fluct_PID.cxx b/.conflict-side-0/PWGCF/EbyEFluctuations/Tasks/Diff_pT_fluct_PID.cxx
index 5710ab1e864..16afcb3219e 100644
--- a/.conflict-side-0/PWGCF/EbyEFluctuations/Tasks/Diff_pT_fluct_PID.cxx
+++ b/.conflict-side-0/PWGCF/EbyEFluctuations/Tasks/Diff_pT_fluct_PID.cxx
@@ -13,37 +13,37 @@
 ///           v0(pT) along with its statistical uncertainity using subsampling technique.
 /// \author Anna Binoy (anna.binoy@niser.ac.in)
 
-#include <CCDB/BasicCCDBManager.h>
-#include <algorithm>
-#include <numeric>
-#include <cmath>
-#include <vector>
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/HistogramSpec.h"
+#include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StaticFor.h"
-
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
+#include "Framework/runDataProcessing.h"
+#include <CCDB/BasicCCDBManager.h>
 
 #include "TDatabasePDG.h"
-#include "TLorentzVector.h"
+#include "TF1.h"
+#include "TH1D.h"
+#include "TH2D.h"
 #include "TList.h"
+#include "TLorentzVector.h"
+#include "TMath.h"
 #include "TProfile.h"
 #include "TProfile2D.h"
-#include "TH2D.h"
-#include "TH1D.h"
 #include "TRandom3.h"
-#include "TMath.h"
-#include "TF1.h"
+
+#include <algorithm>
+#include <cmath>
+#include <numeric>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGCF/EbyEFluctuations/Tasks/FactorialMomentsTask.cxx b/.conflict-side-0/PWGCF/EbyEFluctuations/Tasks/FactorialMomentsTask.cxx
index c76556ec26f..4c905ede9ed 100644
--- a/.conflict-side-0/PWGCF/EbyEFluctuations/Tasks/FactorialMomentsTask.cxx
+++ b/.conflict-side-0/PWGCF/EbyEFluctuations/Tasks/FactorialMomentsTask.cxx
@@ -13,22 +13,24 @@
 /// \author Salman Malik
 /// \author Balwan Singh
 
-#include <iostream>
-#include <array>
-#include <TH1F.h>
 #include "TRandom.h"
+#include <TH1F.h>
+
+#include <array>
+#include <iostream>
 // O2 includes
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "ReconstructionDataFormats/GlobalTrackID.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "Framework/ASoAHelpers.h"
 using std::array;
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGCF/EbyEFluctuations/Tasks/NetProtonCumulants.cxx b/.conflict-side-0/PWGCF/EbyEFluctuations/Tasks/NetProtonCumulants.cxx
index a18b0b97df9..79ea94ab5ad 100644
--- a/.conflict-side-0/PWGCF/EbyEFluctuations/Tasks/NetProtonCumulants.cxx
+++ b/.conflict-side-0/PWGCF/EbyEFluctuations/Tasks/NetProtonCumulants.cxx
@@ -9,26 +9,27 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <CCDB/BasicCCDBManager.h>
-#include <cmath>
-#include <vector>
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/HistogramRegistry.h"
-
-#include "Common/DataModel/EventSelection.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include <CCDB/BasicCCDBManager.h>
 
 #include "TList.h"
+#include "TMath.h"
 #include "TProfile.h"
 #include "TProfile2D.h"
 #include "TRandom3.h"
-#include "TMath.h"
+
+#include <cmath>
+#include <vector>
 
 namespace o2::aod
 {
diff --git a/.conflict-side-0/PWGCF/EbyEFluctuations/Tasks/RobustFluctuationObservables.cxx b/.conflict-side-0/PWGCF/EbyEFluctuations/Tasks/RobustFluctuationObservables.cxx
index f4d50ac9c7a..2db80cf4351 100644
--- a/.conflict-side-0/PWGCF/EbyEFluctuations/Tasks/RobustFluctuationObservables.cxx
+++ b/.conflict-side-0/PWGCF/EbyEFluctuations/Tasks/RobustFluctuationObservables.cxx
@@ -12,35 +12,34 @@
 /// \brief This task is a QA task to accumulate basic event- and track-level plots.
 /// \author Igor Altsybeev, Igor.Altsybeev@cern.ch
 
-#include <iostream>
-#include <string>
-#include <memory>
-#include <vector>
-#include <map>
-
-#include "TF1.h"
-#include "TGraphErrors.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
+#include "Common/CCDB/EventSelectionParams.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/FT0Corrected.h"
 #include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/CCDB/EventSelectionParams.h"
 
 #include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPObject.h"
+#include "DataFormatsFT0/Digit.h"
 #include "DataFormatsParameters/GRPECSObject.h"
 #include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
-#include "Common/DataModel/FT0Corrected.h"
-#include "DataFormatsFT0/Digit.h"
+#include "TF1.h"
+#include "TGraphErrors.h"
 
-#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include <iostream>
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
 
 using namespace std;
 using namespace o2;
@@ -2293,8 +2292,8 @@ struct RobustFluctuationObservables {
         }
 
       } // end of v0 loop
-    }   // end of if (flagIncludeQAHistK0S)
-  }     // end of processRobustFluctuationObservables()
+    } // end of if (flagIncludeQAHistK0S)
+  } // end of processRobustFluctuationObservables()
 
   // shortcut function to fill 2D histograms
   void fillHistForThisCut(string cutName, int multNTracksPV, int multTrk, int nTracksGlobalAccepted, double multT0A, double multT0C, double multV0A, double /*t0cCentr*/, int bc)
diff --git a/.conflict-side-0/PWGCF/EbyEFluctuations/Tasks/antiprotonCumulantsMc.cxx b/.conflict-side-0/PWGCF/EbyEFluctuations/Tasks/antiprotonCumulantsMc.cxx
index f0398450cae..3da35749d11 100644
--- a/.conflict-side-0/PWGCF/EbyEFluctuations/Tasks/antiprotonCumulantsMc.cxx
+++ b/.conflict-side-0/PWGCF/EbyEFluctuations/Tasks/antiprotonCumulantsMc.cxx
@@ -13,48 +13,49 @@
 /// \brief Task for analyzing efficiency of proton, and net-proton distributions in MC reconstructed and generated, and calculating net-proton cumulants
 /// \author Swati Saha
 
-#include <CCDB/BasicCCDBManager.h>
-#include <cstdlib>
-#include <cmath>
-#include <array>
-#include <vector>
-#include <string>
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/StepTHn.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/PIDResponseITS.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CommonConstants/PhysicsConstants.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "DataFormatsParameters/GRPObject.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include <TList.h>
-#include <TProfile.h>
-#include <TProfile2D.h>
-#include <TRandom3.h>
-#include <TMath.h>
-#include <TH1F.h>
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+#include <CCDB/BasicCCDBManager.h>
+
 #include <TDirectory.h>
+#include <TF1.h>
+#include <TFile.h>
+#include <TH1F.h>
+#include <TH2F.h>
 #include <THn.h>
+#include <TList.h>
 #include <TLorentzVector.h>
 #include <TMath.h>
 #include <TObjArray.h>
-#include <TFile.h>
-#include <TH2F.h>
-#include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <TF1.h>
+#include <TProfile.h>
+#include <TProfile2D.h>
+#include <TRandom3.h>
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGCF/EbyEFluctuations/Tasks/kaonIsospinFluctuations.cxx b/.conflict-side-0/PWGCF/EbyEFluctuations/Tasks/kaonIsospinFluctuations.cxx
index 4170d078843..7284bbc329b 100644
--- a/.conflict-side-0/PWGCF/EbyEFluctuations/Tasks/kaonIsospinFluctuations.cxx
+++ b/.conflict-side-0/PWGCF/EbyEFluctuations/Tasks/kaonIsospinFluctuations.cxx
@@ -14,22 +14,21 @@
 ///
 /// \author Rahul Verma (rahul.verma@iitb.ac.in) :: Sadhana Dash (sadhana@phy.iitb.ac.in)
 
-#include <algorithm>
-#include <vector>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/O2DatabasePDGPlugin.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/DataModel/mcCentrality.h"
 
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 
-#include "PWGLF/DataModel/mcCentrality.h"
+#include <algorithm>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGCF/EbyEFluctuations/Tasks/meanPtFlucId.cxx b/.conflict-side-0/PWGCF/EbyEFluctuations/Tasks/meanPtFlucId.cxx
index d6eca57ad0e..e010e737227 100644
--- a/.conflict-side-0/PWGCF/EbyEFluctuations/Tasks/meanPtFlucId.cxx
+++ b/.conflict-side-0/PWGCF/EbyEFluctuations/Tasks/meanPtFlucId.cxx
@@ -16,26 +16,27 @@
 ///
 /// \author Tanu Gahlaut <tanu.gahlaut@cern.ch>
 
-#include <utility>
-#include <vector>
-#include <string>
-#include <TPDGCode.h>
+#include "Common/Core/RecoDecay.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "CCDB/BasicCCDBManager.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/HistogramSpec.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/Core/RecoDecay.h"
-#include "CCDB/BasicCCDBManager.h"
+#include <TPDGCode.h>
+
+#include <string>
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGCF/EbyEFluctuations/Tasks/nchCumulantsId.cxx b/.conflict-side-0/PWGCF/EbyEFluctuations/Tasks/nchCumulantsId.cxx
index 2d4ba400285..acd5185be1b 100644
--- a/.conflict-side-0/PWGCF/EbyEFluctuations/Tasks/nchCumulantsId.cxx
+++ b/.conflict-side-0/PWGCF/EbyEFluctuations/Tasks/nchCumulantsId.cxx
@@ -13,8 +13,11 @@
 /// \brief Event by Event conserved charges fluctuations
 /// \author Pravata Panigrahi <pravata.panigrahi@cern.ch> :: Sadhana Dash(sadhana@phy.iitb.ac.in)
 
-#include <algorithm>
-#include <vector>
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
@@ -24,11 +27,8 @@
 #include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/runDataProcessing.h"
 
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include <algorithm>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGCF/EbyEFluctuations/Tasks/netprotonCumulantsMc.cxx b/.conflict-side-0/PWGCF/EbyEFluctuations/Tasks/netprotonCumulantsMc.cxx
index 36a797a17a9..62318743462 100644
--- a/.conflict-side-0/PWGCF/EbyEFluctuations/Tasks/netprotonCumulantsMc.cxx
+++ b/.conflict-side-0/PWGCF/EbyEFluctuations/Tasks/netprotonCumulantsMc.cxx
@@ -13,48 +13,49 @@
 /// \brief Task for analyzing efficiency of proton, and net-proton distributions in MC reconstructed and generated, and calculating net-proton cumulants
 /// \author Swati Saha
 
-#include <CCDB/BasicCCDBManager.h>
-#include <cstdlib>
-#include <cmath>
-#include <array>
-#include <vector>
-#include <string>
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/StepTHn.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/PIDResponseITS.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CommonConstants/PhysicsConstants.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "DataFormatsParameters/GRPObject.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include <TList.h>
-#include <TProfile.h>
-#include <TProfile2D.h>
-#include <TRandom3.h>
-#include <TMath.h>
-#include <TH1F.h>
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+#include <CCDB/BasicCCDBManager.h>
+
 #include <TDirectory.h>
+#include <TF1.h>
+#include <TFile.h>
+#include <TH1F.h>
+#include <TH2F.h>
 #include <THn.h>
+#include <TList.h>
 #include <TLorentzVector.h>
 #include <TMath.h>
 #include <TObjArray.h>
-#include <TFile.h>
-#include <TH2F.h>
-#include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <TF1.h>
+#include <TProfile.h>
+#include <TProfile2D.h>
+#include <TRandom3.h>
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGCF/Femto/DataModel/PionDeuteronTables.h b/.conflict-side-0/PWGCF/Femto/DataModel/PionDeuteronTables.h
index 89754a8cc97..89fc4cdfa8f 100644
--- a/.conflict-side-0/PWGCF/Femto/DataModel/PionDeuteronTables.h
+++ b/.conflict-side-0/PWGCF/Femto/DataModel/PionDeuteronTables.h
@@ -15,8 +15,8 @@
 /// \author CMY
 /// \date 2025-04-10
 
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
 
 #ifndef PWGCF_FEMTO_DATAMODEL_PIONDEUTERONTABLES_H_
 #define PWGCF_FEMTO_DATAMODEL_PIONDEUTERONTABLES_H_
diff --git a/.conflict-side-0/PWGCF/Femto3D/Core/femto3dPairTask.h b/.conflict-side-0/PWGCF/Femto3D/Core/femto3dPairTask.h
index db5949f4ae0..12638089841 100755
--- a/.conflict-side-0/PWGCF/Femto3D/Core/femto3dPairTask.h
+++ b/.conflict-side-0/PWGCF/Femto3D/Core/femto3dPairTask.h
@@ -24,14 +24,15 @@
 // #include "Framework/Logger.h"
 // #include "Common/DataModel/Multiplicity.h"
 
-#include <vector>
-#include <memory>
+#include "CommonConstants/MathConstants.h"
+#include "CommonConstants/PhysicsConstants.h"
+
+#include "TDatabasePDG.h"
 #include "TLorentzVector.h"
 #include "TVector3.h"
-#include "TDatabasePDG.h"
 
-#include "CommonConstants/PhysicsConstants.h"
-#include "CommonConstants/MathConstants.h"
+#include <memory>
+#include <vector>
 
 double particle_mass(const int PDGcode)
 {
diff --git a/.conflict-side-0/PWGCF/Femto3D/DataModel/PIDutils.h b/.conflict-side-0/PWGCF/Femto3D/DataModel/PIDutils.h
index 9e28f7b5863..2c2eda3e2ce 100644
--- a/.conflict-side-0/PWGCF/Femto3D/DataModel/PIDutils.h
+++ b/.conflict-side-0/PWGCF/Femto3D/DataModel/PIDutils.h
@@ -19,10 +19,11 @@
 #ifndef PWGCF_FEMTO3D_DATAMODEL_PIDUTILS_H_
 #define PWGCF_FEMTO3D_DATAMODEL_PIDUTILS_H_
 
+#include "Common/DataModel/PIDResponse.h"
+
 #include <type_traits>
 #include <utility>
 #include <vector>
-#include "Common/DataModel/PIDResponse.h"
 
 namespace o2::aod::singletrackselector
 {
diff --git a/.conflict-side-0/PWGCF/Femto3D/DataModel/singletrackselector.h b/.conflict-side-0/PWGCF/Femto3D/DataModel/singletrackselector.h
index c7323d15a32..2156db8bf2e 100644
--- a/.conflict-side-0/PWGCF/Femto3D/DataModel/singletrackselector.h
+++ b/.conflict-side-0/PWGCF/Femto3D/DataModel/singletrackselector.h
@@ -17,16 +17,18 @@
 #define PWGCF_FEMTO3D_DATAMODEL_SINGLETRACKSELECTOR_H_
 
 // #include <experimental/type_traits>
-#include <utility>
-#include <vector>
+#include "PWGCF/Femto3D/DataModel/PIDutils.h"
 
-#include "Framework/ASoA.h"
-#include "Framework/AnalysisDataModel.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/PIDResponseITS.h"
+
+#include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
 #include "Framework/Logger.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "PWGCF/Femto3D/DataModel/PIDutils.h"
+
+#include <utility>
+#include <vector>
 
 namespace o2::aod
 {
diff --git a/.conflict-side-0/PWGCF/Femto3D/TableProducer/Converters/singleTrackSelectorConverter.cxx b/.conflict-side-0/PWGCF/Femto3D/TableProducer/Converters/singleTrackSelectorConverter.cxx
index 4a44e331e9b..5ca57c11369 100644
--- a/.conflict-side-0/PWGCF/Femto3D/TableProducer/Converters/singleTrackSelectorConverter.cxx
+++ b/.conflict-side-0/PWGCF/Femto3D/TableProducer/Converters/singleTrackSelectorConverter.cxx
@@ -13,11 +13,13 @@
 /// \author Sofia Tomassini, Gleb Romanenko, Nicolò Jacazio
 /// \since 03 May 2024
 
-#include <fairlogger/Logger.h>
 #include "PWGCF/Femto3D/DataModel/singletrackselector.h"
+
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
 
+#include <fairlogger/Logger.h>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-0/PWGCF/Femto3D/TableProducer/Converters/singleTrackSelectorConverterV1.cxx b/.conflict-side-0/PWGCF/Femto3D/TableProducer/Converters/singleTrackSelectorConverterV1.cxx
index 584760ce74a..a664b83e39d 100644
--- a/.conflict-side-0/PWGCF/Femto3D/TableProducer/Converters/singleTrackSelectorConverterV1.cxx
+++ b/.conflict-side-0/PWGCF/Femto3D/TableProducer/Converters/singleTrackSelectorConverterV1.cxx
@@ -13,11 +13,13 @@
 /// \author Sofia Tomassini, Gleb Romanenko, Nicolò Jacazio
 /// \since 03 May 2024
 
-#include <fairlogger/Logger.h>
 #include "PWGCF/Femto3D/DataModel/singletrackselector.h"
+
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
 
+#include <fairlogger/Logger.h>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-0/PWGCF/Femto3D/TableProducer/singleTrackSelector.cxx b/.conflict-side-0/PWGCF/Femto3D/TableProducer/singleTrackSelector.cxx
index 729538a1470..188aedb2077 100644
--- a/.conflict-side-0/PWGCF/Femto3D/TableProducer/singleTrackSelector.cxx
+++ b/.conflict-side-0/PWGCF/Femto3D/TableProducer/singleTrackSelector.cxx
@@ -13,32 +13,31 @@
 /// \author Sofia Tomassini, Gleb Romanenko, Nicolò Jacazio
 /// \since 31 May 2023
 
-#include <fairlogger/Logger.h>
-#include <Framework/AnalysisDataModel.h>
-
-#include <vector>
-#include <string>
-#include <utility>
+#include "PWGCF/Femto3D/DataModel/singletrackselector.h"
 
+#include "Common/CCDB/ctpRateFetcher.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/PIDResponseITS.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 #include "EventFiltering/Zorro.h"
 #include "EventFiltering/ZorroSummary.h"
 
-#include "PWGCF/Femto3D/DataModel/singletrackselector.h"
-
+#include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/Propagator.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/PIDResponseITS.h"
-#include "Common/CCDB/ctpRateFetcher.h"
+#include <Framework/AnalysisDataModel.h>
 
-#include "DetectorsBase/Propagator.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
+#include <fairlogger/Logger.h>
+
+#include <string>
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGCF/Femto3D/TableProducer/singleTrackSelectorExtra.cxx b/.conflict-side-0/PWGCF/Femto3D/TableProducer/singleTrackSelectorExtra.cxx
index 0f065371ca8..6387eb2b450 100644
--- a/.conflict-side-0/PWGCF/Femto3D/TableProducer/singleTrackSelectorExtra.cxx
+++ b/.conflict-side-0/PWGCF/Femto3D/TableProducer/singleTrackSelectorExtra.cxx
@@ -15,13 +15,13 @@
 
 // this task produces a dummy "SingleCollExtras" table that is now required in the analysis tasks. Needed to have a compatibility with old der. data
 
-#include <fairlogger/Logger.h>
-#include <Framework/AnalysisDataModel.h>
-
 #include "PWGCF/Femto3D/DataModel/singletrackselector.h"
 
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
+#include <Framework/AnalysisDataModel.h>
+
+#include <fairlogger/Logger.h>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGCF/Femto3D/TableProducer/singleTrackSelectorPIDMaker.cxx b/.conflict-side-0/PWGCF/Femto3D/TableProducer/singleTrackSelectorPIDMaker.cxx
index ebdc786469b..3bb5e025d7d 100644
--- a/.conflict-side-0/PWGCF/Femto3D/TableProducer/singleTrackSelectorPIDMaker.cxx
+++ b/.conflict-side-0/PWGCF/Femto3D/TableProducer/singleTrackSelectorPIDMaker.cxx
@@ -14,17 +14,17 @@
 /// \author Sofia Tomassini, Gleb Romanenko, Nicolò Jacazio
 /// \since 22 January 2025
 
-#include <fairlogger/Logger.h>
-#include <Framework/AnalysisDataModel.h>
-
-#include <vector>
-#include <string>
-#include <unordered_map>
-
 #include "PWGCF/Femto3D/DataModel/singletrackselector.h"
 
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
+#include <Framework/AnalysisDataModel.h>
+
+#include <fairlogger/Logger.h>
+
+#include <string>
+#include <unordered_map>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGCF/Femto3D/Tasks/femto3dPairTask.cxx b/.conflict-side-0/PWGCF/Femto3D/Tasks/femto3dPairTask.cxx
index 83aa740795c..bf02d11da69 100644
--- a/.conflict-side-0/PWGCF/Femto3D/Tasks/femto3dPairTask.cxx
+++ b/.conflict-side-0/PWGCF/Femto3D/Tasks/femto3dPairTask.cxx
@@ -13,31 +13,34 @@
 /// \author Sofia Tomassini, Gleb Romanenko, Nicolò Jacazio
 /// \since 31 May 2023
 
-#include <ctime>
-#include <algorithm> // std::random_shuffle
-#include <random>
-#include <chrono>
-#include <vector>
-#include <map>
-#include <memory>
-#include <utility>
-#include <TParameter.h>
-#include <TH1F.h>
-
 #include "PWGCF/Femto3D/Core/femto3dPairTask.h"
+
 #include "PWGCF/Femto3D/DataModel/singletrackselector.h"
-#include "TLorentzVector.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
+#include "Common/DataModel/Multiplicity.h"
+
 #include "Framework/ASoA.h"
-#include "Framework/DataTypes.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/DataTypes.h"
 #include "Framework/Expressions.h"
+#include "Framework/HistogramRegistry.h"
 #include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
 #include "MathUtils/Utils.h"
-#include "Common/DataModel/Multiplicity.h"
+
+#include "TLorentzVector.h"
+#include <TH1F.h>
+#include <TParameter.h>
+
+#include <algorithm> // std::random_shuffle
+#include <chrono>
+#include <ctime>
+#include <map>
+#include <memory>
+#include <random>
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::soa;
diff --git a/.conflict-side-0/PWGCF/Femto3D/Tasks/femto3dPairTaskMC.cxx b/.conflict-side-0/PWGCF/Femto3D/Tasks/femto3dPairTaskMC.cxx
index b776d34e629..ecf9e90392d 100644
--- a/.conflict-side-0/PWGCF/Femto3D/Tasks/femto3dPairTaskMC.cxx
+++ b/.conflict-side-0/PWGCF/Femto3D/Tasks/femto3dPairTaskMC.cxx
@@ -13,27 +13,29 @@
 /// \author Sofia Tomassini, Gleb Romanenko, Nicolò Jacazio
 /// \since 31 May 2023
 
-#include <vector>
-#include <map>
-#include <memory>
-#include <utility>
-#include <TParameter.h>
-#include <TH1F.h>
-
 #include "PWGCF/Femto3D/Core/femto3dPairTask.h"
 #include "PWGCF/Femto3D/DataModel/singletrackselector.h"
-#include "TLorentzVector.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
+#include "Common/DataModel/Multiplicity.h"
+
 #include "Framework/ASoA.h"
-#include "Framework/DataTypes.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/DataTypes.h"
 #include "Framework/Expressions.h"
+#include "Framework/HistogramRegistry.h"
 #include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
 #include "MathUtils/Utils.h"
-#include "Common/DataModel/Multiplicity.h"
+
+#include "TLorentzVector.h"
+#include <TH1F.h>
+#include <TParameter.h>
+
+#include <map>
+#include <memory>
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::soa;
diff --git a/.conflict-side-0/PWGCF/Femto3D/Tasks/femto3dQA.cxx b/.conflict-side-0/PWGCF/Femto3D/Tasks/femto3dQA.cxx
index 64858324b48..dacc092da86 100644
--- a/.conflict-side-0/PWGCF/Femto3D/Tasks/femto3dQA.cxx
+++ b/.conflict-side-0/PWGCF/Femto3D/Tasks/femto3dQA.cxx
@@ -13,26 +13,27 @@
 /// \author Sofia Tomassini, Gleb Romanenko, Nicolò Jacazio
 /// \since 31 May 2023
 
-#include <vector>
-#include <memory>
-#include <utility>
+#include "PWGCF/Femto3D/Core/femto3dPairTask.h"
+#include "PWGCF/Femto3D/DataModel/singletrackselector.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include <TParameter.h>
-#include <TH1F.h>
+#include "Common/DataModel/Multiplicity.h"
 
 #include "Framework/ASoA.h"
-#include "MathUtils/Utils.h"
-#include "Framework/DataTypes.h"
-#include "Common/DataModel/Multiplicity.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/DataTypes.h"
 #include "Framework/Expressions.h"
-
+#include "Framework/HistogramRegistry.h"
 #include "Framework/StaticFor.h"
-#include "PWGCF/Femto3D/DataModel/singletrackselector.h"
-#include "PWGCF/Femto3D/Core/femto3dPairTask.h"
+#include "Framework/runDataProcessing.h"
+#include "MathUtils/Utils.h"
+
+#include <TH1F.h>
+#include <TParameter.h>
+
+#include <memory>
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::soa;
diff --git a/.conflict-side-0/PWGCF/Femto3D/Tools/checkPacking.cxx b/.conflict-side-0/PWGCF/Femto3D/Tools/checkPacking.cxx
index 51d26443200..e71c73ac2cb 100644
--- a/.conflict-side-0/PWGCF/Femto3D/Tools/checkPacking.cxx
+++ b/.conflict-side-0/PWGCF/Femto3D/Tools/checkPacking.cxx
@@ -17,8 +17,9 @@
 ///
 
 #include "PWGCF/Femto3D/DataModel/singletrackselector.h"
-#include "TH1F.h"
+
 #include "TCanvas.h"
+#include "TH1F.h"
 #include "TRandom.h"
 
 using namespace o2;
diff --git a/.conflict-side-0/PWGCF/FemtoDream/Core/femtoDreamCascadeSelection.h b/.conflict-side-0/PWGCF/FemtoDream/Core/femtoDreamCascadeSelection.h
index 2a07c851d09..a861036d640 100644
--- a/.conflict-side-0/PWGCF/FemtoDream/Core/femtoDreamCascadeSelection.h
+++ b/.conflict-side-0/PWGCF/FemtoDream/Core/femtoDreamCascadeSelection.h
@@ -22,20 +22,21 @@
 #ifndef PWGCF_FEMTODREAM_CORE_FEMTODREAMCASCADESELECTION_H_
 #define PWGCF_FEMTODREAM_CORE_FEMTODREAMCASCADESELECTION_H_
 
-#include <iostream>
-#include <string>
-#include <vector>
-
-#include <TDatabasePDG.h> // FIXME
-
 #include "PWGCF/FemtoDream/Core/femtoDreamObjectSelection.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamSelection.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamTrackSelection.h"
 
 #include "Common/Core/RecoDecay.h"
+
 #include "Framework/HistogramRegistry.h"
 #include "ReconstructionDataFormats/PID.h"
 
+#include <TDatabasePDG.h> // FIXME
+
+#include <iostream>
+#include <string>
+#include <vector>
+
 using namespace o2::framework;
 
 namespace o2::analysis::femtoDream
diff --git a/.conflict-side-0/PWGCF/FemtoDream/Core/femtoDreamCollisionSelection.h b/.conflict-side-0/PWGCF/FemtoDream/Core/femtoDreamCollisionSelection.h
index 8fe58ce9d7b..b0b56eaf92b 100644
--- a/.conflict-side-0/PWGCF/FemtoDream/Core/femtoDreamCollisionSelection.h
+++ b/.conflict-side-0/PWGCF/FemtoDream/Core/femtoDreamCollisionSelection.h
@@ -16,13 +16,15 @@
 #ifndef PWGCF_FEMTODREAM_CORE_FEMTODREAMCOLLISIONSELECTION_H_
 #define PWGCF_FEMTODREAM_CORE_FEMTODREAMCOLLISIONSELECTION_H_
 
-#include <string>
-#include <iostream>
 #include "Common/CCDB/TriggerAliases.h"
 #include "Common/DataModel/EventSelection.h"
+
 #include "Framework/HistogramRegistry.h"
 #include "Framework/Logger.h"
 
+#include <iostream>
+#include <string>
+
 using namespace o2::framework;
 
 namespace o2::analysis::femtoDream
diff --git a/.conflict-side-0/PWGCF/FemtoDream/Core/femtoDreamContainer.h b/.conflict-side-0/PWGCF/FemtoDream/Core/femtoDreamContainer.h
index 5e0222a4f07..78a25e29c08 100644
--- a/.conflict-side-0/PWGCF/FemtoDream/Core/femtoDreamContainer.h
+++ b/.conflict-side-0/PWGCF/FemtoDream/Core/femtoDreamContainer.h
@@ -19,18 +19,20 @@
 #ifndef PWGCF_FEMTODREAM_CORE_FEMTODREAMCONTAINER_H_
 #define PWGCF_FEMTODREAM_CORE_FEMTODREAMCONTAINER_H_
 
-#include <fairlogger/Logger.h>
-#include <vector>
-#include <string>
-
-#include "Framework/HistogramRegistry.h"
+#include "PWGCF/DataModel/FemtoDerived.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamMath.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
-#include "PWGCF/DataModel/FemtoDerived.h"
+
+#include "Framework/HistogramRegistry.h"
 
 #include "Math/Vector4D.h"
 #include "TMath.h"
 
+#include <fairlogger/Logger.h>
+
+#include <string>
+#include <vector>
+
 using namespace o2::framework;
 
 namespace o2::analysis::femtoDream
diff --git a/.conflict-side-0/PWGCF/FemtoDream/Core/femtoDreamContainerThreeBody.h b/.conflict-side-0/PWGCF/FemtoDream/Core/femtoDreamContainerThreeBody.h
index a6c60793060..fdfc05252b0 100644
--- a/.conflict-side-0/PWGCF/FemtoDream/Core/femtoDreamContainerThreeBody.h
+++ b/.conflict-side-0/PWGCF/FemtoDream/Core/femtoDreamContainerThreeBody.h
@@ -20,16 +20,18 @@
 #ifndef PWGCF_FEMTODREAM_CORE_FEMTODREAMCONTAINERTHREEBODY_H_
 #define PWGCF_FEMTODREAM_CORE_FEMTODREAMCONTAINERTHREEBODY_H_
 
-#include <fairlogger/Logger.h>
-#include <vector>
-#include <string>
+#include "PWGCF/FemtoDream/Core/femtoDreamMath.h"
 
 #include "Framework/HistogramRegistry.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamMath.h"
 
 #include "Math/Vector4D.h"
-#include "TMath.h"
 #include "TDatabasePDG.h"
+#include "TMath.h"
+
+#include <fairlogger/Logger.h>
+
+#include <string>
+#include <vector>
 
 using namespace o2::framework;
 
diff --git a/.conflict-side-0/PWGCF/FemtoDream/Core/femtoDreamDetaDphiStar.h b/.conflict-side-0/PWGCF/FemtoDream/Core/femtoDreamDetaDphiStar.h
index 58dc6c9ded4..23f35a9af9c 100644
--- a/.conflict-side-0/PWGCF/FemtoDream/Core/femtoDreamDetaDphiStar.h
+++ b/.conflict-side-0/PWGCF/FemtoDream/Core/femtoDreamDetaDphiStar.h
@@ -16,11 +16,13 @@
 #ifndef PWGCF_FEMTODREAM_CORE_FEMTODREAMDETADPHISTAR_H_
 #define PWGCF_FEMTODREAM_CORE_FEMTODREAMDETADPHISTAR_H_
 
+#include "PWGCF/DataModel/FemtoDerived.h"
+
+#include "Framework/HistogramRegistry.h"
+
 #include <memory>
 #include <string>
 #include <vector>
-#include "PWGCF/DataModel/FemtoDerived.h"
-#include "Framework/HistogramRegistry.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGCF/FemtoDream/Core/femtoDreamEventHisto.h b/.conflict-side-0/PWGCF/FemtoDream/Core/femtoDreamEventHisto.h
index 2d668d15c58..23bbbccce64 100644
--- a/.conflict-side-0/PWGCF/FemtoDream/Core/femtoDreamEventHisto.h
+++ b/.conflict-side-0/PWGCF/FemtoDream/Core/femtoDreamEventHisto.h
@@ -17,6 +17,7 @@
 #define PWGCF_FEMTODREAM_CORE_FEMTODREAMEVENTHISTO_H_
 
 #include "PWGCF/DataModel/FemtoDerived.h"
+
 #include "Framework/HistogramRegistry.h"
 
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGCF/FemtoDream/Core/femtoDreamMath.h b/.conflict-side-0/PWGCF/FemtoDream/Core/femtoDreamMath.h
index aba07f96c9c..7a895486cc0 100644
--- a/.conflict-side-0/PWGCF/FemtoDream/Core/femtoDreamMath.h
+++ b/.conflict-side-0/PWGCF/FemtoDream/Core/femtoDreamMath.h
@@ -16,13 +16,13 @@
 #ifndef PWGCF_FEMTODREAM_CORE_FEMTODREAMMATH_H_
 #define PWGCF_FEMTODREAM_CORE_FEMTODREAMMATH_H_
 
-#include <iostream>
-
-#include "Math/Vector4D.h"
 #include "Math/Boost.h"
+#include "Math/Vector4D.h"
 #include "TLorentzVector.h"
 #include "TMath.h"
 
+#include <iostream>
+
 namespace o2::analysis::femtoDream
 {
 
diff --git a/.conflict-side-0/PWGCF/FemtoDream/Core/femtoDreamObjectSelection.h b/.conflict-side-0/PWGCF/FemtoDream/Core/femtoDreamObjectSelection.h
index d01ce564f66..b89c87a2037 100644
--- a/.conflict-side-0/PWGCF/FemtoDream/Core/femtoDreamObjectSelection.h
+++ b/.conflict-side-0/PWGCF/FemtoDream/Core/femtoDreamObjectSelection.h
@@ -16,15 +16,16 @@
 #ifndef PWGCF_FEMTODREAM_CORE_FEMTODREAMOBJECTSELECTION_H_
 #define PWGCF_FEMTODREAM_CORE_FEMTODREAMOBJECTSELECTION_H_
 
+#include "PWGCF/DataModel/FemtoDerived.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamSelection.h"
+
+#include "Framework/HistogramRegistry.h"
+#include "ReconstructionDataFormats/PID.h"
+
 #include <algorithm>
 #include <string>
 #include <vector>
 
-#include "PWGCF/FemtoDream/Core/femtoDreamSelection.h"
-#include "ReconstructionDataFormats/PID.h"
-#include "Framework/HistogramRegistry.h"
-#include "PWGCF/DataModel/FemtoDerived.h"
-
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-side-0/PWGCF/FemtoDream/Core/femtoDreamPairCleaner.h b/.conflict-side-0/PWGCF/FemtoDream/Core/femtoDreamPairCleaner.h
index 3b248657b1f..ca58aa4c18e 100644
--- a/.conflict-side-0/PWGCF/FemtoDream/Core/femtoDreamPairCleaner.h
+++ b/.conflict-side-0/PWGCF/FemtoDream/Core/femtoDreamPairCleaner.h
@@ -17,6 +17,7 @@
 #define PWGCF_FEMTODREAM_CORE_FEMTODREAMPAIRCLEANER_H_
 
 #include "PWGCF/DataModel/FemtoDerived.h"
+
 #include "Framework/HistogramRegistry.h"
 
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h b/.conflict-side-0/PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h
index 4148e8b3efc..3f771c48c1f 100644
--- a/.conflict-side-0/PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h
+++ b/.conflict-side-0/PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h
@@ -18,11 +18,14 @@
 #ifndef PWGCF_FEMTODREAM_CORE_FEMTODREAMPARTICLEHISTO_H_
 #define PWGCF_FEMTODREAM_CORE_FEMTODREAMPARTICLEHISTO_H_
 
-#include <TMath.h>
-#include <string>
 #include "PWGCF/DataModel/FemtoDerived.h"
-#include "Framework/HistogramRegistry.h"
+
 #include "CommonConstants/PhysicsConstants.h"
+#include "Framework/HistogramRegistry.h"
+
+#include <TMath.h>
+
+#include <string>
 
 using namespace o2::framework;
 
diff --git a/.conflict-side-0/PWGCF/FemtoDream/Core/femtoDreamSelection.h b/.conflict-side-0/PWGCF/FemtoDream/Core/femtoDreamSelection.h
index 0e3592bf650..d50d10e929c 100644
--- a/.conflict-side-0/PWGCF/FemtoDream/Core/femtoDreamSelection.h
+++ b/.conflict-side-0/PWGCF/FemtoDream/Core/femtoDreamSelection.h
@@ -16,10 +16,12 @@
 #ifndef PWGCF_FEMTODREAM_CORE_FEMTODREAMSELECTION_H_
 #define PWGCF_FEMTODREAM_CORE_FEMTODREAMSELECTION_H_
 
-#include <cmath>
-#include "Framework/HistogramRegistry.h"
 #include "PWGCF/DataModel/FemtoDerived.h"
 
+#include "Framework/HistogramRegistry.h"
+
+#include <cmath>
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-side-0/PWGCF/FemtoDream/Core/femtoDreamTrackSelection.h b/.conflict-side-0/PWGCF/FemtoDream/Core/femtoDreamTrackSelection.h
index 9cab0f9e78b..78cf91947eb 100644
--- a/.conflict-side-0/PWGCF/FemtoDream/Core/femtoDreamTrackSelection.h
+++ b/.conflict-side-0/PWGCF/FemtoDream/Core/femtoDreamTrackSelection.h
@@ -17,20 +17,22 @@
 #ifndef PWGCF_FEMTODREAM_CORE_FEMTODREAMTRACKSELECTION_H_
 #define PWGCF_FEMTODREAM_CORE_FEMTODREAMTRACKSELECTION_H_
 
-#include <string>
-#include <vector>
-#include <cmath>
-#include <iostream>
-
 #include "PWGCF/DataModel/FemtoDerived.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/PIDResponseITS.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamObjectSelection.h"
+
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamObjectSelection.h"
-#include "ReconstructionDataFormats/PID.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/PIDResponseITS.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/HistogramRegistry.h"
+#include "ReconstructionDataFormats/PID.h"
+
+#include <cmath>
+#include <iostream>
+#include <string>
+#include <vector>
 
 using namespace o2::framework;
 
diff --git a/.conflict-side-0/PWGCF/FemtoDream/Core/femtoDreamUtils.h b/.conflict-side-0/PWGCF/FemtoDream/Core/femtoDreamUtils.h
index c5db8dcc70e..b03de6e9f06 100644
--- a/.conflict-side-0/PWGCF/FemtoDream/Core/femtoDreamUtils.h
+++ b/.conflict-side-0/PWGCF/FemtoDream/Core/femtoDreamUtils.h
@@ -16,11 +16,13 @@
 #ifndef PWGCF_FEMTODREAM_CORE_FEMTODREAMUTILS_H_
 #define PWGCF_FEMTODREAM_CORE_FEMTODREAMUTILS_H_
 
-#include <vector>
-#include <string>
-#include "CommonConstants/PhysicsConstants.h"
 #include "PWGCF/DataModel/FemtoDerived.h"
 
+#include "CommonConstants/PhysicsConstants.h"
+
+#include <string>
+#include <vector>
+
 namespace o2::analysis::femtoDream
 {
 
diff --git a/.conflict-side-0/PWGCF/FemtoDream/Core/femtoDreamV0Selection.h b/.conflict-side-0/PWGCF/FemtoDream/Core/femtoDreamV0Selection.h
index 40158105a5b..fde9af93474 100644
--- a/.conflict-side-0/PWGCF/FemtoDream/Core/femtoDreamV0Selection.h
+++ b/.conflict-side-0/PWGCF/FemtoDream/Core/femtoDreamV0Selection.h
@@ -18,18 +18,19 @@
 #ifndef PWGCF_FEMTODREAM_CORE_FEMTODREAMV0SELECTION_H_
 #define PWGCF_FEMTODREAM_CORE_FEMTODREAMV0SELECTION_H_
 
-#include <iostream>
-#include <string>
-#include <vector>
-
 #include "PWGCF/FemtoDream/Core/femtoDreamObjectSelection.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamSelection.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamTrackSelection.h"
 
 #include "Common/Core/RecoDecay.h"
+
 #include "Framework/HistogramRegistry.h"
 #include "ReconstructionDataFormats/PID.h"
 
+#include <iostream>
+#include <string>
+#include <vector>
+
 using namespace o2::framework;
 
 namespace o2::analysis::femtoDream
diff --git a/.conflict-side-0/PWGCF/FemtoDream/TableProducer/femtoDreamProducerReducedTask.cxx b/.conflict-side-0/PWGCF/FemtoDream/TableProducer/femtoDreamProducerReducedTask.cxx
index a879a18517f..69a39e24b07 100644
--- a/.conflict-side-0/PWGCF/FemtoDream/TableProducer/femtoDreamProducerReducedTask.cxx
+++ b/.conflict-side-0/PWGCF/FemtoDream/TableProducer/femtoDreamProducerReducedTask.cxx
@@ -15,29 +15,33 @@
 /// \author Georgios Mantzaridis, TU München, georgios.mantzaridis@tum.de
 /// \author Anton Riedel, TU München, anton.riedel@tum.de
 
-#include <vector>
-#include "TMath.h"
-#include "CCDB/BasicCCDBManager.h"
+#include "PWGCF/DataModel/FemtoDerived.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamCollisionSelection.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamTrackSelection.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
-#include "PWGCF/DataModel/FemtoDerived.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/PIDResponseITS.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/PIDResponseITS.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+
 #include "Math/Vector4D.h"
+#include "TMath.h"
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis::femtoDream;
diff --git a/.conflict-side-0/PWGCF/FemtoDream/TableProducer/femtoDreamProducerTask.cxx b/.conflict-side-0/PWGCF/FemtoDream/TableProducer/femtoDreamProducerTask.cxx
index 7272382f357..a92292fafaa 100644
--- a/.conflict-side-0/PWGCF/FemtoDream/TableProducer/femtoDreamProducerTask.cxx
+++ b/.conflict-side-0/PWGCF/FemtoDream/TableProducer/femtoDreamProducerTask.cxx
@@ -13,35 +13,40 @@
 /// \brief Tasks that produces the track tables used for the pairing
 /// \author Laura Serksnyte, TU München, laura.serksnyte@tum.de
 
-#include <CCDB/BasicCCDBManager.h>
-#include <fairlogger/Logger.h>
-#include <vector>
-#include <string>
+#include "PWGCF/DataModel/FemtoDerived.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamCascadeSelection.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamCollisionSelection.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamTrackSelection.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamV0Selection.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/PIDResponseITS.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+#include "EventFiltering/Zorro.h"
+
 #include "DataFormatsParameters/GRPMagField.h"
 #include "DataFormatsParameters/GRPObject.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamCollisionSelection.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamTrackSelection.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamV0Selection.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamCascadeSelection.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
-#include "EventFiltering/Zorro.h"
-#include "PWGCF/DataModel/FemtoDerived.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "TMath.h"
+#include <CCDB/BasicCCDBManager.h>
+
 #include "Math/Vector4D.h"
+#include "TMath.h"
+
+#include <fairlogger/Logger.h>
+
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGCF/FemtoDream/TableProducer/femtoDreamProducerTaskWithCascades.cxx b/.conflict-side-0/PWGCF/FemtoDream/TableProducer/femtoDreamProducerTaskWithCascades.cxx
index a7e02ec87e6..e76c0245622 100644
--- a/.conflict-side-0/PWGCF/FemtoDream/TableProducer/femtoDreamProducerTaskWithCascades.cxx
+++ b/.conflict-side-0/PWGCF/FemtoDream/TableProducer/femtoDreamProducerTaskWithCascades.cxx
@@ -13,35 +13,40 @@
 /// \brief Tasks that produces the track tables used for the pairing
 /// \author Laura Serksnyte, TU München, laura.serksnyte@tum.de
 
-#include <CCDB/BasicCCDBManager.h>
-#include <fairlogger/Logger.h>
-#include <vector>
-#include <string>
+#include "PWGCF/DataModel/FemtoDerived.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamCascadeSelection.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamCollisionSelection.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamTrackSelection.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamV0Selection.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/PIDResponseITS.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+#include "EventFiltering/Zorro.h"
+
 #include "DataFormatsParameters/GRPMagField.h"
 #include "DataFormatsParameters/GRPObject.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamCollisionSelection.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamTrackSelection.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamV0Selection.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamCascadeSelection.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
-#include "EventFiltering/Zorro.h"
-#include "PWGCF/DataModel/FemtoDerived.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "TMath.h"
+#include <CCDB/BasicCCDBManager.h>
+
 #include "Math/Vector4D.h"
+#include "TMath.h"
+
+#include <fairlogger/Logger.h>
+
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGCF/FemtoDream/Tasks/femtoDreamCollisionMasker.cxx b/.conflict-side-0/PWGCF/FemtoDream/Tasks/femtoDreamCollisionMasker.cxx
index fddbee16a88..b0bfcf727c5 100644
--- a/.conflict-side-0/PWGCF/FemtoDream/Tasks/femtoDreamCollisionMasker.cxx
+++ b/.conflict-side-0/PWGCF/FemtoDream/Tasks/femtoDreamCollisionMasker.cxx
@@ -14,23 +14,24 @@
 /// \author Anton Riedel, TU München, anton.riedel@tum.de
 /// \author Laura Serksnyte, TU München, laura.serksnyte@tum.de
 
-#include <cstdint>
-#include <vector>
-#include <string>
-#include <bitset>
-#include <algorithm>
-#include <random>
-#include <chrono>
+#include "PWGCF/DataModel/FemtoDerived.h"
 
-#include "fairlogger/Logger.h"
-#include "Framework/Configurable.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
+#include "Framework/Configurable.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
 
-#include "PWGCF/DataModel/FemtoDerived.h"
+#include "fairlogger/Logger.h"
+
+#include <algorithm>
+#include <bitset>
+#include <chrono>
+#include <cstdint>
+#include <random>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-side-0/PWGCF/FemtoDream/Tasks/femtoDreamDebugCascade.cxx b/.conflict-side-0/PWGCF/FemtoDream/Tasks/femtoDreamDebugCascade.cxx
index 54324361ec0..47f77a2732a 100644
--- a/.conflict-side-0/PWGCF/FemtoDream/Tasks/femtoDreamDebugCascade.cxx
+++ b/.conflict-side-0/PWGCF/FemtoDream/Tasks/femtoDreamDebugCascade.cxx
@@ -14,23 +14,25 @@
 /// \author Luca Barioglio, TU München, luca.barioglio@cern.ch
 /// \author Georgios Mantzaridis, TU München, luca.barioglio@cern.ch
 
-#include <cstdint>
-#include <iostream>
-#include <vector>
+#include "PWGCF/DataModel/FemtoDerived.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamEventHisto.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamMath.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
+
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/runDataProcessing.h"
+
 #include "fairlogger/Logger.h"
 
-#include "PWGCF/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamEventHisto.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamMath.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
+#include <cstdint>
+#include <iostream>
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis::femtoDream;
diff --git a/.conflict-side-0/PWGCF/FemtoDream/Tasks/femtoDreamDebugTrack.cxx b/.conflict-side-0/PWGCF/FemtoDream/Tasks/femtoDreamDebugTrack.cxx
index 68fab988fb9..71fdcdb426c 100644
--- a/.conflict-side-0/PWGCF/FemtoDream/Tasks/femtoDreamDebugTrack.cxx
+++ b/.conflict-side-0/PWGCF/FemtoDream/Tasks/femtoDreamDebugTrack.cxx
@@ -13,7 +13,10 @@
 /// \brief Tasks that reads the particle tables and fills QA histograms for tracks
 /// \author Luca Barioglio, TU München, luca.barioglio@cern.ch
 
-#include <Framework/Expressions.h>
+#include "PWGCF/DataModel/FemtoDerived.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamEventHisto.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h"
+
 #include "DataFormatsParameters/GRPObject.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
@@ -21,10 +24,7 @@
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
 #include "Framework/runDataProcessing.h"
-
-#include "PWGCF/FemtoDream/Core/femtoDreamEventHisto.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h"
-#include "PWGCF/DataModel/FemtoDerived.h"
+#include <Framework/Expressions.h>
 
 using namespace o2;
 using namespace o2::analysis::femtoDream;
diff --git a/.conflict-side-0/PWGCF/FemtoDream/Tasks/femtoDreamDebugV0.cxx b/.conflict-side-0/PWGCF/FemtoDream/Tasks/femtoDreamDebugV0.cxx
index 91010d4368e..3dc0c5f9875 100644
--- a/.conflict-side-0/PWGCF/FemtoDream/Tasks/femtoDreamDebugV0.cxx
+++ b/.conflict-side-0/PWGCF/FemtoDream/Tasks/femtoDreamDebugV0.cxx
@@ -13,24 +13,25 @@
 /// \brief Tasks that reads the particle tables and fills QA histograms for V0s
 /// \author Luca Barioglio, TU München, luca.barioglio@cern.ch
 
-#include <cstdint>
-#include <iostream>
-#include <vector>
-
-#include "TVector3.h"
+#include "PWGCF/DataModel/FemtoDerived.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamEventHisto.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h"
 
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TVector3.h"
+
 #include "fairlogger/Logger.h"
 
-#include "PWGCF/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamEventHisto.h"
+#include <cstdint>
+#include <iostream>
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis::femtoDream;
diff --git a/.conflict-side-0/PWGCF/FemtoDream/Tasks/femtoDreamHashTask.cxx b/.conflict-side-0/PWGCF/FemtoDream/Tasks/femtoDreamHashTask.cxx
index fe0aa6c0e3d..00ecf5a4af1 100644
--- a/.conflict-side-0/PWGCF/FemtoDream/Tasks/femtoDreamHashTask.cxx
+++ b/.conflict-side-0/PWGCF/FemtoDream/Tasks/femtoDreamHashTask.cxx
@@ -15,10 +15,12 @@
 /// \author Andi Mathis, TU München, andreas.mathis@ph.tum.de
 
 #include "PWGCF/DataModel/FemtoDerived.h"
+
 #include "Common/Core/EventMixing.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "Framework/ASoAHelpers.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGCF/FemtoDream/Tasks/femtoDreamPairTaskTrackCascade.cxx b/.conflict-side-0/PWGCF/FemtoDream/Tasks/femtoDreamPairTaskTrackCascade.cxx
index 05696761afa..cbf191e34cd 100644
--- a/.conflict-side-0/PWGCF/FemtoDream/Tasks/femtoDreamPairTaskTrackCascade.cxx
+++ b/.conflict-side-0/PWGCF/FemtoDream/Tasks/femtoDreamPairTaskTrackCascade.cxx
@@ -11,23 +11,26 @@
 /// \file femtoDreamPairTaskTrackTrack.cxx
 /// \brief Tasks that reads the track tables used for the pairing and builds pairs of two tracks
 /// \author Andi Mathis, TU München, andreas.mathis@ph.tum.de
-#include <sys/stat.h>
-#include <cstdint>
-#include <vector>
-#include <string>
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/Expressions.h"
 #include "PWGCF/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamEventHisto.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamPairCleaner.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamContainer.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamDetaDphiStar.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamEventHisto.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamPairCleaner.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/Expressions.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+
+#include <sys/stat.h>
+
+#include <cstdint>
+#include <string>
+#include <vector>
 using namespace o2;
 using namespace o2::aod;
 using namespace o2::soa;
diff --git a/.conflict-side-0/PWGCF/FemtoDream/Tasks/femtoDreamPairTaskTrackTrack.cxx b/.conflict-side-0/PWGCF/FemtoDream/Tasks/femtoDreamPairTaskTrackTrack.cxx
index 9f080fd2dd0..2e2eda2f68e 100644
--- a/.conflict-side-0/PWGCF/FemtoDream/Tasks/femtoDreamPairTaskTrackTrack.cxx
+++ b/.conflict-side-0/PWGCF/FemtoDream/Tasks/femtoDreamPairTaskTrackTrack.cxx
@@ -15,28 +15,30 @@
 /// \author Georgios Mantzaridis, TU München, georgios.mantzaridis@tum.de
 /// \author Anton Riedel, TU München, anton.riedel@tum.de
 
-#include <cstdint>
-#include <vector>
-#include <bitset>
-#include <string>
-#include "TRandom3.h"
+#include "PWGCF/DataModel/FemtoDerived.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamContainer.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamDetaDphiStar.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamEventHisto.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamPairCleaner.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
+#include "Framework/Configurable.h"
+#include "Framework/Expressions.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
+#include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "Framework/Configurable.h"
-#include "Framework/Expressions.h"
+#include "Framework/runDataProcessing.h"
 
-#include "PWGCF/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamEventHisto.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamPairCleaner.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamContainer.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamDetaDphiStar.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
+#include "TRandom3.h"
+
+#include <bitset>
+#include <cstdint>
+#include <string>
+#include <vector>
 
 using namespace o2::aod;
 using namespace o2::soa;
diff --git a/.conflict-side-0/PWGCF/FemtoDream/Tasks/femtoDreamPairTaskTrackV0.cxx b/.conflict-side-0/PWGCF/FemtoDream/Tasks/femtoDreamPairTaskTrackV0.cxx
index 7798f3d59c8..428375e1cf9 100644
--- a/.conflict-side-0/PWGCF/FemtoDream/Tasks/femtoDreamPairTaskTrackV0.cxx
+++ b/.conflict-side-0/PWGCF/FemtoDream/Tasks/femtoDreamPairTaskTrackV0.cxx
@@ -13,25 +13,27 @@
 /// \brief Tasks that reads the track tables used for the pairing and builds pairs of two tracks
 /// \author Andi Mathis, TU München, andreas.mathis@ph.tum.de
 
-#include <sys/stat.h>
-#include <cstdint>
-#include <vector>
-#include <string>
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/Expressions.h"
-
 #include "PWGCF/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamEventHisto.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamPairCleaner.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamContainer.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamDetaDphiStar.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamEventHisto.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamPairCleaner.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/Expressions.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+
+#include <sys/stat.h>
+
+#include <cstdint>
+#include <string>
+#include <vector>
+
 using namespace o2;
 using namespace o2::aod;
 using namespace o2::soa;
diff --git a/.conflict-side-0/PWGCF/FemtoDream/Tasks/femtoDreamTripletTaskTrackTrackTrack.cxx b/.conflict-side-0/PWGCF/FemtoDream/Tasks/femtoDreamTripletTaskTrackTrackTrack.cxx
index 899de5659b1..9542b6c364b 100644
--- a/.conflict-side-0/PWGCF/FemtoDream/Tasks/femtoDreamTripletTaskTrackTrackTrack.cxx
+++ b/.conflict-side-0/PWGCF/FemtoDream/Tasks/femtoDreamTripletTaskTrackTrackTrack.cxx
@@ -13,24 +13,26 @@
 /// \brief Tasks that reads the track tables and creates track triplets; only three identical particles can be used
 /// \author Laura Serksnyte, TU München, laura.serksnyte@tum.de
 
-#include <vector>
-#include <string>
+#include "PWGCF/DataModel/FemtoDerived.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamContainerThreeBody.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamDetaDphiStar.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamEventHisto.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamPairCleaner.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
+#include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TDatabasePDG.h"
 
-#include "PWGCF/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamEventHisto.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamPairCleaner.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamContainerThreeBody.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamDetaDphiStar.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis::femtoDream;
diff --git a/.conflict-side-0/PWGCF/FemtoDream/Tasks/femtoDreamTripletTaskTrackTrackV0.cxx b/.conflict-side-0/PWGCF/FemtoDream/Tasks/femtoDreamTripletTaskTrackTrackV0.cxx
index 136b8f9d5ff..a01e51ce3a8 100644
--- a/.conflict-side-0/PWGCF/FemtoDream/Tasks/femtoDreamTripletTaskTrackTrackV0.cxx
+++ b/.conflict-side-0/PWGCF/FemtoDream/Tasks/femtoDreamTripletTaskTrackTrackV0.cxx
@@ -13,25 +13,27 @@
 /// \brief Tasks that reads the track and V0 tables and creates triplets; only two identical tracks and a V0 can be used
 /// \author Laura Serksnyte, TU München, laura.serksnyte@tum.de
 
-#include <vector>
-#include <bitset>
-#include <string>
+#include "PWGCF/DataModel/FemtoDerived.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamContainerThreeBody.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamDetaDphiStar.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamEventHisto.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamPairCleaner.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
+#include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TDatabasePDG.h"
 
-#include "PWGCF/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamEventHisto.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamPairCleaner.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamContainerThreeBody.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamDetaDphiStar.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
+#include <bitset>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis::femtoDream;
diff --git a/.conflict-side-0/PWGCF/FemtoDream/Utils/femtoDreamCutCulator.cxx b/.conflict-side-0/PWGCF/FemtoDream/Utils/femtoDreamCutCulator.cxx
index d6aa862851f..a1a6653c799 100644
--- a/.conflict-side-0/PWGCF/FemtoDream/Utils/femtoDreamCutCulator.cxx
+++ b/.conflict-side-0/PWGCF/FemtoDream/Utils/femtoDreamCutCulator.cxx
@@ -13,13 +13,15 @@
 /// \brief Executable that encodes physical selection criteria in a bit-wise
 /// selection \author Andi Mathis, TU München, andreas.mathis@ph.tum.de
 
-#include <iostream>
-#include <random>
-#include <string>
 #include "PWGCF/FemtoDream/Utils/femtoDreamCutCulator.h"
+
+#include "PWGCF/DataModel/FemtoDerived.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamSelection.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamTrackSelection.h"
-#include "PWGCF/DataModel/FemtoDerived.h"
+
+#include <iostream>
+#include <random>
+#include <string>
 
 using namespace o2::analysis::femtoDream;
 
diff --git a/.conflict-side-0/PWGCF/FemtoDream/Utils/femtoDreamCutCulator.h b/.conflict-side-0/PWGCF/FemtoDream/Utils/femtoDreamCutCulator.h
index f54a9ff62a4..dea6efebb3a 100644
--- a/.conflict-side-0/PWGCF/FemtoDream/Utils/femtoDreamCutCulator.h
+++ b/.conflict-side-0/PWGCF/FemtoDream/Utils/femtoDreamCutCulator.h
@@ -18,21 +18,22 @@
 #ifndef PWGCF_FEMTODREAM_UTILS_FEMTODREAMCUTCULATOR_H_
 #define PWGCF_FEMTODREAM_UTILS_FEMTODREAMCUTCULATOR_H_
 
+#include "PWGCF/FemtoDream/Core/femtoDreamCascadeSelection.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamSelection.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamTrackSelection.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamV0Selection.h"
+
+#include <boost/property_tree/json_parser.hpp>
+#include <boost/property_tree/ptree.hpp>
+
+#include <algorithm>
 #include <bitset>
 #include <functional>
 #include <iostream>
+#include <iterator>
 #include <random>
 #include <string>
 #include <vector>
-#include <algorithm>
-#include <iterator>
-#include <boost/property_tree/json_parser.hpp>
-#include <boost/property_tree/ptree.hpp>
-
-#include "PWGCF/FemtoDream/Core/femtoDreamSelection.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamTrackSelection.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamV0Selection.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamCascadeSelection.h"
 
 namespace o2::analysis::femtoDream
 {
diff --git a/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniverse3DContainer.h b/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniverse3DContainer.h
index 864487cdcb0..4579ec9ffd7 100644
--- a/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniverse3DContainer.h
+++ b/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniverse3DContainer.h
@@ -17,15 +17,18 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSE3DCONTAINER_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSE3DCONTAINER_H_
 
-#include <fairlogger/Logger.h>
-#include <vector>
-#include <string>
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
 
 #include "Framework/HistogramRegistry.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
+
 #include "Math/Vector4D.h"
-#include "TMath.h"
 #include "TDatabasePDG.h"
+#include "TMath.h"
+
+#include <fairlogger/Logger.h>
+
+#include <string>
+#include <vector>
 
 using namespace o2::framework;
 
diff --git a/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniverseAngularContainer.h b/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniverseAngularContainer.h
index 4d267fb67d3..92a2359e497 100644
--- a/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniverseAngularContainer.h
+++ b/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniverseAngularContainer.h
@@ -20,17 +20,20 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEANGULARCONTAINER_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEANGULARCONTAINER_H_
 
-#include <fairlogger/Logger.h>
-#include <vector>
-#include <string>
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
 
-#include "Framework/HistogramRegistry.h"
 #include "Common/Core/RecoDecay.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
+
+#include "Framework/HistogramRegistry.h"
 
 #include "Math/Vector4D.h"
-#include "TMath.h"
 #include "TDatabasePDG.h"
+#include "TMath.h"
+
+#include <fairlogger/Logger.h>
+
+#include <string>
+#include <vector>
 
 using namespace o2::framework;
 
diff --git a/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniverseCascadeSelection.h b/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniverseCascadeSelection.h
index 3a389da705e..d5ddc7a1948 100644
--- a/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniverseCascadeSelection.h
+++ b/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniverseCascadeSelection.h
@@ -21,15 +21,18 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSECASCADESELECTION_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSECASCADESELECTION_H_
 
-#include <string>
-#include <vector>
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseObjectSelection.h"
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseSelection.h"
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
+
 #include "Common/Core/RecoDecay.h"
+
 #include "Framework/HistogramRegistry.h"
 #include "ReconstructionDataFormats/PID.h"
 
+#include <string>
+#include <vector>
+
 namespace o2::analysis::femto_universe
 {
 namespace femto_universe_cascade_selection
diff --git a/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniverseCollisionSelection.h b/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniverseCollisionSelection.h
index 633bba05760..ab47405cb9c 100644
--- a/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniverseCollisionSelection.h
+++ b/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniverseCollisionSelection.h
@@ -18,11 +18,13 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSECOLLISIONSELECTION_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSECOLLISIONSELECTION_H_
 
-#include <string>
 #include "Common/CCDB/TriggerAliases.h"
+
 #include "Framework/HistogramRegistry.h"
 #include "Framework/Logger.h"
 
+#include <string>
+
 using namespace o2::framework;
 
 namespace o2::analysis::femto_universe
diff --git a/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniverseCutculator.h b/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniverseCutculator.h
index 40b7c425e5c..58e278cdde7 100644
--- a/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniverseCutculator.h
+++ b/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniverseCutculator.h
@@ -18,19 +18,20 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSECUTCULATOR_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSECUTCULATOR_H_
 
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseSelection.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseV0Selection.h"
+
+#include <boost/property_tree/json_parser.hpp>
+#include <boost/property_tree/ptree.hpp>
+
+#include <algorithm>
 #include <bitset>
 #include <iostream>
+#include <iterator>
 #include <random>
 #include <string>
 #include <vector>
-#include <algorithm>
-#include <iterator>
-#include <boost/property_tree/json_parser.hpp>
-#include <boost/property_tree/ptree.hpp>
-
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseSelection.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseV0Selection.h"
 
 namespace o2::analysis::femto_universe
 {
diff --git a/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h b/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h
index e8941e7cbd9..d7a0d70f38a 100644
--- a/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h
+++ b/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h
@@ -19,16 +19,19 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEDETADPHISTAR_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEDETADPHISTAR_H_
 
-#include <memory>
-#include <string>
-#include <vector>
-#include "TMath.h"
-#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseFemtoContainer.h"
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseAngularContainer.h"
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseContainer.h"
-#include "Framework/HistogramRegistry.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseFemtoContainer.h"
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
+#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
+
+#include "Framework/HistogramRegistry.h"
+
+#include "TMath.h"
+
+#include <memory>
+#include <string>
+#include <vector>
 
 namespace o2::analysis
 {
diff --git a/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniverseEfficiencyCalculator.h b/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniverseEfficiencyCalculator.h
index a96b70180aa..da40cfbf4d3 100644
--- a/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniverseEfficiencyCalculator.h
+++ b/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniverseEfficiencyCalculator.h
@@ -16,15 +16,17 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEEFFICIENCYCALCULATOR_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEEFFICIENCYCALCULATOR_H_
 
-#include <vector>
-#include <map>
-#include <string>
-#include <algorithm>
+#include "FemtoUniverseParticleHisto.h"
 
-#include "Framework/Configurable.h"
-#include "CCDB/BasicCCDBManager.h"
 #include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
-#include "FemtoUniverseParticleHisto.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "Framework/Configurable.h"
+
+#include <algorithm>
+#include <map>
+#include <string>
+#include <vector>
 
 namespace o2::analysis::femto_universe::efficiency
 {
diff --git a/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h b/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h
index 03d4b5b1fb4..dfe2bd35d62 100644
--- a/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h
+++ b/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h
@@ -18,6 +18,7 @@
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEEVENTHISTO_H_
 
 #include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
+
 #include "Framework/HistogramRegistry.h"
 
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniverseFemtoContainer.h b/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniverseFemtoContainer.h
index 4719561ccf6..8f5954429cd 100644
--- a/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniverseFemtoContainer.h
+++ b/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniverseFemtoContainer.h
@@ -20,16 +20,18 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEFEMTOCONTAINER_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEFEMTOCONTAINER_H_
 
-#include <fairlogger/Logger.h>
-#include <vector>
-#include <string>
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
 
 #include "Framework/HistogramRegistry.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
 
 #include "Math/Vector4D.h"
-#include "TMath.h"
 #include "TDatabasePDG.h"
+#include "TMath.h"
+
+#include <fairlogger/Logger.h>
+
+#include <string>
+#include <vector>
 
 using namespace o2::framework;
 
diff --git a/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h b/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h
index ec40ea035e6..aee87f1a057 100644
--- a/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h
+++ b/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h
@@ -19,14 +19,14 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEMATH_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEMATH_H_
 
-#include <vector>
-#include <algorithm>
-
-#include "Math/Vector4D.h"
 #include "Math/Boost.h"
+#include "Math/Vector4D.h"
 #include "TLorentzVector.h"
 #include "TMath.h"
 
+#include <algorithm>
+#include <vector>
+
 namespace o2::analysis::femto_universe
 {
 
diff --git a/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniverseObjectSelection.h b/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniverseObjectSelection.h
index 07491f92c8f..f01de84b75d 100644
--- a/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniverseObjectSelection.h
+++ b/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniverseObjectSelection.h
@@ -17,15 +17,16 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEOBJECTSELECTION_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEOBJECTSELECTION_H_
 
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseSelection.h"
+#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
+
+#include "Framework/HistogramRegistry.h"
+#include "ReconstructionDataFormats/PID.h"
+
 #include <algorithm>
 #include <string>
 #include <vector>
 
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseSelection.h"
-#include "ReconstructionDataFormats/PID.h"
-#include "Framework/HistogramRegistry.h"
-#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
-
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniversePairAngularWithCentMultKt.h b/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniversePairAngularWithCentMultKt.h
index 31b256f43f7..b63455ee3cf 100644
--- a/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniversePairAngularWithCentMultKt.h
+++ b/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniversePairAngularWithCentMultKt.h
@@ -17,9 +17,10 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEPAIRANGULARWITHCENTMULTKT_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEPAIRANGULARWITHCENTMULTKT_H_
 
+#include "Framework/HistogramRegistry.h"
+
 #include <string>
 #include <vector>
-#include "Framework/HistogramRegistry.h"
 
 namespace o2::analysis::femto_universe
 {
diff --git a/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h b/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h
index b27d8e25abf..32da4810b85 100644
--- a/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h
+++ b/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h
@@ -20,6 +20,7 @@
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEPAIRCLEANER_H_
 
 #include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
+
 #include "Framework/HistogramRegistry.h"
 
 namespace o2::analysis::femto_universe
diff --git a/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniversePairSHCentMultKt.h b/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniversePairSHCentMultKt.h
index ea8626cbe32..5c33b6cf30e 100644
--- a/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniversePairSHCentMultKt.h
+++ b/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniversePairSHCentMultKt.h
@@ -16,11 +16,12 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEPAIRSHCENTMULTKT_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEPAIRSHCENTMULTKT_H_
 
-#include <vector>
-#include <string>
+#include "Framework/HistogramRegistry.h"
+
 #include <complex>
 #include <memory>
-#include "Framework/HistogramRegistry.h"
+#include <string>
+#include <vector>
 
 // using namespace o2::constants::physics;
 
diff --git a/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniversePairWithCentMultKt.h b/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniversePairWithCentMultKt.h
index 5cfef9c433f..1f2651ad2f6 100644
--- a/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniversePairWithCentMultKt.h
+++ b/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniversePairWithCentMultKt.h
@@ -17,9 +17,10 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEPAIRWITHCENTMULTKT_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEPAIRWITHCENTMULTKT_H_
 
+#include "Framework/HistogramRegistry.h"
+
 #include <string>
 #include <vector>
-#include "Framework/HistogramRegistry.h"
 
 namespace o2::analysis::femto_universe
 {
diff --git a/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h b/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h
index 865efa0f36d..b14edcb3aad 100644
--- a/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h
+++ b/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h
@@ -20,11 +20,13 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEPARTICLEHISTO_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEPARTICLEHISTO_H_
 
-#include <string>
-#include <optional>
 #include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
-#include "Framework/HistogramRegistry.h"
+
 #include "CommonConstants/MathConstants.h"
+#include "Framework/HistogramRegistry.h"
+
+#include <optional>
+#include <string>
 
 using namespace o2::framework; // o2-linter: disable=using-directive
 
diff --git a/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniversePhiSelection.h b/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniversePhiSelection.h
index 0ee0bfe4162..c43217ceb72 100644
--- a/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniversePhiSelection.h
+++ b/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniversePhiSelection.h
@@ -19,18 +19,20 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEPHISELECTION_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEPHISELECTION_H_
 
-#include <string>
-#include <vector>
-
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseObjectSelection.h"
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseSelection.h"
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
 
 #include "Common/Core/RecoDecay.h"
+
 #include "Framework/HistogramRegistry.h"
 #include "ReconstructionDataFormats/PID.h"
+
 #include "TLorentzVector.h"
 
+#include <string>
+#include <vector>
+
 namespace o2::analysis::femto_universe
 {
 namespace femto_universe_phi_selection
diff --git a/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniverseSHContainer.h b/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniverseSHContainer.h
index 558874133cb..25b875a0333 100644
--- a/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniverseSHContainer.h
+++ b/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniverseSHContainer.h
@@ -17,18 +17,21 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSESHCONTAINER_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSESHCONTAINER_H_
 
-#include <fairlogger/Logger.h>
-#include <vector>
-#include <string>
-#include <complex>
-#include <memory>
-
-#include "Framework/HistogramRegistry.h"
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseSpherHarMath.h"
+
+#include "Framework/HistogramRegistry.h"
+
 #include "Math/Vector4D.h"
-#include "TMath.h"
 #include "TDatabasePDG.h"
+#include "TMath.h"
+
+#include <fairlogger/Logger.h>
+
+#include <complex>
+#include <memory>
+#include <string>
+#include <vector>
 
 namespace o2::analysis::femto_universe
 {
diff --git a/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniverseSoftPionRemoval.h b/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniverseSoftPionRemoval.h
index 9631b5b3377..4a97c83865d 100644
--- a/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniverseSoftPionRemoval.h
+++ b/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniverseSoftPionRemoval.h
@@ -16,11 +16,12 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSESOFTPIONREMOVAL_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSESOFTPIONREMOVAL_H_
 
-#include <vector>
-
 #include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
+
 #include "Framework/HistogramRegistry.h"
 
+#include <vector>
+
 namespace o2::analysis::femto_universe
 {
 
diff --git a/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniverseSpherHarMath.h b/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniverseSpherHarMath.h
index d92560ceb72..0efa7593a9f 100644
--- a/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniverseSpherHarMath.h
+++ b/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniverseSpherHarMath.h
@@ -16,14 +16,14 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSESPHERHARMATH_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSESPHERHARMATH_H_
 
-#include <vector>
-#include <algorithm>
-
-#include "Math/Vector4D.h"
 #include "Math/Boost.h"
+#include "Math/Vector4D.h"
 #include "TLorentzVector.h"
 #include "TMath.h"
 
+#include <algorithm>
+#include <vector>
+
 namespace o2::analysis::femto_universe
 {
 
diff --git a/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h b/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h
index 75276f24a6d..51c711c8165 100644
--- a/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h
+++ b/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h
@@ -18,17 +18,19 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSETRACKSELECTION_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSETRACKSELECTION_H_
 
-#include <string>
-#include <vector>
-#include <cmath>
-
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseObjectSelection.h"
 #include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseObjectSelection.h"
-#include "ReconstructionDataFormats/PID.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/HistogramRegistry.h"
+#include "ReconstructionDataFormats/PID.h"
+
+#include <cmath>
+#include <string>
+#include <vector>
 
 // using namespace o2::framework;
 
diff --git a/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniverseV0Selection.h b/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniverseV0Selection.h
index 805da180cc3..8b45f664f15 100644
--- a/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniverseV0Selection.h
+++ b/.conflict-side-0/PWGCF/FemtoUniverse/Core/FemtoUniverseV0Selection.h
@@ -19,17 +19,18 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEV0SELECTION_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEV0SELECTION_H_
 
-#include <string>
-#include <vector>
-
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseObjectSelection.h"
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseSelection.h"
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
 
 #include "Common/Core/RecoDecay.h"
+
 #include "Framework/HistogramRegistry.h"
 #include "ReconstructionDataFormats/PID.h"
 
+#include <string>
+#include <vector>
+
 namespace o2::analysis::femto_universe
 {
 namespace femto_universe_v0_selection
diff --git a/.conflict-side-0/PWGCF/FemtoUniverse/Core/femtoUtils.h b/.conflict-side-0/PWGCF/FemtoUniverse/Core/femtoUtils.h
index 70a02e98b8c..ddc1833c335 100644
--- a/.conflict-side-0/PWGCF/FemtoUniverse/Core/femtoUtils.h
+++ b/.conflict-side-0/PWGCF/FemtoUniverse/Core/femtoUtils.h
@@ -17,12 +17,14 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUTILS_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUTILS_H_
 
-#include <vector>
-#include <functional>
-#include <algorithm>
-#include "Framework/ASoAHelpers.h"
 #include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
 
+#include "Framework/ASoAHelpers.h"
+
+#include <algorithm>
+#include <functional>
+#include <vector>
+
 namespace o2::analysis::femto_universe
 {
 
diff --git a/.conflict-side-0/PWGCF/FemtoUniverse/DataModel/FemtoDerived.h b/.conflict-side-0/PWGCF/FemtoUniverse/DataModel/FemtoDerived.h
index c103b52791e..83bf3f7fd72 100644
--- a/.conflict-side-0/PWGCF/FemtoUniverse/DataModel/FemtoDerived.h
+++ b/.conflict-side-0/PWGCF/FemtoUniverse/DataModel/FemtoDerived.h
@@ -16,15 +16,17 @@
 #ifndef PWGCF_FEMTOUNIVERSE_DATAMODEL_FEMTODERIVED_H_
 #define PWGCF_FEMTOUNIVERSE_DATAMODEL_FEMTODERIVED_H_
 
-#include <cmath>
-#include "Framework/ASoA.h"
-#include "MathUtils/Utils.h"
-#include "Framework/DataTypes.h"
 #include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoA.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/DataTypes.h"
 #include "Framework/Expressions.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
+#include "MathUtils/Utils.h"
+
+#include <cmath>
 
 namespace o2::aod
 {
diff --git a/.conflict-side-0/PWGCF/FemtoUniverse/Macros/calculateEfficiencyCorrection.cxx b/.conflict-side-0/PWGCF/FemtoUniverse/Macros/calculateEfficiencyCorrection.cxx
index 3880661d9f7..3d3137abc4a 100644
--- a/.conflict-side-0/PWGCF/FemtoUniverse/Macros/calculateEfficiencyCorrection.cxx
+++ b/.conflict-side-0/PWGCF/FemtoUniverse/Macros/calculateEfficiencyCorrection.cxx
@@ -21,15 +21,16 @@
 #include <TH2F.h>
 #include <TH3F.h>
 #include <TSystem.h>
-#include <unistd.h>
 
 #include <cassert>
 #include <cmath>
 #include <filesystem> // NOLINT
-#include <iostream>
 #include <format>
+#include <iostream>
 #include <string>
 
+#include <unistd.h>
+
 namespace fs = std::filesystem;
 
 auto* getHistogram(TFile* file, const std::string& name)
diff --git a/.conflict-side-0/PWGCF/FemtoUniverse/TableProducer/femtoUniverseProducerReducedTask.cxx b/.conflict-side-0/PWGCF/FemtoUniverse/TableProducer/femtoUniverseProducerReducedTask.cxx
index 4ae5b3b01f2..9eee793ee74 100644
--- a/.conflict-side-0/PWGCF/FemtoUniverse/TableProducer/femtoUniverseProducerReducedTask.cxx
+++ b/.conflict-side-0/PWGCF/FemtoUniverse/TableProducer/femtoUniverseProducerReducedTask.cxx
@@ -16,29 +16,32 @@
 /// \author Anton Riedel, TU München, anton.riedel@tum.de
 /// \author Zuzanna Chochulska, WUT Warsaw & CTU Prague, zchochul@cern.ch
 
-#include <CCDB/BasicCCDBManager.h>
-#include <vector>
-
-#include "TMath.h"
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseCollisionSelection.h"
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
+#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
 #include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+#include <CCDB/BasicCCDBManager.h>
+
 #include "Math/Vector4D.h"
-#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
+#include "TMath.h"
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis::femto_universe;
diff --git a/.conflict-side-0/PWGCF/FemtoUniverse/TableProducer/femtoUniverseProducerTaskV0Only.cxx b/.conflict-side-0/PWGCF/FemtoUniverse/TableProducer/femtoUniverseProducerTaskV0Only.cxx
index 968d3fab7ba..d7da7c67b8c 100644
--- a/.conflict-side-0/PWGCF/FemtoUniverse/TableProducer/femtoUniverseProducerTaskV0Only.cxx
+++ b/.conflict-side-0/PWGCF/FemtoUniverse/TableProducer/femtoUniverseProducerTaskV0Only.cxx
@@ -13,30 +13,33 @@
 /// \author Andi Mathis, TU München, andreas.mathis@ph.tum.de
 /// \author Zuzanna Chochulska, WUT Warsaw & CTU Prague, zchochul@cern.ch
 
-#include <CCDB/BasicCCDBManager.h>
-#include <vector>
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseCollisionSelection.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseV0Selection.h"
+#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "DataFormatsParameters/GRPMagField.h"
 #include "DataFormatsParameters/GRPObject.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseCollisionSelection.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseV0Selection.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
-#include "Math/Vector4D.h"
-#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "ReconstructionDataFormats/Track.h"
+#include <CCDB/BasicCCDBManager.h>
+
+#include "Math/Vector4D.h"
 #include "TMath.h"
 
+#include <vector>
+
 using namespace o2;
 using namespace o2::analysis::femto_universe;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGCF/FemtoUniverse/Tasks/femtoUniverseCutCulator.cxx b/.conflict-side-0/PWGCF/FemtoUniverse/Tasks/femtoUniverseCutCulator.cxx
index 6e5af4e8d52..bae1565238a 100644
--- a/.conflict-side-0/PWGCF/FemtoUniverse/Tasks/femtoUniverseCutCulator.cxx
+++ b/.conflict-side-0/PWGCF/FemtoUniverse/Tasks/femtoUniverseCutCulator.cxx
@@ -14,14 +14,16 @@
 /// \author Andi Mathis, TU München, andreas.mathis@ph.tum.de
 /// \author Zuzanna Chochulska, WUT Warsaw & CTU Prague, zchochul@cern.ch
 
-#include <filesystem>
-#include <iostream>
-#include <random>
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseCutculator.h"
+
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseSelection.h"
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
 #include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
 
+#include <filesystem>
+#include <iostream>
+#include <random>
+
 using namespace o2::analysis::femto_universe;
 
 /// The function takes the path to the dpl-config.json as a argument and the
diff --git a/.conflict-side-0/PWGCF/FemtoUniverse/Tasks/femtoUniverseDebugTrack.cxx b/.conflict-side-0/PWGCF/FemtoUniverse/Tasks/femtoUniverseDebugTrack.cxx
index 984ab7d973e..da9e59016d9 100644
--- a/.conflict-side-0/PWGCF/FemtoUniverse/Tasks/femtoUniverseDebugTrack.cxx
+++ b/.conflict-side-0/PWGCF/FemtoUniverse/Tasks/femtoUniverseDebugTrack.cxx
@@ -14,6 +14,12 @@
 /// \author Luca Barioglio, TU München, luca.barioglio@cern.ch
 /// \author Zuzanna Chochulska, WUT Warsaw & CTU Prague, zchochul@cern.ch
 
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
+#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
+#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
+
 #include "DataFormatsParameters/GRPObject.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
@@ -22,12 +28,6 @@
 #include "Framework/StepTHn.h"
 #include "Framework/runDataProcessing.h"
 
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
-#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
-#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
-
 using namespace o2;
 using namespace o2::analysis::femto_universe;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGCF/FemtoUniverse/Tasks/femtoUniverseDebugV0.cxx b/.conflict-side-0/PWGCF/FemtoUniverse/Tasks/femtoUniverseDebugV0.cxx
index fe1bf2e7983..1207d1ff10f 100644
--- a/.conflict-side-0/PWGCF/FemtoUniverse/Tasks/femtoUniverseDebugV0.cxx
+++ b/.conflict-side-0/PWGCF/FemtoUniverse/Tasks/femtoUniverseDebugV0.cxx
@@ -14,24 +14,27 @@
 /// \author Luca Barioglio, TU München, luca.barioglio@cern.ch
 /// \author Zuzanna Chochulska, WUT Warsaw & CTU Prague, zchochul@cern.ch
 
-#include <fairlogger/Logger.h>
-#include <cstdint>
-#include <vector>
-#include <TDatabasePDG.h>
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
+#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
+#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
+
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
+#include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/runDataProcessing.h"
 
-#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
-#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
+#include <TDatabasePDG.h>
+
+#include <fairlogger/Logger.h>
+
+#include <cstdint>
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis::femto_universe;
diff --git a/.conflict-side-0/PWGCF/FemtoUniverse/Tasks/femtoUniverseEfficiencyTask.cxx b/.conflict-side-0/PWGCF/FemtoUniverse/Tasks/femtoUniverseEfficiencyTask.cxx
index fcd9c56d452..dd13cdcede2 100644
--- a/.conflict-side-0/PWGCF/FemtoUniverse/Tasks/femtoUniverseEfficiencyTask.cxx
+++ b/.conflict-side-0/PWGCF/FemtoUniverse/Tasks/femtoUniverseEfficiencyTask.cxx
@@ -17,20 +17,22 @@
 /// \author Zuzanna Chochulska, WUT Warsaw & CTU Prague, zchochul@cern.ch
 
 // O2 includes
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseCollisionSelection.h"
+#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
+#include "PWGLF/DataModel/LFResonanceTables.h"
+
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/Core/trackUtilities.h"
+
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseCollisionSelection.h"
-#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
-#include "Framework/O2DatabasePDGPlugin.h"
 
 #include "TPDGCode.h"
 
diff --git a/.conflict-side-0/PWGCF/FemtoUniverse/Tasks/femtoUniverseHashTask.cxx b/.conflict-side-0/PWGCF/FemtoUniverse/Tasks/femtoUniverseHashTask.cxx
index 6f7a7d5db2b..0ec405b26ff 100644
--- a/.conflict-side-0/PWGCF/FemtoUniverse/Tasks/femtoUniverseHashTask.cxx
+++ b/.conflict-side-0/PWGCF/FemtoUniverse/Tasks/femtoUniverseHashTask.cxx
@@ -15,10 +15,12 @@
 /// \author Zuzanna Chochulska, WUT Warsaw & CTU Prague, zchochul@cern.ch
 
 #include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
+
 #include "Common/Core/EventMixing.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "Framework/ASoAHelpers.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackCascadeExtended.cxx b/.conflict-side-0/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackCascadeExtended.cxx
index dd019a046db..e2e06229f40 100644
--- a/.conflict-side-0/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackCascadeExtended.cxx
+++ b/.conflict-side-0/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackCascadeExtended.cxx
@@ -14,22 +14,24 @@
 /// \author Barbara Chytla, WUT Warsaw, barbara.chytla@cern.ch
 /// \author Shirajum Monira, WUT Warsaw, shirajum.monira@cern.ch
 
-#include <vector>
-#include <set>
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/StepTHn.h"
-#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseContainer.h"
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
 #include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
+#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
+
+#include <set>
+#include <vector>
 
 using namespace o2;
 using namespace o2::soa;
diff --git a/.conflict-side-0/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackD0.cxx b/.conflict-side-0/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackD0.cxx
index 3e68a275452..7e28f498fbb 100644
--- a/.conflict-side-0/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackD0.cxx
+++ b/.conflict-side-0/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackD0.cxx
@@ -17,38 +17,37 @@
 /// \author Zuzanna Chochulska, WUT Warsaw & CTU Prague, zchochul@cern.ch
 /// \author Katarzyna Gwiździel, WUT Warsaw, katarzyna.gwizdziel@cern.ch
 
-#include <vector>
-#include <string>
-
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "ReconstructionDataFormats/PID.h"
-
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/RecoDecay.h"
-
-#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseFemtoContainer.h"
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseAngularContainer.h"
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h"
-#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseSoftPionRemoval.h"
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseEfficiencyCalculator.h"
-
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseFemtoContainer.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseSoftPionRemoval.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
+#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
+#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
 #include "PWGHF/Core/HfHelper.h"
 #include "PWGHF/Core/SelectorCuts.h"
 #include "PWGHF/DataModel/CandidateReconstructionTables.h"
 #include "PWGHF/DataModel/CandidateSelectionTables.h"
 
+#include "Common/Core/RecoDecay.h"
+#include "Common/DataModel/PIDResponse.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/PID.h"
+
+#include <string>
+#include <vector>
+
 using namespace o2;
 using namespace o2::analysis;
 using namespace o2::analysis::femto_universe;
diff --git a/.conflict-side-0/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackNucleus.cxx b/.conflict-side-0/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackNucleus.cxx
index f5fe1dc91a4..8c4462f3973 100644
--- a/.conflict-side-0/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackNucleus.cxx
+++ b/.conflict-side-0/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackNucleus.cxx
@@ -18,29 +18,31 @@
 /// \author Alicja Płachta, WUT Warsaw, alicja.plachta.stud@pw.edu.pl
 /// \author Anna-Mariia Andrushko, WUT Warsaw, anna-mariia.andrushko@cern.ch
 
-#include <vector>
-#include <string>
-#include <cmath>
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseFemtoContainer.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairWithCentMultKt.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
+#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
+#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
+
+#include "Common/DataModel/PIDResponse.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
+#include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/PID.h"
-#include "Common/DataModel/PIDResponse.h"
 
-#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseFemtoContainer.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h"
-#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairWithCentMultKt.h"
+#include <cmath>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis::femto_universe;
diff --git a/.conflict-side-0/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrack.cxx b/.conflict-side-0/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrack.cxx
index f4eb45752dc..1d623d6ec24 100644
--- a/.conflict-side-0/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrack.cxx
+++ b/.conflict-side-0/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrack.cxx
@@ -16,24 +16,25 @@
 /// \author Anton Riedel, TU München, anton.riedel@tum.de
 /// \author Zuzanna Chochulska, WUT Warsaw & CTU Prague, zchochul@cern.ch
 
-#include <vector>
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseAngularContainer.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseFemtoContainer.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
+#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
+#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
+#include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 
-#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseFemtoContainer.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseAngularContainer.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h"
-#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis::femto_universe;
diff --git a/.conflict-side-0/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrack3DMultKtExtended.cxx b/.conflict-side-0/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrack3DMultKtExtended.cxx
index f5c6242f456..4cb264949b1 100644
--- a/.conflict-side-0/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrack3DMultKtExtended.cxx
+++ b/.conflict-side-0/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrack3DMultKtExtended.cxx
@@ -14,30 +14,33 @@
 /// \remark This file is inherited from ~/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackMultKtExtended.cxx on 10/01/2024
 /// \author Pritam Chakraborty, WUT Warsaw, pritam.chakraborty@pw.edu.pl
 
-#include <vector>
-#include <string>
-#include "TRandom2.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverse3DContainer.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseContainer.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairWithCentMultKt.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
+#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
+#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
+
+#include "Common/DataModel/PIDResponse.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
+#include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/PID.h"
-#include "Common/DataModel/PIDResponse.h"
 
-#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverse3DContainer.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseContainer.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h"
-#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairWithCentMultKt.h"
+#include "TRandom2.h"
+
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis::femto_universe;
diff --git a/.conflict-side-0/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackExtended.cxx b/.conflict-side-0/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackExtended.cxx
index 06665491396..7760a8f2451 100644
--- a/.conflict-side-0/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackExtended.cxx
+++ b/.conflict-side-0/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackExtended.cxx
@@ -16,24 +16,24 @@
 /// \author Anton Riedel, TU München, anton.riedel@tum.de
 /// \author Zuzanna Chochulska, WUT Warsaw & CTU Prague, zchochul@cern.ch
 
-#include <Framework/O2DatabasePDGPlugin.h>
-#include <string>
-#include <vector>
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseContainer.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEfficiencyCorrection.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
+#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
 
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/PID.h"
+#include <Framework/O2DatabasePDGPlugin.h>
 
-#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseContainer.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEfficiencyCorrection.h"
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis::femto_universe;
diff --git a/.conflict-side-0/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackMC.cxx b/.conflict-side-0/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackMC.cxx
index 5b74f18a31e..66214ba9fd2 100644
--- a/.conflict-side-0/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackMC.cxx
+++ b/.conflict-side-0/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackMC.cxx
@@ -17,28 +17,31 @@
 /// \author Zuzanna Chochulska, WUT Warsaw, zuzanna.chochulska.stud@pw.edu.pl
 /// \author Zuzanna Chochulska, WUT Warsaw & CTU Prague, zchochul@cern.ch
 
-#include <vector>
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseContainer.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairAngularWithCentMultKt.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
+#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
+#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
+
+#include "Common/DataModel/PIDResponse.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
+#include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "TDatabasePDG.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/PID.h"
-#include "Common/DataModel/PIDResponse.h"
 
-#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseContainer.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h"
-#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairAngularWithCentMultKt.h"
+#include "TDatabasePDG.h"
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis::femto_universe;
diff --git a/.conflict-side-0/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackMcTruth.cxx b/.conflict-side-0/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackMcTruth.cxx
index d74b76ab237..804dc30e9d7 100644
--- a/.conflict-side-0/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackMcTruth.cxx
+++ b/.conflict-side-0/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackMcTruth.cxx
@@ -14,24 +14,26 @@
 /// \author Malgorzata Janik, WUT, majanik@cern.ch
 /// \author Zuzanna Chochulska, WUT Warsaw & CTU Prague, zchochul@cern.ch
 
-#include <vector>
-#include <random>
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseContainer.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
+#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
+#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
+#include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TDatabasePDG.h"
 
-#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseContainer.h"
-#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
+#include <random>
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis::femto_universe;
diff --git a/.conflict-side-0/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackMultKtExtended.cxx b/.conflict-side-0/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackMultKtExtended.cxx
index 76487c59269..23b0bab4057 100644
--- a/.conflict-side-0/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackMultKtExtended.cxx
+++ b/.conflict-side-0/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackMultKtExtended.cxx
@@ -17,29 +17,32 @@
 /// \author Zuzanna Chochulska, WUT Warsaw & CTU Prague, zchochul@cern.ch
 /// \author Alicja Płachta, WUT Warsaw, alicja.plachta.stud@pw.edu.pl
 
-#include <vector>
-#include <string>
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseFemtoContainer.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairWithCentMultKt.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
+#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
+#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
+
+#include "Common/DataModel/PIDResponse.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
+#include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "TDatabasePDG.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/PID.h"
-#include "Common/DataModel/PIDResponse.h"
 
-#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseFemtoContainer.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h"
-#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairWithCentMultKt.h"
+#include "TDatabasePDG.h"
+
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis::femto_universe;
diff --git a/.conflict-side-0/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackSpherHarMultKtExtended.cxx b/.conflict-side-0/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackSpherHarMultKtExtended.cxx
index 05c910b0b24..ccb74fb5600 100644
--- a/.conflict-side-0/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackSpherHarMultKtExtended.cxx
+++ b/.conflict-side-0/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackSpherHarMultKtExtended.cxx
@@ -14,29 +14,32 @@
 /// \remark This file is inherited from ~/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrack3DMultKtExtended.cxx on 17/06/2024
 /// \author Pritam Chakraborty, WUT Warsaw, pritam.chakraborty@pw.edu.pl
 
-#include <vector>
-#include <string>
-#include "TRandom2.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairSHCentMultKt.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseSHContainer.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
+#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
+#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
+
+#include "Common/DataModel/PIDResponse.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
+#include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/PID.h"
-#include "Common/DataModel/PIDResponse.h"
 
-#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseSHContainer.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h"
-#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairSHCentMultKt.h"
+#include "TRandom2.h"
+
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis::femto_universe;
diff --git a/.conflict-side-0/PWGCF/FemtoWorld/Core/FemtoWorldCollisionSelection.h b/.conflict-side-0/PWGCF/FemtoWorld/Core/FemtoWorldCollisionSelection.h
index d2404f3e214..d581dcaa4ee 100644
--- a/.conflict-side-0/PWGCF/FemtoWorld/Core/FemtoWorldCollisionSelection.h
+++ b/.conflict-side-0/PWGCF/FemtoWorld/Core/FemtoWorldCollisionSelection.h
@@ -17,13 +17,14 @@
 #ifndef PWGCF_FEMTOWORLD_CORE_FEMTOWORLDCOLLISIONSELECTION_H_
 #define PWGCF_FEMTOWORLD_CORE_FEMTOWORLDCOLLISIONSELECTION_H_
 
-#include <string>
-#include <iostream>
-
 #include "Common/CCDB/TriggerAliases.h"
+
 #include "Framework/HistogramRegistry.h"
 #include "Framework/Logger.h"
 
+#include <iostream>
+#include <string>
+
 using namespace o2::framework;
 
 namespace o2::analysis::femtoWorld
diff --git a/.conflict-side-0/PWGCF/FemtoWorld/Core/FemtoWorldContainer.h b/.conflict-side-0/PWGCF/FemtoWorld/Core/FemtoWorldContainer.h
index a80af060d56..5bf2a122062 100644
--- a/.conflict-side-0/PWGCF/FemtoWorld/Core/FemtoWorldContainer.h
+++ b/.conflict-side-0/PWGCF/FemtoWorld/Core/FemtoWorldContainer.h
@@ -18,19 +18,20 @@
 #ifndef PWGCF_FEMTOWORLD_CORE_FEMTOWORLDCONTAINER_H_
 #define PWGCF_FEMTOWORLD_CORE_FEMTOWORLDCONTAINER_H_
 
-#include <vector>
-#include <string>
-#include "Framework/HistogramRegistry.h"
 #include "PWGCF/FemtoWorld/Core/FemtoWorldMath.h"
 
+#include "CommonConstants/MathConstants.h"
+#include "Framework/HistogramRegistry.h"
+
 #include "Math/Vector4D.h"
-#include "TMath.h"
 #include "TDatabasePDG.h"
-
 #include "TLorentzVector.h"
-#include "CommonConstants/MathConstants.h"
+#include "TMath.h"
 #include "TRandom.h"
 
+#include <string>
+#include <vector>
+
 using namespace o2::framework;
 
 namespace o2::analysis::femtoWorld
diff --git a/.conflict-side-0/PWGCF/FemtoWorld/Core/FemtoWorldDetaDphiStar.h b/.conflict-side-0/PWGCF/FemtoWorld/Core/FemtoWorldDetaDphiStar.h
index f7262481a77..c7085de74ce 100644
--- a/.conflict-side-0/PWGCF/FemtoWorld/Core/FemtoWorldDetaDphiStar.h
+++ b/.conflict-side-0/PWGCF/FemtoWorld/Core/FemtoWorldDetaDphiStar.h
@@ -17,13 +17,14 @@
 #ifndef PWGCF_FEMTOWORLD_CORE_FEMTOWORLDDETADPHISTAR_H_
 #define PWGCF_FEMTOWORLD_CORE_FEMTOWORLDDETADPHISTAR_H_
 
-#include <string>
-#include <memory>
-#include <vector>
-
 #include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
+
 #include "Framework/HistogramRegistry.h"
 
+#include <memory>
+#include <string>
+#include <vector>
+
 namespace o2::analysis
 {
 namespace femtoWorld
diff --git a/.conflict-side-0/PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h b/.conflict-side-0/PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h
index fade16ebb00..c7c1c672816 100644
--- a/.conflict-side-0/PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h
+++ b/.conflict-side-0/PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h
@@ -18,6 +18,7 @@
 #define FEMTOWORLDEVENTHISTO_H_
 
 #include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
+
 #include "Framework/HistogramRegistry.h"
 
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGCF/FemtoWorld/Core/FemtoWorldMath.h b/.conflict-side-0/PWGCF/FemtoWorld/Core/FemtoWorldMath.h
index 6eff2f212b8..921b34aa8f5 100644
--- a/.conflict-side-0/PWGCF/FemtoWorld/Core/FemtoWorldMath.h
+++ b/.conflict-side-0/PWGCF/FemtoWorld/Core/FemtoWorldMath.h
@@ -17,8 +17,8 @@
 #ifndef FEMTOWORLDMATH_H_
 #define FEMTOWORLDMATH_H_
 
-#include "Math/Vector4D.h"
 #include "Math/Boost.h"
+#include "Math/Vector4D.h"
 #include "TLorentzVector.h"
 #include "TMath.h"
 
diff --git a/.conflict-side-0/PWGCF/FemtoWorld/Core/FemtoWorldObjectSelection.h b/.conflict-side-0/PWGCF/FemtoWorld/Core/FemtoWorldObjectSelection.h
index d940f9d13ef..2ab9c7a05f2 100644
--- a/.conflict-side-0/PWGCF/FemtoWorld/Core/FemtoWorldObjectSelection.h
+++ b/.conflict-side-0/PWGCF/FemtoWorld/Core/FemtoWorldObjectSelection.h
@@ -18,8 +18,8 @@
 
 #include "PWGCF/FemtoWorld/Core/FemtoWorldSelection.h"
 
-#include "ReconstructionDataFormats/PID.h"
 #include "Framework/HistogramRegistry.h"
+#include "ReconstructionDataFormats/PID.h"
 
 using namespace o2::framework;
 
diff --git a/.conflict-side-0/PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h b/.conflict-side-0/PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h
index 5c20af3813e..f0f6b24dead 100644
--- a/.conflict-side-0/PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h
+++ b/.conflict-side-0/PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h
@@ -18,6 +18,7 @@
 #define PWGCF_FEMTOWORLD_CORE_FEMTOWORLDPAIRCLEANER_H_
 
 #include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
+
 #include "Framework/HistogramRegistry.h"
 
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGCF/FemtoWorld/Core/FemtoWorldPairWithCentrality.h b/.conflict-side-0/PWGCF/FemtoWorld/Core/FemtoWorldPairWithCentrality.h
index 2a2548b5d5b..fee7b1aed33 100644
--- a/.conflict-side-0/PWGCF/FemtoWorld/Core/FemtoWorldPairWithCentrality.h
+++ b/.conflict-side-0/PWGCF/FemtoWorld/Core/FemtoWorldPairWithCentrality.h
@@ -13,10 +13,11 @@
 #ifndef PWGCF_FEMTOWORLD_CORE_FEMTOWORLDPAIRWITHCENTRALITY_H_
 #define PWGCF_FEMTOWORLD_CORE_FEMTOWORLDPAIRWITHCENTRALITY_H_
 
-#include <string>
+#include "Framework/HistogramRegistry.h"
+
 #include <iostream>
+#include <string>
 #include <vector>
-#include "Framework/HistogramRegistry.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h b/.conflict-side-0/PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h
index 0671c267200..574fa371ae8 100644
--- a/.conflict-side-0/PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h
+++ b/.conflict-side-0/PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h
@@ -17,10 +17,12 @@
 #ifndef PWGCF_FEMTOWORLD_CORE_FEMTOWORLDPARTICLEHISTO_H_
 #define PWGCF_FEMTOWORLD_CORE_FEMTOWORLDPARTICLEHISTO_H_
 
-#include <string>
 #include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
+
 #include "Framework/HistogramRegistry.h"
 
+#include <string>
+
 using namespace o2::framework;
 // using namespace o2::aod::o2::aod;
 
diff --git a/.conflict-side-0/PWGCF/FemtoWorld/Core/FemtoWorldPhiSelection.h b/.conflict-side-0/PWGCF/FemtoWorld/Core/FemtoWorldPhiSelection.h
index 39040d70ec0..52ed3db69ed 100644
--- a/.conflict-side-0/PWGCF/FemtoWorld/Core/FemtoWorldPhiSelection.h
+++ b/.conflict-side-0/PWGCF/FemtoWorld/Core/FemtoWorldPhiSelection.h
@@ -19,19 +19,20 @@
 #ifndef PWGCF_FEMTOWORLD_CORE_FEMTOWORLDPHISELECTION_H_
 #define PWGCF_FEMTOWORLD_CORE_FEMTOWORLDPHISELECTION_H_
 
-#include <string>
-#include <vector>
-
-#include <TDatabasePDG.h> // FIXME
-
 #include "PWGCF/FemtoWorld/Core/FemtoWorldObjectSelection.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldTrackSelection.h"
 #include "PWGCF/FemtoWorld/Core/FemtoWorldSelection.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldTrackSelection.h"
 
-#include "ReconstructionDataFormats/PID.h"
 #include "Common/Core/RecoDecay.h"
+
 #include "Framework/HistogramRegistry.h"
+#include "ReconstructionDataFormats/PID.h"
+
 #include "TLorentzVector.h"
+#include <TDatabasePDG.h> // FIXME
+
+#include <string>
+#include <vector>
 
 using namespace o2::framework;
 
diff --git a/.conflict-side-0/PWGCF/FemtoWorld/Core/FemtoWorldPionContainer.h b/.conflict-side-0/PWGCF/FemtoWorld/Core/FemtoWorldPionContainer.h
index 9c68ac7c76e..fe4641b9463 100644
--- a/.conflict-side-0/PWGCF/FemtoWorld/Core/FemtoWorldPionContainer.h
+++ b/.conflict-side-0/PWGCF/FemtoWorld/Core/FemtoWorldPionContainer.h
@@ -18,19 +18,20 @@
 #ifndef PWGCF_FEMTOWORLD_CORE_FEMTOWORLDPIONCONTAINER_H_
 #define PWGCF_FEMTOWORLD_CORE_FEMTOWORLDPIONCONTAINER_H_
 
-#include <vector>
-#include <string>
-#include "Framework/HistogramRegistry.h"
 #include "PWGCF/FemtoWorld/Core/FemtoWorldMath.h"
 
+#include "CommonConstants/MathConstants.h"
+#include "Framework/HistogramRegistry.h"
+
 #include "Math/Vector4D.h"
-#include "TMath.h"
 #include "TDatabasePDG.h"
-
 #include "TLorentzVector.h"
-#include "CommonConstants/MathConstants.h"
+#include "TMath.h"
 #include "TRandom.h"
 
+#include <string>
+#include <vector>
+
 using namespace o2::framework;
 
 namespace o2::analysis::femtoWorld
diff --git a/.conflict-side-0/PWGCF/FemtoWorld/Core/FemtoWorldTrackSelection.h b/.conflict-side-0/PWGCF/FemtoWorld/Core/FemtoWorldTrackSelection.h
index 1853be4bd3c..ea06a1433a4 100644
--- a/.conflict-side-0/PWGCF/FemtoWorld/Core/FemtoWorldTrackSelection.h
+++ b/.conflict-side-0/PWGCF/FemtoWorld/Core/FemtoWorldTrackSelection.h
@@ -18,14 +18,16 @@
 #ifndef FEMTOWORLDTRACKSELECTION_H_
 #define FEMTOWORLDTRACKSELECTION_H_
 
+#include "PWGCF/FemtoWorld/Core/FemtoWorldObjectSelection.h"
 #include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldObjectSelection.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "ReconstructionDataFormats/PID.h"
 #include "Framework/HistogramRegistry.h"
+#include "ReconstructionDataFormats/PID.h"
+
 #include <cmath>
 #include <iostream>
 
@@ -278,7 +280,7 @@ class FemtoWorldTrackSelection : public FemtoWorldObjectSelection<float, femtoWo
                                                                           "Maximal DCA_z (cm)",
                                                                           "Minimal DCA (cm)",
                                                                           "Maximal PID (nSigma)"}; ///< Helper information for the different selections
-};                                                                                                 // namespace femtoWorld
+}; // namespace femtoWorld
 
 template <o2::aod::femtoworldparticle::ParticleType part, o2::aod::femtoworldparticle::TrackType tracktype, typename cutContainerType>
 void FemtoWorldTrackSelection::init(HistogramRegistry* registry)
diff --git a/.conflict-side-0/PWGCF/FemtoWorld/Core/FemtoWorldUtils.h b/.conflict-side-0/PWGCF/FemtoWorld/Core/FemtoWorldUtils.h
index 6f7ae6e31e3..a918e674e45 100644
--- a/.conflict-side-0/PWGCF/FemtoWorld/Core/FemtoWorldUtils.h
+++ b/.conflict-side-0/PWGCF/FemtoWorld/Core/FemtoWorldUtils.h
@@ -18,8 +18,9 @@
 #ifndef FEMTOWORLD_UTILS_H_
 #define FEMTOWORLD_UTILS_H_
 
-#include "Framework/ASoAHelpers.h"
 #include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
+
+#include "Framework/ASoAHelpers.h"
 #include <CCDB/BasicCCDBManager.h>
 
 #include <vector>
diff --git a/.conflict-side-0/PWGCF/FemtoWorld/Core/FemtoWorldV0Selection.h b/.conflict-side-0/PWGCF/FemtoWorld/Core/FemtoWorldV0Selection.h
index b86171502e8..e5202efbc65 100644
--- a/.conflict-side-0/PWGCF/FemtoWorld/Core/FemtoWorldV0Selection.h
+++ b/.conflict-side-0/PWGCF/FemtoWorld/Core/FemtoWorldV0Selection.h
@@ -20,12 +20,13 @@
 #define FEMTOWORLDV0SELECTION_H_
 
 #include "PWGCF/FemtoWorld/Core/FemtoWorldObjectSelection.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldTrackSelection.h"
 #include "PWGCF/FemtoWorld/Core/FemtoWorldSelection.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldTrackSelection.h"
 
-#include "ReconstructionDataFormats/PID.h"
 #include "Common/Core/RecoDecay.h"
+
 #include "Framework/HistogramRegistry.h"
+#include "ReconstructionDataFormats/PID.h"
 
 using namespace o2::framework;
 
diff --git a/.conflict-side-0/PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h b/.conflict-side-0/PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h
index d112f11c2ab..4d3071b5575 100644
--- a/.conflict-side-0/PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h
+++ b/.conflict-side-0/PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h
@@ -12,16 +12,18 @@
 #ifndef PWGCF_FEMTOWORLD_DATAMODEL_FEMTOWORLDDERIVED_H_
 #define PWGCF_FEMTOWORLD_DATAMODEL_FEMTOWORLDDERIVED_H_
 
-#include <cmath>
-#include "Framework/ASoA.h"
-#include "MathUtils/Utils.h"
-#include "Framework/DataTypes.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoA.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/DataTypes.h"
 #include "Framework/Expressions.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Centrality.h"
+#include "MathUtils/Utils.h"
+
+#include <cmath>
 
 namespace o2::aod
 {
diff --git a/.conflict-side-0/PWGCF/FemtoWorld/TableProducer/femtoWorldProducerReducedTask.cxx b/.conflict-side-0/PWGCF/FemtoWorld/TableProducer/femtoWorldProducerReducedTask.cxx
index 06bb8dff109..c6380dd97d2 100644
--- a/.conflict-side-0/PWGCF/FemtoWorld/TableProducer/femtoWorldProducerReducedTask.cxx
+++ b/.conflict-side-0/PWGCF/FemtoWorld/TableProducer/femtoWorldProducerReducedTask.cxx
@@ -16,23 +16,25 @@
 #include "PWGCF/FemtoWorld/Core/FemtoWorldCollisionSelection.h"
 #include "PWGCF/FemtoWorld/Core/FemtoWorldTrackSelection.h"
 #include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "DataFormatsParameters/GRPObject.h"
+#include <CCDB/BasicCCDBManager.h>
+
 #include "Math/Vector4D.h"
 #include "TMath.h"
-#include <CCDB/BasicCCDBManager.h>
 
 using namespace o2;
 using namespace o2::analysis::femtoWorld;
diff --git a/.conflict-side-0/PWGCF/FemtoWorld/TableProducer/femtoWorldProducerTask.cxx b/.conflict-side-0/PWGCF/FemtoWorld/TableProducer/femtoWorldProducerTask.cxx
index ce5b415b275..861e7ff8005 100644
--- a/.conflict-side-0/PWGCF/FemtoWorld/TableProducer/femtoWorldProducerTask.cxx
+++ b/.conflict-side-0/PWGCF/FemtoWorld/TableProducer/femtoWorldProducerTask.cxx
@@ -14,38 +14,38 @@
 /// \author Andi Mathis, TU München, andreas.mathis@ph.tum.de
 /// \author Zuzanna Chochulska, WUT Warsaw, zchochul@cern.ch
 
-#include <TDatabasePDG.h> // FIXME
-
-#include "CCDB/BasicCCDBManager.h"
 #include "PWGCF/FemtoWorld/Core/FemtoWorldCollisionSelection.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldPhiSelection.h"
 #include "PWGCF/FemtoWorld/Core/FemtoWorldTrackSelection.h"
 #include "PWGCF/FemtoWorld/Core/FemtoWorldV0Selection.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldPhiSelection.h"
 #include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h"
-
 #include "PWGHF/Core/HfHelper.h"
 #include "PWGHF/DataModel/CandidateReconstructionTables.h"
 #include "PWGHF/DataModel/CandidateSelectionTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "TLorentzVector.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsParameters/GRPMagField.h"
 #include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
 #include "Math/Vector4D.h"
+#include "TLorentzVector.h"
 #include "TMath.h"
+#include <TDatabasePDG.h> // FIXME
 
 using namespace o2;
 using namespace o2::analysis::femtoWorld;
diff --git a/.conflict-side-0/PWGCF/FemtoWorld/TableProducer/femtoWorldProducerTaskV0Only.cxx b/.conflict-side-0/PWGCF/FemtoWorld/TableProducer/femtoWorldProducerTaskV0Only.cxx
index b576f2c125b..0e635dc97ee 100644
--- a/.conflict-side-0/PWGCF/FemtoWorld/TableProducer/femtoWorldProducerTaskV0Only.cxx
+++ b/.conflict-side-0/PWGCF/FemtoWorld/TableProducer/femtoWorldProducerTaskV0Only.cxx
@@ -17,23 +17,25 @@
 #include "PWGCF/FemtoWorld/Core/FemtoWorldTrackSelection.h"
 #include "PWGCF/FemtoWorld/Core/FemtoWorldV0Selection.h"
 #include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "DataFormatsParameters/GRPObject.h"
+#include <CCDB/BasicCCDBManager.h>
+
 #include "Math/Vector4D.h"
 #include "TMath.h"
-#include <CCDB/BasicCCDBManager.h>
 
 using namespace o2;
 using namespace o2::analysis::femtoWorld;
diff --git a/.conflict-side-0/PWGCF/FemtoWorld/Tasks/femtoWorldDebugTrack.cxx b/.conflict-side-0/PWGCF/FemtoWorld/Tasks/femtoWorldDebugTrack.cxx
index cb5fd945b3c..a0f158df070 100644
--- a/.conflict-side-0/PWGCF/FemtoWorld/Tasks/femtoWorldDebugTrack.cxx
+++ b/.conflict-side-0/PWGCF/FemtoWorld/Tasks/femtoWorldDebugTrack.cxx
@@ -13,18 +13,18 @@
 /// \brief Tasks that reads the particle tables and fills QA histograms for tracks
 /// \author Luca Barioglio, TU München, luca.barioglio@cern.ch
 
+#include "PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldUtils.h"
+#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
+
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-#include "DataFormatsParameters/GRPObject.h"
-
-#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldUtils.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::analysis::femtoWorld;
diff --git a/.conflict-side-0/PWGCF/FemtoWorld/Tasks/femtoWorldDebugV0.cxx b/.conflict-side-0/PWGCF/FemtoWorld/Tasks/femtoWorldDebugV0.cxx
index b2080ba4789..31c37c84772 100644
--- a/.conflict-side-0/PWGCF/FemtoWorld/Tasks/femtoWorldDebugV0.cxx
+++ b/.conflict-side-0/PWGCF/FemtoWorld/Tasks/femtoWorldDebugV0.cxx
@@ -13,18 +13,18 @@
 /// \brief Tasks that reads the particle tables and fills QA histograms for V0s
 /// \author Luca Barioglio, TU München, luca.barioglio@cern.ch
 
+#include "PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldUtils.h"
+#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
+
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-#include "DataFormatsParameters/GRPObject.h"
-
-#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldUtils.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::analysis::femtoWorld;
diff --git a/.conflict-side-0/PWGCF/FemtoWorld/Tasks/femtoWorldEfficiencyTask.cxx b/.conflict-side-0/PWGCF/FemtoWorld/Tasks/femtoWorldEfficiencyTask.cxx
index 9cad450302f..a4fb0717a75 100644
--- a/.conflict-side-0/PWGCF/FemtoWorld/Tasks/femtoWorldEfficiencyTask.cxx
+++ b/.conflict-side-0/PWGCF/FemtoWorld/Tasks/femtoWorldEfficiencyTask.cxx
@@ -16,20 +16,22 @@
 /// \author Barbara Chytla, WUT Warsaw, barbara.chytla@cern.ch
 
 // O2 includes
+#include "PWGCF/FemtoWorld/Core/FemtoWorldCollisionSelection.h"
+#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
+#include "PWGLF/DataModel/LFResonanceTables.h"
+
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/Core/trackUtilities.h"
+
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldCollisionSelection.h"
-#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
-#include "Framework/O2DatabasePDGPlugin.h"
 
 #include "TPDGCode.h"
 
diff --git a/.conflict-side-0/PWGCF/FemtoWorld/Tasks/femtoWorldEfficiencyTaskDe.cxx b/.conflict-side-0/PWGCF/FemtoWorld/Tasks/femtoWorldEfficiencyTaskDe.cxx
index b0108b37a2b..cd0d2e4b247 100644
--- a/.conflict-side-0/PWGCF/FemtoWorld/Tasks/femtoWorldEfficiencyTaskDe.cxx
+++ b/.conflict-side-0/PWGCF/FemtoWorld/Tasks/femtoWorldEfficiencyTaskDe.cxx
@@ -16,19 +16,21 @@
 /// \author Barbara Chytla, WUT Warsaw, barbara.chytla@cern.ch
 
 // O2 includes
+#include "PWGCF/FemtoWorld/Core/FemtoWorldCollisionSelection.h"
+#include "PWGLF/DataModel/LFResonanceTables.h"
+
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/Core/trackUtilities.h"
+
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldCollisionSelection.h"
-#include "Framework/O2DatabasePDGPlugin.h"
 
 #include "TPDGCode.h"
 
diff --git a/.conflict-side-0/PWGCF/FemtoWorld/Tasks/femtoWorldHashTask.cxx b/.conflict-side-0/PWGCF/FemtoWorld/Tasks/femtoWorldHashTask.cxx
index 4a6bdac3a2b..a990af3bf9e 100644
--- a/.conflict-side-0/PWGCF/FemtoWorld/Tasks/femtoWorldHashTask.cxx
+++ b/.conflict-side-0/PWGCF/FemtoWorld/Tasks/femtoWorldHashTask.cxx
@@ -16,11 +16,12 @@
 /// \author Zuzanna Chochulska, WUT Warsaw, zchochul@cern.ch
 
 #include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
+
 #include "Common/Core/EventMixing.h"
-#include "Framework/AnalysisTask.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "Framework/ASoAHelpers.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskPionPion.cxx b/.conflict-side-0/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskPionPion.cxx
index a2d061ed1f4..07185918140 100644
--- a/.conflict-side-0/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskPionPion.cxx
+++ b/.conflict-side-0/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskPionPion.cxx
@@ -15,20 +15,20 @@
 /// \author Zuzanna Chochulska, WUT Warsaw, zchochul@cern.ch
 /// \author Alicja Plachta, WUT Warsaw
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/StepTHn.h"
-
-#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldDetaDphiStar.h"
 #include "PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h"
 #include "PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h"
 #include "PWGCF/FemtoWorld/Core/FemtoWorldPionContainer.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldDetaDphiStar.h"
 #include "PWGCF/FemtoWorld/Core/FemtoWorldUtils.h"
+#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::analysis::femtoWorld;
diff --git a/.conflict-side-0/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskProtonAntiproton.cxx b/.conflict-side-0/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskProtonAntiproton.cxx
index 066307a91d4..46f6f802ae6 100644
--- a/.conflict-side-0/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskProtonAntiproton.cxx
+++ b/.conflict-side-0/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskProtonAntiproton.cxx
@@ -15,20 +15,20 @@
 /// \author Zuzanna Chochulska, WUT Warsaw, zchochul@cern.ch
 /// \author Barbara Chytła, WUT Warsaw, barbara.chytla.stud@pw.edu.pl
 
+#include "PWGCF/FemtoWorld/Core/FemtoWorldContainer.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldDetaDphiStar.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldUtils.h"
+#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-
-#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldContainer.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldDetaDphiStar.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldUtils.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::analysis::femtoWorld;
diff --git a/.conflict-side-0/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskTrackD0.cxx b/.conflict-side-0/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskTrackD0.cxx
index 8f1452c1c49..6a1fa8331c6 100644
--- a/.conflict-side-0/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskTrackD0.cxx
+++ b/.conflict-side-0/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskTrackD0.cxx
@@ -14,24 +14,23 @@
 /// \author Andi Mathis, TU München, andreas.mathis@ph.tum.de
 /// \author Zuzanna Chochulska, WUT Warsaw, zchochul@cern.ch
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/StepTHn.h"
-
-#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h"
 #include "PWGCF/FemtoWorld/Core/FemtoWorldContainer.h"
 #include "PWGCF/FemtoWorld/Core/FemtoWorldDetaDphiStar.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h"
 #include "PWGCF/FemtoWorld/Core/FemtoWorldUtils.h"
-
+#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
 #include "PWGHF/DataModel/CandidateReconstructionTables.h"
 #include "PWGHF/DataModel/CandidateSelectionTables.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::analysis::femtoWorld;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskTrackPhi.cxx b/.conflict-side-0/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskTrackPhi.cxx
index e5201b379d5..3e6c1a066bb 100644
--- a/.conflict-side-0/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskTrackPhi.cxx
+++ b/.conflict-side-0/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskTrackPhi.cxx
@@ -14,20 +14,20 @@
 /// \author Andi Mathis, TU München, andreas.mathis@ph.tum.de
 /// \author Zuzanna Chochulska, WUT Warsaw, zchochul@cern.ch
 
+#include "PWGCF/FemtoWorld/Core/FemtoWorldContainer.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldDetaDphiStar.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldUtils.h"
+#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-
-#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldContainer.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldDetaDphiStar.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldUtils.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::analysis::femtoWorld;
diff --git a/.conflict-side-0/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskTrackTrack.cxx b/.conflict-side-0/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskTrackTrack.cxx
index 4037bd991e0..1cacc212d47 100644
--- a/.conflict-side-0/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskTrackTrack.cxx
+++ b/.conflict-side-0/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskTrackTrack.cxx
@@ -14,20 +14,20 @@
 /// \author Andi Mathis, TU München, andreas.mathis@ph.tum.de
 /// \author Zuzanna Chochulska, WUT Warsaw, zchochul@cern.ch
 
+#include "PWGCF/FemtoWorld/Core/FemtoWorldContainer.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldDetaDphiStar.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldUtils.h"
+#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-
-#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldContainer.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldDetaDphiStar.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldUtils.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::analysis::femtoWorld;
diff --git a/.conflict-side-0/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskTrackV0.cxx b/.conflict-side-0/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskTrackV0.cxx
index 36094a0f16a..2d8be41c0c1 100644
--- a/.conflict-side-0/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskTrackV0.cxx
+++ b/.conflict-side-0/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskTrackV0.cxx
@@ -13,20 +13,20 @@
 /// \brief Tasks that reads the track tables used for the pairing and builds pairs of two tracks
 /// \author Andi Mathis, TU München, andreas.mathis@ph.tum.de
 
+#include "PWGCF/FemtoWorld/Core/FemtoWorldContainer.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldDetaDphiStar.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldUtils.h"
+#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-
-#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldContainer.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldDetaDphiStar.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldUtils.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::analysis::femtoWorld;
diff --git a/.conflict-side-0/PWGCF/FemtoWorld/Tasks/femtoWorldPionAllPairTask.cxx b/.conflict-side-0/PWGCF/FemtoWorld/Tasks/femtoWorldPionAllPairTask.cxx
index 44278d89471..ba41e02a12d 100644
--- a/.conflict-side-0/PWGCF/FemtoWorld/Tasks/femtoWorldPionAllPairTask.cxx
+++ b/.conflict-side-0/PWGCF/FemtoWorld/Tasks/femtoWorldPionAllPairTask.cxx
@@ -15,23 +15,24 @@
 /// \author Zuzanna Chochulska, WUT Warsaw, zchochul@cern.ch
 /// \author Deependra Sharma, IITB, deependra.sharma@cern.ch
 
+#include "PWGCF/FemtoWorld/Core/FemtoWorldContainer.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldDetaDphiStar.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldMath.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldPairWithCentrality.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldUtils.h"
+#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-#include "TDatabasePDG.h"
+#include "Framework/runDataProcessing.h"
 
-#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldContainer.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldDetaDphiStar.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldUtils.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldMath.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldPairWithCentrality.h"
+#include "TDatabasePDG.h"
 
 using namespace o2;
 using namespace o2::analysis::femtoWorld;
diff --git a/.conflict-side-0/PWGCF/FemtoWorld/Tasks/femtoWorldPionPairTaskTrackTrack.cxx b/.conflict-side-0/PWGCF/FemtoWorld/Tasks/femtoWorldPionPairTaskTrackTrack.cxx
index 9d83c1ca3ec..3bba47662c9 100644
--- a/.conflict-side-0/PWGCF/FemtoWorld/Tasks/femtoWorldPionPairTaskTrackTrack.cxx
+++ b/.conflict-side-0/PWGCF/FemtoWorld/Tasks/femtoWorldPionPairTaskTrackTrack.cxx
@@ -15,20 +15,20 @@
 /// \author Zuzanna Chochulska, WUT Warsaw, zchochul@cern.ch
 /// \author Deependra Sharma, IITB, deependra.sharma@cern.ch
 
+#include "PWGCF/FemtoWorld/Core/FemtoWorldContainer.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldDetaDphiStar.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldUtils.h"
+#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-
-#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldContainer.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldDetaDphiStar.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldUtils.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::analysis::femtoWorld;
diff --git a/.conflict-side-0/PWGCF/Flow/TableProducer/zdcQVectors.cxx b/.conflict-side-0/PWGCF/Flow/TableProducer/zdcQVectors.cxx
index c748b1f51ec..095bc857326 100644
--- a/.conflict-side-0/PWGCF/Flow/TableProducer/zdcQVectors.cxx
+++ b/.conflict-side-0/PWGCF/Flow/TableProducer/zdcQVectors.cxx
@@ -14,47 +14,48 @@
 /// \since  11/2024
 /// \brief  In this task the energy calibration and recentring of Q-vectors constructed in the ZDCs will be done
 
-#include <stdlib.h>
-#include <cmath>
-#include <algorithm>
-#include <numeric>
-#include <vector>
-#include <typeinfo>
-#include <memory>
-#include <string>
+#include "PWGCF/DataModel/SPTableZDC.h"
 
-#include "CCDB/BasicCCDBManager.h"
 #include "Common/CCDB/EventSelectionParams.h"
 #include "Common/CCDB/TriggerAliases.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "Framework/AnalysisTask.h"
+#include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StaticFor.h"
-
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/GlobalTrackID.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "PWGCF/DataModel/SPTableZDC.h"
 
+#include "TCanvas.h"
+#include "TF1.h"
+#include "TFitResult.h"
 #include "TH1F.h"
 #include "TH2F.h"
-#include "TProfile.h"
 #include "TObjArray.h"
-#include "TF1.h"
-#include "TFitResult.h"
-#include "TCanvas.h"
-#include "TSystem.h"
+#include "TProfile.h"
 #include "TROOT.h"
+#include "TSystem.h"
+
+#include <algorithm>
+#include <cmath>
+#include <memory>
+#include <numeric>
+#include <string>
+#include <typeinfo>
+#include <vector>
+
+#include <stdlib.h>
 
 #define O2_DEFINE_CONFIGURABLE(NAME, TYPE, DEFAULT, HELP) Configurable<TYPE> NAME{#NAME, DEFAULT, HELP};
 
@@ -80,7 +81,7 @@ std::vector<double> pyZDC = {-1.75, -1.75, 1.75, 1.75};
 double alphaZDC = 0.395;
 
 // q-vectors before (q) and after (qRec) recentering.
-std::vector<double> q(4); // start values of [QxA, QyA, QxC, QyC]
+std::vector<double> q(4);     // start values of [QxA, QyA, QxC, QyC]
 std::vector<double> qNoEq(4); // start values of [QxA, QyA, QxC, QyC]
 
 // for energy calibration
diff --git a/.conflict-side-0/PWGCF/Flow/Tasks/flowAnalysisGF.cxx b/.conflict-side-0/PWGCF/Flow/Tasks/flowAnalysisGF.cxx
index 08e223befb6..38b5ddf9eb7 100644
--- a/.conflict-side-0/PWGCF/Flow/Tasks/flowAnalysisGF.cxx
+++ b/.conflict-side-0/PWGCF/Flow/Tasks/flowAnalysisGF.cxx
@@ -9,35 +9,36 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <CCDB/BasicCCDBManager.h>
-#include <DataFormatsParameters/GRPObject.h>
-#include <DataFormatsParameters/GRPMagField.h>
-#include <algorithm>
-#include <numeric>
-#include <vector>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/HistogramRegistry.h"
-
-#include "Common/DataModel/EventSelection.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-
-#include "GFWPowerArray.h"
-#include "GFW.h"
-#include "GFWCumulant.h"
 #include "FlowContainer.h"
 #include "FlowPtContainer.h"
+#include "GFW.h"
 #include "GFWConfig.h"
+#include "GFWCumulant.h"
+#include "GFWPowerArray.h"
 #include "GFWWeights.h"
+
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include <CCDB/BasicCCDBManager.h>
+#include <DataFormatsParameters/GRPMagField.h>
+#include <DataFormatsParameters/GRPObject.h>
+
+#include <TF1.h>
 #include <TProfile.h>
 #include <TRandom3.h>
-#include <TF1.h>
+
+#include <algorithm>
+#include <numeric>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGCF/Flow/Tasks/flowEfficiencyCasc.cxx b/.conflict-side-0/PWGCF/Flow/Tasks/flowEfficiencyCasc.cxx
index 25e23838586..e47d25cc6bf 100644
--- a/.conflict-side-0/PWGCF/Flow/Tasks/flowEfficiencyCasc.cxx
+++ b/.conflict-side-0/PWGCF/Flow/Tasks/flowEfficiencyCasc.cxx
@@ -14,23 +14,27 @@
 /// \since  Feb/21/2025
 /// \brief  This task is to calculate V0s and cascades local density efficiency
 
-#include <vector>
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
+#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/DataModel/cascqaanalysis.h"
+
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGLF/DataModel/cascqaanalysis.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 #include <TPDGCode.h>
 
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-0/PWGCF/Flow/Tasks/flowEsePHe3.cxx b/.conflict-side-0/PWGCF/Flow/Tasks/flowEsePHe3.cxx
index 2a4955c1419..1577b36037e 100644
--- a/.conflict-side-0/PWGCF/Flow/Tasks/flowEsePHe3.cxx
+++ b/.conflict-side-0/PWGCF/Flow/Tasks/flowEsePHe3.cxx
@@ -14,41 +14,41 @@
 /// \brief  task to calculate the P He3 flow correlation.
 // C++/ROOT includes.
 #include <CCDB/BasicCCDBManager.h>
-#include <chrono>
-#include <string>
-#include <vector>
-#include <utility>
-#include <memory>
-#include <TF1.h>
+
 #include <TComplex.h>
+#include <TF1.h>
 #include <TH1F.h>
 #include <TH2D.h>
 #include <TMath.h>
 #include <TVector2.h>
 
-// o2Physics includes.
-#include "Framework/ASoA.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/StaticFor.h"
-
-#include "DataFormatsTPC/BetheBlochAleph.h"
+#include <chrono>
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
 
-#include "Common/DataModel/Qvectors.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Multiplicity.h"
+// o2Physics includes.
 #include "Common/Core/EventPlaneHelper.h"
 #include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/PIDResponseITS.h"
+#include "Common/DataModel/Qvectors.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
 #include "CommonConstants/PhysicsConstants.h"
+#include "DataFormatsTPC/BetheBlochAleph.h"
+#include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGCF/Flow/Tasks/flowGfwOmegaXi.cxx b/.conflict-side-0/PWGCF/Flow/Tasks/flowGfwOmegaXi.cxx
index 741f4b5b33a..0dbc93d8bdd 100644
--- a/.conflict-side-0/PWGCF/Flow/Tasks/flowGfwOmegaXi.cxx
+++ b/.conflict-side-0/PWGCF/Flow/Tasks/flowGfwOmegaXi.cxx
@@ -196,7 +196,7 @@ struct FlowGfwOmegaXi {
 
   using TracksPID = soa::Join<aod::pidTPCPi, aod::pidTPCKa, aod::pidTPCPr, aod::pidTOFPi, aod::pidTOFKa, aod::pidTOFPr>;
   using AodTracks = soa::Filtered<soa::Join<aod::Tracks, aod::TrackSelection, o2::aod::TrackSelectionExtension, aod::TracksExtra, TracksPID, aod::TracksIU>>; // tracks filter
-  using AodCollisions = soa::Filtered<soa::Join<aod::Collisions, aod::EvSels, aod::CentFT0Cs, aod::Mults>>;  // collisions filter
+  using AodCollisions = soa::Filtered<soa::Join<aod::Collisions, aod::EvSels, aod::CentFT0Cs, aod::Mults>>;                                                   // collisions filter
   using DaughterTracks = soa::Join<aod::Tracks, aod::TracksExtra, aod::TracksDCA, TracksPID, aod::TrackSelection, o2::aod::TrackSelectionExtension>;
 
   // Connect to ccdb
diff --git a/.conflict-side-0/PWGCF/Flow/Tasks/flowGfwTask.cxx b/.conflict-side-0/PWGCF/Flow/Tasks/flowGfwTask.cxx
index e5854dcf43b..9e2d03f41d1 100644
--- a/.conflict-side-0/PWGCF/Flow/Tasks/flowGfwTask.cxx
+++ b/.conflict-side-0/PWGCF/Flow/Tasks/flowGfwTask.cxx
@@ -14,40 +14,41 @@
 /// \since  Mar 28, 2024
 /// \brief  Multiparticle flow measurements with FT0 and ZDC
 
-#include <CCDB/BasicCCDBManager.h>
-#include <DataFormatsParameters/GRPMagField.h>
-#include <cmath>
-#include <vector>
-#include <string>
-#include <memory>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/AnalysisDataModel.h"
+#include "FlowContainer.h"
+#include "GFW.h"
+#include "GFWCumulant.h"
+#include "GFWPowerArray.h"
+#include "GFWWeights.h"
 
-#include "Common/DataModel/EventSelection.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/GlobalTrackID.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "TPDGCode.h"
+#include <CCDB/BasicCCDBManager.h>
+#include <DataFormatsParameters/GRPMagField.h>
 
-#include "GFWPowerArray.h"
-#include "GFW.h"
-#include "GFWCumulant.h"
-#include "GFWWeights.h"
-#include "FlowContainer.h"
 #include "TList.h"
+#include "TPDGCode.h"
+#include <TF1.h>
 #include <TProfile.h>
 #include <TRandom3.h>
-#include <TF1.h>
+
+#include <cmath>
+#include <memory>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGCF/Flow/Tasks/flowMc.cxx b/.conflict-side-0/PWGCF/Flow/Tasks/flowMc.cxx
index b310096ef40..81ed7e3f95b 100644
--- a/.conflict-side-0/PWGCF/Flow/Tasks/flowMc.cxx
+++ b/.conflict-side-0/PWGCF/Flow/Tasks/flowMc.cxx
@@ -14,34 +14,39 @@
 /// \since  Feb/5/2025
 /// \brief  QC of synthetic flow exercise
 
-#include <CCDB/BasicCCDBManager.h>
-#include <vector>
-#include <string>
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "FlowContainer.h"
+#include "GFW.h"
+#include "GFWCumulant.h"
+#include "GFWPowerArray.h"
+#include "GFWWeights.h"
+
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGMM/Mult/DataModel/Index.h" // for Particles2Tracks table
+
 #include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
 #include "Common/Core/trackUtilities.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "DataFormatsParameters/GRPObject.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "DataFormatsParameters/GRPMagField.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGMM/Mult/DataModel/Index.h" // for Particles2Tracks table
-#include "GFWPowerArray.h"
-#include "GFW.h"
-#include "GFWCumulant.h"
-#include "GFWWeights.h"
-#include "FlowContainer.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+#include <CCDB/BasicCCDBManager.h>
+
+#include <TF1.h>
+#include <TPDGCode.h>
 #include <TProfile.h>
 #include <TRandom3.h>
-#include <TPDGCode.h>
-#include <TF1.h>
+
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGCF/Flow/Tasks/flowPidCme.cxx b/.conflict-side-0/PWGCF/Flow/Tasks/flowPidCme.cxx
index bd91bdc4450..0248af750d6 100644
--- a/.conflict-side-0/PWGCF/Flow/Tasks/flowPidCme.cxx
+++ b/.conflict-side-0/PWGCF/Flow/Tasks/flowPidCme.cxx
@@ -14,39 +14,40 @@
 /// \brief  task to calculate the pikp cme signal and bacground.
 // C++/ROOT includes.
 #include <CCDB/BasicCCDBManager.h>
-#include <chrono>
-#include <string>
-#include <vector>
-#include <utility>
-#include <memory>
-#include <TF1.h>
+
 #include <TComplex.h>
+#include <TF1.h>
 #include <TH1F.h>
 #include <TH2D.h>
 #include <TMath.h>
 #include <TVector2.h>
 
-// o2Physics includes.
-#include "Framework/ASoA.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/StaticFor.h"
+#include <chrono>
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
 
-#include "Common/DataModel/Qvectors.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Multiplicity.h"
+// o2Physics includes.
 #include "Common/Core/EventPlaneHelper.h"
 #include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/PIDResponseITS.h"
+#include "Common/DataModel/Qvectors.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
 #include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
 
 // o2 includes.
 
diff --git a/.conflict-side-0/PWGCF/Flow/Tasks/flowPtEfficiency.cxx b/.conflict-side-0/PWGCF/Flow/Tasks/flowPtEfficiency.cxx
index 217b6f7fb36..a66de51e212 100644
--- a/.conflict-side-0/PWGCF/Flow/Tasks/flowPtEfficiency.cxx
+++ b/.conflict-side-0/PWGCF/Flow/Tasks/flowPtEfficiency.cxx
@@ -14,29 +14,31 @@
 /// \since  Jun/08/2023
 /// \brief  a task to calculate the pt efficiency
 
-#include <CCDB/BasicCCDBManager.h>
-#include <vector>
-#include <string>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/HistogramRegistry.h"
+#include "FlowContainer.h"
+#include "GFW.h"
+#include "GFWCumulant.h"
+#include "GFWPowerArray.h"
+#include "GFWWeights.h"
 
 #include "Common/Core/RecoDecay.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
-#include "GFWPowerArray.h"
-#include "GFW.h"
-#include "GFWCumulant.h"
-#include "GFWWeights.h"
-#include "FlowContainer.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include <CCDB/BasicCCDBManager.h>
+
+#include <TPDGCode.h>
 #include <TProfile.h>
 #include <TRandom3.h>
-#include <TPDGCode.h>
+
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGCF/Flow/Tasks/flowQa.cxx b/.conflict-side-0/PWGCF/Flow/Tasks/flowQa.cxx
index 1eaa6d8437d..3d52e9ec429 100644
--- a/.conflict-side-0/PWGCF/Flow/Tasks/flowQa.cxx
+++ b/.conflict-side-0/PWGCF/Flow/Tasks/flowQa.cxx
@@ -14,36 +14,38 @@
 /// \since  Feb/23/2025
 /// \brief  jira: PWGCF-254, QA for flow analysis
 
-#include <CCDB/BasicCCDBManager.h>
-#include <cmath>
-#include <vector>
-#include <unordered_map>
-#include <string>
-#include <memory>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/HistogramRegistry.h"
+#include "FlowContainer.h"
+#include "GFW.h"
+#include "GFWCumulant.h"
+#include "GFWPowerArray.h"
+#include "GFWWeights.h"
 
-#include "Common/DataModel/EventSelection.h"
+#include "Common/CCDB/ctpRateFetcher.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/CCDB/ctpRateFetcher.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include <CCDB/BasicCCDBManager.h>
 
-#include "GFWPowerArray.h"
-#include "GFW.h"
-#include "GFWCumulant.h"
-#include "GFWWeights.h"
-#include "FlowContainer.h"
 #include "TList.h"
+#include <TF1.h>
+#include <TObjArray.h>
 #include <TProfile.h>
 #include <TRandom3.h>
-#include <TObjArray.h>
-#include <TF1.h>
+
+#include <cmath>
+#include <memory>
+#include <string>
+#include <unordered_map>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGCF/Flow/Tasks/flowRunbyRun.cxx b/.conflict-side-0/PWGCF/Flow/Tasks/flowRunbyRun.cxx
index 620063e1d5d..b0221c34c3c 100644
--- a/.conflict-side-0/PWGCF/Flow/Tasks/flowRunbyRun.cxx
+++ b/.conflict-side-0/PWGCF/Flow/Tasks/flowRunbyRun.cxx
@@ -15,36 +15,38 @@
 /// \since  Oct/30/2024
 /// \brief  jira: PWGCF-254, produce Run-by-Run QA plots and flow analysis for Run3
 
-#include <CCDB/BasicCCDBManager.h>
-#include <cmath>
-#include <vector>
-#include <unordered_map>
-#include <map>
-#include <string>
-#include <memory>
-#include <utility>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/HistogramRegistry.h"
+#include "FlowContainer.h"
+#include "GFW.h"
+#include "GFWCumulant.h"
+#include "GFWPowerArray.h"
+#include "GFWWeights.h"
 
-#include "Common/DataModel/EventSelection.h"
+#include "Common/CCDB/ctpRateFetcher.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/CCDB/ctpRateFetcher.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include <CCDB/BasicCCDBManager.h>
 
-#include "GFWPowerArray.h"
-#include "GFW.h"
-#include "GFWCumulant.h"
-#include "GFWWeights.h"
-#include "FlowContainer.h"
 #include "TList.h"
+#include <TF1.h>
 #include <TProfile.h>
 #include <TRandom3.h>
-#include <TF1.h>
+
+#include <cmath>
+#include <map>
+#include <memory>
+#include <string>
+#include <unordered_map>
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGCF/Flow/Tasks/flowSP.cxx b/.conflict-side-0/PWGCF/Flow/Tasks/flowSP.cxx
index f37c15eac01..cc3f51e91d0 100644
--- a/.conflict-side-0/PWGCF/Flow/Tasks/flowSP.cxx
+++ b/.conflict-side-0/PWGCF/Flow/Tasks/flowSP.cxx
@@ -14,35 +14,37 @@
 /// \since  01/12/2024
 /// \brief  task to evaluate flow with respect to spectator plane.
 
-#include <CCDB/BasicCCDBManager.h>
-#include <DataFormatsParameters/GRPObject.h>
-#include <DataFormatsParameters/GRPMagField.h>
-#include <algorithm>
-#include <numeric>
-#include <vector>
-#include <string>
-#include <unordered_map>
+#include "GFWWeights.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/O2DatabasePDGPlugin.h"
+#include "PWGCF/DataModel/SPTableZDC.h"
 
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/Centrality.h"
-#include "Common/Core/RecoDecay.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include <CCDB/BasicCCDBManager.h>
+#include <DataFormatsParameters/GRPMagField.h>
+#include <DataFormatsParameters/GRPObject.h>
 
-#include "PWGCF/DataModel/SPTableZDC.h"
-#include "GFWWeights.h"
 #include "TF1.h"
 #include "TPDGCode.h"
 
+#include <algorithm>
+#include <numeric>
+#include <string>
+#include <unordered_map>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-0/PWGCF/Flow/Tasks/flowTask.cxx b/.conflict-side-0/PWGCF/Flow/Tasks/flowTask.cxx
index 9ebe74d1f76..bb6d1749e5d 100644
--- a/.conflict-side-0/PWGCF/Flow/Tasks/flowTask.cxx
+++ b/.conflict-side-0/PWGCF/Flow/Tasks/flowTask.cxx
@@ -14,36 +14,38 @@
 /// \since  Dec/10/2023
 /// \brief  jira: PWGCF-254, task to measure flow observables with cumulant method
 
-#include <CCDB/BasicCCDBManager.h>
-#include <cmath>
-#include <vector>
-#include <unordered_map>
-#include <string>
-#include <memory>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/HistogramRegistry.h"
+#include "FlowContainer.h"
+#include "GFW.h"
+#include "GFWCumulant.h"
+#include "GFWPowerArray.h"
+#include "GFWWeights.h"
 
-#include "Common/DataModel/EventSelection.h"
+#include "Common/CCDB/ctpRateFetcher.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/CCDB/ctpRateFetcher.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include <CCDB/BasicCCDBManager.h>
 
-#include "GFWPowerArray.h"
-#include "GFW.h"
-#include "GFWCumulant.h"
-#include "GFWWeights.h"
-#include "FlowContainer.h"
 #include "TList.h"
+#include <TF1.h>
+#include <TObjArray.h>
 #include <TProfile.h>
 #include <TRandom3.h>
-#include <TObjArray.h>
-#include <TF1.h>
+
+#include <cmath>
+#include <memory>
+#include <string>
+#include <unordered_map>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGCF/GenericFramework/Core/BootstrapProfile.h b/.conflict-side-0/PWGCF/GenericFramework/Core/BootstrapProfile.h
index 829c58cc11a..e7d0b62e45e 100644
--- a/.conflict-side-0/PWGCF/GenericFramework/Core/BootstrapProfile.h
+++ b/.conflict-side-0/PWGCF/GenericFramework/Core/BootstrapProfile.h
@@ -16,11 +16,11 @@
 #ifndef PWGCF_GENERICFRAMEWORK_CORE_BOOTSTRAPPROFILE_H_
 #define PWGCF_GENERICFRAMEWORK_CORE_BOOTSTRAPPROFILE_H_
 
-#include "TProfile.h"
-#include "TList.h"
-#include "TString.h"
 #include "TCollection.h"
+#include "TList.h"
 #include "TMath.h"
+#include "TProfile.h"
+#include "TString.h"
 
 class BootstrapProfile : public TProfile
 {
diff --git a/.conflict-side-0/PWGCF/GenericFramework/Core/FlowContainer.h b/.conflict-side-0/PWGCF/GenericFramework/Core/FlowContainer.h
index bb330c049b6..5cba4eed279 100644
--- a/.conflict-side-0/PWGCF/GenericFramework/Core/FlowContainer.h
+++ b/.conflict-side-0/PWGCF/GenericFramework/Core/FlowContainer.h
@@ -15,23 +15,24 @@
 
 #ifndef PWGCF_GENERICFRAMEWORK_CORE_FLOWCONTAINER_H_
 #define PWGCF_GENERICFRAMEWORK_CORE_FLOWCONTAINER_H_
-#include <vector>
-#include "TH3F.h"
-#include "TProfile2D.h"
-#include "TProfile.h"
-#include "TNamed.h"
+#include "ProfileSubset.h"
+
+#include "Framework/HistogramSpec.h"
+
+#include "TAxis.h"
+#include "TCollection.h"
+#include "TFile.h"
 #include "TH1.h"
+#include "TH3F.h"
 #include "TMath.h"
-#include "TFile.h"
-#include "TAxis.h"
-#include "TString.h"
+#include "TNamed.h"
 #include "TObjArray.h"
+#include "TProfile.h"
+#include "TProfile2D.h"
 #include "TRandom.h"
 #include "TString.h"
-#include "TCollection.h"
-#include "TAxis.h"
-#include "ProfileSubset.h"
-#include "Framework/HistogramSpec.h"
+
+#include <vector>
 
 class FlowContainer : public TNamed
 {
diff --git a/.conflict-side-0/PWGCF/GenericFramework/Core/FlowPtContainer.cxx b/.conflict-side-0/PWGCF/GenericFramework/Core/FlowPtContainer.cxx
index 33f2e303711..5e3e3a45306 100644
--- a/.conflict-side-0/PWGCF/GenericFramework/Core/FlowPtContainer.cxx
+++ b/.conflict-side-0/PWGCF/GenericFramework/Core/FlowPtContainer.cxx
@@ -14,9 +14,10 @@
 /// \author Emil Gorm Nielsen, NBI, emil.gorm.nielsen@cern.ch
 
 #include "FlowPtContainer.h"
+
 #include <algorithm>
-#include <vector>
 #include <cstdio>
+#include <vector>
 
 FlowPtContainer::FlowPtContainer() : fCMTermList(0),
                                      fCorrList(0),
diff --git a/.conflict-side-0/PWGCF/GenericFramework/Core/FlowPtContainer.h b/.conflict-side-0/PWGCF/GenericFramework/Core/FlowPtContainer.h
index 207e1a36fe7..b0bd6b6a72c 100644
--- a/.conflict-side-0/PWGCF/GenericFramework/Core/FlowPtContainer.h
+++ b/.conflict-side-0/PWGCF/GenericFramework/Core/FlowPtContainer.h
@@ -16,18 +16,21 @@
 #ifndef PWGCF_GENERICFRAMEWORK_CORE_FLOWPTCONTAINER_H_
 #define PWGCF_GENERICFRAMEWORK_CORE_FLOWPTCONTAINER_H_
 
-#include <algorithm>
-#include <vector>
-#include <complex>
-#include <variant>
 #include "BootstrapProfile.h"
-#include "TNamed.h"
-#include "TList.h"
-#include "TCollection.h"
-#include "Framework/HistogramSpec.h"
 #include "GFW.h"
 #include "GFWConfig.h"
 
+#include "Framework/HistogramSpec.h"
+
+#include "TCollection.h"
+#include "TList.h"
+#include "TNamed.h"
+
+#include <algorithm>
+#include <complex>
+#include <variant>
+#include <vector>
+
 namespace o2::analysis::genericframework::eventweight
 {
 enum EventWeight {
diff --git a/.conflict-side-0/PWGCF/GenericFramework/Core/GFWConfig.h b/.conflict-side-0/PWGCF/GenericFramework/Core/GFWConfig.h
index 779d06b604e..949a16e23d1 100644
--- a/.conflict-side-0/PWGCF/GenericFramework/Core/GFWConfig.h
+++ b/.conflict-side-0/PWGCF/GenericFramework/Core/GFWConfig.h
@@ -12,13 +12,15 @@
 #ifndef PWGCF_GENERICFRAMEWORK_CORE_GFWCONFIG_H_
 #define PWGCF_GENERICFRAMEWORK_CORE_GFWCONFIG_H_
 
+#include "GFW.h"
+
+#include <TMath.h>
+#include <TObject.h>
+
 #include <algorithm>
+#include <string>
 #include <utility>
 #include <vector>
-#include <string>
-#include <TObject.h>
-#include <TMath.h>
-#include "GFW.h"
 
 namespace o2
 {
diff --git a/.conflict-side-0/PWGCF/GenericFramework/Core/GFWPowerArray.h b/.conflict-side-0/PWGCF/GenericFramework/Core/GFWPowerArray.h
index ba38f2fcc54..8b0a5eca32c 100644
--- a/.conflict-side-0/PWGCF/GenericFramework/Core/GFWPowerArray.h
+++ b/.conflict-side-0/PWGCF/GenericFramework/Core/GFWPowerArray.h
@@ -16,9 +16,9 @@
 #ifndef PWGCF_GENERICFRAMEWORK_CORE_GFWPOWERARRAY_H_
 #define PWGCF_GENERICFRAMEWORK_CORE_GFWPOWERARRAY_H_
 
-#include <vector>
 #include <cmath>
 #include <string>
+#include <vector>
 
 typedef std::vector<int> HarSet;
 class GFWPowerArray
diff --git a/.conflict-side-0/PWGCF/GenericFramework/Core/GFWWeights.cxx b/.conflict-side-0/PWGCF/GenericFramework/Core/GFWWeights.cxx
index 4d2d41cd85d..b729213d80d 100644
--- a/.conflict-side-0/PWGCF/GenericFramework/Core/GFWWeights.cxx
+++ b/.conflict-side-0/PWGCF/GenericFramework/Core/GFWWeights.cxx
@@ -10,7 +10,9 @@
 // or submit itself to any jurisdiction.
 
 #include "GFWWeights.h"
+
 #include "TMath.h"
+
 #include <cstdio>
 
 GFWWeights::GFWWeights() : TNamed("", ""),
diff --git a/.conflict-side-0/PWGCF/GenericFramework/Core/GFWWeights.h b/.conflict-side-0/PWGCF/GenericFramework/Core/GFWWeights.h
index f60783ccec8..c0be3f7caeb 100644
--- a/.conflict-side-0/PWGCF/GenericFramework/Core/GFWWeights.h
+++ b/.conflict-side-0/PWGCF/GenericFramework/Core/GFWWeights.h
@@ -18,13 +18,13 @@
 
 #include "Framework/Logger.h"
 
-#include "TObjArray.h"
-#include "TNamed.h"
-#include "TH3D.h"
-#include "TH2D.h"
-#include "TH1D.h"
-#include "TFile.h"
 #include "TCollection.h"
+#include "TFile.h"
+#include "TH1D.h"
+#include "TH2D.h"
+#include "TH3D.h"
+#include "TNamed.h"
+#include "TObjArray.h"
 #include "TString.h"
 
 class GFWWeights : public TNamed
diff --git a/.conflict-side-0/PWGCF/GenericFramework/Core/GFWWeightsList.cxx b/.conflict-side-0/PWGCF/GenericFramework/Core/GFWWeightsList.cxx
index 11a6ffe3159..104c6c77907 100644
--- a/.conflict-side-0/PWGCF/GenericFramework/Core/GFWWeightsList.cxx
+++ b/.conflict-side-0/PWGCF/GenericFramework/Core/GFWWeightsList.cxx
@@ -14,9 +14,10 @@
 /// \since  Dec/25/2024
 /// \brief  one object to hold a list of GFWWeights objects,
 
-#include <utility>
 #include "GFWWeightsList.h"
 
+#include <utility>
+
 GFWWeightsList::GFWWeightsList() : TNamed("", ""), list(0)
 {
   runNumberMap.clear();
diff --git a/.conflict-side-0/PWGCF/GenericFramework/Core/GFWWeightsList.h b/.conflict-side-0/PWGCF/GenericFramework/Core/GFWWeightsList.h
index c0f208a7088..dab5b345fa0 100644
--- a/.conflict-side-0/PWGCF/GenericFramework/Core/GFWWeightsList.h
+++ b/.conflict-side-0/PWGCF/GenericFramework/Core/GFWWeightsList.h
@@ -16,15 +16,16 @@
 
 #ifndef PWGCF_GENERICFRAMEWORK_CORE_GFWWEIGHTSLIST_H_
 #define PWGCF_GENERICFRAMEWORK_CORE_GFWWEIGHTSLIST_H_
-#include <map>
-#include <cstdio>
-#include <string>
-#include <vector>
+#include "GFWWeights.h"
 
 #include "Framework/Logger.h"
 
 #include "TObjArray.h"
-#include "GFWWeights.h"
+
+#include <cstdio>
+#include <map>
+#include <string>
+#include <vector>
 
 class GFWWeightsList : public TNamed
 {
diff --git a/.conflict-side-0/PWGCF/GenericFramework/Core/ProfileSubset.cxx b/.conflict-side-0/PWGCF/GenericFramework/Core/ProfileSubset.cxx
index 66969f699af..333f1eea5e0 100644
--- a/.conflict-side-0/PWGCF/GenericFramework/Core/ProfileSubset.cxx
+++ b/.conflict-side-0/PWGCF/GenericFramework/Core/ProfileSubset.cxx
@@ -10,6 +10,7 @@
 // or submit itself to any jurisdiction.
 
 #include "ProfileSubset.h"
+
 #include "TProfile2D.h"
 
 TProfile* ProfileSubset::GetSubset(bool onX, const char* name, int firstbin, int lastbin, int l_nbins, double* l_binarray)
diff --git a/.conflict-side-0/PWGCF/GenericFramework/Core/ProfileSubset.h b/.conflict-side-0/PWGCF/GenericFramework/Core/ProfileSubset.h
index fc920b898c4..f2b09d1a640 100644
--- a/.conflict-side-0/PWGCF/GenericFramework/Core/ProfileSubset.h
+++ b/.conflict-side-0/PWGCF/GenericFramework/Core/ProfileSubset.h
@@ -16,9 +16,9 @@
 #ifndef PWGCF_GENERICFRAMEWORK_CORE_PROFILESUBSET_H_
 #define PWGCF_GENERICFRAMEWORK_CORE_PROFILESUBSET_H_
 
+#include "TError.h"
 #include "TProfile.h"
 #include "TProfile2D.h"
-#include "TError.h"
 
 class ProfileSubset : public TProfile2D
 {
diff --git a/.conflict-side-0/PWGCF/GenericFramework/Tasks/flowGenericFramework.cxx b/.conflict-side-0/PWGCF/GenericFramework/Tasks/flowGenericFramework.cxx
index 79e56fbcff6..31aa9d9e194 100644
--- a/.conflict-side-0/PWGCF/GenericFramework/Tasks/flowGenericFramework.cxx
+++ b/.conflict-side-0/PWGCF/GenericFramework/Tasks/flowGenericFramework.cxx
@@ -13,42 +13,43 @@
 /// \brief Task to analyse angular and transverse momentum correlations with GFW
 /// \author Emil Gorm Nielsen, NBI, emil.gorm.nielsen@cern.ch
 
-#include <CCDB/BasicCCDBManager.h>
-#include <DataFormatsParameters/GRPObject.h>
-#include <DataFormatsParameters/GRPMagField.h>
-#include <algorithm>
-#include <numeric>
-#include <vector>
-#include <complex>
-#include <string>
-#include <map>
-#include <utility>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/HistogramRegistry.h"
-
-#include "Common/DataModel/EventSelection.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/PIDResponse.h"
-
-#include "GFWPowerArray.h"
-#include "GFW.h"
-#include "GFWCumulant.h"
 #include "FlowContainer.h"
 #include "FlowPtContainer.h"
+#include "GFW.h"
 #include "GFWConfig.h"
+#include "GFWCumulant.h"
+#include "GFWPowerArray.h"
 #include "GFWWeights.h"
 #include "GFWWeightsList.h"
-#include <TProfile.h>
-#include <TRandom3.h>
+
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include <CCDB/BasicCCDBManager.h>
+#include <DataFormatsParameters/GRPMagField.h>
+#include <DataFormatsParameters/GRPObject.h>
+
 #include <TF1.h>
 #include <TPDGCode.h>
+#include <TProfile.h>
+#include <TRandom3.h>
+
+#include <algorithm>
+#include <complex>
+#include <map>
+#include <numeric>
+#include <string>
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGCF/JCorran/Core/FlowJHistManager.cxx b/.conflict-side-0/PWGCF/JCorran/Core/FlowJHistManager.cxx
index 880ec409dbd..4a13ac5f31d 100644
--- a/.conflict-side-0/PWGCF/JCorran/Core/FlowJHistManager.cxx
+++ b/.conflict-side-0/PWGCF/JCorran/Core/FlowJHistManager.cxx
@@ -16,6 +16,7 @@
 
 // O2 Physics headers.
 #include "PWGCF/JCorran/Core/FlowJHistManager.h"
+
 #include "CommonConstants/MathConstants.h"
 
 // Namespaces.
diff --git a/.conflict-side-0/PWGCF/JCorran/Core/FlowJHistManager.h b/.conflict-side-0/PWGCF/JCorran/Core/FlowJHistManager.h
index e067a9f00b5..3c7b1773eac 100644
--- a/.conflict-side-0/PWGCF/JCorran/Core/FlowJHistManager.h
+++ b/.conflict-side-0/PWGCF/JCorran/Core/FlowJHistManager.h
@@ -16,16 +16,17 @@
 #define PWGCF_JCORRAN_CORE_FLOWJHISTMANAGER_H_
 
 /* Header files. */
-#include <vector>
-#include <array>
-#include <string>
-#include <string_view>
 #include "TH1.h"
 #include "TH2.h"
 #include "TH3.h"
 #include "TProfile.h"
 #include "TProfile2D.h"
 
+#include <array>
+#include <string>
+#include <string_view>
+#include <vector>
+
 // O2 headers. //
 #include "Framework/HistogramRegistry.h"
 
diff --git a/.conflict-side-0/PWGCF/JCorran/Core/FlowJSPCAnalysis.h b/.conflict-side-0/PWGCF/JCorran/Core/FlowJSPCAnalysis.h
index ba584d1e1eb..d1bd45354ec 100644
--- a/.conflict-side-0/PWGCF/JCorran/Core/FlowJSPCAnalysis.h
+++ b/.conflict-side-0/PWGCF/JCorran/Core/FlowJSPCAnalysis.h
@@ -16,15 +16,17 @@
 #define PWGCF_JCORRAN_CORE_FLOWJSPCANALYSIS_H_
 
 /* Header files. */
-#include <array>
-#include <vector>
 #include <TComplex.h>
 #include <TProfile.h>
 
+#include <array>
+#include <vector>
+
 // O2 headers. //
-#include "Framework/HistogramRegistry.h"
 #include "PWGCF/JCorran/Core/JQVectors.h"
+
 #include "CommonConstants/MathConstants.h"
+#include "Framework/HistogramRegistry.h"
 
 class FlowJSPCAnalysis
 {
diff --git a/.conflict-side-0/PWGCF/JCorran/Core/JFFlucAnalysis.cxx b/.conflict-side-0/PWGCF/JCorran/Core/JFFlucAnalysis.cxx
index 9dc4189a810..4c3b01adeca 100644
--- a/.conflict-side-0/PWGCF/JCorran/Core/JFFlucAnalysis.cxx
+++ b/.conflict-side-0/PWGCF/JCorran/Core/JFFlucAnalysis.cxx
@@ -12,10 +12,12 @@
 /// \author Jasper Parkkila (jparkkil@cern.ch)
 /// \since Sep 2022
 
-#include <TMath.h>
+#include "JFFlucAnalysis.h"
+
 #include <TComplex.h>
+#include <TMath.h>
+
 #include <algorithm>
-#include "JFFlucAnalysis.h"
 
 JFFlucAnalysis::JFFlucAnalysis() : TNamed(),
                                    fVertex(0),
diff --git a/.conflict-side-0/PWGCF/JCorran/Core/JFFlucAnalysis.h b/.conflict-side-0/PWGCF/JCorran/Core/JFFlucAnalysis.h
index 01589a09849..039dc51d421 100644
--- a/.conflict-side-0/PWGCF/JCorran/Core/JFFlucAnalysis.h
+++ b/.conflict-side-0/PWGCF/JCorran/Core/JFFlucAnalysis.h
@@ -15,13 +15,15 @@
 #ifndef PWGCF_JCORRAN_CORE_JFFLUCANALYSIS_H_
 #define PWGCF_JCORRAN_CORE_JFFLUCANALYSIS_H_
 
-#include <experimental/type_traits>
 #include "JQVectors.h"
+
 #include <TComplex.h>
-#include <TNamed.h>
 #include <TH1.h>
 #include <THn.h>
 #include <THnSparse.h>
+#include <TNamed.h>
+
+#include <experimental/type_traits>
 
 class JFFlucAnalysis : public TNamed
 {
diff --git a/.conflict-side-0/PWGCF/JCorran/Core/JFFlucAnalysisO2Hist.cxx b/.conflict-side-0/PWGCF/JCorran/Core/JFFlucAnalysisO2Hist.cxx
index b3419ff7dc8..55520ba8158 100644
--- a/.conflict-side-0/PWGCF/JCorran/Core/JFFlucAnalysisO2Hist.cxx
+++ b/.conflict-side-0/PWGCF/JCorran/Core/JFFlucAnalysisO2Hist.cxx
@@ -12,10 +12,12 @@
 /// \since Sep 2024
 
 #include "JFFlucAnalysisO2Hist.h"
-#include <vector>
-#include <memory>
+
 #include "CommonConstants/MathConstants.h"
 
+#include <memory>
+#include <vector>
+
 using namespace o2;
 
 JFFlucAnalysisO2Hist::JFFlucAnalysisO2Hist(HistogramRegistry& registry, AxisSpec& axisMultiplicity, AxisSpec& phiAxis, AxisSpec& etaAxis, AxisSpec& zvtAxis, AxisSpec& ptAxis, AxisSpec& massAxis, const TString& folder) : JFFlucAnalysis()
diff --git a/.conflict-side-0/PWGCF/JCorran/Core/JFFlucAnalysisO2Hist.h b/.conflict-side-0/PWGCF/JCorran/Core/JFFlucAnalysisO2Hist.h
index a9de2fd7864..1c65334d607 100644
--- a/.conflict-side-0/PWGCF/JCorran/Core/JFFlucAnalysisO2Hist.h
+++ b/.conflict-side-0/PWGCF/JCorran/Core/JFFlucAnalysisO2Hist.h
@@ -15,6 +15,7 @@
 #define PWGCF_JCORRAN_CORE_JFFLUCANALYSISO2HIST_H_
 
 #include "JFFlucAnalysis.h"
+
 #include "Framework/HistogramRegistry.h"
 
 using namespace o2;
diff --git a/.conflict-side-0/PWGCF/JCorran/Core/JQVectors.h b/.conflict-side-0/PWGCF/JCorran/Core/JQVectors.h
index c96aac454b7..210968d23ec 100644
--- a/.conflict-side-0/PWGCF/JCorran/Core/JQVectors.h
+++ b/.conflict-side-0/PWGCF/JCorran/Core/JQVectors.h
@@ -15,9 +15,10 @@
 #ifndef PWGCF_JCORRAN_CORE_JQVECTORS_H_
 #define PWGCF_JCORRAN_CORE_JQVECTORS_H_
 
-#include <experimental/type_traits>
 #include <TMath.h>
 
+#include <experimental/type_traits>
+
 template <class Q, UInt_t nh, UInt_t nk>
 class JQVectorsGapBase
 {
diff --git a/.conflict-side-0/PWGCF/JCorran/TableProducer/JCatalyst.cxx b/.conflict-side-0/PWGCF/JCorran/TableProducer/JCatalyst.cxx
index e0cb26994e3..7b354a1541e 100644
--- a/.conflict-side-0/PWGCF/JCorran/TableProducer/JCatalyst.cxx
+++ b/.conflict-side-0/PWGCF/JCorran/TableProducer/JCatalyst.cxx
@@ -12,28 +12,29 @@
 /// \author Dong Jo Kim (djkim@jyu.fi)
 /// \since Sep 2022
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
 #include <CCDB/BasicCCDBManager.h>
-#include <Math/Vector4D.h>
+
 #include <Math/LorentzVector.h>
+#include <Math/Vector4D.h>
 #include <TRandom.h>
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/ASoAHelpers.h"
-
 // centrality
-#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Centrality.h"
 
 ////TODO: remove redundant:
-#include "Framework/HistogramRegistry.h"
-
-#include "DCAFitter/DCAFitterN.h"
 #include "PWGHF/DataModel/CandidateReconstructionTables.h"
+
 #include "Common/Core/trackUtilities.h"
+
+#include "DCAFitter/DCAFitterN.h"
+#include "Framework/HistogramRegistry.h"
 #include "ReconstructionDataFormats/DCA.h"
 #include "ReconstructionDataFormats/V0.h"
 ////
diff --git a/.conflict-side-0/PWGCF/JCorran/Tasks/flowJNUACreation.cxx b/.conflict-side-0/PWGCF/JCorran/Tasks/flowJNUACreation.cxx
index 31edc2a7c3d..ab4fef15591 100644
--- a/.conflict-side-0/PWGCF/JCorran/Tasks/flowJNUACreation.cxx
+++ b/.conflict-side-0/PWGCF/JCorran/Tasks/flowJNUACreation.cxx
@@ -13,31 +13,31 @@
 // \author  Maxim Virta (maxim.virta@cern.ch)
 
 // Standard headers.
+#include <TRandom3.h>
+
 #include <chrono>
 #include <string>
 #include <vector>
-#include <TRandom3.h>
 
 // O2 headers. //
 // The first two are mandatory.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
 #include "CCDB/BasicCCDBManager.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 
 // O2 Physics headers. //
+#include "PWGCF/JCorran/Core/FlowJHistManager.h"
+
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/FT0Corrected.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/Core/TrackSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
-#include "PWGCF/JCorran/Core/FlowJHistManager.h"
-
 // Namespaces and definitions.
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGCF/JCorran/Tasks/flowJSPCAnalysis.cxx b/.conflict-side-0/PWGCF/JCorran/Tasks/flowJSPCAnalysis.cxx
index 2ce4568348f..ad7a05b7a07 100644
--- a/.conflict-side-0/PWGCF/JCorran/Tasks/flowJSPCAnalysis.cxx
+++ b/.conflict-side-0/PWGCF/JCorran/Tasks/flowJSPCAnalysis.cxx
@@ -13,34 +13,34 @@
 // \author  Maxim Virta (maxim.virta@cern.ch), Cindy Mordasini (cindy.mordasini@cern.ch)
 
 // Standard headers.
+#include <TRandom3.h>
+
 #include <chrono>
 #include <string>
 #include <vector>
-#include <TRandom3.h>
 
 // O2 headers. //
 // The first two are mandatory.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 
 // O2 Physics headers. //
+#include "PWGCF/DataModel/CorrelationsDerived.h"
+#include "PWGCF/JCorran/Core/FlowJHistManager.h"
+#include "PWGCF/JCorran/Core/FlowJSPCAnalysis.h"
+#include "PWGCF/JCorran/Core/FlowJSPCObservables.h"
+#include "PWGCF/JCorran/DataModel/JCatalyst.h"
+
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/FT0Corrected.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/Core/TrackSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
-#include "PWGCF/DataModel/CorrelationsDerived.h"
-#include "PWGCF/JCorran/DataModel/JCatalyst.h"
-#include "PWGCF/JCorran/Core/FlowJSPCAnalysis.h"
-#include "PWGCF/JCorran/Core/FlowJSPCObservables.h"
-#include "PWGCF/JCorran/Core/FlowJHistManager.h"
-
 // Namespaces and definitions.
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGCF/JCorran/Tasks/jEPDzeroFlowAnalysis.cxx b/.conflict-side-0/PWGCF/JCorran/Tasks/jEPDzeroFlowAnalysis.cxx
index be132b44684..2fe4adb49ca 100644
--- a/.conflict-side-0/PWGCF/JCorran/Tasks/jEPDzeroFlowAnalysis.cxx
+++ b/.conflict-side-0/PWGCF/JCorran/Tasks/jEPDzeroFlowAnalysis.cxx
@@ -11,52 +11,47 @@
 /// \author junlee.kim@cern.ch
 /// \since Jul 2024
 
-#include <experimental/type_traits>
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <chrono>
-#include <string>
-#include <vector>
-
-#include "TLorentzVector.h"
-#include "TRandom3.h"
-#include "TF1.h"
-#include "TVector2.h"
-#include "Math/Vector3D.h"
-#include "Math/Vector4D.h"
-#include "Math/GenVector/Boost.h"
-#include <TMath.h>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/StaticFor.h"
+#include "PWGCF/DataModel/CorrelationsDerived.h"
 
+#include "Common/Core/EventPlaneHelper.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Qvectors.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "Common/Core/trackUtilities.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/Core/EventPlaneHelper.h"
-
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
 #include "CommonConstants/PhysicsConstants.h"
-
-#include "ReconstructionDataFormats/Track.h"
-
-#include "DataFormatsParameters/GRPObject.h"
 #include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/StaticFor.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
-#include "CCDB/CcdbApi.h"
-#include "CCDB/BasicCCDBManager.h"
+#include "Math/GenVector/Boost.h"
+#include "Math/Vector3D.h"
+#include "Math/Vector4D.h"
+#include "TF1.h"
+#include "TLorentzVector.h"
+#include "TRandom3.h"
+#include "TVector2.h"
+#include <TMath.h>
 
-#include "PWGCF/DataModel/CorrelationsDerived.h"
+#include <array>
+#include <chrono>
+#include <cmath>
+#include <cstdlib>
+#include <experimental/type_traits>
+#include <string>
+#include <vector>
 
 using namespace std;
 using namespace o2;
diff --git a/.conflict-side-0/PWGCF/JCorran/Tasks/jEPFlowAnalysis.cxx b/.conflict-side-0/PWGCF/JCorran/Tasks/jEPFlowAnalysis.cxx
index f3f43744f19..fc36ab43d35 100644
--- a/.conflict-side-0/PWGCF/JCorran/Tasks/jEPFlowAnalysis.cxx
+++ b/.conflict-side-0/PWGCF/JCorran/Tasks/jEPFlowAnalysis.cxx
@@ -11,20 +11,20 @@
 /// \author Maxim Virta (maxim.virta@cern.ch)
 /// \since Jul 2024
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/HistogramRegistry.h"
+#include "JEPFlowAnalysis.h"
 
-#include "Common/DataModel/EventSelection.h"
-#include "Common/Core/TrackSelection.h"
-#include "Framework/runDataProcessing.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "FlowJHistManager.h"
 
-#include "Common/DataModel/Qvectors.h"
 #include "Common/Core/EventPlaneHelper.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Qvectors.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "FlowJHistManager.h"
-#include "JEPFlowAnalysis.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGCF/JCorran/Tasks/jFlucEfficiencyTask.cxx b/.conflict-side-0/PWGCF/JCorran/Tasks/jFlucEfficiencyTask.cxx
index 59ca8b18903..e50baa4c1cb 100644
--- a/.conflict-side-0/PWGCF/JCorran/Tasks/jFlucEfficiencyTask.cxx
+++ b/.conflict-side-0/PWGCF/JCorran/Tasks/jFlucEfficiencyTask.cxx
@@ -14,20 +14,23 @@
 /// \author DongJo Kim, Jasper Parkkila, Bong-Hwi Lim (djkim@cern.ch, jparkkil@cern.ch, bong-hwi.lim@cern.ch)
 /// \since March 2024
 
-#include <vector>
-#include <string>
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/O2DatabasePDGPlugin.h"
+#include "PWGCF/DataModel/CorrelationsDerived.h"
+#include "PWGLF/Utils/collisionCuts.h"
+
 #include "Common/Core/TrackSelection.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "PWGCF/DataModel/CorrelationsDerived.h"
-#include "PWGLF/Utils/collisionCuts.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGCF/JCorran/Tasks/jflucAnalysisTask.cxx b/.conflict-side-0/PWGCF/JCorran/Tasks/jflucAnalysisTask.cxx
index 6e0ba68d2df..12e2a599f55 100644
--- a/.conflict-side-0/PWGCF/JCorran/Tasks/jflucAnalysisTask.cxx
+++ b/.conflict-side-0/PWGCF/JCorran/Tasks/jflucAnalysisTask.cxx
@@ -12,25 +12,27 @@
 /// \author Dong Jo Kim (djkim@jyu.fi)
 /// \since Sep 2022
 
-#include <deque>
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "Framework/AnalysisTask.h"
 #include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-
-#include "Common/DataModel/EventSelection.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Centrality.h"
+#include "Framework/RunningWorkflowInfo.h"
 #include "ReconstructionDataFormats/V0.h"
 
+#include <deque>
+
 // #include "CCDB/BasicCCDBManager.h"
 
-#include "PWGCF/JCorran/DataModel/JCatalyst.h"
-#include "PWGCF/DataModel/CorrelationsDerived.h"
 #include "JFFlucAnalysis.h"
 #include "JFFlucAnalysisO2Hist.h"
+
+#include "PWGCF/DataModel/CorrelationsDerived.h"
+#include "PWGCF/JCorran/DataModel/JCatalyst.h"
+
 #include "Framework/runDataProcessing.h"
 
 using namespace o2;
diff --git a/.conflict-side-0/PWGCF/JCorran/Tasks/jflucWeightsLoader.cxx b/.conflict-side-0/PWGCF/JCorran/Tasks/jflucWeightsLoader.cxx
index 244035fd310..438a73d4bbf 100644
--- a/.conflict-side-0/PWGCF/JCorran/Tasks/jflucWeightsLoader.cxx
+++ b/.conflict-side-0/PWGCF/JCorran/Tasks/jflucWeightsLoader.cxx
@@ -12,27 +12,27 @@
 /// \since May 2024
 // o2-linter: disable='doc/file'
 
-#include <experimental/type_traits>
-#include <string>
-#include <TFile.h>
-#include <THn.h>
-
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/HistogramRegistry.h"
+#include "PWGCF/DataModel/CorrelationsDerived.h"
+#include "PWGCF/JCorran/DataModel/JCatalyst.h"
 
-#include "Common/DataModel/EventSelection.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/Centrality.h"
-#include "ReconstructionDataFormats/V0.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
 #include "CCDB/BasicCCDBManager.h"
-
-#include "PWGCF/JCorran/DataModel/JCatalyst.h"
-#include "PWGCF/DataModel/CorrelationsDerived.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
 #include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/V0.h"
+
+#include <TFile.h>
+#include <THn.h>
+
+#include <experimental/type_traits>
+#include <string>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGCF/MultiparticleCorrelations/Tasks/multiparticle-correlations-ar.cxx b/.conflict-side-0/PWGCF/MultiparticleCorrelations/Tasks/multiparticle-correlations-ar.cxx
index 5b1539deb9e..fb891b91365 100644
--- a/.conflict-side-0/PWGCF/MultiparticleCorrelations/Tasks/multiparticle-correlations-ar.cxx
+++ b/.conflict-side-0/PWGCF/MultiparticleCorrelations/Tasks/multiparticle-correlations-ar.cxx
@@ -13,23 +13,27 @@
 /// \brief multiparticle-correlations-ar - Task belonging to Anton Riedel for computing multiparticle correlations
 /// \author Anton Riedel, TU München, anton.riedel@tum.de
 
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/Expressions.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TComplex.h"
 #include <TMath.h>
+
 #include "fairlogger/Logger.h"
+
 #include <algorithm>
+#include <array>
 #include <cstdint>
 #include <iostream>
-#include <string_view>
+#include <numeric>
 #include <string>
+#include <string_view>
 #include <vector>
-#include <array>
-#include <numeric>
-#include "TComplex.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/Expressions.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGCF/MultiparticleCorrelations/Tasks/threeParticleCorrelations.cxx b/.conflict-side-0/PWGCF/MultiparticleCorrelations/Tasks/threeParticleCorrelations.cxx
index 299867abfd7..02fe0addf20 100644
--- a/.conflict-side-0/PWGCF/MultiparticleCorrelations/Tasks/threeParticleCorrelations.cxx
+++ b/.conflict-side-0/PWGCF/MultiparticleCorrelations/Tasks/threeParticleCorrelations.cxx
@@ -13,20 +13,23 @@
 /// \brief Task for producing particle correlations
 /// \author Joey Staa <joey.staa@fysik.lu.se>
 
-#include <algorithm>
+#include "RecoDecay.h"
+
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "CCDB/BasicCCDBManager.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/McCollisionExtra.h"
 #include "Common/DataModel/PIDResponse.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
-#include "RecoDecay.h"
 #include "TPDGCode.h"
 
+#include <algorithm>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-0/PWGCF/TableProducer/dptDptFilter.cxx b/.conflict-side-0/PWGCF/TableProducer/dptDptFilter.cxx
index 30f55cf3c3f..c55cec45f1e 100644
--- a/.conflict-side-0/PWGCF/TableProducer/dptDptFilter.cxx
+++ b/.conflict-side-0/PWGCF/TableProducer/dptDptFilter.cxx
@@ -13,40 +13,43 @@
 /// \brief Filters collisions and tracks according to selection criteria
 /// \author victor.gonzalez.sebastian@gmail.com
 
-#include <cmath>
-#include <algorithm>
-#include <string>
-#include <vector>
+#include "PWGCF/TableProducer/dptDptFilter.h"
+
+#include "PWGCF/Core/AnalysisConfigurableCuts.h"
+#include "PWGCF/DataModel/DptDptFiltered.h"
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
 #include "Common/Core/TableHelper.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/CollisionAssociationTables.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGCF/Core/AnalysisConfigurableCuts.h"
-#include "PWGCF/DataModel/DptDptFiltered.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/CollisionAssociationTables.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/RunningWorkflowInfo.h"
-#include <TROOT.h>
-#include <TPDGCode.h>
-#include <TParameter.h>
-#include <TList.h>
+#include "Framework/runDataProcessing.h"
+
 #include <TDirectory.h>
 #include <TFolder.h>
 #include <TH1.h>
 #include <TH2.h>
 #include <TH3.h>
+#include <TList.h>
+#include <TPDGCode.h>
+#include <TParameter.h>
 #include <TProfile3D.h>
+#include <TROOT.h>
 
-#include "PWGCF/TableProducer/dptDptFilter.h"
+#include <algorithm>
+#include <cmath>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGCF/TableProducer/dptDptFilter.h b/.conflict-side-0/PWGCF/TableProducer/dptDptFilter.h
index 18076266f1a..b107156d5f3 100644
--- a/.conflict-side-0/PWGCF/TableProducer/dptDptFilter.h
+++ b/.conflict-side-0/PWGCF/TableProducer/dptDptFilter.h
@@ -16,33 +16,36 @@
 #ifndef PWGCF_TABLEPRODUCER_DPTDPTFILTER_H_
 #define PWGCF_TABLEPRODUCER_DPTDPTFILTER_H_
 
+#include "PWGCF/Core/AnalysisConfigurableCuts.h"
+
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "ReconstructionDataFormats/PID.h"
 #include <CCDB/BasicCCDBManager.h>
-#include <TPDGCode.h>
-#include <TMCProcess.h>
+
 #include <TF1.h>
 #include <TList.h>
-#include <vector>
+#include <TMCProcess.h>
+#include <TPDGCode.h>
+
 #include <bitset>
-#include <string>
-#include <iomanip>
 #include <fstream>
-#include <locale>
-#include <sstream>
-#include <ranges>
 #include <functional>
+#include <iomanip>
+#include <locale>
 #include <map>
-
-#include "ReconstructionDataFormats/PID.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/Core/TrackSelectionDefaults.h"
-#include "PWGCF/Core/AnalysisConfigurableCuts.h"
+#include <ranges>
+#include <sstream>
+#include <string>
+#include <vector>
 
 namespace o2
 {
diff --git a/.conflict-side-0/PWGCF/Tasks/dptDptCorrelations.cxx b/.conflict-side-0/PWGCF/Tasks/dptDptCorrelations.cxx
index 065e4be286f..33b64e32bdc 100644
--- a/.conflict-side-0/PWGCF/Tasks/dptDptCorrelations.cxx
+++ b/.conflict-side-0/PWGCF/Tasks/dptDptCorrelations.cxx
@@ -13,7 +13,26 @@
 /// \brief implements two-particle correlations base data collection
 /// \author victor.gonzalez.sebastian@gmail.com
 
+#include "PWGCF/Core/AnalysisConfigurableCuts.h"
+#include "PWGCF/Core/PairCuts.h"
+#include "PWGCF/DataModel/DptDptFiltered.h"
+#include "PWGCF/TableProducer/dptDptFilter.h"
+
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/TableHelper.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
 #include <CCDB/BasicCCDBManager.h>
+
 #include <TDirectory.h>
 #include <TFolder.h>
 #include <TH1.h>
@@ -24,28 +43,12 @@
 #include <TProfile3D.h>
 #include <TROOT.h>
 #include <TVector2.h>
+
+#include <cmath>
 #include <cstdio>
+#include <ctime>
 #include <string>
 #include <vector>
-#include <cmath>
-#include <ctime>
-
-#include "Common/Core/TrackSelection.h"
-#include "Common/Core/TableHelper.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "PWGCF/Core/AnalysisConfigurableCuts.h"
-#include "PWGCF/Core/PairCuts.h"
-#include "PWGCF/DataModel/DptDptFiltered.h"
-#include "PWGCF/TableProducer/dptDptFilter.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGCF/Tasks/dptDptFilterQa.cxx b/.conflict-side-0/PWGCF/Tasks/dptDptFilterQa.cxx
index 85dee751438..876fd8ccb5e 100644
--- a/.conflict-side-0/PWGCF/Tasks/dptDptFilterQa.cxx
+++ b/.conflict-side-0/PWGCF/Tasks/dptDptFilterQa.cxx
@@ -13,15 +13,16 @@
 /// \brief basic checks for the behavior of the filter task
 /// \author victor.gonzalez.sebastian@gmail.com
 
-#include <cmath>
-#include <string>
+#include "PWGCF/DataModel/DptDptFiltered.h"
+#include "PWGCF/TableProducer/dptDptFilter.h"
 
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGCF/DataModel/DptDptFiltered.h"
-#include "PWGCF/TableProducer/dptDptFilter.h"
+
+#include <cmath>
+#include <string>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGCF/Tasks/matchRecoGen.cxx b/.conflict-side-0/PWGCF/Tasks/matchRecoGen.cxx
index 57ab00301b7..1881b17b268 100644
--- a/.conflict-side-0/PWGCF/Tasks/matchRecoGen.cxx
+++ b/.conflict-side-0/PWGCF/Tasks/matchRecoGen.cxx
@@ -13,25 +13,24 @@
 /// \brief basic check for the matching between generator level and detector level
 /// \author victor.gonzalez.sebastian@gmail.com
 
-#include <cmath>
-#include <string>
-#include <vector>
+#include "PWGCF/Core/AnalysisConfigurableCuts.h"
+#include "PWGCF/DataModel/DptDptFiltered.h"
+#include "PWGCF/TableProducer/dptDptFilter.h"
 
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGCF/Core/AnalysisConfigurableCuts.h"
-#include "PWGCF/DataModel/DptDptFiltered.h"
-#include "PWGCF/TableProducer/dptDptFilter.h"
+
 #include <TDirectory.h>
 #include <TFolder.h>
 #include <TH1.h>
@@ -42,6 +41,10 @@
 #include <TProfile3D.h>
 #include <TROOT.h>
 
+#include <cmath>
+#include <string>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::soa;
diff --git a/.conflict-side-0/PWGCF/Tutorial/CFTutorialTask1.cxx b/.conflict-side-0/PWGCF/Tutorial/CFTutorialTask1.cxx
index f79eb1871c2..14a541f45e1 100644
--- a/.conflict-side-0/PWGCF/Tutorial/CFTutorialTask1.cxx
+++ b/.conflict-side-0/PWGCF/Tutorial/CFTutorialTask1.cxx
@@ -12,12 +12,13 @@
 /// \author Luca Barioglio
 
 // O2 includes
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-0/PWGCF/Tutorial/CFTutorialTask2.cxx b/.conflict-side-0/PWGCF/Tutorial/CFTutorialTask2.cxx
index bf40ce17353..ae0bc6d6ae1 100644
--- a/.conflict-side-0/PWGCF/Tutorial/CFTutorialTask2.cxx
+++ b/.conflict-side-0/PWGCF/Tutorial/CFTutorialTask2.cxx
@@ -12,12 +12,13 @@
 /// \author Luca Barioglio
 
 // O2 includes
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-0/PWGCF/Tutorial/CFTutorialTask3.cxx b/.conflict-side-0/PWGCF/Tutorial/CFTutorialTask3.cxx
index 42b76f9f0db..d04fbe969ac 100644
--- a/.conflict-side-0/PWGCF/Tutorial/CFTutorialTask3.cxx
+++ b/.conflict-side-0/PWGCF/Tutorial/CFTutorialTask3.cxx
@@ -12,12 +12,13 @@
 /// \author Luca Barioglio
 
 // O2 includes
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-0/PWGCF/Tutorial/CFTutorialTask4.cxx b/.conflict-side-0/PWGCF/Tutorial/CFTutorialTask4.cxx
index a21f1ff7949..46790dca80f 100644
--- a/.conflict-side-0/PWGCF/Tutorial/CFTutorialTask4.cxx
+++ b/.conflict-side-0/PWGCF/Tutorial/CFTutorialTask4.cxx
@@ -12,12 +12,13 @@
 /// \author Luca Barioglio
 
 // O2 includes
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
+
 #include "CommonConstants/PhysicsConstants.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 #include "TLorentzVector.h"
 
diff --git a/.conflict-side-0/PWGCF/Tutorial/CFTutorialTask5.cxx b/.conflict-side-0/PWGCF/Tutorial/CFTutorialTask5.cxx
index 5357950aab1..a9f30b5db71 100644
--- a/.conflict-side-0/PWGCF/Tutorial/CFTutorialTask5.cxx
+++ b/.conflict-side-0/PWGCF/Tutorial/CFTutorialTask5.cxx
@@ -12,12 +12,13 @@
 /// \author Luca Barioglio
 
 // O2 includes
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
+
 #include "CommonConstants/PhysicsConstants.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 #include "TLorentzVector.h"
 
diff --git a/.conflict-side-0/PWGCF/Tutorial/post-config.json b/.conflict-side-0/PWGCF/Tutorial/post-config.json
index 4b484b32088..4c7a012c0fe 100644
--- a/.conflict-side-0/PWGCF/Tutorial/post-config.json
+++ b/.conflict-side-0/PWGCF/Tutorial/post-config.json
@@ -1,128 +1,128 @@
 {
-  "internal-dpl-clock": "",
-  "internal-dpl-aod-reader": {
-    "time-limit": "0",
-    "orbit-offset-enumeration": "0",
-    "orbit-multiplier-enumeration": "0",
-    "start-value-enumeration": "0",
-    "end-value-enumeration": "-1",
-    "step-value-enumeration": "1",
-    "aod-file": "FemtoAO2D.root"
-  },
-  "femto-dream-debug-track": {
-    "cfgCutTable": {
-      "labels_rows": "",
-      "labels_cols": [
-        "MaxPt",
-        "PIDthr",
-        "nSigmaTPC",
-        "nSigmaTPCTOF",
-        "MaxP"
-      ],
-      "values": [
-        [
-          "4.05",
-          "1",
-          "3.5",
-          "3.5",
-          "1"
-        ]
-      ]
+    "internal-dpl-clock": "",
+    "internal-dpl-aod-reader": {
+        "time-limit": "0",
+        "orbit-offset-enumeration": "0",
+        "orbit-multiplier-enumeration": "0",
+        "start-value-enumeration": "0",
+        "end-value-enumeration": "-1",
+        "step-value-enumeration": "1",
+        "aod-file": "FemtoAO2D.root"
     },
-    "ccfgNspecies": "1",
-    "ConfPDGCodePartOne": "2212",
-    "ConfCutPartOne": "168072266",
-    "ConfPIDPartOne": {
-      "values": [
-        "0"
-      ]
-    }
-  },
-  "femto-dream-pair-task-track-track": {
-    "cfgCutTable": {
-      "labels_rows": [
-        "PartOne",
-        "PartTwo"
-      ],
-      "labels_cols": [
-        "MaxPt",
-        "PIDthr",
-        "nSigmaTPC",
-        "nSigmaTPCTOF",
-        "MaxP"
-      ],
-      "values": [
-        [
-          "4.05",
-          "1",
-          "3",
-          "3",
-          "1"
-        ],
-        [
-          "4.05",
-          "1",
-          "3",
-          "3",
-          "1"
-        ]
-      ]
+    "femto-dream-debug-track": {
+        "cfgCutTable": {
+            "labels_rows": "",
+            "labels_cols": [
+                "MaxPt",
+                "PIDthr",
+                "nSigmaTPC",
+                "nSigmaTPCTOF",
+                "MaxP"
+            ],
+            "values": [
+                [
+                    "4.05",
+                    "1",
+                    "3.5",
+                    "3.5",
+                    "1"
+                ]
+            ]
+        },
+        "ccfgNspecies": "1",
+        "ConfPDGCodePartOne": "2212",
+        "ConfCutPartOne": "168072266",
+        "ConfPIDPartOne": {
+            "values": [
+                "0"
+            ]
+        }
     },
-    "ccfgNspecies": "1",
-    "ConfPDGCodePartOne": "2212",
-    "ConfCutPartOne": "168072266",
-    "ConfPIDPartOne": {
-      "values": [
-        "0"
-      ]
+    "femto-dream-pair-task-track-track": {
+        "cfgCutTable": {
+            "labels_rows": [
+                "PartOne",
+                "PartTwo"
+            ],
+            "labels_cols": [
+                "MaxPt",
+                "PIDthr",
+                "nSigmaTPC",
+                "nSigmaTPCTOF",
+                "MaxP"
+            ],
+            "values": [
+                [
+                    "4.05",
+                    "1",
+                    "3",
+                    "3",
+                    "1"
+                ],
+                [
+                    "4.05",
+                    "1",
+                    "3",
+                    "3",
+                    "1"
+                ]
+            ]
+        },
+        "ccfgNspecies": "1",
+        "ConfPDGCodePartOne": "2212",
+        "ConfCutPartOne": "168072266",
+        "ConfPIDPartOne": {
+            "values": [
+                "0"
+            ]
+        },
+        "ConfIsSame": "false",
+        "ConfPDGCodePartTwo": "2212",
+        "ConfCutPartTwo": "168072266",
+        "ConfPIDPartTwo": {
+            "values": [
+                "0"
+            ]
+        },
+        "CfgMultBins": {
+            "values": [
+                "0",
+                "0",
+                "20",
+                "40",
+                "60",
+                "80",
+                "100",
+                "200",
+                "99999"
+            ]
+        },
+        "CfgkstarBins": {
+            "values": [
+                "1500",
+                "0",
+                "6"
+            ]
+        },
+        "CfgkTBins": {
+            "values": [
+                "150",
+                "0",
+                "9"
+            ]
+        },
+        "CfgmTBins": {
+            "values": [
+                "225",
+                "0",
+                "7.5"
+            ]
+        },
+        "ConfNEventsMix": "5",
+        "ConfIsCPR": "true",
+        "processSameEvent": "true",
+        "processMixedEvent": "true"
     },
-    "ConfIsSame": "false",
-    "ConfPDGCodePartTwo": "2212",
-    "ConfCutPartTwo": "168072266",
-    "ConfPIDPartTwo": {
-      "values": [
-        "0"
-      ]
-    },
-    "CfgMultBins": {
-      "values": [
-        "0",
-        "0",
-        "20",
-        "40",
-        "60",
-        "80",
-        "100",
-        "200",
-        "99999"
-      ]
-    },
-    "CfgkstarBins": {
-      "values": [
-        "1500",
-        "0",
-        "6"
-      ]
-    },
-    "CfgkTBins": {
-      "values": [
-        "150",
-        "0",
-        "9"
-      ]
-    },
-    "CfgmTBins": {
-      "values": [
-        "225",
-        "0",
-        "7.5"
-      ]
-    },
-    "ConfNEventsMix": "5",
-    "ConfIsCPR": "true",
-    "processSameEvent": "true",
-    "processMixedEvent": "true"
-  },
-  "internal-dpl-injected-dummy-sink": "",
-  "internal-dpl-aod-global-analysis-file-sink": ""
+    "internal-dpl-injected-dummy-sink": "",
+    "internal-dpl-aod-global-analysis-file-sink": ""
 }
diff --git a/.conflict-side-0/PWGCF/Tutorial/prod-config.json b/.conflict-side-0/PWGCF/Tutorial/prod-config.json
index 8be00067d90..934b219a50a 100644
--- a/.conflict-side-0/PWGCF/Tutorial/prod-config.json
+++ b/.conflict-side-0/PWGCF/Tutorial/prod-config.json
@@ -1,47 +1,47 @@
 {
-  "internal-dpl-clock": "",
-  "internal-dpl-aod-reader": {
-    "time-limit": "0",
-    "orbit-offset-enumeration": "0",
-    "orbit-multiplier-enumeration": "0",
-    "start-value-enumeration": "0",
-    "end-value-enumeration": "-1",
-    "step-value-enumeration": "1",
-    "aod-file": "AO2D.root"
-  },
-  "internal-dpl-aod-index-builder": "",
-  "internal-dpl-aod-spawner": "",
-  "fdd-converter": "",
-  "timestamp-task": {
-    "verbose": "false",
-    "rct-path": "RCT/RunInformation/",
-    "start-orbit-path": "GRP/StartOrbit",
-    "ccdb-url": "http://alice-ccdb.cern.ch",
-    "isRun2MC": "false"
-  },
-  "tpc-pid": {
-    "param-file": "",
-    "param-signal": "BetheBloch",
-    "param-sigma": "TPCReso",
-    "ccdb-url": "http://alice-ccdb.cern.ch",
-    "ccdbPath": "Analysis/PID/TPC/Response",
-    "ccdb-timestamp": "-1",
-    "pid-el": "-1",
-    "pid-mu": "-1",
-    "pid-pi": "-1",
-    "pid-ka": "-1",
-    "pid-pr": "-1",
-    "pid-de": "-1",
-    "pid-tr": "-1",
-    "pid-he": "-1",
-    "pid-al": "-1"
-  },
-  "bc-selection-task": {
-    "processRun2": "false",
-    "processRun3": "true"
-  },
-  "tof-signal": "",
-  "track-propagation": {
+    "internal-dpl-clock": "",
+    "internal-dpl-aod-reader": {
+        "time-limit": "0",
+        "orbit-offset-enumeration": "0",
+        "orbit-multiplier-enumeration": "0",
+        "start-value-enumeration": "0",
+        "end-value-enumeration": "-1",
+        "step-value-enumeration": "1",
+        "aod-file": "AO2D.root"
+    },
+    "internal-dpl-aod-index-builder": "",
+    "internal-dpl-aod-spawner": "",
+    "fdd-converter": "",
+    "timestamp-task": {
+        "verbose": "false",
+        "rct-path": "RCT/RunInformation/",
+        "start-orbit-path": "GRP/StartOrbit",
+        "ccdb-url": "http://alice-ccdb.cern.ch",
+        "isRun2MC": "false"
+    },
+    "tpc-pid": {
+        "param-file": "",
+        "param-signal": "BetheBloch",
+        "param-sigma": "TPCReso",
+        "ccdb-url": "http://alice-ccdb.cern.ch",
+        "ccdbPath": "Analysis/PID/TPC/Response",
+        "ccdb-timestamp": "-1",
+        "pid-el": "-1",
+        "pid-mu": "-1",
+        "pid-pi": "-1",
+        "pid-ka": "-1",
+        "pid-pr": "-1",
+        "pid-de": "-1",
+        "pid-tr": "-1",
+        "pid-he": "-1",
+        "pid-al": "-1"
+    },
+    "bc-selection-task": {
+        "processRun2": "false",
+        "processRun3": "true"
+    },
+    "tof-signal": "",
+    "track-propagation": {
         "ccdb-url": "http://alice-ccdb.cern.ch",
         "lutPath": "GLO/Param/MatLUT",
         "geoPath": "GLO/Config/GeometryAligned",
@@ -50,196 +50,196 @@
         "processStandard": "true",
         "processCovariance": "false"
     },
-  "tof-pid-base": {},
-  "tof-pid": {
-    "param-file": "",
-    "param-sigma": "TOFResoParams",
-    "ccdb-url": "http://alice-ccdb.cern.ch",
-    "ccdbPath": "Analysis/PID/TOF",
-    "ccdb-timestamp": "-1",
-    "pid-el": "-1",
-    "pid-mu": "-1",
-    "pid-pi": "-1",
-    "pid-ka": "-1",
-    "pid-pr": "-1",
-    "pid-de": "-1",
-    "pid-tr": "-1",
-    "pid-he": "-1",
-    "pid-al": "-1",
-    "processEvTime": "true",
-    "processNoEvTime": "false"
-  },
-  "lambdakzero-builder": {
-    "dcanegtopv": "0.1",
-    "dcapostopv": "0.1",
-    "mincrossedrows": "70",
-    "isRun2": "1",
-    "v0cospa": "0.995",
-    "dcav0dau": "1",
-    "v0radius": "5",
-    "useMatCorrType": "0",
-    "rejDiffCollTracks": "0",
+    "tof-pid-base": {},
+    "tof-pid": {
+        "param-file": "",
+        "param-sigma": "TOFResoParams",
+        "ccdb-url": "http://alice-ccdb.cern.ch",
+        "ccdbPath": "Analysis/PID/TOF",
+        "ccdb-timestamp": "-1",
+        "pid-el": "-1",
+        "pid-mu": "-1",
+        "pid-pi": "-1",
+        "pid-ka": "-1",
+        "pid-pr": "-1",
+        "pid-de": "-1",
+        "pid-tr": "-1",
+        "pid-he": "-1",
+        "pid-al": "-1",
+        "processEvTime": "true",
+        "processNoEvTime": "false"
+    },
+    "lambdakzero-builder": {
+        "dcanegtopv": "0.1",
+        "dcapostopv": "0.1",
+        "mincrossedrows": "70",
+        "isRun2": "1",
+        "v0cospa": "0.995",
+        "dcav0dau": "1",
+        "v0radius": "5",
+        "useMatCorrType": "0",
+        "rejDiffCollTracks": "0",
         "processRun2": "false",
         "processRun3": "true"
-  },
-  "event-selection-task": {
-    "syst": "pp",
-    "muonSelection": "0",
-    "customDeltaBC": "300",
-    "isMC": "false",
-    "processRun2": "false",
-    "processRun3": "true"
-  },
-  "multiplicity-table": {
-    "processRun2": "false",
-    "processRun3": "true"
-  },
-  "femto-dream-producer-task": {
-    "ConfDebugOutput": "true",
-    "ConfIsTrigger": "false",
-    "ConfIsRun3": "true",
-    "ConfEvtZvtx": "10",
-    "ConfEvtTriggerCheck": "true",
-    "ConfEvtTriggerSel": "0",
-    "ConfEvtOfflineCheck": "true",
-    "ConfStoreV0": "true",
-    "ConfTrkSign": {
-      "values": [
-        "-1",
-        "1"
-      ]
-    },
-    "ConfTrkPtMin": {
-      "values": [
-        "0.4",
-        "0.6",
-        "0.5"
-      ]
-    },
-    "ConfTrkEtaMax": {
-      "values": [
-        "0.8",
-        "0.7",
-        "0.9"
-      ]
-    },
-    "ConfTrkTPCnClsMin": {
-      "values": [
-        "80",
-        "70",
-        "60"
-      ]
-    },
-    "ConfTrkTPCfClsMin": {
-      "values": [
-        "0.7",
-        "0.8",
-        "0.9"
-      ]
-    },
-    "ConfTrkTPCcRowsMin": {
-      "values": [
-        "70",
-        "60",
-        "80"
-      ]
-    },
-    "ConfTrkTPCsClsMax": {
-      "values": [
-        "0.1",
-        "160"
-      ]
-    },
-    "ConfTrkITSnClsMin": {
-      "values": [
-        "-1",
-        "2",
-        "4"
-      ]
-    },
-    "ConfTrkITSnClsIbMin": {
-      "values": [
-        "-1",
-        "1"
-      ]
     },
-    "ConfTrkDCAxyMax": {
-      "values": [
-        "0.1",
-        "3.5"
-      ]
-    },
-    "ConfTrkDCAzMax": {
-      "values": [
-        "0.2",
-        "3.5"
-      ]
-    },
-    "ConfTrkPIDnSigmaMax": {
-      "values": [
-        "3.5",
-        "3",
-        "2.5"
-      ]
-    },
-    "ConfTrkTPIDspecies": {
-      "values": [
-        "2",
-        "4"
-      ]
-    },
-    "ConfV0Sign": {
-      "values": [
-        "-1",
-        "1"
-      ]
-    },
-    "ConfV0PtMin": {
-      "values": [
-        "0.3",
-        "0.4",
-        "0.5"
-      ]
-    },
-    "ConfV0DCAdaughMax": {
-      "values": [
-        "1.2",
-        "1.5"
-      ]
-    },
-    "ConfV0CPAMin": {
-      "values": [
-        "0.90",
-        "0.995"
-      ]
-    },
-    "ConfV0TranRadMin": {
-      "values": [
-        "0.2"
-      ]
-    },
-    "ConfV0TranRadMax": {
-      "values": [
-        "100"
-      ]
-    },
-    "ConfV0DecVecMax": {
-      "values": [
-        "100"
-      ]
+    "event-selection-task": {
+        "syst": "pp",
+        "muonSelection": "0",
+        "customDeltaBC": "300",
+        "isMC": "false",
+        "processRun2": "false",
+        "processRun3": "true"
     },
-    "ConfV0DaughTPIDspecies": {
-      "values": [
-        "2",
-        "4"
-      ]
+    "multiplicity-table": {
+        "processRun2": "false",
+        "processRun3": "true"
     },
-    "ConfInvMassLowLimit": "0",
-    "ConfInvMassUpLimit": "100"
-  },
-  "track-selection": {
-    "isRun3": "true"
-  },
-  "internal-dpl-aod-global-analysis-file-sink": "",
-  "internal-dpl-aod-writer": ""
+    "femto-dream-producer-task": {
+        "ConfDebugOutput": "true",
+        "ConfIsTrigger": "false",
+        "ConfIsRun3": "true",
+        "ConfEvtZvtx": "10",
+        "ConfEvtTriggerCheck": "true",
+        "ConfEvtTriggerSel": "0",
+        "ConfEvtOfflineCheck": "true",
+        "ConfStoreV0": "true",
+        "ConfTrkSign": {
+            "values": [
+                "-1",
+                "1"
+            ]
+        },
+        "ConfTrkPtMin": {
+            "values": [
+                "0.4",
+                "0.6",
+                "0.5"
+            ]
+        },
+        "ConfTrkEtaMax": {
+            "values": [
+                "0.8",
+                "0.7",
+                "0.9"
+            ]
+        },
+        "ConfTrkTPCnClsMin": {
+            "values": [
+                "80",
+                "70",
+                "60"
+            ]
+        },
+        "ConfTrkTPCfClsMin": {
+            "values": [
+                "0.7",
+                "0.8",
+                "0.9"
+            ]
+        },
+        "ConfTrkTPCcRowsMin": {
+            "values": [
+                "70",
+                "60",
+                "80"
+            ]
+        },
+        "ConfTrkTPCsClsMax": {
+            "values": [
+                "0.1",
+                "160"
+            ]
+        },
+        "ConfTrkITSnClsMin": {
+            "values": [
+                "-1",
+                "2",
+                "4"
+            ]
+        },
+        "ConfTrkITSnClsIbMin": {
+            "values": [
+                "-1",
+                "1"
+            ]
+        },
+        "ConfTrkDCAxyMax": {
+            "values": [
+                "0.1",
+                "3.5"
+            ]
+        },
+        "ConfTrkDCAzMax": {
+            "values": [
+                "0.2",
+                "3.5"
+            ]
+        },
+        "ConfTrkPIDnSigmaMax": {
+            "values": [
+                "3.5",
+                "3",
+                "2.5"
+            ]
+        },
+        "ConfTrkTPIDspecies": {
+            "values": [
+                "2",
+                "4"
+            ]
+        },
+        "ConfV0Sign": {
+            "values": [
+                "-1",
+                "1"
+            ]
+        },
+        "ConfV0PtMin": {
+            "values": [
+                "0.3",
+                "0.4",
+                "0.5"
+            ]
+        },
+        "ConfV0DCAdaughMax": {
+            "values": [
+                "1.2",
+                "1.5"
+            ]
+        },
+        "ConfV0CPAMin": {
+            "values": [
+                "0.90",
+                "0.995"
+            ]
+        },
+        "ConfV0TranRadMin": {
+            "values": [
+                "0.2"
+            ]
+        },
+        "ConfV0TranRadMax": {
+            "values": [
+                "100"
+            ]
+        },
+        "ConfV0DecVecMax": {
+            "values": [
+                "100"
+            ]
+        },
+        "ConfV0DaughTPIDspecies": {
+            "values": [
+                "2",
+                "4"
+            ]
+        },
+        "ConfInvMassLowLimit": "0",
+        "ConfInvMassUpLimit": "100"
+    },
+    "track-selection": {
+        "isRun3": "true"
+    },
+    "internal-dpl-aod-global-analysis-file-sink": "",
+    "internal-dpl-aod-writer": ""
 }
diff --git a/.conflict-side-0/PWGCF/Tutorial/run-config.json b/.conflict-side-0/PWGCF/Tutorial/run-config.json
index 424db80fbb8..1c7c55db103 100644
--- a/.conflict-side-0/PWGCF/Tutorial/run-config.json
+++ b/.conflict-side-0/PWGCF/Tutorial/run-config.json
@@ -1,135 +1,135 @@
 {
-  "internal-dpl-clock": "",
-  "internal-dpl-aod-reader": {
-    "time-limit": "0",
-    "orbit-offset-enumeration": "0",
-    "orbit-multiplier-enumeration": "0",
-    "start-value-enumeration": "0",
-    "end-value-enumeration": "-1",
-    "step-value-enumeration": "1",
-    "aod-file": "AO2D.root"
-  },
-  "internal-dpl-aod-index-builder": "",
-  "internal-dpl-aod-spawner": "",
-  "fdd-converter": "",
-  "timestamp-task": {
-    "verbose": "false",
-    "rct-path": "RCT/RunInformation/",
-    "start-orbit-path": "GRP/StartOrbit",
-    "ccdb-url": "http://alice-ccdb.cern.ch",
-    "isRun2MC": "false"
-  },
-  "tpc-pid": {
-    "param-file": "",
-    "param-signal": "BetheBloch",
-    "param-sigma": "TPCReso",
-    "ccdb-url": "http://alice-ccdb.cern.ch",
-    "ccdbPath": "Analysis/PID/TPC/Response",
-    "ccdb-timestamp": "-1",
-    "pid-el": "-1",
-    "pid-mu": "-1",
-    "pid-pi": "-1",
-    "pid-ka": "-1",
-    "pid-pr": "-1",
-    "pid-de": "-1",
-    "pid-tr": "-1",
-    "pid-he": "-1",
-    "pid-al": "-1"
-  },
-  "bc-selection-task": {
-    "processRun2": "false",
-    "processRun3": "true"
-  },
-  "tof-signal": "",
-  "track-propagation": {
-    "ccdb-url": "http://alice-ccdb.cern.ch",
-    "lutPath": "GLO/Param/MatLUT",
-    "geoPath": "GLO/Config/GeometryAligned",
-    "grpPath": "GLO/GRP/GRP",
-    "mVtxPath": "GLO/Calib/MeanVertex",
-    "processStandard": "true",
-    "processCovariance": "false"
-  },
-  "event-selection-task": {
-    "syst": "pp",
-    "muonSelection": "0",
-    "customDeltaBC": "300",
-    "isMC": "false",
-    "processRun2": "false",
-    "processRun3": "true"
-  },
-  "multiplicity-table": {
-    "processRun2": "false",
-    "processRun3": "true"
-  },
-  "track-selection": {
-    "isRun3": "true"
-  },
-  "c-f-tutorial-task0": "",
-  "c-f-tutorial-task1": "",
-  "c-f-tutorial-task2": {
-    "ConfZvtxCut": "10",
-    "ConfEtaCut": "0.8",
-    "ConfMaxPtCut": "3",
-    "ConfMinPtCut": "0.5",
-    "ConfMinNSigmaTPCCut": "3"
-  },
-  "c-f-tutorial-task3": {
-    "ConfZvtxCut": "10",
-    "ConfEtaCut": "0.8",
-    "ConfMaxPtCut": "3",
-    "ConfMinPtCut": "0.5",
-    "ConfMinNSigmaTPCCut": "3",
-    "ConfChargeCut": "0"
-  },
-  "c-f-tutorial-task4": {
-    "ConfZvtxCut": "10",
-    "ConfEtaCut": "0.8",
-    "ConfMaxPtCut": "3",
-    "ConfMinPtCut": "0.5",
-    "ConfMinNSigmaTPCCut": "3",
-    "ConfChargeCut": "0"
-  },
-  "c-f-tutorial-task5": {
-    "ConfZvtxCut": "10",
-    "ConfEtaCut": "0.8",
-    "ConfMaxPtCut": "3",
-    "ConfMinPtCut": "0.5",
-    "ConfMinNSigmaTPCCut": "3",
-    "ConfChargeCut": "0",
-    "ConfMultBins": {
-      "values": [
-        "0",
-        "0",
-        "20",
-        "40",
-        "60",
-        "80",
-        "100",
-        "200",
-        "99999"
-      ]
+    "internal-dpl-clock": "",
+    "internal-dpl-aod-reader": {
+        "time-limit": "0",
+        "orbit-offset-enumeration": "0",
+        "orbit-multiplier-enumeration": "0",
+        "start-value-enumeration": "0",
+        "end-value-enumeration": "-1",
+        "step-value-enumeration": "1",
+        "aod-file": "AO2D.root"
     },
-    "ConfVtxBins": {
-      "values": [
-        "0",
-        "-10",
-        "-8",
-        "-6",
-        "-4",
-        "-2",
-        "0",
-        "2",
-        "4",
-        "6",
-        "8",
-        "10"
-      ]
+    "internal-dpl-aod-index-builder": "",
+    "internal-dpl-aod-spawner": "",
+    "fdd-converter": "",
+    "timestamp-task": {
+        "verbose": "false",
+        "rct-path": "RCT/RunInformation/",
+        "start-orbit-path": "GRP/StartOrbit",
+        "ccdb-url": "http://alice-ccdb.cern.ch",
+        "isRun2MC": "false"
     },
-    "processSame": "true",
-    "processMixed": "true",
-    "processMixedEventInterface": "true"
-  },
-  "internal-dpl-aod-global-analysis-file-sink": "",
-  "internal-dpl-aod-writer": ""
+    "tpc-pid": {
+        "param-file": "",
+        "param-signal": "BetheBloch",
+        "param-sigma": "TPCReso",
+        "ccdb-url": "http://alice-ccdb.cern.ch",
+        "ccdbPath": "Analysis/PID/TPC/Response",
+        "ccdb-timestamp": "-1",
+        "pid-el": "-1",
+        "pid-mu": "-1",
+        "pid-pi": "-1",
+        "pid-ka": "-1",
+        "pid-pr": "-1",
+        "pid-de": "-1",
+        "pid-tr": "-1",
+        "pid-he": "-1",
+        "pid-al": "-1"
+    },
+    "bc-selection-task": {
+        "processRun2": "false",
+        "processRun3": "true"
+    },
+    "tof-signal": "",
+    "track-propagation": {
+        "ccdb-url": "http://alice-ccdb.cern.ch",
+        "lutPath": "GLO/Param/MatLUT",
+        "geoPath": "GLO/Config/GeometryAligned",
+        "grpPath": "GLO/GRP/GRP",
+        "mVtxPath": "GLO/Calib/MeanVertex",
+        "processStandard": "true",
+        "processCovariance": "false"
+    },
+    "event-selection-task": {
+        "syst": "pp",
+        "muonSelection": "0",
+        "customDeltaBC": "300",
+        "isMC": "false",
+        "processRun2": "false",
+        "processRun3": "true"
+    },
+    "multiplicity-table": {
+        "processRun2": "false",
+        "processRun3": "true"
+    },
+    "track-selection": {
+        "isRun3": "true"
+    },
+    "c-f-tutorial-task0": "",
+    "c-f-tutorial-task1": "",
+    "c-f-tutorial-task2": {
+        "ConfZvtxCut": "10",
+        "ConfEtaCut": "0.8",
+        "ConfMaxPtCut": "3",
+        "ConfMinPtCut": "0.5",
+        "ConfMinNSigmaTPCCut": "3"
+    },
+    "c-f-tutorial-task3": {
+        "ConfZvtxCut": "10",
+        "ConfEtaCut": "0.8",
+        "ConfMaxPtCut": "3",
+        "ConfMinPtCut": "0.5",
+        "ConfMinNSigmaTPCCut": "3",
+        "ConfChargeCut": "0"
+    },
+    "c-f-tutorial-task4": {
+        "ConfZvtxCut": "10",
+        "ConfEtaCut": "0.8",
+        "ConfMaxPtCut": "3",
+        "ConfMinPtCut": "0.5",
+        "ConfMinNSigmaTPCCut": "3",
+        "ConfChargeCut": "0"
+    },
+    "c-f-tutorial-task5": {
+        "ConfZvtxCut": "10",
+        "ConfEtaCut": "0.8",
+        "ConfMaxPtCut": "3",
+        "ConfMinPtCut": "0.5",
+        "ConfMinNSigmaTPCCut": "3",
+        "ConfChargeCut": "0",
+        "ConfMultBins": {
+            "values": [
+                "0",
+                "0",
+                "20",
+                "40",
+                "60",
+                "80",
+                "100",
+                "200",
+                "99999"
+            ]
+        },
+        "ConfVtxBins": {
+            "values": [
+                "0",
+                "-10",
+                "-8",
+                "-6",
+                "-4",
+                "-2",
+                "0",
+                "2",
+                "4",
+                "6",
+                "8",
+                "10"
+            ]
+        },
+        "processSame": "true",
+        "processMixed": "true",
+        "processMixedEventInterface": "true"
+    },
+    "internal-dpl-aod-global-analysis-file-sink": "",
+    "internal-dpl-aod-writer": ""
 }
diff --git a/.conflict-side-0/PWGCF/TwoParticleCorrelations/Core/EventSelectionFilterAndAnalysis.cxx b/.conflict-side-0/PWGCF/TwoParticleCorrelations/Core/EventSelectionFilterAndAnalysis.cxx
index 57a65059663..cb2ca3398b2 100644
--- a/.conflict-side-0/PWGCF/TwoParticleCorrelations/Core/EventSelectionFilterAndAnalysis.cxx
+++ b/.conflict-side-0/PWGCF/TwoParticleCorrelations/Core/EventSelectionFilterAndAnalysis.cxx
@@ -9,11 +9,13 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <boost/regex.hpp>
-#include <TObjArray.h>
+#include "EventSelectionFilterAndAnalysis.h"
 
 #include "Framework/AnalysisTask.h"
-#include "EventSelectionFilterAndAnalysis.h"
+
+#include <TObjArray.h>
+
+#include <boost/regex.hpp>
 
 using namespace o2;
 using namespace o2::analysis::PWGCF;
diff --git a/.conflict-side-0/PWGCF/TwoParticleCorrelations/Core/EventSelectionFilterAndAnalysis.h b/.conflict-side-0/PWGCF/TwoParticleCorrelations/Core/EventSelectionFilterAndAnalysis.h
index 72e8d6672c0..63a10c2bd78 100644
--- a/.conflict-side-0/PWGCF/TwoParticleCorrelations/Core/EventSelectionFilterAndAnalysis.h
+++ b/.conflict-side-0/PWGCF/TwoParticleCorrelations/Core/EventSelectionFilterAndAnalysis.h
@@ -11,15 +11,17 @@
 #ifndef EVENTSELECTIONFILTERANDANALYSIS_H
 #define EVENTSELECTIONFILTERANDANALYSIS_H
 
-#include <Rtypes.h>
-#include <TString.h>
-#include <TObject.h>
-#include <TNamed.h>
+#include "SelectionFilterAndAnalysis.h"
+#include "SkimmingConfigurableCuts.h"
+
 #include <TList.h>
+#include <TNamed.h>
+#include <TObject.h>
+#include <TString.h>
 
 #include <fairlogger/Logger.h>
-#include "SkimmingConfigurableCuts.h"
-#include "SelectionFilterAndAnalysis.h"
+
+#include <Rtypes.h>
 
 namespace o2
 {
diff --git a/.conflict-side-0/PWGCF/TwoParticleCorrelations/Core/FilterAndAnalysisFramework.cxx b/.conflict-side-0/PWGCF/TwoParticleCorrelations/Core/FilterAndAnalysisFramework.cxx
index ba83f4aa2ed..40c4cebf8c8 100644
--- a/.conflict-side-0/PWGCF/TwoParticleCorrelations/Core/FilterAndAnalysisFramework.cxx
+++ b/.conflict-side-0/PWGCF/TwoParticleCorrelations/Core/FilterAndAnalysisFramework.cxx
@@ -9,14 +9,16 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
+#include "FilterAndAnalysisFramework.h"
+
+#include <TList.h>
+#include <TObjString.h>
+
 #include <fairlogger/Logger.h>
+
 #include <iomanip>
 #include <map>
 #include <string>
-#include <TList.h>
-#include <TObjString.h>
-
-#include "FilterAndAnalysisFramework.h"
 
 using namespace o2;
 using namespace o2::analysis::PWGCF;
diff --git a/.conflict-side-0/PWGCF/TwoParticleCorrelations/Core/FilterAndAnalysisFramework.h b/.conflict-side-0/PWGCF/TwoParticleCorrelations/Core/FilterAndAnalysisFramework.h
index fa3b7aaeb6e..54d1656ad3d 100644
--- a/.conflict-side-0/PWGCF/TwoParticleCorrelations/Core/FilterAndAnalysisFramework.h
+++ b/.conflict-side-0/PWGCF/TwoParticleCorrelations/Core/FilterAndAnalysisFramework.h
@@ -11,18 +11,21 @@
 #ifndef PWGCF_TWOPARTICLECORRELATIONS_CORE_FILTERANDANALYSISFRAMEWORK_H_
 #define PWGCF_TWOPARTICLECORRELATIONS_CORE_FILTERANDANALYSISFRAMEWORK_H_
 
+#include "PWGCF/TwoParticleCorrelations/Core/EventSelectionFilterAndAnalysis.h"
+#include "PWGCF/TwoParticleCorrelations/Core/PIDSelectionFilterAndAnalysis.h"
+#include "PWGCF/TwoParticleCorrelations/Core/TrackSelectionFilterAndAnalysis.h"
+
 #include <CCDB/BasicCCDBManager.h>
-#include <vector>
-#include <string>
-#include <Rtypes.h>
-#include <TString.h>
-#include <TObject.h>
-#include <TNamed.h>
+
 #include <TList.h>
+#include <TNamed.h>
+#include <TObject.h>
+#include <TString.h>
 
-#include "PWGCF/TwoParticleCorrelations/Core/EventSelectionFilterAndAnalysis.h"
-#include "PWGCF/TwoParticleCorrelations/Core/TrackSelectionFilterAndAnalysis.h"
-#include "PWGCF/TwoParticleCorrelations/Core/PIDSelectionFilterAndAnalysis.h"
+#include <Rtypes.h>
+
+#include <string>
+#include <vector>
 
 namespace o2
 {
diff --git a/.conflict-side-0/PWGCF/TwoParticleCorrelations/Core/PIDSelectionFilterAndAnalysis.cxx b/.conflict-side-0/PWGCF/TwoParticleCorrelations/Core/PIDSelectionFilterAndAnalysis.cxx
index bfe06121f9e..519b3a825e1 100644
--- a/.conflict-side-0/PWGCF/TwoParticleCorrelations/Core/PIDSelectionFilterAndAnalysis.cxx
+++ b/.conflict-side-0/PWGCF/TwoParticleCorrelations/Core/PIDSelectionFilterAndAnalysis.cxx
@@ -9,14 +9,17 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <boost/regex.hpp>
-#include <TObjArray.h>
+#include "PIDSelectionFilterAndAnalysis.h"
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PIDSelectionFilterAndAnalysis.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+
+#include <TObjArray.h>
+
+#include <boost/regex.hpp>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGCF/TwoParticleCorrelations/Core/PIDSelectionFilterAndAnalysis.h b/.conflict-side-0/PWGCF/TwoParticleCorrelations/Core/PIDSelectionFilterAndAnalysis.h
index 1d8645b351c..530a2f95658 100644
--- a/.conflict-side-0/PWGCF/TwoParticleCorrelations/Core/PIDSelectionFilterAndAnalysis.h
+++ b/.conflict-side-0/PWGCF/TwoParticleCorrelations/Core/PIDSelectionFilterAndAnalysis.h
@@ -11,14 +11,15 @@
 #ifndef PIDSELECTIONFILTERANDANALYSIS_H
 #define PIDSELECTIONFILTERANDANALYSIS_H
 
-#include <Rtypes.h>
-#include <TString.h>
-#include <TObject.h>
-#include <TNamed.h>
+#include "SelectionFilterAndAnalysis.h"
+#include "SkimmingConfigurableCuts.h"
+
 #include <TList.h>
+#include <TNamed.h>
+#include <TObject.h>
+#include <TString.h>
 
-#include "SkimmingConfigurableCuts.h"
-#include "SelectionFilterAndAnalysis.h"
+#include <Rtypes.h>
 
 #undef INCORPORATEBAYESIANPID
 
diff --git a/.conflict-side-0/PWGCF/TwoParticleCorrelations/Core/SelectionFilterAndAnalysis.cxx b/.conflict-side-0/PWGCF/TwoParticleCorrelations/Core/SelectionFilterAndAnalysis.cxx
index 1c816268063..eb15706406d 100644
--- a/.conflict-side-0/PWGCF/TwoParticleCorrelations/Core/SelectionFilterAndAnalysis.cxx
+++ b/.conflict-side-0/PWGCF/TwoParticleCorrelations/Core/SelectionFilterAndAnalysis.cxx
@@ -9,13 +9,15 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <boost/regex.hpp>
-#include <TObjArray.h>
+#include "SelectionFilterAndAnalysis.h"
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
-#include "SelectionFilterAndAnalysis.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+
+#include <TObjArray.h>
+
+#include <boost/regex.hpp>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGCF/TwoParticleCorrelations/Core/SelectionFilterAndAnalysis.h b/.conflict-side-0/PWGCF/TwoParticleCorrelations/Core/SelectionFilterAndAnalysis.h
index f3680d188f4..ea88f12edca 100644
--- a/.conflict-side-0/PWGCF/TwoParticleCorrelations/Core/SelectionFilterAndAnalysis.h
+++ b/.conflict-side-0/PWGCF/TwoParticleCorrelations/Core/SelectionFilterAndAnalysis.h
@@ -11,11 +11,12 @@
 #ifndef SELECTIONFILTERANDANALYSIS_H
 #define SELECTIONFILTERANDANALYSIS_H
 
-#include <Rtypes.h>
-#include <TString.h>
-#include <TObject.h>
-#include <TNamed.h>
 #include <TList.h>
+#include <TNamed.h>
+#include <TObject.h>
+#include <TString.h>
+
+#include <Rtypes.h>
 
 namespace o2
 {
diff --git a/.conflict-side-0/PWGCF/TwoParticleCorrelations/Core/SkimmingConfigurableCuts.cxx b/.conflict-side-0/PWGCF/TwoParticleCorrelations/Core/SkimmingConfigurableCuts.cxx
index 81436952bd0..9c9c131e768 100644
--- a/.conflict-side-0/PWGCF/TwoParticleCorrelations/Core/SkimmingConfigurableCuts.cxx
+++ b/.conflict-side-0/PWGCF/TwoParticleCorrelations/Core/SkimmingConfigurableCuts.cxx
@@ -9,11 +9,13 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <regex>
+#include "PWGCF/TwoParticleCorrelations/Core/SkimmingConfigurableCuts.h"
+
 #include <TObjArray.h>
 
 #include <fairlogger/Logger.h>
-#include "PWGCF/TwoParticleCorrelations/Core/SkimmingConfigurableCuts.h"
+
+#include <regex>
 
 using namespace o2;
 using namespace o2::analysis::PWGCF;
diff --git a/.conflict-side-0/PWGCF/TwoParticleCorrelations/Core/SkimmingConfigurableCuts.h b/.conflict-side-0/PWGCF/TwoParticleCorrelations/Core/SkimmingConfigurableCuts.h
index 53e1c56dcaa..823f6a848ac 100644
--- a/.conflict-side-0/PWGCF/TwoParticleCorrelations/Core/SkimmingConfigurableCuts.h
+++ b/.conflict-side-0/PWGCF/TwoParticleCorrelations/Core/SkimmingConfigurableCuts.h
@@ -11,20 +11,23 @@
 #ifndef SKIMMING_CONFIGURABLE_CUTS_CLASSES_H
 #define SKIMMING_CONFIGURABLE_CUTS_CLASSES_H
 
-#include <Rtypes.h>
-#include <TString.h>
-#include <TObject.h>
-#include <TNamed.h>
-#include <TMath.h>
-#include <TList.h>
+#include "Framework/DataTypes.h"
+
 #include <TF1.h>
-#include <set>
-#include <vector>
-#include <regex>
+#include <TList.h>
+#include <TMath.h>
+#include <TNamed.h>
 #include <TObjArray.h>
+#include <TObject.h>
+#include <TString.h>
 
 #include <fairlogger/Logger.h>
-#include "Framework/DataTypes.h"
+
+#include <Rtypes.h>
+
+#include <regex>
+#include <set>
+#include <vector>
 
 namespace o2
 {
diff --git a/.conflict-side-0/PWGCF/TwoParticleCorrelations/Core/TrackSelectionFilterAndAnalysis.cxx b/.conflict-side-0/PWGCF/TwoParticleCorrelations/Core/TrackSelectionFilterAndAnalysis.cxx
index 4b5708fdc90..859c6d04802 100644
--- a/.conflict-side-0/PWGCF/TwoParticleCorrelations/Core/TrackSelectionFilterAndAnalysis.cxx
+++ b/.conflict-side-0/PWGCF/TwoParticleCorrelations/Core/TrackSelectionFilterAndAnalysis.cxx
@@ -9,11 +9,12 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <boost/regex.hpp>
+#include "TrackSelectionFilterAndAnalysis.h"
+
 #include <TObjArray.h>
 
+#include <boost/regex.hpp>
 #include <fairlogger/Logger.h>
-#include "TrackSelectionFilterAndAnalysis.h"
 
 using namespace o2;
 using namespace o2::analysis::PWGCF;
diff --git a/.conflict-side-0/PWGCF/TwoParticleCorrelations/Core/TrackSelectionFilterAndAnalysis.h b/.conflict-side-0/PWGCF/TwoParticleCorrelations/Core/TrackSelectionFilterAndAnalysis.h
index 8c186a97109..cfb6e4524cd 100644
--- a/.conflict-side-0/PWGCF/TwoParticleCorrelations/Core/TrackSelectionFilterAndAnalysis.h
+++ b/.conflict-side-0/PWGCF/TwoParticleCorrelations/Core/TrackSelectionFilterAndAnalysis.h
@@ -11,15 +11,17 @@
 #ifndef TRACKSELECTIONFILTERANDANALYSIS_H
 #define TRACKSELECTIONFILTERANDANALYSIS_H
 
-#include <Rtypes.h>
-#include <TString.h>
-#include <TObject.h>
-#include <TNamed.h>
+#include "SelectionFilterAndAnalysis.h"
+#include "SkimmingConfigurableCuts.h"
+
 #include <TList.h>
+#include <TNamed.h>
+#include <TObject.h>
+#include <TString.h>
 
 #include <fairlogger/Logger.h>
-#include "SkimmingConfigurableCuts.h"
-#include "SelectionFilterAndAnalysis.h"
+
+#include <Rtypes.h>
 
 namespace o2
 {
diff --git a/.conflict-side-0/PWGCF/TwoParticleCorrelations/DataModel/TwoParticleCorrelationsFiltered.h b/.conflict-side-0/PWGCF/TwoParticleCorrelations/DataModel/TwoParticleCorrelationsFiltered.h
index ac35f064808..f0e48acab70 100644
--- a/.conflict-side-0/PWGCF/TwoParticleCorrelations/DataModel/TwoParticleCorrelationsFiltered.h
+++ b/.conflict-side-0/PWGCF/TwoParticleCorrelations/DataModel/TwoParticleCorrelationsFiltered.h
@@ -11,9 +11,10 @@
 #ifndef O2_ANALYSIS_TWOPARTFILTERED_H
 #define O2_ANALYSIS_TWOPARTFILTERED_H
 
+#include "TwoParticleCorrelationsSkimmed.h"
+
 #include "Framework/ASoA.h"
 #include "Framework/AnalysisDataModel.h"
-#include "TwoParticleCorrelationsSkimmed.h"
 
 namespace o2
 {
diff --git a/.conflict-side-0/PWGCF/TwoParticleCorrelations/DataModel/TwoParticleCorrelationsSkimmed.h b/.conflict-side-0/PWGCF/TwoParticleCorrelations/DataModel/TwoParticleCorrelationsSkimmed.h
index b032d89647f..c91c3d491d1 100644
--- a/.conflict-side-0/PWGCF/TwoParticleCorrelations/DataModel/TwoParticleCorrelationsSkimmed.h
+++ b/.conflict-side-0/PWGCF/TwoParticleCorrelations/DataModel/TwoParticleCorrelationsSkimmed.h
@@ -12,19 +12,22 @@
 #ifndef PWGCF_TWOPARTICLECORRELATIONS_DATAMODEL_TWOPARTICLECORRELATIONSSKIMMED_H_
 #define PWGCF_TWOPARTICLECORRELATIONS_DATAMODEL_TWOPARTICLECORRELATIONSSKIMMED_H_
 
-#include <vector>
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoA.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Centrality.h"
-#include "PWGCF/TwoParticleCorrelations/Core/SkimmingConfigurableCuts.h"
 #include "PWGCF/TwoParticleCorrelations/Core/EventSelectionFilterAndAnalysis.h"
-#include "PWGCF/TwoParticleCorrelations/Core/TrackSelectionFilterAndAnalysis.h"
 #include "PWGCF/TwoParticleCorrelations/Core/PIDSelectionFilterAndAnalysis.h"
+#include "PWGCF/TwoParticleCorrelations/Core/SkimmingConfigurableCuts.h"
+#include "PWGCF/TwoParticleCorrelations/Core/TrackSelectionFilterAndAnalysis.h"
+
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
 
+#include <vector>
+
 namespace o2
 {
 namespace aod
@@ -60,15 +63,15 @@ DECLARE_SOA_TABLE(CFMCCollMasks, "AOD", "CFMCCOLLMASK", //! Generated collision/
 using CFMCCollMask = CFMCCollMasks::iterator;
 namespace cfskim
 {
-DECLARE_SOA_INDEX_COLUMN(CFCollision, cfcollision);     //! Reconstructed collision/event
-DECLARE_SOA_INDEX_COLUMN(CFMCCollision, cfmccollision); //! Generated collision/event
-DECLARE_SOA_COLUMN(CFTrackFlags, trackflags, uint64_t); //! The skimming flags for track selection, B0 track/particle positive charge, B1 track/particle negative charge
+DECLARE_SOA_INDEX_COLUMN(CFCollision, cfcollision);         //! Reconstructed collision/event
+DECLARE_SOA_INDEX_COLUMN(CFMCCollision, cfmccollision);     //! Generated collision/event
+DECLARE_SOA_COLUMN(CFTrackFlags, trackflags, uint64_t);     //! The skimming flags for track selection, B0 track/particle positive charge, B1 track/particle negative charge
 DECLARE_SOA_COLUMN(CFMCTrackFlags, mctrackflags, uint64_t); //! The skimming flags for particle selection, B0 track/particle positive charge, B1 track/particle negative charge
 DECLARE_SOA_COLUMN(CFPidFlags, pidflags, uint64_t);         //! The PID skimming flags for track selection
-DECLARE_SOA_COLUMN(Pt, pt, float);                      //! The track transverse momentum
-DECLARE_SOA_COLUMN(Eta, eta, float);                    //! The track pseudorapidity
-DECLARE_SOA_COLUMN(Phi, phi, float);                    //! The track azimuthal angle
-DECLARE_SOA_DYNAMIC_COLUMN(Sign, sign,                  //! Charge: positive: 1, negative: -1
+DECLARE_SOA_COLUMN(Pt, pt, float);                          //! The track transverse momentum
+DECLARE_SOA_COLUMN(Eta, eta, float);                        //! The track pseudorapidity
+DECLARE_SOA_COLUMN(Phi, phi, float);                        //! The track azimuthal angle
+DECLARE_SOA_DYNAMIC_COLUMN(Sign, sign,                      //! Charge: positive: 1, negative: -1
                            [](uint64_t mask) -> int8_t { return ((mask & 0x1L) == 0x1L) ? 1 : ((mask & 0x2L) == 0x2L) ? -1
                                                                                                                       : 0; });
 
diff --git a/.conflict-side-0/PWGCF/TwoParticleCorrelations/TableProducer/Productions/skimmingconf_20221115.cxx b/.conflict-side-0/PWGCF/TwoParticleCorrelations/TableProducer/Productions/skimmingconf_20221115.cxx
index cd174dc8d86..0299ca49dcf 100644
--- a/.conflict-side-0/PWGCF/TwoParticleCorrelations/TableProducer/Productions/skimmingconf_20221115.cxx
+++ b/.conflict-side-0/PWGCF/TwoParticleCorrelations/TableProducer/Productions/skimmingconf_20221115.cxx
@@ -9,10 +9,11 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <vector>
-#include <string>
-#include "Framework/AnalysisTask.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+
+#include <string>
+#include <vector>
 
 struct : o2::framework::ConfigurableGroup {
   o2::framework::Configurable<std::vector<std::string>> bfield{"evtflt_bfield", {"positive-yes", "negative-yes"}, "B filed polarity cut: both 'yes' default, anything else alternative"};
diff --git a/.conflict-side-0/PWGCF/TwoParticleCorrelations/TableProducer/identifiedBfFilter.cxx b/.conflict-side-0/PWGCF/TwoParticleCorrelations/TableProducer/identifiedBfFilter.cxx
index 535dd77cce2..d55ee0c8e78 100644
--- a/.conflict-side-0/PWGCF/TwoParticleCorrelations/TableProducer/identifiedBfFilter.cxx
+++ b/.conflict-side-0/PWGCF/TwoParticleCorrelations/TableProducer/identifiedBfFilter.cxx
@@ -15,35 +15,38 @@
 
 #include "PWGCF/TwoParticleCorrelations/TableProducer/identifiedBfFilter.h"
 
-#include <cmath>
-#include <algorithm>
-#include <string>
-#include <vector>
+#include "PWGCF/Core/AnalysisConfigurableCuts.h"
+#include "PWGCF/TwoParticleCorrelations/DataModel/IdentifiedBfFiltered.h"
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/CollisionAssociationTables.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGCF/Core/AnalysisConfigurableCuts.h"
-#include "PWGCF/TwoParticleCorrelations/DataModel/IdentifiedBfFiltered.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/CollisionAssociationTables.h"
-#include "Framework/runDataProcessing.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include <TROOT.h>
-#include <TParameter.h>
-#include <TPDGCode.h>
-#include <TList.h>
+#include "Framework/runDataProcessing.h"
+
 #include <TDirectory.h>
 #include <TFolder.h>
 #include <TH1.h>
 #include <TH2.h>
 #include <TH3.h>
+#include <TList.h>
+#include <TPDGCode.h>
+#include <TParameter.h>
 #include <TProfile3D.h>
+#include <TROOT.h>
+
+#include <algorithm>
+#include <cmath>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
@@ -1843,8 +1846,8 @@ inline MatchRecoGenSpecies IdentifiedBfFilterTracks::identifyTrack(TrackObject c
     for (int sp = 0; (sp < kIdBfNoOfSpecies) && !doublematch; ++sp) { // iterate over all species while there's no double match and we're in the list
       if (sp != spMinNSigma) {                                        // for species not current minimum nsigma species
         // LOGF(info, "looking at Reject Range");
-        if (std::fabs(nsigmas[sp]) < rejectRange[spMinNSigma][sp]) {  // If secondary species is in rejection range
-          doublematch = true;                                         // Set double match true
+        if (std::fabs(nsigmas[sp]) < rejectRange[spMinNSigma][sp]) { // If secondary species is in rejection range
+          doublematch = true;                                        // Set double match true
           spDouble = MatchRecoGenSpecies(sp);
         }
       }
@@ -1921,11 +1924,11 @@ inline int8_t IdentifiedBfFilterTracks::acceptTrack(TrackObject const& track)
       if (!(sp < 0)) {
         fillTrackHistosAfterSelection(track, sp); //<Fill accepted track histo with PID
         if (track.sign() > 0) {                   // if positive
-          trkMultPos[sp]++; //<< Update Particle Multiplicity
+          trkMultPos[sp]++;                       //<< Update Particle Multiplicity
           return speciesChargeValue1[sp];
         }
         if (track.sign() < 0) { // if negative
-          trkMultNeg[sp]++; //<< Update Particle Multiplicity
+          trkMultNeg[sp]++;     //<< Update Particle Multiplicity
           return speciesChargeValue1[sp] + 1;
         }
       }
diff --git a/.conflict-side-0/PWGCF/TwoParticleCorrelations/TableProducer/identifiedBfFilter.h b/.conflict-side-0/PWGCF/TwoParticleCorrelations/TableProducer/identifiedBfFilter.h
index 7335b36c421..ea7f52553b6 100644
--- a/.conflict-side-0/PWGCF/TwoParticleCorrelations/TableProducer/identifiedBfFilter.h
+++ b/.conflict-side-0/PWGCF/TwoParticleCorrelations/TableProducer/identifiedBfFilter.h
@@ -16,23 +16,24 @@
 #ifndef PWGCF_TWOPARTICLECORRELATIONS_TABLEPRODUCER_IDENTIFIEDBFFILTER_H_
 #define PWGCF_TWOPARTICLECORRELATIONS_TABLEPRODUCER_IDENTIFIEDBFFILTER_H_
 
-#include <CCDB/BasicCCDBManager.h>
-
-#include <vector>
-#include <string>
+#include "PWGCF/Core/AnalysisConfigurableCuts.h"
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/O2DatabasePDGPlugin.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/Core/TrackSelectionDefaults.h"
-#include "PWGCF/Core/AnalysisConfigurableCuts.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 #include "MathUtils/Utils.h"
+#include <CCDB/BasicCCDBManager.h>
+
+#include <string>
+#include <vector>
 
 namespace o2
 
diff --git a/.conflict-side-0/PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsFiltering.cxx b/.conflict-side-0/PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsFiltering.cxx
index 7bdaddd053d..5d0108119f6 100644
--- a/.conflict-side-0/PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsFiltering.cxx
+++ b/.conflict-side-0/PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsFiltering.cxx
@@ -9,23 +9,25 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <cmath>
-
-#include "Framework/AnalysisTask.h"
 #include "PWGCF/TwoParticleCorrelations/Core/FilterAndAnalysisFramework.h"
-#include "PWGCF/TwoParticleCorrelations/DataModel/TwoParticleCorrelationsSkimmed.h"
 #include "PWGCF/TwoParticleCorrelations/DataModel/TwoParticleCorrelationsFiltered.h"
+#include "PWGCF/TwoParticleCorrelations/DataModel/TwoParticleCorrelationsSkimmed.h"
+
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include <TROOT.h>
+
 #include <TDatabasePDG.h>
-#include <TParameter.h>
-#include <TList.h>
 #include <TDirectory.h>
 #include <TFolder.h>
 #include <TH1.h>
 #include <TH2.h>
 #include <TH3.h>
+#include <TList.h>
+#include <TParameter.h>
 #include <TProfile3D.h>
+#include <TROOT.h>
+
+#include <cmath>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsFullSkimming.cxx b/.conflict-side-0/PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsFullSkimming.cxx
index 2dec74acf61..f4e8e9ac797 100644
--- a/.conflict-side-0/PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsFullSkimming.cxx
+++ b/.conflict-side-0/PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsFullSkimming.cxx
@@ -9,18 +9,20 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <CCDB/BasicCCDBManager.h>
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "PWGCF/TwoParticleCorrelations/Core/FilterAndAnalysisFramework.h"
+#include "PWGCF/TwoParticleCorrelations/DataModel/TwoParticleCorrelationsSkimmed.h"
+
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGCF/TwoParticleCorrelations/DataModel/TwoParticleCorrelationsSkimmed.h"
-#include "PWGCF/TwoParticleCorrelations/Core/FilterAndAnalysisFramework.h"
-#include "Framework/runDataProcessing.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include <CCDB/BasicCCDBManager.h>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsNotStoredSkimming.cxx b/.conflict-side-0/PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsNotStoredSkimming.cxx
index 3964b745b91..497371fea43 100644
--- a/.conflict-side-0/PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsNotStoredSkimming.cxx
+++ b/.conflict-side-0/PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsNotStoredSkimming.cxx
@@ -9,18 +9,20 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <CCDB/BasicCCDBManager.h>
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "PWGCF/TwoParticleCorrelations/Core/FilterAndAnalysisFramework.h"
+#include "PWGCF/TwoParticleCorrelations/DataModel/TwoParticleCorrelationsSkimmed.h"
+
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGCF/TwoParticleCorrelations/DataModel/TwoParticleCorrelationsSkimmed.h"
-#include "PWGCF/TwoParticleCorrelations/Core/FilterAndAnalysisFramework.h"
-#include "Framework/runDataProcessing.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include <CCDB/BasicCCDBManager.h>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsRegisterSkimming.cxx b/.conflict-side-0/PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsRegisterSkimming.cxx
index 20bbd90efbc..8fb759fec54 100644
--- a/.conflict-side-0/PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsRegisterSkimming.cxx
+++ b/.conflict-side-0/PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsRegisterSkimming.cxx
@@ -9,12 +9,13 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <CCDB/BasicCCDBManager.h>
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
 #include "PWGCF/TwoParticleCorrelations/Core/FilterAndAnalysisFramework.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
+#include <CCDB/BasicCCDBManager.h>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGCF/TwoParticleCorrelations/Tasks/corrSparse.cxx b/.conflict-side-0/PWGCF/TwoParticleCorrelations/Tasks/corrSparse.cxx
index 489c99bdbff..117457911da 100644
--- a/.conflict-side-0/PWGCF/TwoParticleCorrelations/Tasks/corrSparse.cxx
+++ b/.conflict-side-0/PWGCF/TwoParticleCorrelations/Tasks/corrSparse.cxx
@@ -13,30 +13,32 @@
 /// \brief Provides a sparse with usefull two particle correlation info
 /// \author Thor Jensen (thor.kjaersgaard.jensen@cern.ch)
 
-#include <CCDB/BasicCCDBManager.h>
-#include "TRandom3.h"
-#include <vector>
+#include "PWGCF/Core/CorrelationContainer.h"
+#include "PWGCF/Core/PairCuts.h"
+#include "PWGCF/DataModel/CorrelationsDerived.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/StepTHn.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "CommonConstants/MathConstants.h"
 #include "Common/Core/RecoDecay.h"
-
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/CollisionAssociationTables.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Centrality.h"
-#include "PWGCF/DataModel/CorrelationsDerived.h"
-#include "Common/DataModel/CollisionAssociationTables.h"
-#include "PWGCF/Core/CorrelationContainer.h"
-#include "PWGCF/Core/PairCuts.h"
-#include "DataFormatsParameters/GRPObject.h"
+
+#include "CommonConstants/MathConstants.h"
 #include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
+#include <CCDB/BasicCCDBManager.h>
+
+#include "TRandom3.h"
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGCF/TwoParticleCorrelations/Tasks/diHadronCor.cxx b/.conflict-side-0/PWGCF/TwoParticleCorrelations/Tasks/diHadronCor.cxx
index e3eb978e08f..498a1772882 100644
--- a/.conflict-side-0/PWGCF/TwoParticleCorrelations/Tasks/diHadronCor.cxx
+++ b/.conflict-side-0/PWGCF/TwoParticleCorrelations/Tasks/diHadronCor.cxx
@@ -14,39 +14,41 @@
 /// \author Zhiyong Lu (zhiyong.lu@cern.ch)
 /// \since  May/03/2025
 
-#include <CCDB/BasicCCDBManager.h>
-#include "TRandom3.h"
-#include "TF1.h"
-#include <vector>
-#include <string>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/StepTHn.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "CommonConstants/MathConstants.h"
-#include "Common/Core/RecoDecay.h"
-
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Centrality.h"
-#include "PWGCF/DataModel/CorrelationsDerived.h"
-#include "Common/DataModel/CollisionAssociationTables.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "PWGCF/Core/CorrelationContainer.h"
 #include "PWGCF/Core/PairCuts.h"
-#include "PWGCF/GenericFramework/Core/GFWPowerArray.h"
+#include "PWGCF/DataModel/CorrelationsDerived.h"
 #include "PWGCF/GenericFramework/Core/GFW.h"
 #include "PWGCF/GenericFramework/Core/GFWCumulant.h"
+#include "PWGCF/GenericFramework/Core/GFWPowerArray.h"
 #include "PWGCF/GenericFramework/Core/GFWWeights.h"
-#include "DataFormatsParameters/GRPObject.h"
+
+#include "Common/Core/RecoDecay.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/CollisionAssociationTables.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonConstants/MathConstants.h"
 #include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
+#include <CCDB/BasicCCDBManager.h>
+
+#include "TF1.h"
+#include "TRandom3.h"
 #include <TPDGCode.h>
 
+#include <string>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-0/PWGCF/TwoParticleCorrelations/Tasks/dptDptEfficiencyAndQc.cxx b/.conflict-side-0/PWGCF/TwoParticleCorrelations/Tasks/dptDptEfficiencyAndQc.cxx
index 0fdbca208bf..1bb717b98f8 100644
--- a/.conflict-side-0/PWGCF/TwoParticleCorrelations/Tasks/dptDptEfficiencyAndQc.cxx
+++ b/.conflict-side-0/PWGCF/TwoParticleCorrelations/Tasks/dptDptEfficiencyAndQc.cxx
@@ -13,35 +13,38 @@
 /// \brief Provides efficiency extraction and QC for track cuts and PID
 /// \author victor.gonzalez.sebastian@gmail.com
 
-#include <TH2F.h>
-#include <TProfile2D.h>
-#include <THnSparse.h>
-#include <TPDGCode.h>
-#include <TMCProcess.h>
-#include <CCDB/BasicCCDBManager.h>
-#include <vector>
-#include <algorithm>
-#include <cstdio>
-#include <memory>
-#include <string>
-#include "ReconstructionDataFormats/PID.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/Core/TableHelper.h"
+#include "PWGCF/Core/AnalysisConfigurableCuts.h"
+#include "PWGCF/DataModel/DptDptFiltered.h"
+#include "PWGCF/TableProducer/dptDptFilter.h"
+
 #include "Common/Core/RecoDecay.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/Core/TableHelper.h"
+#include "Common/Core/TrackSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoAHelpers.h"
-#include "Framework/Expressions.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
+#include "Framework/Expressions.h"
 #include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/PID.h"
+#include <CCDB/BasicCCDBManager.h>
+
 #include "Math/MatrixFunctions.h"
 #include "Math/SMatrix.h"
+#include <TH2F.h>
+#include <THnSparse.h>
+#include <TMCProcess.h>
+#include <TPDGCode.h>
+#include <TProfile2D.h>
 
-#include "PWGCF/Core/AnalysisConfigurableCuts.h"
-#include "PWGCF/DataModel/DptDptFiltered.h"
-#include "PWGCF/TableProducer/dptDptFilter.h"
+#include <algorithm>
+#include <cstdio>
+#include <memory>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGCF/TwoParticleCorrelations/Tasks/dptDptPerRunExtraQc.cxx b/.conflict-side-0/PWGCF/TwoParticleCorrelations/Tasks/dptDptPerRunExtraQc.cxx
index 8617a65de2f..c9304ec1ef9 100644
--- a/.conflict-side-0/PWGCF/TwoParticleCorrelations/Tasks/dptDptPerRunExtraQc.cxx
+++ b/.conflict-side-0/PWGCF/TwoParticleCorrelations/Tasks/dptDptPerRunExtraQc.cxx
@@ -13,18 +13,18 @@
 /// \brief basic per run check of the per analyzed species p vs TPC IW momentum
 /// \author victor.gonzalez.sebastian@gmail.com
 
-#include <array>
-#include <cmath>
-#include <unordered_map>
+#include "PWGCF/DataModel/DptDptFiltered.h"
+#include "PWGCF/TableProducer/dptDptFilter.h"
 
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
 
-#include "PWGCF/DataModel/DptDptFiltered.h"
-#include "PWGCF/TableProducer/dptDptFilter.h"
+#include <array>
+#include <cmath>
+#include <unordered_map>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGCF/TwoParticleCorrelations/Tasks/dptDptPerRunQc.cxx b/.conflict-side-0/PWGCF/TwoParticleCorrelations/Tasks/dptDptPerRunQc.cxx
index 598d3305539..286641391ea 100644
--- a/.conflict-side-0/PWGCF/TwoParticleCorrelations/Tasks/dptDptPerRunQc.cxx
+++ b/.conflict-side-0/PWGCF/TwoParticleCorrelations/Tasks/dptDptPerRunQc.cxx
@@ -13,29 +13,28 @@
 /// \brief basic per run check of the ITS dead chips and of the hadronic interaction rate
 /// \author victor.gonzalez.sebastian@gmail.com
 
-#include <array>
-#include <cmath>
-#include <unordered_map>
-#include <memory>
-#include <vector>
-#include <string>
+#include "PWGCF/DataModel/DptDptFiltered.h"
+#include "PWGCF/TableProducer/dptDptFilter.h"
 
-#include "CCDB/BasicCCDBManager.h"
 #include "Common/CCDB/ctpRateFetcher.h"
 
-#include "DataFormatsParameters/AggregatedRunInfo.h"
+#include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsITSMFT/NoiseMap.h" // missing include in TimeDeadMap.h
 #include "DataFormatsITSMFT/TimeDeadMap.h"
-#include "ITSMFTReconstruction/ChipMappingITS.h"
-
+#include "DataFormatsParameters/AggregatedRunInfo.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
+#include "ITSMFTReconstruction/ChipMappingITS.h"
 
-#include "PWGCF/DataModel/DptDptFiltered.h"
-#include "PWGCF/TableProducer/dptDptFilter.h"
+#include <array>
+#include <cmath>
+#include <memory>
+#include <string>
+#include <unordered_map>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGCF/TwoParticleCorrelations/Tasks/identifiedbf.cxx b/.conflict-side-0/PWGCF/TwoParticleCorrelations/Tasks/identifiedbf.cxx
index b357272c17c..100291176ec 100644
--- a/.conflict-side-0/PWGCF/TwoParticleCorrelations/Tasks/identifiedbf.cxx
+++ b/.conflict-side-0/PWGCF/TwoParticleCorrelations/Tasks/identifiedbf.cxx
@@ -12,7 +12,25 @@
 /// \file identifiedbf.cxx
 /// \brief Fills histograms with particles and tracks to calculate the Balance Function
 /// \author bghanley1995@gmail.com
+#include "PWGCF/Core/AnalysisConfigurableCuts.h"
+#include "PWGCF/Core/PairCuts.h"
+#include "PWGCF/TwoParticleCorrelations/DataModel/IdentifiedBfFiltered.h"
+#include "PWGCF/TwoParticleCorrelations/TableProducer/identifiedBfFilter.h"
+
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 #include <CCDB/BasicCCDBManager.h>
+
 #include <TDirectory.h>
 #include <TFolder.h>
 #include <TH1.h>
@@ -23,27 +41,12 @@
 #include <TProfile3D.h>
 #include <TROOT.h>
 #include <TVector2.h>
+
 #include <cmath>
+#include <cstdio>
 #include <ctime>
-#include <vector>
 #include <string>
-#include <cstdio>
-
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/Core/RecoDecay.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "PWGCF/Core/AnalysisConfigurableCuts.h"
-#include "PWGCF/Core/PairCuts.h"
-#include "PWGCF/TwoParticleCorrelations/DataModel/IdentifiedBfFiltered.h"
-#include "PWGCF/TwoParticleCorrelations/TableProducer/identifiedBfFilter.h"
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
@@ -93,24 +96,24 @@ struct IdentifiedbfTask {
     // The IdentifiedBfCorrelationsAnalysisTask output objects
     //============================================================================================
     /* histograms */
-    TH1F* fhVertexZA;                                                             //!<! the z vertex distribution for the current multiplicity/centrality class
-    std::vector<TH1F*> fhN1VsPt{nch, nullptr};                                    //!<! weighted single particle distribution vs \f$p_T\f$, for the different species
-    std::vector<TH2F*> fhN1VsEtaPhi{nch, nullptr};                                //!<! weighted single particle distribution vs \f$\eta,\;\phi\f$, for the different species
-    std::vector<TH2F*> fhSum1PtVsEtaPhi{nch, nullptr};                            //!<! accumulated sum of weighted \f$p_T\f$ vs \f$\eta,\;\phi\f$, for the different species
-    std::vector<TH3F*> fhN1VsZEtaPhiPt{nch + 1, nullptr};                         //!<! single particle distribution vs \f$\mbox{vtx}_z,\; \eta,\;\phi,\;p_T\f$, for the different species
-    std::vector<TH3F*> fhN1VsZEtaPhiPtPrimary{nch, nullptr};                      //!<! single particle distribution of primary particles vs \f$\mbox{vtx}_z,\; \eta,\;\phi,\;p_T\f$, for the different species
-    std::vector<TH3F*> fhN1VsZEtaPhiPtSecondary{nch, nullptr};                    //!<! single particle distribution of primary particles vs \f$\mbox{vtx}_z,\; \eta,\;\phi,\;p_T\f$, for the different species
-    std::vector<TH3F*> fhN1VsZEtaPhiPtPure{nch + 1, nullptr};                     //!<! single particle distribution of pure particles vs \f$\mbox{vtx}_z,\; \eta,\;\phi,\;p_T\f$, for the different species
-    std::vector<TH3F*> fhSum1PtVsZEtaPhiPt{nch, nullptr};                         //!<! accumulated sum of weighted \f$p_T\f$ vs \f$\mbox{vtx}_z,\; \eta,\;\phi,\;p_T\f$, for the different species
-    std::vector<TH3*> fhNuaNueVsZEtaPhiPt{nch, nullptr};                          //!<! NUA+NUE correction vs \f$\mbox{vtx}_z,\; \eta,\;\phi,\;p_T\f$, for the differents species
-    std::vector<TH2*> fhPtAvgVsEtaPhi{nch, nullptr};                              //!<! average \f$p_T\f$ vs \f$\eta,\;\phi\f$, for the different species
-    std::vector<std::vector<TH2F*>> fhN2VsPtPt{nch, {nch, nullptr}};              //!<! weighted two particle distribution vs \f${p_T}_1, {p_T}_2\f$ for the different species combinations
-    std::vector<std::vector<TH2F*>> fhN2VsDEtaDPhi{nch, {nch, nullptr}};          //!<! two-particle distribution vs \f$\Delta\eta,\;\Delta\phi\f$ for the different species combinations
-    std::vector<std::vector<TH2F*>> fhN2ContVsDEtaDPhi{nch, {nch, nullptr}};      //!<! two-particle distribution continuous vs \f$\Delta\eta,\;\Delta\phi\f$ for the different species combinations
-    std::vector<std::vector<TH2F*>> fhSum2PtPtVsDEtaDPhi{nch, {nch, nullptr}};    //!<! two-particle  \f$\sum {p_T}_1 {p_T}_2\f$ distribution vs \f$\Delta\eta,\;\Delta\phi\f$ for the different species combinations
-    std::vector<std::vector<TH2F*>> fhSum2DptDptVsDEtaDPhi{nch, {nch, nullptr}};  //!<! two-particle  \f$\sum ({p_T}_1- <{p_T}_1>) ({p_T}_2 - <{p_T}_2>) \f$ distribution vs \f$\Delta\eta,\;\Delta\phi\f$ for the different species combinations
-    std::vector<std::vector<TH2F*>> fhSupN1N1VsDEtaDPhi{nch, {nch, nullptr}};     //!<! suppressed n1n1 two-particle distribution vs \f$\Delta\eta,\;\Delta\phi\f$ for the different species combinations
-    std::vector<std::vector<TH2F*>> fhSupPt1Pt1VsDEtaDPhi{nch, {nch, nullptr}};   //!<! suppressed \f${p_T}_1 {p_T}_2\f$ two-particle distribution vs \f$\Delta\eta,\;\Delta\phi\f$ for the different species combinations
+    TH1F* fhVertexZA;                                                            //!<! the z vertex distribution for the current multiplicity/centrality class
+    std::vector<TH1F*> fhN1VsPt{nch, nullptr};                                   //!<! weighted single particle distribution vs \f$p_T\f$, for the different species
+    std::vector<TH2F*> fhN1VsEtaPhi{nch, nullptr};                               //!<! weighted single particle distribution vs \f$\eta,\;\phi\f$, for the different species
+    std::vector<TH2F*> fhSum1PtVsEtaPhi{nch, nullptr};                           //!<! accumulated sum of weighted \f$p_T\f$ vs \f$\eta,\;\phi\f$, for the different species
+    std::vector<TH3F*> fhN1VsZEtaPhiPt{nch + 1, nullptr};                        //!<! single particle distribution vs \f$\mbox{vtx}_z,\; \eta,\;\phi,\;p_T\f$, for the different species
+    std::vector<TH3F*> fhN1VsZEtaPhiPtPrimary{nch, nullptr};                     //!<! single particle distribution of primary particles vs \f$\mbox{vtx}_z,\; \eta,\;\phi,\;p_T\f$, for the different species
+    std::vector<TH3F*> fhN1VsZEtaPhiPtSecondary{nch, nullptr};                   //!<! single particle distribution of primary particles vs \f$\mbox{vtx}_z,\; \eta,\;\phi,\;p_T\f$, for the different species
+    std::vector<TH3F*> fhN1VsZEtaPhiPtPure{nch + 1, nullptr};                    //!<! single particle distribution of pure particles vs \f$\mbox{vtx}_z,\; \eta,\;\phi,\;p_T\f$, for the different species
+    std::vector<TH3F*> fhSum1PtVsZEtaPhiPt{nch, nullptr};                        //!<! accumulated sum of weighted \f$p_T\f$ vs \f$\mbox{vtx}_z,\; \eta,\;\phi,\;p_T\f$, for the different species
+    std::vector<TH3*> fhNuaNueVsZEtaPhiPt{nch, nullptr};                         //!<! NUA+NUE correction vs \f$\mbox{vtx}_z,\; \eta,\;\phi,\;p_T\f$, for the differents species
+    std::vector<TH2*> fhPtAvgVsEtaPhi{nch, nullptr};                             //!<! average \f$p_T\f$ vs \f$\eta,\;\phi\f$, for the different species
+    std::vector<std::vector<TH2F*>> fhN2VsPtPt{nch, {nch, nullptr}};             //!<! weighted two particle distribution vs \f${p_T}_1, {p_T}_2\f$ for the different species combinations
+    std::vector<std::vector<TH2F*>> fhN2VsDEtaDPhi{nch, {nch, nullptr}};         //!<! two-particle distribution vs \f$\Delta\eta,\;\Delta\phi\f$ for the different species combinations
+    std::vector<std::vector<TH2F*>> fhN2ContVsDEtaDPhi{nch, {nch, nullptr}};     //!<! two-particle distribution continuous vs \f$\Delta\eta,\;\Delta\phi\f$ for the different species combinations
+    std::vector<std::vector<TH2F*>> fhSum2PtPtVsDEtaDPhi{nch, {nch, nullptr}};   //!<! two-particle  \f$\sum {p_T}_1 {p_T}_2\f$ distribution vs \f$\Delta\eta,\;\Delta\phi\f$ for the different species combinations
+    std::vector<std::vector<TH2F*>> fhSum2DptDptVsDEtaDPhi{nch, {nch, nullptr}}; //!<! two-particle  \f$\sum ({p_T}_1- <{p_T}_1>) ({p_T}_2 - <{p_T}_2>) \f$ distribution vs \f$\Delta\eta,\;\Delta\phi\f$ for the different species combinations
+    std::vector<std::vector<TH2F*>> fhSupN1N1VsDEtaDPhi{nch, {nch, nullptr}};    //!<! suppressed n1n1 two-particle distribution vs \f$\Delta\eta,\;\Delta\phi\f$ for the different species combinations
+    std::vector<std::vector<TH2F*>> fhSupPt1Pt1VsDEtaDPhi{nch, {nch, nullptr}};  //!<! suppressed \f${p_T}_1 {p_T}_2\f$ two-particle distribution vs \f$\Delta\eta,\;\Delta\phi\f$ for the different species combinations
     /* versus centrality/multiplicity  profiles */
     std::vector<TProfile*> fhN1VsC{nch, nullptr};                               //!<! weighted single particle distribution vs event centrality/multiplicity, track 1 and 2
     std::vector<TProfile*> fhSum1PtVsC{nch, nullptr};                           //!<! accumulated sum of weighted \f$p_T\f$ vs event centrality/multiplicity, track 1 and 2
diff --git a/.conflict-side-0/PWGCF/TwoParticleCorrelations/Tasks/identifiedbfqa.cxx b/.conflict-side-0/PWGCF/TwoParticleCorrelations/Tasks/identifiedbfqa.cxx
index a52ff377832..f519dbf2eac 100644
--- a/.conflict-side-0/PWGCF/TwoParticleCorrelations/Tasks/identifiedbfqa.cxx
+++ b/.conflict-side-0/PWGCF/TwoParticleCorrelations/Tasks/identifiedbfqa.cxx
@@ -9,14 +9,15 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <cmath>
+#include "PWGCF/TwoParticleCorrelations/DataModel/IdentifiedBfFiltered.h"
+#include "PWGCF/TwoParticleCorrelations/TableProducer/identifiedBfFilter.h"
 
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGCF/TwoParticleCorrelations/DataModel/IdentifiedBfFiltered.h"
-#include "PWGCF/TwoParticleCorrelations/TableProducer/identifiedBfFilter.h"
+
+#include <cmath>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGCF/TwoParticleCorrelations/Tasks/longrangeCorrelation.cxx b/.conflict-side-0/PWGCF/TwoParticleCorrelations/Tasks/longrangeCorrelation.cxx
index 5fb1bc8e1c8..f4942e1515a 100644
--- a/.conflict-side-0/PWGCF/TwoParticleCorrelations/Tasks/longrangeCorrelation.cxx
+++ b/.conflict-side-0/PWGCF/TwoParticleCorrelations/Tasks/longrangeCorrelation.cxx
@@ -15,42 +15,44 @@
 /// \author Abhi Modak (abhi.modak@cern.ch) and Debojit sarkar (debojit.sarkar@cern.ch)
 /// \since April 22, 2025
 
-#include <TH1F.h>
-#include <chrono>
-#include <string>
-#include <vector>
-#include <TComplex.h>
-#include <TMath.h>
-#include <cstdio>
+#include "PWGCF/Core/CorrelationContainer.h"
+#include "PWGCF/Core/PairCuts.h"
+#include "PWGCF/DataModel/CorrelationsDerived.h"
 
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/StepTHn.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/DataModel/CollisionAssociationTables.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/Core/trackUtilities.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/TrackSelection.h"
-#include "Framework/ASoAHelpers.h"
 #include "Common/DataModel/FT0Corrected.h"
-#include "Common/Core/RecoDecay.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
 #include "CommonConstants/MathConstants.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "DetectorsCommonDataFormats/AlignParam.h"
 #include "FT0Base/Geometry.h"
 #include "FV0Base/Geometry.h"
-#include "PWGCF/DataModel/CorrelationsDerived.h"
-#include "Common/DataModel/CollisionAssociationTables.h"
-#include "PWGCF/Core/CorrelationContainer.h"
-#include "PWGCF/Core/PairCuts.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
-#include "CCDB/CcdbApi.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "DetectorsCommonDataFormats/AlignParam.h"
+#include <TComplex.h>
+#include <TH1F.h>
+#include <TMath.h>
+
+#include <chrono>
+#include <cstdio>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGCF/TwoParticleCorrelations/Tasks/neutronProtonCorrZdc.cxx b/.conflict-side-0/PWGCF/TwoParticleCorrelations/Tasks/neutronProtonCorrZdc.cxx
index 1870c66da80..39e6c3fda7c 100644
--- a/.conflict-side-0/PWGCF/TwoParticleCorrelations/Tasks/neutronProtonCorrZdc.cxx
+++ b/.conflict-side-0/PWGCF/TwoParticleCorrelations/Tasks/neutronProtonCorrZdc.cxx
@@ -13,15 +13,17 @@
 /// \brief Correlations between protons and neutrons in the ZDC
 /// \author Olaf Massen <olaf.massen@cern.ch>
 
-#include <string>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
+
+#include <string>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGCF/TwoParticleCorrelations/Tasks/r2p2-4-id.cxx b/.conflict-side-0/PWGCF/TwoParticleCorrelations/Tasks/r2p2-4-id.cxx
index e6c13fe1318..f12e1bdf044 100644
--- a/.conflict-side-0/PWGCF/TwoParticleCorrelations/Tasks/r2p2-4-id.cxx
+++ b/.conflict-side-0/PWGCF/TwoParticleCorrelations/Tasks/r2p2-4-id.cxx
@@ -9,14 +9,15 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <memory>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include <memory>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGCF/TwoParticleCorrelations/Tasks/twoParticleCorrelations.cxx b/.conflict-side-0/PWGCF/TwoParticleCorrelations/Tasks/twoParticleCorrelations.cxx
index a7a05beb310..135db8bb324 100644
--- a/.conflict-side-0/PWGCF/TwoParticleCorrelations/Tasks/twoParticleCorrelations.cxx
+++ b/.conflict-side-0/PWGCF/TwoParticleCorrelations/Tasks/twoParticleCorrelations.cxx
@@ -9,25 +9,27 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
+#include "PWGCF/Core/AnalysisConfigurableCuts.h"
+#include "PWGCF/Core/PairCuts.h"
+#include "PWGCF/TwoParticleCorrelations/Core/FilterAndAnalysisFramework.h"
+#include "PWGCF/TwoParticleCorrelations/DataModel/TwoParticleCorrelationsSkimmed.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 #include <DataFormatsParameters/GRPObject.h>
-#include <cmath>
-#include <TROOT.h>
+
 #include <TDatabasePDG.h>
-#include <TParameter.h>
-#include <TList.h>
 #include <TDirectory.h>
 #include <TFolder.h>
 #include <TH1.h>
 #include <TH2.h>
 #include <TH3.h>
+#include <TList.h>
+#include <TParameter.h>
 #include <TProfile3D.h>
+#include <TROOT.h>
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "PWGCF/Core/AnalysisConfigurableCuts.h"
-#include "PWGCF/TwoParticleCorrelations/Core/FilterAndAnalysisFramework.h"
-#include "PWGCF/TwoParticleCorrelations/DataModel/TwoParticleCorrelationsSkimmed.h"
-#include "PWGCF/Core/PairCuts.h"
+#include <cmath>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGDQ/Core/AnalysisCompositeCut.h b/.conflict-side-0/PWGDQ/Core/AnalysisCompositeCut.h
index f3d603909c4..692ba633638 100644
--- a/.conflict-side-0/PWGDQ/Core/AnalysisCompositeCut.h
+++ b/.conflict-side-0/PWGDQ/Core/AnalysisCompositeCut.h
@@ -18,6 +18,7 @@
 #define AnalysisCompositeCut_H
 
 #include "PWGDQ/Core/AnalysisCut.h"
+
 #include <vector>
 
 //_________________________________________________________________________
diff --git a/.conflict-side-0/PWGDQ/Core/AnalysisCut.h b/.conflict-side-0/PWGDQ/Core/AnalysisCut.h
index 6c7185b13ec..9457635798c 100644
--- a/.conflict-side-0/PWGDQ/Core/AnalysisCut.h
+++ b/.conflict-side-0/PWGDQ/Core/AnalysisCut.h
@@ -18,6 +18,7 @@
 #define AnalysisCut_H
 
 #include <TF1.h>
+
 #include <vector>
 
 //_________________________________________________________________________
diff --git a/.conflict-side-0/PWGDQ/Core/CutsLibrary.cxx b/.conflict-side-0/PWGDQ/Core/CutsLibrary.cxx
index 5cf99d6f22f..8d61904b7b8 100644
--- a/.conflict-side-0/PWGDQ/Core/CutsLibrary.cxx
+++ b/.conflict-side-0/PWGDQ/Core/CutsLibrary.cxx
@@ -12,14 +12,18 @@
 // Contact: iarsene@cern.ch, i.c.arsene@fys.uio.no
 //
 #include "PWGDQ/Core/CutsLibrary.h"
-#include <RtypesCore.h>
-#include <TF1.h>
-#include <vector>
-#include <string>
-#include <iostream>
+
 #include "AnalysisCompositeCut.h"
 #include "VarManager.h"
 
+#include <TF1.h>
+
+#include <RtypesCore.h>
+
+#include <iostream>
+#include <string>
+#include <vector>
+
 using std::cout;
 using std::endl;
 
diff --git a/.conflict-side-0/PWGDQ/Core/CutsLibrary.h b/.conflict-side-0/PWGDQ/Core/CutsLibrary.h
index c6ad4caded2..15ed07b1f11 100644
--- a/.conflict-side-0/PWGDQ/Core/CutsLibrary.h
+++ b/.conflict-side-0/PWGDQ/Core/CutsLibrary.h
@@ -15,12 +15,13 @@
 #ifndef PWGDQ_CORE_CUTSLIBRARY_H_
 #define PWGDQ_CORE_CUTSLIBRARY_H_
 
-#include <string>
-#include <vector>
-#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/AnalysisCompositeCut.h"
+#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/VarManager.h"
 
+#include <string>
+#include <vector>
+
 // ///////////////////////////////////////////////
 //   These are the Cuts used in the CEFP Task   //
 //   to select tracks in the event selection    //
diff --git a/.conflict-side-0/PWGDQ/Core/HistogramManager.cxx b/.conflict-side-0/PWGDQ/Core/HistogramManager.cxx
index fb5ce5f8d65..9133dede291 100644
--- a/.conflict-side-0/PWGDQ/Core/HistogramManager.cxx
+++ b/.conflict-side-0/PWGDQ/Core/HistogramManager.cxx
@@ -11,28 +11,29 @@
 
 #include "PWGDQ/Core/HistogramManager.h"
 
-#include <iostream>
-#include <memory>
+#include "Framework/Logger.h"
+
+#include <algorithm>
 #include <fstream>
+#include <iostream>
 #include <list>
+#include <memory>
 #include <vector>
-#include <algorithm>
-#include "Framework/Logger.h"
 using namespace std;
 
-#include <TObject.h>
-#include <TObjArray.h>
-#include <THashList.h>
+#include <TClass.h>
 #include <TH1F.h>
 #include <TH2F.h>
 #include <TH3F.h>
-#include <TProfile.h>
-#include <TProfile2D.h>
-#include <TProfile3D.h>
+#include <THashList.h>
 #include <THn.h>
 #include <THnSparse.h>
 #include <TIterator.h>
-#include <TClass.h>
+#include <TObjArray.h>
+#include <TObject.h>
+#include <TProfile.h>
+#include <TProfile2D.h>
+#include <TProfile3D.h>
 
 ClassImp(HistogramManager);
 
diff --git a/.conflict-side-0/PWGDQ/Core/HistogramManager.h b/.conflict-side-0/PWGDQ/Core/HistogramManager.h
index 4b1393b2eb7..1fc0cf858b8 100644
--- a/.conflict-side-0/PWGDQ/Core/HistogramManager.h
+++ b/.conflict-side-0/PWGDQ/Core/HistogramManager.h
@@ -17,17 +17,17 @@
 #ifndef PWGDQ_CORE_HISTOGRAMMANAGER_H_
 #define PWGDQ_CORE_HISTOGRAMMANAGER_H_
 
-#include <TString.h>
-#include <TNamed.h>
-#include <TList.h>
-#include <THashList.h>
-#include <TAxis.h>
 #include <TArrayD.h>
+#include <TAxis.h>
+#include <THashList.h>
+#include <TList.h>
+#include <TNamed.h>
+#include <TString.h>
 
-#include <string>
+#include <list>
 #include <map>
+#include <string>
 #include <vector>
-#include <list>
 
 class HistogramManager : public TNamed
 {
@@ -103,10 +103,10 @@ class HistogramManager : public TNamed
   std::map<std::string, std::list<std::vector<int>>> fVariablesMap; //!  map holding identifiers for all variables needed by histograms
 
   // various
-  bool fUseDefaultVariableNames;    //! toggle the usage of default variable names and units
-  uint64_t fBinsAllocated;          //! number of allocated bins
-  TString* fVariableNames;          //! variable names
-  TString* fVariableUnits;          //! variable units
+  bool fUseDefaultVariableNames; //! toggle the usage of default variable names and units
+  uint64_t fBinsAllocated;       //! number of allocated bins
+  TString* fVariableNames;       //! variable names
+  TString* fVariableUnits;       //! variable units
 
   void MakeAxisLabels(TAxis* ax, const char* labels);
 
diff --git a/.conflict-side-0/PWGDQ/Core/HistogramsLibrary.cxx b/.conflict-side-0/PWGDQ/Core/HistogramsLibrary.cxx
index 11c87e700de..5aca1c60acf 100644
--- a/.conflict-side-0/PWGDQ/Core/HistogramsLibrary.cxx
+++ b/.conflict-side-0/PWGDQ/Core/HistogramsLibrary.cxx
@@ -11,12 +11,15 @@
 //
 // Contact: iarsene@cern.ch, i.c.arsene@fys.uio.no
 //
-#include <vector>
-#include <algorithm>
 #include "PWGDQ/Core/HistogramsLibrary.h"
+
 #include "VarManager.h"
+
 #include "CommonConstants/MathConstants.h"
 
+#include <algorithm>
+#include <vector>
+
 void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* histClass, const char* groupName, const char* subGroupName)
 {
   //
diff --git a/.conflict-side-0/PWGDQ/Core/HistogramsLibrary.h b/.conflict-side-0/PWGDQ/Core/HistogramsLibrary.h
index 869fb3a85f3..6b7f6a09fc2 100644
--- a/.conflict-side-0/PWGDQ/Core/HistogramsLibrary.h
+++ b/.conflict-side-0/PWGDQ/Core/HistogramsLibrary.h
@@ -15,10 +15,13 @@
 #ifndef PWGDQ_CORE_HISTOGRAMSLIBRARY_H_
 #define PWGDQ_CORE_HISTOGRAMSLIBRARY_H_
 
-#include <TString.h>
 #include "PWGDQ/Core/HistogramManager.h"
 #include "PWGDQ/Core/VarManager.h"
+
 #include "CommonConstants/MathConstants.h"
+
+#include <TString.h>
+
 #include "rapidjson/document.h"
 
 namespace o2::aod
@@ -29,7 +32,7 @@ void DefineHistograms(HistogramManager* hm, const char* histClass, const char* g
 template <typename T>
 bool ValidateJSONHistogram(T hist);
 void AddHistogramsFromJSON(HistogramManager* hm, const char* json);
-}
+} // namespace dqhistograms
 } // namespace o2::aod
 
 #endif // PWGDQ_CORE_HISTOGRAMSLIBRARY_H_
diff --git a/.conflict-side-0/PWGDQ/Core/MCProng.cxx b/.conflict-side-0/PWGDQ/Core/MCProng.cxx
index 48f2c52ae36..925542fbe12 100644
--- a/.conflict-side-0/PWGDQ/Core/MCProng.cxx
+++ b/.conflict-side-0/PWGDQ/Core/MCProng.cxx
@@ -11,10 +11,10 @@
 
 #include "PWGDQ/Core/MCProng.h"
 
-#include <map>
-#include <vector>
 #include <cmath>
 #include <iostream>
+#include <map>
+#include <vector>
 
 ClassImp(MCProng);
 
diff --git a/.conflict-side-0/PWGDQ/Core/MCProng.h b/.conflict-side-0/PWGDQ/Core/MCProng.h
index cd42965d271..8e679db8bb8 100644
--- a/.conflict-side-0/PWGDQ/Core/MCProng.h
+++ b/.conflict-side-0/PWGDQ/Core/MCProng.h
@@ -60,9 +60,9 @@ A few non-existent PYTHIA codes are used to select more than one PYTHIA code.
 #include "TNamed.h"
 #include "TString.h"
 
-#include <vector>
 #include <iostream>
 #include <map>
+#include <vector>
 
 class MCProng
 {
diff --git a/.conflict-side-0/PWGDQ/Core/MCSignal.cxx b/.conflict-side-0/PWGDQ/Core/MCSignal.cxx
index 7a234b65088..ba62e86a6bd 100644
--- a/.conflict-side-0/PWGDQ/Core/MCSignal.cxx
+++ b/.conflict-side-0/PWGDQ/Core/MCSignal.cxx
@@ -9,11 +9,11 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <vector>
-#include <iostream>
-
 #include "PWGDQ/Core/MCSignal.h"
 
+#include <iostream>
+#include <vector>
+
 using std::cout;
 using std::endl;
 
diff --git a/.conflict-side-0/PWGDQ/Core/MCSignal.h b/.conflict-side-0/PWGDQ/Core/MCSignal.h
index 42fe0a0a050..534d6985da0 100644
--- a/.conflict-side-0/PWGDQ/Core/MCSignal.h
+++ b/.conflict-side-0/PWGDQ/Core/MCSignal.h
@@ -57,10 +57,11 @@ process(aod::McParticles const& mcTracks) {
 #define PWGDQ_CORE_MCSIGNAL_H_
 
 #include "MCProng.h"
+
 #include "TNamed.h"
 
-#include <vector>
 #include <iostream>
+#include <vector>
 
 class MCSignal : public TNamed
 {
diff --git a/.conflict-side-0/PWGDQ/Core/MCSignalLibrary.cxx b/.conflict-side-0/PWGDQ/Core/MCSignalLibrary.cxx
index 5e4f2ada1bb..4b953e2363a 100644
--- a/.conflict-side-0/PWGDQ/Core/MCSignalLibrary.cxx
+++ b/.conflict-side-0/PWGDQ/Core/MCSignalLibrary.cxx
@@ -15,11 +15,13 @@
 #include <vector>
 // #include <iostream>
 
-#include <TPDGCode.h>
-#include "CommonConstants/PhysicsConstants.h"
 #include "PWGDQ/Core/MCSignalLibrary.h"
+
+#include "CommonConstants/PhysicsConstants.h"
 #include "Framework/Logger.h"
 
+#include <TPDGCode.h>
+
 using namespace o2::constants::physics;
 // using std::cout;
 // using std::endl;
diff --git a/.conflict-side-0/PWGDQ/Core/MCSignalLibrary.h b/.conflict-side-0/PWGDQ/Core/MCSignalLibrary.h
index df01f60c978..f4c1c88e1df 100644
--- a/.conflict-side-0/PWGDQ/Core/MCSignalLibrary.h
+++ b/.conflict-side-0/PWGDQ/Core/MCSignalLibrary.h
@@ -15,11 +15,13 @@
 #ifndef PWGDQ_CORE_MCSIGNALLIBRARY_H_
 #define PWGDQ_CORE_MCSIGNALLIBRARY_H_
 
-#include <string>
-#include "rapidjson/document.h"
 #include "PWGDQ/Core/MCProng.h"
 #include "PWGDQ/Core/MCSignal.h"
 
+#include "rapidjson/document.h"
+
+#include <string>
+
 namespace o2::aod
 {
 namespace dqmcsignals
@@ -36,7 +38,7 @@ MCProng* ParseJSONMCProng(T prongJSON, const char* prongName);
 
 template <typename T>
 bool ValidateJSONMCProng(T prongJSON, const char* prongName);
-}
+} // namespace dqmcsignals
 } // namespace o2::aod
 
 #endif // PWGDQ_CORE_MCSIGNALLIBRARY_H_
diff --git a/.conflict-side-0/PWGDQ/Core/MixingHandler.cxx b/.conflict-side-0/PWGDQ/Core/MixingHandler.cxx
index 532b91ea9ac..d85c3181048 100644
--- a/.conflict-side-0/PWGDQ/Core/MixingHandler.cxx
+++ b/.conflict-side-0/PWGDQ/Core/MixingHandler.cxx
@@ -10,15 +10,16 @@
 // or submit itself to any jurisdiction.
 
 #include "PWGDQ/Core/MixingHandler.h"
+
 #include "PWGDQ/Core/VarManager.h"
 
-#include <iostream>
 #include <fstream>
+#include <iostream>
 using namespace std;
 
 #include <TMath.h>
-#include <TTimeStamp.h>
 #include <TRandom.h>
+#include <TTimeStamp.h>
 
 ClassImp(MixingHandler);
 
diff --git a/.conflict-side-0/PWGDQ/Core/MixingHandler.h b/.conflict-side-0/PWGDQ/Core/MixingHandler.h
index 0e38a89291e..f07f73fcef2 100644
--- a/.conflict-side-0/PWGDQ/Core/MixingHandler.h
+++ b/.conflict-side-0/PWGDQ/Core/MixingHandler.h
@@ -17,16 +17,16 @@
 #ifndef MixingHandler_H
 #define MixingHandler_H
 
-#include <TNamed.h>
+#include "PWGDQ/Core/HistogramManager.h"
+#include "PWGDQ/Core/VarManager.h"
+
 #include <TArrayF.h>
 #include <TArrayI.h>
 #include <TClonesArray.h>
 #include <TList.h>
+#include <TNamed.h>
 #include <TString.h>
 
-#include "PWGDQ/Core/HistogramManager.h"
-#include "PWGDQ/Core/VarManager.h"
-
 class MixingHandler : public TNamed
 {
 
diff --git a/.conflict-side-0/PWGDQ/Core/MixingLibrary.h b/.conflict-side-0/PWGDQ/Core/MixingLibrary.h
index db7f92583df..4c6a15eed73 100644
--- a/.conflict-side-0/PWGDQ/Core/MixingLibrary.h
+++ b/.conflict-side-0/PWGDQ/Core/MixingLibrary.h
@@ -11,10 +11,11 @@
 //
 // Contact: iarsene@cern.ch, i.c.arsene@fys.uio.no
 //
-#include <TString.h>
 #include "PWGDQ/Core/MixingHandler.h"
 #include "PWGDQ/Core/VarManager.h"
 
+#include <TString.h>
+
 namespace o2::aod
 {
 namespace dqmixing
diff --git a/.conflict-side-0/PWGDQ/Core/VarManager.cxx b/.conflict-side-0/PWGDQ/Core/VarManager.cxx
index 912dc06740a..999d5ef3cfe 100644
--- a/.conflict-side-0/PWGDQ/Core/VarManager.cxx
+++ b/.conflict-side-0/PWGDQ/Core/VarManager.cxx
@@ -8,12 +8,14 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
+#include "PWGDQ/Core/VarManager.h"
+
+#include "Tools/KFparticle/KFUtilities.h"
+
 #include <cmath>
 #include <iostream>
-#include <vector>
 #include <map>
-#include "PWGDQ/Core/VarManager.h"
-#include "Tools/KFparticle/KFUtilities.h"
+#include <vector>
 
 using std::cout;
 using std::endl;
@@ -28,7 +30,7 @@ bool VarManager::fgUsedVars[VarManager::kNVars] = {false};
 bool VarManager::fgUsedKF = false;
 float VarManager::fgMagField = 0.5;
 float VarManager::fgValues[VarManager::kNVars] = {0.0f};
-float VarManager::fgTPCInterSectorBoundary = 1.0;       // cm
+float VarManager::fgTPCInterSectorBoundary = 1.0; // cm
 int VarManager::fgITSROFbias = 0;
 int VarManager::fgITSROFlength = 100;
 int VarManager::fgITSROFBorderMarginLow = 0;
diff --git a/.conflict-side-0/PWGDQ/Core/VarManager.h b/.conflict-side-0/PWGDQ/Core/VarManager.h
index dfcba891bfc..7e885d342b8 100644
--- a/.conflict-side-0/PWGDQ/Core/VarManager.h
+++ b/.conflict-side-0/PWGDQ/Core/VarManager.h
@@ -18,7 +18,9 @@
 #define PWGDQ_CORE_VARMANAGER_H_
 
 #include <Framework/AnalysisDataModel.h>
+
 #include <Math/Vector4Dfwd.h>
+
 #include <cstdint>
 #ifndef HomogeneousField
 #define HomogeneousField
@@ -1189,15 +1191,15 @@ class VarManager : public TObject
   static void SetVariableDependencies(); // toggle those variables on which other used variables might depend
 
   static float fgMagField;
-  static float fgCenterOfMassEnergy;      // collision energy
-  static float fgMassofCollidingParticle; // mass of the colliding particle
-  static float fgTPCInterSectorBoundary;  // TPC inter-sector border size at the TPC outer radius, in cm
-  static int fgITSROFbias;                // ITS ROF bias (from ALPIDE parameters)
-  static int fgITSROFlength;              // ITS ROF length (from ALPIDE parameters)
-  static int fgITSROFBorderMarginLow;     // ITS ROF border low margin
-  static int fgITSROFBorderMarginHigh;    // ITS ROF border high margin
-  static uint64_t fgSOR;                  // Timestamp for start of run
-  static uint64_t fgEOR;                  // Timestamp for end of run
+  static float fgCenterOfMassEnergy;        // collision energy
+  static float fgMassofCollidingParticle;   // mass of the colliding particle
+  static float fgTPCInterSectorBoundary;    // TPC inter-sector border size at the TPC outer radius, in cm
+  static int fgITSROFbias;                  // ITS ROF bias (from ALPIDE parameters)
+  static int fgITSROFlength;                // ITS ROF length (from ALPIDE parameters)
+  static int fgITSROFBorderMarginLow;       // ITS ROF border low margin
+  static int fgITSROFBorderMarginHigh;      // ITS ROF border high margin
+  static uint64_t fgSOR;                    // Timestamp for start of run
+  static uint64_t fgEOR;                    // Timestamp for end of run
   static ROOT::Math::PxPyPzEVector fgBeamA; // beam from A-side 4-momentum vector
   static ROOT::Math::PxPyPzEVector fgBeamC; // beam from C-side 4-momentum vector
 
diff --git a/.conflict-side-0/PWGDQ/DataModel/ReducedInfoTables.h b/.conflict-side-0/PWGDQ/DataModel/ReducedInfoTables.h
index ae5fd853bf9..20e9298e908 100644
--- a/.conflict-side-0/PWGDQ/DataModel/ReducedInfoTables.h
+++ b/.conflict-side-0/PWGDQ/DataModel/ReducedInfoTables.h
@@ -752,7 +752,7 @@ DECLARE_SOA_COLUMN(CosThetaRM, costhetaRM, float);             //! Cosine in the
 DECLARE_SOA_COLUMN(CosThetaStarTPC, costhetaStarTPC, float);   //! global polarization, event plane reconstructed from TPC tracks
 DECLARE_SOA_COLUMN(CosThetaStarFT0A, costhetaStarFT0A, float); //! global polarization, event plane reconstructed from FT0A tracks
 DECLARE_SOA_COLUMN(CosThetaStarFT0C, costhetaStarFT0C, float); //! global polarization, event plane reconstructed from FT0C tracks
-DECLARE_SOA_DYNAMIC_COLUMN(Px, px, //!
+DECLARE_SOA_DYNAMIC_COLUMN(Px, px,                             //!
                            [](float pt, float phi) -> float { return pt * std::cos(phi); });
 DECLARE_SOA_DYNAMIC_COLUMN(Py, py, //!
                            [](float pt, float phi) -> float { return pt * std::sin(phi); });
diff --git a/.conflict-side-0/PWGDQ/Macros/configFit.json b/.conflict-side-0/PWGDQ/Macros/configFit.json
index 4fd44eee0ff..83d3d33efc8 100644
--- a/.conflict-side-0/PWGDQ/Macros/configFit.json
+++ b/.conflict-side-0/PWGDQ/Macros/configFit.json
@@ -1,186 +1,186 @@
 {
-  "input": {
-    "input_file_name": "tutorial.root",
-    "input_name": "histMass",
-    "pdf_dictionary": {
-      "pdf": [
-        "CB2",
-        "CB2",
-        "VWG",
-        "SUM"
-      ],
-      "pdfName": [
-        "Jpsi",
-        "Psi2s",
-        "Bkg",
-        "SUM"
-      ],
-      "pdfNameForLegend": [
-        "J/#psi",
-        "#psi(2S)",
-        "Background",
-        "Fit"
-      ],
-      "pdfColor": [
-        861,
-        417,
-        1
-      ],
-      "pdfStyle": [
-        1,
-        1,
-        2
-      ],
-      "parVal": [
-        [
-          3.096,
-          1.2e-01,
-          1.089,
-          3.393,
-          2.097,
-          8.694
-        ],
-        [
-          3.096,
-          1.2e-01,
-          1.089,
-          3.393,
-          2.097,
-          8.694
-        ],
-        [
-          1,
-          1,
-          1
-        ],
-        [
-          1000,
-          100,
-          100000
-        ]
-      ],
-      "parLimMin": [
-        [
-          2.9,
-          7.0e-02,
-          1.089,
-          3.393,
-          2.097,
-          8.694
-        ],
-        [
-          2.9,
-          7.0e-02,
-          1.089,
-          3.393,
-          2.097,
-          8.694
-        ],
-        [
-          -10,
-          0,
-          -100
-        ],
-        [
-          0,
-          0,
-          0
-        ]
-      ],
-      "parLimMax": [
-        [
-          3.5,
-          1.9e-01,
-          1.089,
-          3.393,
-          2.097,
-          8.694
-        ],
-        [
-          3.9,
-          1.9e-01,
-          1.089,
-          3.393,
-          2.097,
-          8.694
-        ],
-        [
-          10,
-          100,
-          100
-        ],
-        [
-          5000000,
-          5000000,
-          50000000
-        ]
-      ],
-      "parName": [
-        [
-          "mean_Jpsi",
-          "width_Jpsi",
-          "a_Jpsi",
-          "b_Jpsi",
-          "c_Jpsi",
-          "d_Jpsi"
-        ],
-        [
-          "sum::mean_Psi2s(mean_Jpsi,0.584)",
-          "prod::width_Psi2s(width_Jpsi,1.05)",
-          "a_Psi2s",
-          "b_Psi2s",
-          "c_Psi2s",
-          "d_Psi2s"
-        ],
-        [
-          "aa",
-          "bb",
-          "cc"
-        ],
-        [
-          "sig_Jpsi",
-          "sig_Psi2s",
-          "bkg"
-        ]
-      ],
-      "fitRangeMin": [
-        2,
-        2.1,
-        2.2
-      ],
-      "fitRangeMax": [
-        5,
-        4.9,
-        4.8
-      ],
-      "doPropagandaPlot": true,
-      "parForPropagandaPlot": [
-        "mean_Jpsi",
-        "width_Jpsi",
-        "sig_Jpsi",
-        "sig_Psi2s"
-      ],
-      "parNameForPropagandaPlot": [
-        "#mu_{J/#psi}",
-        "#sigma_{J/#psi}",
-        "#it{N}_{J/#psi}",
-        "#it{N}_{#psi(2S)}"
-      ],
-      "textForPropagandaPlot": [
-        [
-          0.20,
-          0.87,
-          "Simulation, toy MC"
-        ],
-        [
-          0.20,
-          0.80,
-          "2.5 < #it{y} < 4, J/#psi #rightarrow #mu^{+}#mu^{-}"
-        ]
-      ]
+    "input": {
+        "input_file_name": "tutorial.root",
+        "input_name": "histMass",
+        "pdf_dictionary": {
+            "pdf": [
+                "CB2",
+                "CB2",
+                "VWG",
+                "SUM"
+            ],
+            "pdfName": [
+                "Jpsi",
+                "Psi2s",
+                "Bkg",
+                "SUM"
+            ],
+            "pdfNameForLegend": [
+                "J/#psi",
+                "#psi(2S)",
+                "Background",
+                "Fit"
+            ],
+            "pdfColor": [
+                861,
+                417,
+                1
+            ],
+            "pdfStyle": [
+                1,
+                1,
+                2
+            ],
+            "parVal": [
+                [
+                    3.096,
+                    1.2e-01,
+                    1.089,
+                    3.393,
+                    2.097,
+                    8.694
+                ],
+                [
+                    3.096,
+                    1.2e-01,
+                    1.089,
+                    3.393,
+                    2.097,
+                    8.694
+                ],
+                [
+                    1,
+                    1,
+                    1
+                ],
+                [
+                    1000,
+                    100,
+                    100000
+                ]
+            ],
+            "parLimMin": [
+                [
+                    2.9,
+                    7.0e-02,
+                    1.089,
+                    3.393,
+                    2.097,
+                    8.694
+                ],
+                [
+                    2.9,
+                    7.0e-02,
+                    1.089,
+                    3.393,
+                    2.097,
+                    8.694
+                ],
+                [
+                    -10,
+                    0,
+                    -100
+                ],
+                [
+                    0,
+                    0,
+                    0
+                ]
+            ],
+            "parLimMax": [
+                [
+                    3.5,
+                    1.9e-01,
+                    1.089,
+                    3.393,
+                    2.097,
+                    8.694
+                ],
+                [
+                    3.9,
+                    1.9e-01,
+                    1.089,
+                    3.393,
+                    2.097,
+                    8.694
+                ],
+                [
+                    10,
+                    100,
+                    100
+                ],
+                [
+                    5000000,
+                    5000000,
+                    50000000
+                ]
+            ],
+            "parName": [
+                [
+                    "mean_Jpsi",
+                    "width_Jpsi",
+                    "a_Jpsi",
+                    "b_Jpsi",
+                    "c_Jpsi",
+                    "d_Jpsi"
+                ],
+                [
+                    "sum::mean_Psi2s(mean_Jpsi,0.584)",
+                    "prod::width_Psi2s(width_Jpsi,1.05)",
+                    "a_Psi2s",
+                    "b_Psi2s",
+                    "c_Psi2s",
+                    "d_Psi2s"
+                ],
+                [
+                    "aa",
+                    "bb",
+                    "cc"
+                ],
+                [
+                    "sig_Jpsi",
+                    "sig_Psi2s",
+                    "bkg"
+                ]
+            ],
+            "fitRangeMin": [
+                2,
+                2.1,
+                2.2
+            ],
+            "fitRangeMax": [
+                5,
+                4.9,
+                4.8
+            ],
+            "doPropagandaPlot": true,
+            "parForPropagandaPlot": [
+                "mean_Jpsi",
+                "width_Jpsi",
+                "sig_Jpsi",
+                "sig_Psi2s"
+            ],
+            "parNameForPropagandaPlot": [
+                "#mu_{J/#psi}",
+                "#sigma_{J/#psi}",
+                "#it{N}_{J/#psi}",
+                "#it{N}_{#psi(2S)}"
+            ],
+            "textForPropagandaPlot": [
+                [
+                    0.20,
+                    0.87,
+                    "Simulation, toy MC"
+                ],
+                [
+                    0.20,
+                    0.80,
+                    "2.5 < #it{y} < 4, J/#psi #rightarrow #mu^{+}#mu^{-}"
+                ]
+            ]
+        }
+    },
+    "output": {
+        "output_file_name": "output/"
     }
-  },
-  "output": {
-    "output_file_name": "output/"
-  }
-}
\ No newline at end of file
+}
diff --git a/.conflict-side-0/PWGDQ/Macros/dqFlowAccWeights.C b/.conflict-side-0/PWGDQ/Macros/dqFlowAccWeights.C
index 00cb5107d45..13695c9e799 100644
--- a/.conflict-side-0/PWGDQ/Macros/dqFlowAccWeights.C
+++ b/.conflict-side-0/PWGDQ/Macros/dqFlowAccWeights.C
@@ -14,18 +14,20 @@
 ///
 /// \author Chi ZHANG, CEA-Saclay, chi.zhang@cern.ch
 
-#include <gsl/span>
+#include "PWGCF/GenericFramework/Core/GFWWeights.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "Framework/Logger.h"
+
+#include <TFile.h>
+#include <TSystem.h>
+
 #include <cmath>
+#include <gsl/span>
+#include <iostream>
 #include <string>
 #include <unordered_map>
 #include <vector>
-#include <iostream>
-
-#include <TSystem.h>
-#include <TFile.h>
-#include "Framework/Logger.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "PWGCF/GenericFramework/Core/GFWWeights.h"
 
 using namespace o2;
 using namespace std;
diff --git a/.conflict-side-0/PWGDQ/Macros/evalMchTrackingEfficiency.cxx b/.conflict-side-0/PWGDQ/Macros/evalMchTrackingEfficiency.cxx
index 34610915850..e2c1ae796e3 100644
--- a/.conflict-side-0/PWGDQ/Macros/evalMchTrackingEfficiency.cxx
+++ b/.conflict-side-0/PWGDQ/Macros/evalMchTrackingEfficiency.cxx
@@ -14,17 +14,17 @@
 ///
 /// \author Zaida Conesa del Valle <zaida.conesa.del.valle@cern.ch>
 /// \author Andrea Tavira García <tavira-garcia@ijclab.in2p3.fr>
-#include <vector>
-
-#include "TFile.h"
+#include "TAxis.h"
+#include "TCanvas.h"
 #include "TDirectoryFile.h"
-#include "THn.h"
+#include "TFile.h"
 #include "TH1F.h"
 #include "TH2F.h"
-#include "TAxis.h"
-#include "TCanvas.h"
-#include "TStyle.h"
+#include "THn.h"
 #include "TLegend.h"
+#include "TStyle.h"
+
+#include <vector>
 
 double computeEfficiencyPerChamber(THnF* hnf, int iAxis, int iCh, double binLimits[2]);
 double computeEfficiencyPerChamber(THnF* hnf, const int iAxis[3], int iCh, double binLimits[3][2]);
diff --git a/.conflict-side-0/PWGDQ/Macros/fit_library/CB2Pdf.cxx b/.conflict-side-0/PWGDQ/Macros/fit_library/CB2Pdf.cxx
index 7f2501825e3..43fc0d0a613 100644
--- a/.conflict-side-0/PWGDQ/Macros/fit_library/CB2Pdf.cxx
+++ b/.conflict-side-0/PWGDQ/Macros/fit_library/CB2Pdf.cxx
@@ -11,14 +11,16 @@
 
 /// \author Luca Micheletti <luca.micheletti@cern.ch>, CERN
 
+#include "CB2Pdf.h"
+
 #include "Riostream.h"
 
-#include "CB2Pdf.h"
-#include "RooAbsReal.h"
 #include "RooAbsCategory.h"
-#include <math.h>
+#include "RooAbsReal.h"
 #include "TMath.h"
 
+#include <math.h>
+
 ClassImp(CB2Pdf);
 
 CB2Pdf::CB2Pdf(const char* name, const char* title,
diff --git a/.conflict-side-0/PWGDQ/Macros/fit_library/CB2Pdf.h b/.conflict-side-0/PWGDQ/Macros/fit_library/CB2Pdf.h
index a9e3a87409e..2415631b03b 100644
--- a/.conflict-side-0/PWGDQ/Macros/fit_library/CB2Pdf.h
+++ b/.conflict-side-0/PWGDQ/Macros/fit_library/CB2Pdf.h
@@ -14,11 +14,11 @@
 #ifndef CB2PDF
 #define CB2PDF
 
+#include "RooAbsCategory.h"
 #include "RooAbsPdf.h"
-#include "RooRealProxy.h"
-#include "RooCategoryProxy.h"
 #include "RooAbsReal.h"
-#include "RooAbsCategory.h"
+#include "RooCategoryProxy.h"
+#include "RooRealProxy.h"
 
 class CB2Pdf : public RooAbsPdf
 {
diff --git a/.conflict-side-0/PWGDQ/Macros/fit_library/ExpPdf.cxx b/.conflict-side-0/PWGDQ/Macros/fit_library/ExpPdf.cxx
index 1841ccd7cbb..9f07c07e07a 100755
--- a/.conflict-side-0/PWGDQ/Macros/fit_library/ExpPdf.cxx
+++ b/.conflict-side-0/PWGDQ/Macros/fit_library/ExpPdf.cxx
@@ -11,14 +11,16 @@
 
 /// \author Luca Micheletti <luca.micheletti@cern.ch>, CERN
 
+#include "ExpPdf.h"
+
 #include "Riostream.h"
 
-#include "ExpPdf.h"
-#include "RooAbsReal.h"
 #include "RooAbsCategory.h"
-#include <math.h>
+#include "RooAbsReal.h"
 #include "TMath.h"
 
+#include <math.h>
+
 ClassImp(ExpPdf);
 
 ExpPdf::ExpPdf(const char* name, const char* title,
diff --git a/.conflict-side-0/PWGDQ/Macros/fit_library/ExpPdf.h b/.conflict-side-0/PWGDQ/Macros/fit_library/ExpPdf.h
index 394c73c52e6..4756e5a7ad8 100755
--- a/.conflict-side-0/PWGDQ/Macros/fit_library/ExpPdf.h
+++ b/.conflict-side-0/PWGDQ/Macros/fit_library/ExpPdf.h
@@ -14,11 +14,11 @@
 #ifndef EXPPDF
 #define EXPPDF
 
+#include "RooAbsCategory.h"
 #include "RooAbsPdf.h"
-#include "RooRealProxy.h"
-#include "RooCategoryProxy.h"
 #include "RooAbsReal.h"
-#include "RooAbsCategory.h"
+#include "RooCategoryProxy.h"
+#include "RooRealProxy.h"
 
 class ExpPdf : public RooAbsPdf
 {
diff --git a/.conflict-side-0/PWGDQ/Macros/fit_library/GausPdf.cxx b/.conflict-side-0/PWGDQ/Macros/fit_library/GausPdf.cxx
index 84d303e3a2b..bdf7f88aa2f 100755
--- a/.conflict-side-0/PWGDQ/Macros/fit_library/GausPdf.cxx
+++ b/.conflict-side-0/PWGDQ/Macros/fit_library/GausPdf.cxx
@@ -11,14 +11,16 @@
 
 /// \author Luca Micheletti <luca.micheletti@cern.ch>, CERN
 
+#include "GausPdf.h"
+
 #include "Riostream.h"
 
-#include "GausPdf.h"
-#include "RooAbsReal.h"
 #include "RooAbsCategory.h"
-#include <math.h>
+#include "RooAbsReal.h"
 #include "TMath.h"
 
+#include <math.h>
+
 ClassImp(GausPdf);
 
 GausPdf::GausPdf(const char* name, const char* title,
diff --git a/.conflict-side-0/PWGDQ/Macros/fit_library/GausPdf.h b/.conflict-side-0/PWGDQ/Macros/fit_library/GausPdf.h
index 4edb19ff47c..0cdda519651 100755
--- a/.conflict-side-0/PWGDQ/Macros/fit_library/GausPdf.h
+++ b/.conflict-side-0/PWGDQ/Macros/fit_library/GausPdf.h
@@ -14,11 +14,11 @@
 #ifndef GAUSPDF
 #define GAUSPDF
 
+#include "RooAbsCategory.h"
 #include "RooAbsPdf.h"
-#include "RooRealProxy.h"
-#include "RooCategoryProxy.h"
 #include "RooAbsReal.h"
-#include "RooAbsCategory.h"
+#include "RooCategoryProxy.h"
+#include "RooRealProxy.h"
 
 class GausPdf : public RooAbsPdf
 {
diff --git a/.conflict-side-0/PWGDQ/Macros/fit_library/Pol4ExpPdf.cxx b/.conflict-side-0/PWGDQ/Macros/fit_library/Pol4ExpPdf.cxx
index 912406a3b0b..6ef59d327ee 100755
--- a/.conflict-side-0/PWGDQ/Macros/fit_library/Pol4ExpPdf.cxx
+++ b/.conflict-side-0/PWGDQ/Macros/fit_library/Pol4ExpPdf.cxx
@@ -11,14 +11,16 @@
 
 /// \author Luca Micheletti <luca.micheletti@cern.ch>, CERN
 
+#include "Pol4ExpPdf.h"
+
 #include "Riostream.h"
 
-#include "Pol4ExpPdf.h"
-#include "RooAbsReal.h"
 #include "RooAbsCategory.h"
-#include <math.h>
+#include "RooAbsReal.h"
 #include "TMath.h"
 
+#include <math.h>
+
 ClassImp(Pol4ExpPdf);
 
 Pol4ExpPdf::Pol4ExpPdf(const char* name, const char* title,
diff --git a/.conflict-side-0/PWGDQ/Macros/fit_library/Pol4ExpPdf.h b/.conflict-side-0/PWGDQ/Macros/fit_library/Pol4ExpPdf.h
index 13cd8696c6c..42a898a0493 100755
--- a/.conflict-side-0/PWGDQ/Macros/fit_library/Pol4ExpPdf.h
+++ b/.conflict-side-0/PWGDQ/Macros/fit_library/Pol4ExpPdf.h
@@ -14,11 +14,11 @@
 #ifndef POL4EXPPDF
 #define POL4EXPPDF
 
+#include "RooAbsCategory.h"
 #include "RooAbsPdf.h"
-#include "RooRealProxy.h"
-#include "RooCategoryProxy.h"
 #include "RooAbsReal.h"
-#include "RooAbsCategory.h"
+#include "RooCategoryProxy.h"
+#include "RooRealProxy.h"
 
 TString nameParameters[] = {"p0", "p1", "p2", "p3", "p4", "p5", "N_bkg", "N_sig", "mean", "width"};
 
diff --git a/.conflict-side-0/PWGDQ/Macros/fit_library/VWGPdf.cxx b/.conflict-side-0/PWGDQ/Macros/fit_library/VWGPdf.cxx
index 8cebc90b2f4..8cbcdd9be83 100644
--- a/.conflict-side-0/PWGDQ/Macros/fit_library/VWGPdf.cxx
+++ b/.conflict-side-0/PWGDQ/Macros/fit_library/VWGPdf.cxx
@@ -11,14 +11,16 @@
 
 /// \author Luca Micheletti <luca.micheletti@cern.ch>, CERN
 
+#include "VWGPdf.h"
+
 #include "Riostream.h"
 
-#include "VWGPdf.h"
-#include "RooAbsReal.h"
 #include "RooAbsCategory.h"
-#include <math.h>
+#include "RooAbsReal.h"
 #include "TMath.h"
 
+#include <math.h>
+
 ClassImp(VWGPdf);
 
 VWGPdf::VWGPdf(const char* name, const char* title,
diff --git a/.conflict-side-0/PWGDQ/Macros/fit_library/VWGPdf.h b/.conflict-side-0/PWGDQ/Macros/fit_library/VWGPdf.h
index 9077d43be71..5014c924773 100644
--- a/.conflict-side-0/PWGDQ/Macros/fit_library/VWGPdf.h
+++ b/.conflict-side-0/PWGDQ/Macros/fit_library/VWGPdf.h
@@ -14,11 +14,11 @@
 #ifndef VWGPDF
 #define VWGPDF
 
+#include "RooAbsCategory.h"
 #include "RooAbsPdf.h"
-#include "RooRealProxy.h"
-#include "RooCategoryProxy.h"
 #include "RooAbsReal.h"
-#include "RooAbsCategory.h"
+#include "RooCategoryProxy.h"
+#include "RooRealProxy.h"
 
 class VWGPdf : public RooAbsPdf
 {
diff --git a/.conflict-side-0/PWGDQ/TableProducer/generatedQuarkoniaMC.cxx b/.conflict-side-0/PWGDQ/TableProducer/generatedQuarkoniaMC.cxx
index 737faaaa6b2..a820a167a32 100644
--- a/.conflict-side-0/PWGDQ/TableProducer/generatedQuarkoniaMC.cxx
+++ b/.conflict-side-0/PWGDQ/TableProducer/generatedQuarkoniaMC.cxx
@@ -16,40 +16,42 @@
 // It is meant to help with providing auxiliary information
 // when dealing with derived data.
 
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <map>
-#include <iterator>
-#include <utility>
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+#include "PWGLF/DataModel/EPCalibrationTables.h"
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
 #include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/McCollisionExtra.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/Qvectors.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+#include "Common/TableProducer/PID/pidTOFBase.h"
+
 #include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/PhysicsConstants.h"
-#include "Common/TableProducer/PID/pidTOFBase.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Qvectors.h"
+#include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StaticFor.h"
-#include "Common/DataModel/McCollisionExtra.h"
-#include "PWGLF/DataModel/EPCalibrationTables.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <iterator>
+#include <map>
+#include <utility>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGDQ/TableProducer/tableMaker.cxx b/.conflict-side-0/PWGDQ/TableProducer/tableMaker.cxx
index 87d1183d385..f0b74e47974 100644
--- a/.conflict-side-0/PWGDQ/TableProducer/tableMaker.cxx
+++ b/.conflict-side-0/PWGDQ/TableProducer/tableMaker.cxx
@@ -24,45 +24,48 @@
 #include <string>
 #include <vector>
 // other includes
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/DataTypes.h"
-#include "Framework/runDataProcessing.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
+#include "PWGDQ/Core/AnalysisCompositeCut.h"
+#include "PWGDQ/Core/AnalysisCut.h"
+#include "PWGDQ/Core/CutsLibrary.h"
+#include "PWGDQ/Core/HistogramManager.h"
+#include "PWGDQ/Core/HistogramsLibrary.h"
+#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+
 #include "Common/CCDB/TriggerAliases.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/CollisionAssociationTables.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/FwdTrackReAlignTables.h"
+#include "Common/DataModel/MftmchMatchingML.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/MftmchMatchingML.h"
-#include "Common/DataModel/FwdTrackReAlignTables.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "PWGDQ/Core/VarManager.h"
-#include "PWGDQ/Core/HistogramManager.h"
-#include "PWGDQ/Core/AnalysisCut.h"
-#include "PWGDQ/Core/AnalysisCompositeCut.h"
-#include "PWGDQ/Core/HistogramsLibrary.h"
-#include "PWGDQ/Core/CutsLibrary.h"
-#include "DataFormatsGlobalTracking/RecoContainerCreateTracksVariadic.h"
-#include "DetectorsVertexing/VertexTrackMatcher.h"
-#include "ReconstructionDataFormats/PrimaryVertex.h"
-#include "ReconstructionDataFormats/VtxTrackIndex.h"
-#include "ReconstructionDataFormats/VtxTrackRef.h"
-#include "DataFormatsITSMFT/ROFRecord.h"
+#include "EventFiltering/Zorro.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "CommonDataFormat/InteractionRecord.h"
-#include "DetectorsVertexing/PVertexerParams.h"
-#include "MathUtils/Primitive2D.h"
 #include "DataFormatsGlobalTracking/RecoContainer.h"
-#include "Common/DataModel/CollisionAssociationTables.h"
+#include "DataFormatsGlobalTracking/RecoContainerCreateTracksVariadic.h"
+#include "DataFormatsITSMFT/ROFRecord.h"
 #include "DataFormatsParameters/GRPMagField.h"
 #include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "DetectorsVertexing/PVertexerParams.h"
+#include "DetectorsVertexing/VertexTrackMatcher.h"
 #include "Field/MagneticField.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/DataTypes.h"
+#include "Framework/runDataProcessing.h"
+#include "MathUtils/Primitive2D.h"
+#include "ReconstructionDataFormats/PrimaryVertex.h"
+#include "ReconstructionDataFormats/VtxTrackIndex.h"
+#include "ReconstructionDataFormats/VtxTrackRef.h"
+
 #include "TGeoGlobalMagField.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "EventFiltering/Zorro.h"
 
 using std::cout;
 using std::endl;
diff --git a/.conflict-side-0/PWGDQ/TableProducer/tableMakerJpsiHf.cxx b/.conflict-side-0/PWGDQ/TableProducer/tableMakerJpsiHf.cxx
index 7ae949c40d1..4700ce4be4f 100644
--- a/.conflict-side-0/PWGDQ/TableProducer/tableMakerJpsiHf.cxx
+++ b/.conflict-side-0/PWGDQ/TableProducer/tableMakerJpsiHf.cxx
@@ -14,23 +14,23 @@
 /// \author Luca Micheletti <luca.micheletti@to.infn.it>, INFN
 /// \author Fabrizio Grosa <fabrizio.grosa@cern.ch>, CERN
 
-#include <string>
-
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
-
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/AnalysisCompositeCut.h"
+#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/CutsLibrary.h"
 #include "PWGDQ/Core/HistogramManager.h"
 #include "PWGDQ/Core/HistogramsLibrary.h"
 #include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+#include "PWGHF/Core/HfHelper.h"
 #include "PWGHF/DataModel/CandidateReconstructionTables.h"
 #include "PWGHF/DataModel/CandidateSelectionTables.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+
+#include <string>
 
 using namespace o2;
 using namespace o2::analysis;
diff --git a/.conflict-side-0/PWGDQ/TableProducer/tableMakerMC.cxx b/.conflict-side-0/PWGDQ/TableProducer/tableMakerMC.cxx
index 1d43d196f9d..2edcef5717f 100644
--- a/.conflict-side-0/PWGDQ/TableProducer/tableMakerMC.cxx
+++ b/.conflict-side-0/PWGDQ/TableProducer/tableMakerMC.cxx
@@ -16,41 +16,45 @@
 //   The skimmed MC stack includes the MC truth particles corresponding to the list of user specified MC signals (see MCsignal.h)
 //    and the MC truth particles corresponding to the reconstructed tracks selected by the specified track cuts on reconstructed data.
 
-#include <iostream>
-#include <string>
-#include <map>
-#include <memory>
-#include <vector>
-#include "TList.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/ASoA.h"
-#include "Framework/DataTypes.h"
-#include "Framework/runDataProcessing.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/CCDB/TriggerAliases.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "PWGDQ/Core/VarManager.h"
-#include "PWGDQ/Core/HistogramManager.h"
-#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/AnalysisCompositeCut.h"
-#include "PWGDQ/Core/HistogramsLibrary.h"
+#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/CutsLibrary.h"
+#include "PWGDQ/Core/HistogramManager.h"
+#include "PWGDQ/Core/HistogramsLibrary.h"
 #include "PWGDQ/Core/MCSignal.h"
 #include "PWGDQ/Core/MCSignalLibrary.h"
+#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+
+#include "Common/CCDB/TriggerAliases.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/CollisionAssociationTables.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/CollisionAssociationTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsParameters/GRPMagField.h"
 #include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
 #include "Field/MagneticField.h"
+#include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/DataTypes.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TGeoGlobalMagField.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "CCDB/BasicCCDBManager.h"
+#include "TList.h"
+
+#include <iostream>
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
 
 using std::cout;
 using std::endl;
@@ -653,7 +657,7 @@ struct TableMakerMC {
                            track.c1PtY(), track.c1PtZ(), track.c1PtSnp(), track.c1PtTgl(), track.c1Pt21Pt2());
           }
         } // end loop over reconstructed tracks
-      }   // end if constexpr (static_cast<bool>(TTrackFillMap))
+      } // end if constexpr (static_cast<bool>(TTrackFillMap))
 
       // Maps for the MFT-muon matching index
       std::map<int, int> newMFTTableSize; // key : oldMFTIndex, value: size of the table-1 at step key
@@ -864,9 +868,9 @@ struct TableMakerMC {
               newMatchIndex[muon.index()] = newEntryNb[matchIdx];                                  // update the match for this muon to the updated entry of the match
               newMatchIndex[muon.index()] += muonBasic.lastIndex() + 1 - newEntryNb[muon.index()]; // adding the offset of muons, muonBasic.lastIndex() start at -1
 
-              if (static_cast<int>(muon.trackType()) == 0) {                                       // for now only do this to global tracks
-                newMatchIndex[matchIdx] = newEntryNb[muon.index()];                                // add the  updated index of this muon as a match to mch track
-                newMatchIndex[matchIdx] += muonBasic.lastIndex() + 1 - newEntryNb[muon.index()];   // adding the offset, muonBasic.lastIndex() start at -1
+              if (static_cast<int>(muon.trackType()) == 0) {                                     // for now only do this to global tracks
+                newMatchIndex[matchIdx] = newEntryNb[muon.index()];                              // add the  updated index of this muon as a match to mch track
+                newMatchIndex[matchIdx] += muonBasic.lastIndex() + 1 - newEntryNb[muon.index()]; // adding the offset, muonBasic.lastIndex() start at -1
               }
             } else {
               newMatchIndex[muon.index()] = -1;
@@ -915,7 +919,7 @@ struct TableMakerMC {
           muonLabels(fNewLabels.find(mctrack.index())->second, muon.mcMask(), mcflags);
         }
       } // end if constexpr (static_cast<bool>(TMuonFillMap))
-    }   // end loop over collisions
+    } // end loop over collisions
 
     // Loop over the label map, create the mother/daughter relationships if these exist and write the skimmed MC stack
     for (const auto& [newLabel, oldLabel] : fNewLabelsReversed) {
@@ -1276,7 +1280,7 @@ struct TableMakerMC {
                            track.c1PtY(), track.c1PtZ(), track.c1PtSnp(), track.c1PtTgl(), track.c1Pt21Pt2());
           }
         } // end loop over reconstructed tracks
-      }   // end if constexpr (static_cast<bool>(TTrackFillMap))
+      } // end if constexpr (static_cast<bool>(TTrackFillMap))
 
       if constexpr (static_cast<bool>(TMuonFillMap)) {
         // build the muon tables
@@ -1454,7 +1458,7 @@ struct TableMakerMC {
           muonLabels(fNewLabels.find(mctrack.index())->second, muon.mcMask(), mcflags);
         }
       } // end if constexpr (static_cast<bool>(TMuonFillMap))
-    }   // end loop over collisions
+    } // end loop over collisions
 
     // Loop over the label map, create the mother/daughter relationships if these exist and write the skimmed MC stack
     for (const auto& [newLabel, oldLabel] : fNewLabelsReversed) {
diff --git a/.conflict-side-0/PWGDQ/TableProducer/tableMakerMC_withAssoc.cxx b/.conflict-side-0/PWGDQ/TableProducer/tableMakerMC_withAssoc.cxx
index 7dc49516e8a..8fe5f479131 100644
--- a/.conflict-side-0/PWGDQ/TableProducer/tableMakerMC_withAssoc.cxx
+++ b/.conflict-side-0/PWGDQ/TableProducer/tableMakerMC_withAssoc.cxx
@@ -16,45 +16,49 @@
 //   The skimmed MC stack includes the MC truth particles corresponding to the list of user specified MC signals (see MCsignal.h)
 //    and the MC truth particles corresponding to the reconstructed tracks selected by the specified track cuts on reconstructed data.
 
-#include <cstdint>
-#include <iostream>
-#include <map>
-#include <string>
-#include <memory>
-#include <vector>
-#include <utility>
-#include <unordered_map>
-#include "TList.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/ASoA.h"
-#include "Framework/DataTypes.h"
-#include "Framework/runDataProcessing.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/CCDB/TriggerAliases.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "PWGDQ/Core/VarManager.h"
-#include "PWGDQ/Core/HistogramManager.h"
-#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/AnalysisCompositeCut.h"
-#include "PWGDQ/Core/HistogramsLibrary.h"
+#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/CutsLibrary.h"
+#include "PWGDQ/Core/HistogramManager.h"
+#include "PWGDQ/Core/HistogramsLibrary.h"
 #include "PWGDQ/Core/MCSignal.h"
 #include "PWGDQ/Core/MCSignalLibrary.h"
+#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+
+#include "Common/CCDB/TriggerAliases.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/CollisionAssociationTables.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/FwdTrackReAlignTables.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/FwdTrackReAlignTables.h"
-#include "Common/DataModel/CollisionAssociationTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsParameters/GRPMagField.h"
 #include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
 #include "Field/MagneticField.h"
+#include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/DataTypes.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TGeoGlobalMagField.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "CCDB/BasicCCDBManager.h"
+#include "TList.h"
+
+#include <cstdint>
+#include <iostream>
+#include <map>
+#include <memory>
+#include <string>
+#include <unordered_map>
+#include <utility>
+#include <vector>
 
 using std::cout;
 using std::endl;
diff --git a/.conflict-side-0/PWGDQ/TableProducer/tableMakerMuonMchTrkEfficiency.cxx b/.conflict-side-0/PWGDQ/TableProducer/tableMakerMuonMchTrkEfficiency.cxx
index 11634be2e0d..7474dd1740f 100644
--- a/.conflict-side-0/PWGDQ/TableProducer/tableMakerMuonMchTrkEfficiency.cxx
+++ b/.conflict-side-0/PWGDQ/TableProducer/tableMakerMuonMchTrkEfficiency.cxx
@@ -19,34 +19,35 @@
 /// \author Zaida Conesa del Valle <zaida.conesa.del.valle@cern.ch>
 ///
 
-#include <vector>
-#include <memory>
-#include <string>
-#include <algorithm>
+#include "TDatabasePDG.h"
 #include <TH1F.h>
 #include <TH3F.h>
 #include <THashList.h>
 #include <TList.h>
-#include <TString.h>
 #include <TLorentzVector.h>
-#include "TDatabasePDG.h"
+#include <TString.h>
+
+#include <algorithm>
+#include <memory>
+#include <string>
+#include <vector>
 //
 #include "Common/DataModel/TrackSelectionTables.h"
 //
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/ASoA.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/Logger.h"
 #include "Framework/runDataProcessing.h"
 //
-#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/AnalysisCompositeCut.h"
+#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/CutsLibrary.h"
 #include "PWGDQ/Core/VarManager.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
 #include "PWGDQ/DataModel/MchTrkEffTables.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-side-0/PWGDQ/TableProducer/tableMaker_withAssoc.cxx b/.conflict-side-0/PWGDQ/TableProducer/tableMaker_withAssoc.cxx
index 3b3d4c4e0af..7b35a84bd87 100644
--- a/.conflict-side-0/PWGDQ/TableProducer/tableMaker_withAssoc.cxx
+++ b/.conflict-side-0/PWGDQ/TableProducer/tableMaker_withAssoc.cxx
@@ -23,46 +23,49 @@
 #include <string>
 #include <vector>
 // other includes
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/DataTypes.h"
-#include "Framework/runDataProcessing.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
+#include "PWGDQ/Core/AnalysisCompositeCut.h"
+#include "PWGDQ/Core/AnalysisCut.h"
+#include "PWGDQ/Core/CutsLibrary.h"
+#include "PWGDQ/Core/HistogramManager.h"
+#include "PWGDQ/Core/HistogramsLibrary.h"
+#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+
 #include "Common/CCDB/TriggerAliases.h"
+#include "Common/Core/TableHelper.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/CollisionAssociationTables.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/FwdTrackReAlignTables.h"
+#include "Common/DataModel/MftmchMatchingML.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/MftmchMatchingML.h"
-#include "Common/DataModel/FwdTrackReAlignTables.h"
-#include "Common/Core/TableHelper.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "PWGDQ/Core/VarManager.h"
-#include "PWGDQ/Core/HistogramManager.h"
-#include "PWGDQ/Core/AnalysisCut.h"
-#include "PWGDQ/Core/AnalysisCompositeCut.h"
-#include "PWGDQ/Core/HistogramsLibrary.h"
-#include "PWGDQ/Core/CutsLibrary.h"
-#include "DataFormatsGlobalTracking/RecoContainerCreateTracksVariadic.h"
-#include "DetectorsVertexing/VertexTrackMatcher.h"
-#include "ReconstructionDataFormats/PrimaryVertex.h"
-#include "ReconstructionDataFormats/VtxTrackIndex.h"
-#include "ReconstructionDataFormats/VtxTrackRef.h"
-#include "DataFormatsITSMFT/ROFRecord.h"
+#include "EventFiltering/Zorro.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "CommonDataFormat/InteractionRecord.h"
-#include "DetectorsVertexing/PVertexerParams.h"
-#include "MathUtils/Primitive2D.h"
 #include "DataFormatsGlobalTracking/RecoContainer.h"
-#include "Common/DataModel/CollisionAssociationTables.h"
+#include "DataFormatsGlobalTracking/RecoContainerCreateTracksVariadic.h"
+#include "DataFormatsITSMFT/ROFRecord.h"
 #include "DataFormatsParameters/GRPMagField.h"
 #include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "DetectorsVertexing/PVertexerParams.h"
+#include "DetectorsVertexing/VertexTrackMatcher.h"
 #include "Field/MagneticField.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/DataTypes.h"
+#include "Framework/runDataProcessing.h"
+#include "MathUtils/Primitive2D.h"
+#include "ReconstructionDataFormats/PrimaryVertex.h"
+#include "ReconstructionDataFormats/VtxTrackIndex.h"
+#include "ReconstructionDataFormats/VtxTrackRef.h"
+
 #include "TGeoGlobalMagField.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "EventFiltering/Zorro.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGDQ/Tasks/DalitzSelection.cxx b/.conflict-side-0/PWGDQ/Tasks/DalitzSelection.cxx
index 6b285d4e04a..a19ab82ae65 100755
--- a/.conflict-side-0/PWGDQ/Tasks/DalitzSelection.cxx
+++ b/.conflict-side-0/PWGDQ/Tasks/DalitzSelection.cxx
@@ -13,26 +13,28 @@
 //        It can produce track and pair histograms for selected tracks
 //      It creates a bitmap with selections to be stored during skimming
 //
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/DataTypes.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
+#include "PWGDQ/Core/AnalysisCompositeCut.h"
+#include "PWGDQ/Core/AnalysisCut.h"
+#include "PWGDQ/Core/CutsLibrary.h"
+#include "PWGDQ/Core/HistogramManager.h"
+#include "PWGDQ/Core/HistogramsLibrary.h"
+#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+
 #include "Common/CCDB/TriggerAliases.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "PWGDQ/Core/VarManager.h"
-#include "PWGDQ/Core/HistogramManager.h"
-#include "PWGDQ/Core/AnalysisCut.h"
-#include "PWGDQ/Core/AnalysisCompositeCut.h"
-#include "PWGDQ/Core/HistogramsLibrary.h"
-#include "PWGDQ/Core/CutsLibrary.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsParameters/GRPMagField.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/DataTypes.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGDQ/Tasks/MIDefficiency.cxx b/.conflict-side-0/PWGDQ/Tasks/MIDefficiency.cxx
index 3dcbcc4d595..219489d9ab9 100644
--- a/.conflict-side-0/PWGDQ/Tasks/MIDefficiency.cxx
+++ b/.conflict-side-0/PWGDQ/Tasks/MIDefficiency.cxx
@@ -18,11 +18,12 @@
 ///
 /// \author Luca Quaglia <luca.quaglia@cern.ch
 
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/CallbackService.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
-#include "Framework/CallbackService.h"
-#include "Framework/ASoAHelpers.h"
+
 #include <iostream>
 
 // O2 physics classes
@@ -30,13 +31,12 @@
 
 // O2
 #include "DataFormatsMID/Track.h" //MID track from O2
-#include "Framework/Variant.h"
-#include "Framework/ConfigParamSpec.h"
 #include "Framework/CompletionPolicyHelpers.h"
-
-#include "MIDEfficiency/Efficiency.h"
+#include "Framework/ConfigParamSpec.h"
+#include "Framework/Variant.h"
 #include "MIDBase/DetectorParameters.h"
 #include "MIDBase/Mapping.h"
+#include "MIDEfficiency/Efficiency.h"
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-side-0/PWGDQ/Tasks/ModelConverterMultPv.cxx b/.conflict-side-0/PWGDQ/Tasks/ModelConverterMultPv.cxx
index 088590435b8..42b19de5191 100644
--- a/.conflict-side-0/PWGDQ/Tasks/ModelConverterMultPv.cxx
+++ b/.conflict-side-0/PWGDQ/Tasks/ModelConverterMultPv.cxx
@@ -15,15 +15,17 @@
 // the conflict with the old data model.
 
 // other includes
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 #include <THashList.h>
 #include <TList.h>
 #include <TString.h>
-#include "DataFormatsParameters/GRPObject.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGDQ/Tasks/dqCorrelation.cxx b/.conflict-side-0/PWGDQ/Tasks/dqCorrelation.cxx
index 950e82364cb..f3aed01c057 100644
--- a/.conflict-side-0/PWGDQ/Tasks/dqCorrelation.cxx
+++ b/.conflict-side-0/PWGDQ/Tasks/dqCorrelation.cxx
@@ -11,44 +11,45 @@
 /// @author  Victor Valencia
 // Contact: iarsene@cern.ch, i.c.arsene@fys.uio.no
 //
-#include <iostream>
-#include <vector>
-#include <algorithm>
-#include <TH1F.h>
-#include <TH3F.h>
-#include <THashList.h>
-#include <TList.h>
-#include <TString.h>
-#include <TRandom3.h>
-#include <cmath>
-
-#include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
 #include "PWGCF/GenericFramework/Core/FlowContainer.h"
-#include "PWGCF/GenericFramework/Core/GFWCumulant.h"
 #include "PWGCF/GenericFramework/Core/GFW.h"
+#include "PWGCF/GenericFramework/Core/GFWCumulant.h"
+#include "PWGCF/GenericFramework/Core/GFWPowerArray.h"
 #include "PWGCF/GenericFramework/Core/GFWWeights.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "PWGDQ/Core/VarManager.h"
-#include "PWGDQ/Core/HistogramManager.h"
-#include "PWGDQ/Core/MixingHandler.h"
-#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/AnalysisCompositeCut.h"
-#include "PWGDQ/Core/HistogramsLibrary.h"
+#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/CutsLibrary.h"
+#include "PWGDQ/Core/HistogramManager.h"
+#include "PWGDQ/Core/HistogramsLibrary.h"
+#include "PWGDQ/Core/MixingHandler.h"
 #include "PWGDQ/Core/MixingLibrary.h"
+#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include "Field/MagneticField.h"
-#include "TGeoGlobalMagField.h"
-#include "DetectorsBase/Propagator.h"
+#include "DataFormatsParameters/GRPObject.h"
 #include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Field/MagneticField.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
-#include "PWGCF/GenericFramework/Core/GFWPowerArray.h"
+#include "TGeoGlobalMagField.h"
 #include "TProfile.h"
+#include <TH1F.h>
+#include <TH3F.h>
+#include <THashList.h>
+#include <TList.h>
+#include <TRandom3.h>
+#include <TString.h>
+
+#include <algorithm>
+#include <cmath>
+#include <iostream>
+#include <vector>
 
 using std::cout;
 using std::endl;
diff --git a/.conflict-side-0/PWGDQ/Tasks/dqEfficiency.cxx b/.conflict-side-0/PWGDQ/Tasks/dqEfficiency.cxx
index 29f7b79392b..6083aa610c8 100644
--- a/.conflict-side-0/PWGDQ/Tasks/dqEfficiency.cxx
+++ b/.conflict-side-0/PWGDQ/Tasks/dqEfficiency.cxx
@@ -13,30 +13,33 @@
 //
 // Analysis task for processing O2::DQ MC skimmed AODs
 //
-#include <iostream>
-#include <vector>
-#include <TMath.h>
-#include <TH1F.h>
-#include <THashList.h>
-#include <TString.h>
-#include <cstdio>
-#include <string>
-#include <memory>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "PWGDQ/Core/VarManager.h"
-#include "PWGDQ/Core/HistogramManager.h"
-#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/AnalysisCompositeCut.h"
-#include "PWGDQ/Core/HistogramsLibrary.h"
+#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/CutsLibrary.h"
+#include "PWGDQ/Core/HistogramManager.h"
+#include "PWGDQ/Core/HistogramsLibrary.h"
 #include "PWGDQ/Core/MCSignal.h"
 #include "PWGDQ/Core/MCSignalLibrary.h"
+#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsParameters/GRPMagField.h"
 #include "DetectorsBase/GeometryManager.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include <TH1F.h>
+#include <THashList.h>
+#include <TMath.h>
+#include <TString.h>
+
+#include <cstdio>
+#include <iostream>
+#include <memory>
+#include <string>
+#include <vector>
 
 using std::cout;
 using std::endl;
diff --git a/.conflict-side-0/PWGDQ/Tasks/dqEfficiency_withAssoc.cxx b/.conflict-side-0/PWGDQ/Tasks/dqEfficiency_withAssoc.cxx
index e2a58ff5bf2..3d7e1613f44 100644
--- a/.conflict-side-0/PWGDQ/Tasks/dqEfficiency_withAssoc.cxx
+++ b/.conflict-side-0/PWGDQ/Tasks/dqEfficiency_withAssoc.cxx
@@ -12,43 +12,47 @@
 // Contact: iarsene@cern.ch, i.c.arsene@fys.uio.no
 //   Configurable workflow for running several DQ or other PWG analyses
 
-#include <iostream>
-#include <vector>
-#include <algorithm>
-#include <map>
-#include <string>
-#include <memory>
-#include <utility>
-#include <TH1F.h>
-#include <TH3F.h>
-#include <THashList.h>
-#include <TList.h>
-#include <TString.h>
-#include <TObjString.h>
-#include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/AnalysisHelpers.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "PWGDQ/Core/VarManager.h"
-#include "PWGDQ/Core/HistogramManager.h"
-#include "PWGDQ/Core/MixingHandler.h"
-#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/AnalysisCompositeCut.h"
-#include "PWGDQ/Core/HistogramsLibrary.h"
+#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/CutsLibrary.h"
-#include "PWGDQ/Core/MixingLibrary.h"
+#include "PWGDQ/Core/HistogramManager.h"
+#include "PWGDQ/Core/HistogramsLibrary.h"
 #include "PWGDQ/Core/MCSignal.h"
 #include "PWGDQ/Core/MCSignalLibrary.h"
+#include "PWGDQ/Core/MixingHandler.h"
+#include "PWGDQ/Core/MixingLibrary.h"
+#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+
+#include "Common/Core/TableHelper.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
 #include "Field/MagneticField.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TGeoGlobalMagField.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "Common/Core/TableHelper.h"
+#include <TH1F.h>
+#include <TH3F.h>
+#include <THashList.h>
+#include <TList.h>
+#include <TObjString.h>
+#include <TString.h>
+
+#include <algorithm>
+#include <iostream>
+#include <map>
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
 
 using std::cout;
 using std::endl;
@@ -534,7 +538,7 @@ struct AnalysisTrackSelection {
         DefineHistograms(fHistMan, "TrackBarrel_AmbiguityInBunch;TrackBarrel_AmbiguityOutOfBunch;", "ambiguity");
       }
       dqhistograms::AddHistogramsFromJSON(fHistMan, fConfigAddJSONHistograms.value.c_str()); // ad-hoc histograms via JSON
-      VarManager::SetUseVars(fHistMan->GetUsedVars()); // provide the list of required variables so that VarManager knows what to fill
+      VarManager::SetUseVars(fHistMan->GetUsedVars());                                       // provide the list of required variables so that VarManager knows what to fill
       fOutputList.setObject(fHistMan->GetMainHistogramList());
     }
 
@@ -856,9 +860,9 @@ struct AnalysisMuonSelection {
         histClasses += "Muon_AmbiguityInBunch;Muon_AmbiguityOutOfBunch;";
       }
 
-      DefineHistograms(fHistMan, histClasses.Data(), fConfigAddMuonHistogram.value.data()); // define all histograms
+      DefineHistograms(fHistMan, histClasses.Data(), fConfigAddMuonHistogram.value.data());  // define all histograms
       dqhistograms::AddHistogramsFromJSON(fHistMan, fConfigAddJSONHistograms.value.c_str()); // ad-hoc histograms via JSON
-      VarManager::SetUseVars(fHistMan->GetUsedVars());                                      // provide the list of required variables so that VarManager knows what to fill
+      VarManager::SetUseVars(fHistMan->GetUsedVars());                                       // provide the list of required variables so that VarManager knows what to fill
       fOutputList.setObject(fHistMan->GetMainHistogramList());
     }
 
@@ -1638,9 +1642,9 @@ struct AnalysisSameEventPairing {
 
     VarManager::SetCollisionSystem((TString)fConfigOptions.collisionSystem, fConfigOptions.centerMassEnergy); // set collision system and center of mass energy
 
-    DefineHistograms(fHistMan, histNames.Data(), fConfigAddSEPHistogram.value.data()); // define all histograms
+    DefineHistograms(fHistMan, histNames.Data(), fConfigAddSEPHistogram.value.data());     // define all histograms
     dqhistograms::AddHistogramsFromJSON(fHistMan, fConfigAddJSONHistograms.value.c_str()); // ad-hoc histograms via JSON
-    VarManager::SetUseVars(fHistMan->GetUsedVars());                                   // provide the list of required variables so that VarManager knows what to fill
+    VarManager::SetUseVars(fHistMan->GetUsedVars());                                       // provide the list of required variables so that VarManager knows what to fill
     fOutputList.setObject(fHistMan->GetMainHistogramList());
   }
 
@@ -2642,7 +2646,7 @@ struct AnalysisAsymmetricPairing {
     VarManager::SetupMatLUTFwdDCAFitter(fLUT);
 
     dqhistograms::AddHistogramsFromJSON(fHistMan, fConfigAddJSONHistograms.value.c_str()); // ad-hoc histograms via JSON
-    VarManager::SetUseVars(fHistMan->GetUsedVars());                                      // provide the list of required variables so that VarManager knows what to fill
+    VarManager::SetUseVars(fHistMan->GetUsedVars());                                       // provide the list of required variables so that VarManager knows what to fill
     fOutputList.setObject(fHistMan->GetMainHistogramList());
   }
 
@@ -2802,7 +2806,7 @@ struct AnalysisAsymmetricPairing {
         for (int icut = 0; icut < fNLegCuts; icut++) {
           if (twoTrackFilter & (static_cast<uint32_t>(1) << icut)) {
             isAmbi = (twoTrackFilter & (static_cast<uint32_t>(1) << 30)) || (twoTrackFilter & (static_cast<uint32_t>(1) << 31));
-            if (sign1 * sign2 < 0) {                                                    // +- pairs
+            if (sign1 * sign2 < 0) {                                                                                // +- pairs
               fHistMan->FillHistClass(Form("PairsBarrelSEPM_%s", fLegCutNames[icut].Data()), VarManager::fgValues); // reconstructed, unmatched
               if (isAmbi && fConfigQA) {
                 fHistMan->FillHistClass(Form("PairsBarrelSEPM_ambiguous_%s", fLegCutNames[icut].Data()), VarManager::fgValues);
diff --git a/.conflict-side-0/PWGDQ/Tasks/dqFlow.cxx b/.conflict-side-0/PWGDQ/Tasks/dqFlow.cxx
index 52e3ca8c29c..c3c0820030d 100644
--- a/.conflict-side-0/PWGDQ/Tasks/dqFlow.cxx
+++ b/.conflict-side-0/PWGDQ/Tasks/dqFlow.cxx
@@ -16,38 +16,42 @@
 ///       o2-analysis-timestamp --aod-file AO2D.root -b | o2-analysis-event-selection -b | o2-analysis-multiplicity-table -b | o2-analysis-centrality-table -b | o2-analysis-fdd-converter -b | o2-analysis-trackselection -b | o2-analysis-trackextension -b | o2-analysis-pid-tpc-full -b | o2-analysis-pid-tof-full -b | o2-analysis-pid-tof-base -b | o2-analysis-pid-tof-beta -b | o2-analysis-dq-flow -b
 ///       tested (June 2, 2022) on AO2D.root files from train production 242
 
-#include <iostream>
-#include <vector>
-#include <string>
-#include <memory>
-#include <TH1F.h>
-#include <THashList.h>
-#include <TString.h>
-#include <TRandom3.h>
-#include "CCDB/BasicCCDBManager.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "PWGDQ/Core/VarManager.h"
-#include "PWGDQ/Core/HistogramManager.h"
-#include "PWGDQ/Core/MixingHandler.h"
-#include "PWGDQ/Core/AnalysisCut.h"
-#include "PWGDQ/Core/AnalysisCompositeCut.h"
-#include "PWGDQ/Core/HistogramsLibrary.h"
-#include "PWGDQ/Core/CutsLibrary.h"
-#include "PWGDQ/Core/MixingLibrary.h"
+#include "PWGCF/GenericFramework/Core/FlowContainer.h"
 #include "PWGCF/GenericFramework/Core/GFW.h"
+#include "PWGCF/GenericFramework/Core/GFWConfig.h"
 #include "PWGCF/GenericFramework/Core/GFWCumulant.h"
-#include "PWGCF/GenericFramework/Core/FlowContainer.h"
 #include "PWGCF/GenericFramework/Core/GFWWeights.h"
-#include "PWGCF/GenericFramework/Core/GFWConfig.h"
-#include "Common/DataModel/EventSelection.h"
+#include "PWGDQ/Core/AnalysisCompositeCut.h"
+#include "PWGDQ/Core/AnalysisCut.h"
+#include "PWGDQ/Core/CutsLibrary.h"
+#include "PWGDQ/Core/HistogramManager.h"
+#include "PWGDQ/Core/HistogramsLibrary.h"
+#include "PWGDQ/Core/MixingHandler.h"
+#include "PWGDQ/Core/MixingLibrary.h"
+#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Qvectors.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include <TH1F.h>
+#include <THashList.h>
+#include <TRandom3.h>
+#include <TString.h>
+
+#include <iostream>
+#include <memory>
+#include <string>
+#include <vector>
 
 using std::complex;
 using std::cout;
diff --git a/.conflict-side-0/PWGDQ/Tasks/filterPP.cxx b/.conflict-side-0/PWGDQ/Tasks/filterPP.cxx
index c9239f8366d..0f5fd7b1b74 100644
--- a/.conflict-side-0/PWGDQ/Tasks/filterPP.cxx
+++ b/.conflict-side-0/PWGDQ/Tasks/filterPP.cxx
@@ -11,35 +11,39 @@
 //
 // Contact: iarsene@cern.ch, i.c.arsene@fys.uio.no
 //
-#include <iostream>
-#include <vector>
-#include <map>
-#include <string>
-#include <memory>
-#include <cstring>
-#include <TH1.h>
-#include <THashList.h>
-#include <TString.h>
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/DataTypes.h"
-#include "Framework/runDataProcessing.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
+#include "PWGDQ/Core/AnalysisCompositeCut.h"
+#include "PWGDQ/Core/AnalysisCut.h"
+#include "PWGDQ/Core/CutsLibrary.h"
+#include "PWGDQ/Core/HistogramManager.h"
+#include "PWGDQ/Core/HistogramsLibrary.h"
+#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+
 #include "Common/CCDB/TriggerAliases.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 #include "EventFiltering/filterTables.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "PWGDQ/Core/VarManager.h"
-#include "PWGDQ/Core/HistogramManager.h"
-#include "PWGDQ/Core/AnalysisCut.h"
-#include "PWGDQ/Core/AnalysisCompositeCut.h"
-#include "PWGDQ/Core/HistogramsLibrary.h"
-#include "PWGDQ/Core/CutsLibrary.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/DataTypes.h"
+#include "Framework/runDataProcessing.h"
+
+#include <TH1.h>
+#include <THashList.h>
+#include <TString.h>
+
+#include <cstring>
+#include <iostream>
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
 
 using std::cout;
 using std::endl;
diff --git a/.conflict-side-0/PWGDQ/Tasks/filterPPwithAssociation.cxx b/.conflict-side-0/PWGDQ/Tasks/filterPPwithAssociation.cxx
index 532482e641b..be139e0344b 100644
--- a/.conflict-side-0/PWGDQ/Tasks/filterPPwithAssociation.cxx
+++ b/.conflict-side-0/PWGDQ/Tasks/filterPPwithAssociation.cxx
@@ -11,44 +11,48 @@
 //
 // Contact: iarsene@cern.ch, i.c.arsene@fys.uio.no
 //
-#include <iostream>
-#include <vector>
-#include <map>
-#include <string>
-#include <memory>
-#include <cstring>
-#include <TH1.h>
-#include <THashList.h>
-#include <TString.h>
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/DataTypes.h"
-#include "Framework/runDataProcessing.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
+#include "PWGDQ/Core/AnalysisCompositeCut.h"
+#include "PWGDQ/Core/AnalysisCut.h"
+#include "PWGDQ/Core/CutsLibrary.h"
+#include "PWGDQ/Core/HistogramManager.h"
+#include "PWGDQ/Core/HistogramsLibrary.h"
+#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+
 #include "Common/CCDB/TriggerAliases.h"
+#include "Common/Core/CollisionAssociation.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/CollisionAssociationTables.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 #include "EventFiltering/filterTables.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "PWGDQ/Core/VarManager.h"
-#include "PWGDQ/Core/HistogramManager.h"
-#include "PWGDQ/Core/AnalysisCut.h"
-#include "PWGDQ/Core/AnalysisCompositeCut.h"
-#include "PWGDQ/Core/HistogramsLibrary.h"
-#include "PWGDQ/Core/CutsLibrary.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/LHCConstants.h"
-#include "Common/Core/CollisionAssociation.h"
-#include "Common/DataModel/CollisionAssociationTables.h"
 #include "DataFormatsParameters/GRPMagField.h"
 #include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
 #include "Field/MagneticField.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/DataTypes.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TGeoGlobalMagField.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
+#include <TH1.h>
+#include <THashList.h>
+#include <TString.h>
+
+#include <cstring>
+#include <iostream>
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
 
 using std::cout;
 using std::endl;
@@ -83,9 +87,9 @@ DECLARE_SOA_COLUMN(IsDQBarrelSelected, isDQBarrelSelected, uint32_t);
 DECLARE_SOA_COLUMN(IsDQMuonSelected, isDQMuonSelected, uint32_t);
 DECLARE_SOA_COLUMN(IsDQEMuBarrelSelected, isDQEMuBarrelSelected, uint32_t); // for electron-muon pair
 DECLARE_SOA_COLUMN(IsDQEMuMuonSelected, isDQEMuMuonSelected, uint32_t);     // for electron-muon pair
-DECLARE_SOA_INDEX_COLUMN(Collision, collision); //! Collision index
-DECLARE_SOA_INDEX_COLUMN(Track, track);         //! Track index
-DECLARE_SOA_INDEX_COLUMN(FwdTrack, fwdtrack);   //! FwdTrack index
+DECLARE_SOA_INDEX_COLUMN(Collision, collision);                             //! Collision index
+DECLARE_SOA_INDEX_COLUMN(Track, track);                                     //! Track index
+DECLARE_SOA_INDEX_COLUMN(FwdTrack, fwdtrack);                               //! FwdTrack index
 } // namespace dqppfilter
 
 DECLARE_SOA_TABLE(DQEventCuts, "AOD", "DQEVENTCUTS", dqppfilter::IsDQEventSelected);
@@ -160,7 +164,7 @@ struct DQEventSelectionTask {
       fHistMan->SetDefaultVarNames(VarManager::fgVariableNames, VarManager::fgVariableUnits);
 
       DefineHistograms(fHistMan, "Event_BeforeCuts;Event_AfterCuts;", fConfigHistClasses.value); // define all histograms
-      VarManager::SetUseVars(fHistMan->GetUsedVars());                 // provide the list of required variables so that VarManager knows what to fill
+      VarManager::SetUseVars(fHistMan->GetUsedVars());                                           // provide the list of required variables so that VarManager knows what to fill
       fOutputList.setObject(fHistMan->GetMainHistogramList());
     }
   }
@@ -266,7 +270,7 @@ struct DQBarrelTrackSelection {
       }
 
       DefineHistograms(fHistMan, cutNames.Data(), fConfigHistClasses.value); // define all histograms
-      VarManager::SetUseVars(fHistMan->GetUsedVars()); // provide the list of required variables so that VarManager knows what to fill
+      VarManager::SetUseVars(fHistMan->GetUsedVars());                       // provide the list of required variables so that VarManager knows what to fill
       fOutputList.setObject(fHistMan->GetMainHistogramList());
 
       // CCDB configuration
@@ -441,7 +445,7 @@ struct DQMuonsSelection {
       }
 
       DefineHistograms(fHistMan, cutNames.Data(), fConfigHistClasses.value); // define all histograms
-      VarManager::SetUseVars(fHistMan->GetUsedVars()); // provide the list of required variables so that VarManager knows what to fill
+      VarManager::SetUseVars(fHistMan->GetUsedVars());                       // provide the list of required variables so that VarManager knows what to fill
       fOutputList.setObject(fHistMan->GetMainHistogramList());
     }
   }
@@ -539,21 +543,21 @@ struct DQFilterPPTask {
 
   int fCurrentRun; // needed to detect if the run changed and trigger update of calibrations etc.
 
-  int fNBarrelCuts;                                    // number of barrel selections
-  int fNMuonCuts;                                      // number of muon selections
-  int fNElectronMuonCuts;                              // number of electron-muon selections
-  std::vector<bool> fBarrelRunPairing;                 // bit map on whether the selections require pairing (barrel)
-  std::vector<bool> fMuonRunPairing;                   // bit map on whether the selections require pairing (muon)
-  std::vector<bool> fElectronMuonRunPairing;           // bit map on whether the selections require pairing (e-mu)
-  std::vector<int> fBarrelNreqObjs;                    // minimal number of tracks/pairs required (barrel)
-  std::vector<int> fMuonNreqObjs;                      // minimal number of tracks/pairs required (muon)
-  std::vector<int> fElectronMuonNreqObjs;              // minimal number of electron-muon pairs required
-  std::map<int, AnalysisCompositeCut> fBarrelPairCuts; // map of barrel pair cuts
-  std::map<int, AnalysisCompositeCut> fMuonPairCuts;   // map of muon pair cuts
+  int fNBarrelCuts;                                          // number of barrel selections
+  int fNMuonCuts;                                            // number of muon selections
+  int fNElectronMuonCuts;                                    // number of electron-muon selections
+  std::vector<bool> fBarrelRunPairing;                       // bit map on whether the selections require pairing (barrel)
+  std::vector<bool> fMuonRunPairing;                         // bit map on whether the selections require pairing (muon)
+  std::vector<bool> fElectronMuonRunPairing;                 // bit map on whether the selections require pairing (e-mu)
+  std::vector<int> fBarrelNreqObjs;                          // minimal number of tracks/pairs required (barrel)
+  std::vector<int> fMuonNreqObjs;                            // minimal number of tracks/pairs required (muon)
+  std::vector<int> fElectronMuonNreqObjs;                    // minimal number of electron-muon pairs required
+  std::map<int, AnalysisCompositeCut> fBarrelPairCuts;       // map of barrel pair cuts
+  std::map<int, AnalysisCompositeCut> fMuonPairCuts;         // map of muon pair cuts
   std::map<int, AnalysisCompositeCut> fElectronMuonPairCuts; // map of electron-muon pair cuts
-  std::map<int, TString> fBarrelPairHistNames;         // map with names of the barrel pairing histogram directories
-  std::map<int, TString> fMuonPairHistNames;           // map with names of the muon pairing histogram directories
-  std::map<int, TString> fElectronMuonPairHistNames;   // map with names of the electron-muon pairing histogram directories
+  std::map<int, TString> fBarrelPairHistNames;               // map with names of the barrel pairing histogram directories
+  std::map<int, TString> fMuonPairHistNames;                 // map with names of the muon pairing histogram directories
+  std::map<int, TString> fElectronMuonPairHistNames;         // map with names of the electron-muon pairing histogram directories
 
   std::map<uint64_t, uint64_t> fFiltersMap;           // map of filters for events that passed at least one filter
   std::map<uint64_t, std::vector<bool>> fCEFPfilters; // map of CEFP filters for events that passed at least one filter
@@ -771,7 +775,7 @@ struct DQFilterPPTask {
           if (objCountersBarrel[i] > 1) { // pairing has to be enabled and at least two tracks are needed
             pairingMask |= (static_cast<uint32_t>(1) << i);
           }
-          objCountersBarrel[i] = 0; // reset counters for selections where pairing is needed (count pairs instead)
+          objCountersBarrel[i] = 0;    // reset counters for selections where pairing is needed (count pairs instead)
           taggedCollisions[i].clear(); // empty the list of tagged collisions if pairing is needed (so we count just events with pairs or containing selected pair legs)
         }
       }
@@ -848,7 +852,7 @@ struct DQFilterPPTask {
           if (objCountersMuon[i] > 1) {
             pairingMask |= (static_cast<uint32_t>(1) << i);
           }
-          objCountersMuon[i] = 0; // reset counters for selections where pairing is needed (count pairs instead)
+          objCountersMuon[i] = 0;                     // reset counters for selections where pairing is needed (count pairs instead)
           taggedCollisions[i + fNBarrelCuts].clear(); // empty the list of tagged collisions if pairing is needed (so we count just events with pairs or containing selected pair legs)
         }
       }
diff --git a/.conflict-side-0/PWGDQ/Tasks/filterPbPb.cxx b/.conflict-side-0/PWGDQ/Tasks/filterPbPb.cxx
index 1544ea14f21..155f7a0610b 100644
--- a/.conflict-side-0/PWGDQ/Tasks/filterPbPb.cxx
+++ b/.conflict-side-0/PWGDQ/Tasks/filterPbPb.cxx
@@ -9,16 +9,19 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 //
-#include <Framework/AnalysisDataModel.h>
-#include <fairlogger/Logger.h>
-#include <cstdint>
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
 #include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+#include "PWGUD/Core/SGSelector.h"
+
 #include "CommonConstants/LHCConstants.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Vertex.h"
-#include "PWGUD/Core/SGSelector.h"
+#include <Framework/AnalysisDataModel.h>
+
+#include <fairlogger/Logger.h>
+
+#include <cstdint>
 
 using namespace std;
 
diff --git a/.conflict-side-0/PWGDQ/Tasks/mchAlignRecord.cxx b/.conflict-side-0/PWGDQ/Tasks/mchAlignRecord.cxx
index 2f612493b6e..bd34e08496b 100644
--- a/.conflict-side-0/PWGDQ/Tasks/mchAlignRecord.cxx
+++ b/.conflict-side-0/PWGDQ/Tasks/mchAlignRecord.cxx
@@ -14,63 +14,61 @@
 ///
 /// \author Chi ZHANG, CEA-Saclay, chi.zhang@cern.ch
 
-#include <gsl/span>
-#include <cmath>
-#include <string>
-#include <unordered_map>
-#include <vector>
-#include <iostream>
-#include <memory>
+#include "PWGDQ/Core/VarManager.h"
+
+#include "Common/DataModel/EventSelection.h"
 
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonConstants/LHCConstants.h"
+#include "CommonUtils/NameConf.h"
+#include "DataFormatsMCH/Cluster.h"
+#include "DataFormatsMCH/TrackMCH.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GRPGeomHelper.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "DetectorsCommonDataFormats/AlignParam.h"
+#include "DetectorsCommonDataFormats/DetID.h"
+#include "DetectorsCommonDataFormats/DetectorNameConf.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/CallbackService.h"
+#include "Framework/Logger.h"
 #include "Framework/runDataProcessing.h"
+#include "MCHAlign/Aligner.h"
+#include "MCHBase/TrackerParam.h"
+#include "MCHGeometryTransformer/Transformations.h"
+#include "MCHTracking/Track.h"
+#include "MCHTracking/TrackExtrap.h"
+#include "MCHTracking/TrackFitter.h"
+#include "MCHTracking/TrackParam.h"
+#include "ReconstructionDataFormats/TrackMCHMID.h"
 
 #include <TCanvas.h>
+#include <TChain.h>
 #include <TDatabasePDG.h>
 #include <TF1.h>
 #include <TFile.h>
+#include <TGraph.h>
+#include <TGraphErrors.h>
 #include <TH1F.h>
 #include <TH2F.h>
 #include <TLegend.h>
+#include <TLine.h>
 #include <TMatrixD.h>
 #include <TParameter.h>
 #include <TSystem.h>
 #include <TTree.h>
 #include <TTreeReader.h>
 #include <TTreeReaderValue.h>
-#include <TChain.h>
-#include <TGraph.h>
-#include <TGraphErrors.h>
-#include <TLine.h>
-#include <TSystem.h>
-
-#include "CommonConstants/LHCConstants.h"
-#include "CommonUtils/NameConf.h"
-#include "Common/DataModel/EventSelection.h"
-#include "PWGDQ/Core/VarManager.h"
 
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DetectorsBase/GRPGeomHelper.h"
-#include "DetectorsBase/Propagator.h"
-#include "Framework/Logger.h"
-#include "Framework/CallbackService.h"
-#include "CCDB/BasicCCDBManager.h"
-
-#include "MCHGeometryTransformer/Transformations.h"
-#include "DataFormatsMCH/Cluster.h"
-#include "DataFormatsMCH/TrackMCH.h"
-#include "MCHTracking/Track.h"
-#include "MCHTracking/TrackExtrap.h"
-#include "MCHTracking/TrackParam.h"
-#include "MCHTracking/TrackFitter.h"
-#include "MCHBase/TrackerParam.h"
-#include "ReconstructionDataFormats/TrackMCHMID.h"
-#include "MCHAlign/Aligner.h"
-#include "DetectorsCommonDataFormats/AlignParam.h"
-#include "DetectorsCommonDataFormats/DetID.h"
-#include "DetectorsCommonDataFormats/DetectorNameConf.h"
+#include <cmath>
+#include <gsl/span>
+#include <iostream>
+#include <memory>
+#include <string>
+#include <unordered_map>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGDQ/Tasks/muonDCA.cxx b/.conflict-side-0/PWGDQ/Tasks/muonDCA.cxx
index b2031418d5c..9581efe62b5 100644
--- a/.conflict-side-0/PWGDQ/Tasks/muonDCA.cxx
+++ b/.conflict-side-0/PWGDQ/Tasks/muonDCA.cxx
@@ -13,14 +13,15 @@
 /// \brief Task to compute and evaluate DCA quantities
 /// \author Nicolas Bizé <nicolas.bize@cern.ch>, SUBATECH
 //
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "GlobalTracking/MatchGlobalFwd.h"
+#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "PWGDQ/Core/VarManager.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "GlobalTracking/MatchGlobalFwd.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGDQ/Tasks/quarkoniaToHyperons.cxx b/.conflict-side-0/PWGDQ/Tasks/quarkoniaToHyperons.cxx
index 6133ee4e090..accdde13a9d 100644
--- a/.conflict-side-0/PWGDQ/Tasks/quarkoniaToHyperons.cxx
+++ b/.conflict-side-0/PWGDQ/Tasks/quarkoniaToHyperons.cxx
@@ -29,44 +29,45 @@
 //    david.dobrigkeit.chinellato@cern.ch
 //
 
-#include <Math/Vector4D.h>
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <map>
-#include <string>
-#include <vector>
-
-#include <TFile.h>
-#include <TH2F.h>
-#include <TProfile.h>
-#include <TLorentzVector.h>
-#include <TPDGCode.h>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "PWGLF/DataModel/LFStrangenessMLTables.h"
 #include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGUD/Core/SGSelector.h"
+
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/Core/SGSelector.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+#include "EventFiltering/Zorro.h"
+#include "EventFiltering/ZorroSummary.h"
 #include "Tools/ML/MlResponse.h"
 #include "Tools/ML/model.h"
 
-#include "EventFiltering/Zorro.h"
-#include "EventFiltering/ZorroSummary.h"
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <Math/Vector4D.h>
+#include <TFile.h>
+#include <TH2F.h>
+#include <TLorentzVector.h>
+#include <TPDGCode.h>
+#include <TProfile.h>
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <map>
+#include <string>
+#include <vector>
 
 // constants
 const float ctauXiPDG = 4.91;     // Xi PDG lifetime
diff --git a/.conflict-side-0/PWGDQ/Tasks/tableReader.cxx b/.conflict-side-0/PWGDQ/Tasks/tableReader.cxx
index 22a8d82e2d8..a51d54c48f8 100644
--- a/.conflict-side-0/PWGDQ/Tasks/tableReader.cxx
+++ b/.conflict-side-0/PWGDQ/Tasks/tableReader.cxx
@@ -11,39 +11,43 @@
 //
 // Contact: iarsene@cern.ch, i.c.arsene@fys.uio.no
 //
-#include <iostream>
-#include <vector>
-#include <algorithm>
-#include <map>
-#include <string>
-#include <memory>
-#include <TH1F.h>
-#include <TH3F.h>
-#include <THashList.h>
-#include <TList.h>
-#include <TString.h>
-#include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "PWGDQ/Core/VarManager.h"
-#include "PWGDQ/Core/HistogramManager.h"
-#include "PWGDQ/Core/MixingHandler.h"
-#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/AnalysisCompositeCut.h"
-#include "PWGDQ/Core/HistogramsLibrary.h"
+#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/CutsLibrary.h"
+#include "PWGDQ/Core/HistogramManager.h"
+#include "PWGDQ/Core/HistogramsLibrary.h"
+#include "PWGDQ/Core/MixingHandler.h"
 #include "PWGDQ/Core/MixingLibrary.h"
+#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+
+#include "Common/CCDB/EventSelectionParams.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include "Field/MagneticField.h"
-#include "TGeoGlobalMagField.h"
-#include "DetectorsBase/Propagator.h"
+#include "DataFormatsParameters/GRPObject.h"
 #include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Field/MagneticField.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 #include "ITSMFTBase/DPLAlpideParam.h"
-#include "Common/CCDB/EventSelectionParams.h"
+
+#include "TGeoGlobalMagField.h"
+#include <TH1F.h>
+#include <TH3F.h>
+#include <THashList.h>
+#include <TList.h>
+#include <TString.h>
+
+#include <algorithm>
+#include <iostream>
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
 
 using std::cout;
 using std::endl;
diff --git a/.conflict-side-0/PWGDQ/Tasks/tableReader_withAssoc.cxx b/.conflict-side-0/PWGDQ/Tasks/tableReader_withAssoc.cxx
index d6b29b461d2..b08729dabdb 100644
--- a/.conflict-side-0/PWGDQ/Tasks/tableReader_withAssoc.cxx
+++ b/.conflict-side-0/PWGDQ/Tasks/tableReader_withAssoc.cxx
@@ -12,51 +12,54 @@
 // Contact: iarsene@cern.ch, i.c.arsene@fys.uio.no
 //   Configurable workflow for running several DQ or other PWG analyses
 
+#include "PWGDQ/Core/AnalysisCompositeCut.h"
+#include "PWGDQ/Core/AnalysisCut.h"
+#include "PWGDQ/Core/CutsLibrary.h"
+#include "PWGDQ/Core/HistogramManager.h"
+#include "PWGDQ/Core/HistogramsLibrary.h"
+#include "PWGDQ/Core/MixingHandler.h"
+#include "PWGDQ/Core/MixingLibrary.h"
+#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+
+#include "Common/CCDB/EventSelectionParams.h"
+#include "Common/Core/TableHelper.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Field/MagneticField.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/Configurable.h"
+#include "Framework/OutputObjHeader.h"
+#include "Framework/runDataProcessing.h"
+#include "ITSMFTBase/DPLAlpideParam.h"
+
+#include "TGeoGlobalMagField.h"
+#include <TH1F.h>
+#include <TH3F.h>
+#include <THashList.h>
+#include <TList.h>
+#include <TObjString.h>
+#include <TString.h>
+
+#include <algorithm>
 #include <cstdint>
 #include <cstdio>
 #include <cstring>
 #include <iostream>
+#include <map>
+#include <memory>
 #include <numeric>
-#include <vector>
-#include <algorithm>
-#include <utility>
 #include <set>
-#include <map>
 #include <string>
-#include <memory>
 #include <utility>
-#include <TH1F.h>
-#include <TH3F.h>
-#include <THashList.h>
-#include <TList.h>
-#include <TString.h>
-#include <TObjString.h>
-#include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "Framework/AnalysisHelpers.h"
-#include "Framework/Configurable.h"
-#include "Framework/OutputObjHeader.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "PWGDQ/Core/VarManager.h"
-#include "PWGDQ/Core/HistogramManager.h"
-#include "PWGDQ/Core/MixingHandler.h"
-#include "PWGDQ/Core/AnalysisCut.h"
-#include "PWGDQ/Core/AnalysisCompositeCut.h"
-#include "PWGDQ/Core/HistogramsLibrary.h"
-#include "PWGDQ/Core/CutsLibrary.h"
-#include "PWGDQ/Core/MixingLibrary.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "Field/MagneticField.h"
-#include "TGeoGlobalMagField.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "Common/Core/TableHelper.h"
-#include "ITSMFTBase/DPLAlpideParam.h"
-#include "Common/CCDB/EventSelectionParams.h"
+#include <vector>
 
 using std::cout;
 using std::endl;
diff --git a/.conflict-side-0/PWGDQ/Tasks/taskFwdTrackPid.cxx b/.conflict-side-0/PWGDQ/Tasks/taskFwdTrackPid.cxx
index cbe6e233630..52c2c3b908a 100644
--- a/.conflict-side-0/PWGDQ/Tasks/taskFwdTrackPid.cxx
+++ b/.conflict-side-0/PWGDQ/Tasks/taskFwdTrackPid.cxx
@@ -13,38 +13,42 @@
 /// \brief Task for the analysis of forward PID with MFT
 /// \author Luca Micheletti <luca.micheletti@to.infn.it>, INFN
 
-#include <iostream>
-#include <vector>
-#include <algorithm>
-#include <TH1F.h>
-#include <TH3F.h>
-#include <THashList.h>
-#include <TList.h>
-#include <TString.h>
-#include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/Core/AnalysisCompositeCut.h"
+#include "PWGDQ/Core/AnalysisCut.h"
+#include "PWGDQ/Core/CutsLibrary.h"
 #include "PWGDQ/Core/HistogramManager.h"
-#include "PWGDQ/Core/MixingHandler.h"
+#include "PWGDQ/Core/HistogramsLibrary.h"
 #include "PWGDQ/Core/MCSignal.h"
 #include "PWGDQ/Core/MCSignalLibrary.h"
-#include "PWGDQ/Core/AnalysisCut.h"
-#include "PWGDQ/Core/AnalysisCompositeCut.h"
-#include "PWGDQ/Core/HistogramsLibrary.h"
-#include "PWGDQ/Core/CutsLibrary.h"
+#include "PWGDQ/Core/MixingHandler.h"
 #include "PWGDQ/Core/MixingLibrary.h"
+#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+
+#include "Common/CCDB/EventSelectionParams.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include "Field/MagneticField.h"
-#include "TGeoGlobalMagField.h"
-#include "DetectorsBase/Propagator.h"
+#include "DataFormatsParameters/GRPObject.h"
 #include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Field/MagneticField.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 #include "ITSMFTBase/DPLAlpideParam.h"
-#include "Common/CCDB/EventSelectionParams.h"
+
+#include "TGeoGlobalMagField.h"
+#include <TH1F.h>
+#include <TH3F.h>
+#include <THashList.h>
+#include <TList.h>
+#include <TString.h>
+
+#include <algorithm>
+#include <iostream>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGDQ/Tasks/taskJpsiHf.cxx b/.conflict-side-0/PWGDQ/Tasks/taskJpsiHf.cxx
index 79d9348940a..d9cd1133472 100644
--- a/.conflict-side-0/PWGDQ/Tasks/taskJpsiHf.cxx
+++ b/.conflict-side-0/PWGDQ/Tasks/taskJpsiHf.cxx
@@ -14,20 +14,20 @@
 /// \author Luca Micheletti <luca.micheletti@to.infn.it>, INFN
 /// \author Fabrizio Grosa <fabrizio.grosa@cern.ch>, CERN
 
-#include <string>
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
+#include "PWGHF/Utils/utilsAnalysis.h"
+
+#include "Common/Core/RecoDecay.h"
 
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
 
-#include "Common/Core/RecoDecay.h"
-
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
-#include "PWGHF/Utils/utilsAnalysis.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
+#include <string>
 
 using namespace o2;
 using namespace o2::analysis;
diff --git a/.conflict-side-0/PWGDQ/Tasks/taskMuonMchTrkEfficiency.cxx b/.conflict-side-0/PWGDQ/Tasks/taskMuonMchTrkEfficiency.cxx
index 4914658ae81..7ff72350bd7 100644
--- a/.conflict-side-0/PWGDQ/Tasks/taskMuonMchTrkEfficiency.cxx
+++ b/.conflict-side-0/PWGDQ/Tasks/taskMuonMchTrkEfficiency.cxx
@@ -19,12 +19,12 @@
 /// \author Zaida Conesa del Valle <zaida.conesa.del.valle@cern.ch>
 ///
 
+#include "PWGDQ/DataModel/MchTrkEffTables.h"
+
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
 
-#include "PWGDQ/DataModel/MchTrkEffTables.h"
-
 using namespace o2;
 using namespace o2::aod;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGDQ/Tasks/v0selector.cxx b/.conflict-side-0/PWGDQ/Tasks/v0selector.cxx
index 0c970d80c91..378c2332b15 100644
--- a/.conflict-side-0/PWGDQ/Tasks/v0selector.cxx
+++ b/.conflict-side-0/PWGDQ/Tasks/v0selector.cxx
@@ -17,35 +17,39 @@
 //    Comments, questions, complaints, suggestions?
 //    Please write to: daiki.sekihata@cern.ch
 //
-#include <array>
-#include <map>
-#include <string>
-#include <memory>
-#include <vector>
-#include "Math/Vector4D.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/trackUtilities.h"
+#include "PWGDQ/Core/HistogramManager.h"
+#include "PWGDQ/Core/HistogramsLibrary.h"
+#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/RecoDecay.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "DCAFitter/DCAFitterN.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "PWGDQ/Core/VarManager.h"
-#include "PWGDQ/Core/HistogramManager.h"
-#include "PWGDQ/Core/HistogramsLibrary.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include "Math/Vector4D.h"
+
+#include <array>
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
@@ -574,7 +578,7 @@ struct trackPIDQA {
       }
 
     } // end of track loop
-  }   // end of process
+  } // end of process
 
   void DefineHistograms(TString histClasses)
   {
diff --git a/.conflict-side-0/PWGEM/Dilepton/TableProducer/eventSelection.cxx b/.conflict-side-0/PWGEM/Dilepton/TableProducer/eventSelection.cxx
index 65eb1a93d53..d5420a13225 100644
--- a/.conflict-side-0/PWGEM/Dilepton/TableProducer/eventSelection.cxx
+++ b/.conflict-side-0/PWGEM/Dilepton/TableProducer/eventSelection.cxx
@@ -14,14 +14,17 @@
 // This code produces event selection table for PWG-EM.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include <string>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/CCDB/RCTSelectionFlags.h"
 #include "PWGEM/Dilepton/DataModel/dileptonTables.h"
 
+#include "Common/CCDB/RCTSelectionFlags.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include <string>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-0/PWGEM/Dilepton/Tasks/Converters/electronConverter2.cxx b/.conflict-side-0/PWGEM/Dilepton/Tasks/Converters/electronConverter2.cxx
index 785272dcf3a..cde46f9cf7d 100644
--- a/.conflict-side-0/PWGEM/Dilepton/Tasks/Converters/electronConverter2.cxx
+++ b/.conflict-side-0/PWGEM/Dilepton/Tasks/Converters/electronConverter2.cxx
@@ -14,11 +14,12 @@
 // This code runs loop over ULS ee pars for virtual photon QC.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
 #include "PWGEM/Dilepton/DataModel/dileptonTables.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::aod;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGEM/Dilepton/Tasks/Converters/eventConverter2.cxx b/.conflict-side-0/PWGEM/Dilepton/Tasks/Converters/eventConverter2.cxx
index 568cb741d08..944f92e699f 100644
--- a/.conflict-side-0/PWGEM/Dilepton/Tasks/Converters/eventConverter2.cxx
+++ b/.conflict-side-0/PWGEM/Dilepton/Tasks/Converters/eventConverter2.cxx
@@ -14,11 +14,12 @@
 // This code runs loop over ULS ee pars for virtual photon QC.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
 #include "PWGEM/Dilepton/DataModel/dileptonTables.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::aod;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGEM/Dilepton/Tasks/MCtemplates.cxx b/.conflict-side-0/PWGEM/Dilepton/Tasks/MCtemplates.cxx
index 3288bd2745e..c7bf193aa61 100644
--- a/.conflict-side-0/PWGEM/Dilepton/Tasks/MCtemplates.cxx
+++ b/.conflict-side-0/PWGEM/Dilepton/Tasks/MCtemplates.cxx
@@ -13,27 +13,31 @@
 //
 // Analysis task to generate Monte Carlo templates of different heavy-flavour dielectron sources
 //
-#include <iostream>
-#include <vector>
-#include <TMath.h>
-#include <TH1F.h>
-#include <THashList.h>
-#include <TString.h>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "PWGDQ/Core/VarManager.h"
-#include "PWGDQ/Core/HistogramManager.h"
-#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/AnalysisCompositeCut.h"
-#include "PWGDQ/Core/HistogramsLibrary.h"
+#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/CutsLibrary.h"
+#include "PWGDQ/Core/HistogramManager.h"
+#include "PWGDQ/Core/HistogramsLibrary.h"
 #include "PWGDQ/Core/MCSignal.h"
 #include "PWGDQ/Core/MCSignalLibrary.h"
+#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+
 #include "Common/DataModel/TrackSelectionTables.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include <TH1F.h>
+#include <THashList.h>
+#include <TMath.h>
+#include <TString.h>
+
+#include <iostream>
+#include <vector>
+
 using std::cout;
 using std::endl;
 using std::string;
@@ -480,8 +484,8 @@ struct AnalysisSameEventPairing {
           }
           fBarrelHistNamesMCmatched.emplace_back(mcSigClasses);
         } // end loop over cuts
-      }   // end if(cutNames.IsNull())
-    }     // end if processBarrel
+      } // end if(cutNames.IsNull())
+    } // end if processBarrel
 
     // Add histogram classes for each specified MCsignal at the generator level
     // TODO: create a std::vector of hist classes to be used at Fill time, to avoid using Form in the process function
@@ -577,7 +581,7 @@ struct AnalysisSameEventPairing {
         }
       }
     } // end loop over barrel track pairs
-  }   // end runPairing
+  } // end runPairing
 
   template <typename TTracksMC>
   void runMCGenPair(TTracksMC const& groupedMCTracks)
@@ -609,7 +613,7 @@ struct AnalysisSameEventPairing {
         }
       }
     } // end of true pairing loop
-  }   // end runMCGen
+  } // end runMCGen
 
   // skimmed
   PresliceUnsorted<ReducedMCTracks> perReducedMcEvent = aod::reducedtrackMC::reducedMCeventId;
diff --git a/.conflict-side-0/PWGEM/Dilepton/Tasks/PhotonHBTEEEE.cxx b/.conflict-side-0/PWGEM/Dilepton/Tasks/PhotonHBTEEEE.cxx
index b26a40af6fc..59002430983 100644
--- a/.conflict-side-0/PWGEM/Dilepton/Tasks/PhotonHBTEEEE.cxx
+++ b/.conflict-side-0/PWGEM/Dilepton/Tasks/PhotonHBTEEEE.cxx
@@ -14,25 +14,25 @@
 // This code loops over v0 photons and makes pairs for photon HBT analysis.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include <cstring>
-#include <iterator>
+#include "PWGEM/Dilepton/Core/PhotonHBT.h"
 
-#include "TString.h"
-#include "Math/Vector4D.h"
-#include "Math/Vector3D.h"
-#include "Math/LorentzRotation.h"
-#include "Math/GenVector/Boost.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
+#include "Math/GenVector/Boost.h"
+#include "Math/LorentzRotation.h"
+#include "Math/Vector3D.h"
+#include "Math/Vector4D.h"
+#include "TString.h"
 
-#include "PWGEM/Dilepton/Core/PhotonHBT.h"
+#include <cstring>
+#include <iterator>
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-side-0/PWGEM/Dilepton/Tasks/PhotonHBTPCMEE.cxx b/.conflict-side-0/PWGEM/Dilepton/Tasks/PhotonHBTPCMEE.cxx
index 3e792f9d27a..bd8392fd75a 100644
--- a/.conflict-side-0/PWGEM/Dilepton/Tasks/PhotonHBTPCMEE.cxx
+++ b/.conflict-side-0/PWGEM/Dilepton/Tasks/PhotonHBTPCMEE.cxx
@@ -14,25 +14,25 @@
 // This code loops over v0 photons and makes pairs for photon HBT analysis.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include <cstring>
-#include <iterator>
+#include "PWGEM/Dilepton/Core/PhotonHBT.h"
 
-#include "TString.h"
-#include "Math/Vector4D.h"
-#include "Math/Vector3D.h"
-#include "Math/LorentzRotation.h"
-#include "Math/GenVector/Boost.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
+#include "Math/GenVector/Boost.h"
+#include "Math/LorentzRotation.h"
+#include "Math/Vector3D.h"
+#include "Math/Vector4D.h"
+#include "TString.h"
 
-#include "PWGEM/Dilepton/Core/PhotonHBT.h"
+#include <cstring>
+#include <iterator>
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-side-0/PWGEM/Dilepton/Tasks/PhotonHBTPCMPCM.cxx b/.conflict-side-0/PWGEM/Dilepton/Tasks/PhotonHBTPCMPCM.cxx
index ddcbe423eae..7c3abcd362d 100644
--- a/.conflict-side-0/PWGEM/Dilepton/Tasks/PhotonHBTPCMPCM.cxx
+++ b/.conflict-side-0/PWGEM/Dilepton/Tasks/PhotonHBTPCMPCM.cxx
@@ -14,25 +14,25 @@
 // This code loops over v0 photons and makes pairs for photon HBT analysis.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include <cstring>
-#include <iterator>
+#include "PWGEM/Dilepton/Core/PhotonHBT.h"
 
-#include "TString.h"
-#include "Math/Vector4D.h"
-#include "Math/Vector3D.h"
-#include "Math/LorentzRotation.h"
-#include "Math/GenVector/Boost.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
+#include "Math/GenVector/Boost.h"
+#include "Math/LorentzRotation.h"
+#include "Math/Vector3D.h"
+#include "Math/Vector4D.h"
+#include "TString.h"
 
-#include "PWGEM/Dilepton/Core/PhotonHBT.h"
+#include <cstring>
+#include <iterator>
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-side-0/PWGEM/Dilepton/Tasks/associateMCcollision.cxx b/.conflict-side-0/PWGEM/Dilepton/Tasks/associateMCcollision.cxx
index eb0e7d3bf5c..7f3c860e526 100644
--- a/.conflict-side-0/PWGEM/Dilepton/Tasks/associateMCcollision.cxx
+++ b/.conflict-side-0/PWGEM/Dilepton/Tasks/associateMCcollision.cxx
@@ -14,11 +14,12 @@
 // This code produces a table with an index between mc collision and rec. collision.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
 #include "PWGEM/Dilepton/DataModel/dileptonTables.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::aod;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGEM/Dilepton/Tasks/bcCounter.cxx b/.conflict-side-0/PWGEM/Dilepton/Tasks/bcCounter.cxx
index 1b16c88e89b..da462851aef 100644
--- a/.conflict-side-0/PWGEM/Dilepton/Tasks/bcCounter.cxx
+++ b/.conflict-side-0/PWGEM/Dilepton/Tasks/bcCounter.cxx
@@ -14,29 +14,32 @@
 // This code is for bc counter.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include <string>
-#include <vector>
-#include <algorithm>
-#include <type_traits>
-#include <optional>
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "TString.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
 #include "Common/Core/RecoDecay.h"
-#include "MathUtils/Utils.h"
-#include "Framework/AnalysisDataModel.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Qvectors.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/PIDResponseITS.h"
+#include "Common/DataModel/Qvectors.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "MathUtils/Utils.h"
+
+#include "TString.h"
+
+#include <algorithm>
+#include <optional>
+#include <string>
+#include <type_traits>
+#include <vector>
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-side-0/PWGEM/Dilepton/Tasks/dielectron.cxx b/.conflict-side-0/PWGEM/Dilepton/Tasks/dielectron.cxx
index c8fa31b0e3b..494d50b49b1 100644
--- a/.conflict-side-0/PWGEM/Dilepton/Tasks/dielectron.cxx
+++ b/.conflict-side-0/PWGEM/Dilepton/Tasks/dielectron.cxx
@@ -14,12 +14,12 @@
 // This code is for dielectron analyses.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-
 #include "PWGEM/Dilepton/Core/Dilepton.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
   return WorkflowSpec{
diff --git a/.conflict-side-0/PWGEM/Dilepton/Tasks/dielectronMC.cxx b/.conflict-side-0/PWGEM/Dilepton/Tasks/dielectronMC.cxx
index 3c525c29c6e..ff8e2f1bdca 100644
--- a/.conflict-side-0/PWGEM/Dilepton/Tasks/dielectronMC.cxx
+++ b/.conflict-side-0/PWGEM/Dilepton/Tasks/dielectronMC.cxx
@@ -14,12 +14,12 @@
 // This code runs loop over dalitz ee table for dalitz QC.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-
 #include "PWGEM/Dilepton/Core/DileptonMC.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
   return WorkflowSpec{
diff --git a/.conflict-side-0/PWGEM/Dilepton/Tasks/dimuon.cxx b/.conflict-side-0/PWGEM/Dilepton/Tasks/dimuon.cxx
index 51b92ab81b7..8cfa155b422 100644
--- a/.conflict-side-0/PWGEM/Dilepton/Tasks/dimuon.cxx
+++ b/.conflict-side-0/PWGEM/Dilepton/Tasks/dimuon.cxx
@@ -14,12 +14,12 @@
 // This code is for dimuon analyses.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-
 #include "PWGEM/Dilepton/Core/Dilepton.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
   return WorkflowSpec{
diff --git a/.conflict-side-0/PWGEM/Dilepton/Tasks/dimuonMC.cxx b/.conflict-side-0/PWGEM/Dilepton/Tasks/dimuonMC.cxx
index f505c073dc3..9c203ff4461 100644
--- a/.conflict-side-0/PWGEM/Dilepton/Tasks/dimuonMC.cxx
+++ b/.conflict-side-0/PWGEM/Dilepton/Tasks/dimuonMC.cxx
@@ -14,12 +14,12 @@
 // This code runs loop over dalitz ee table for dalitz QC.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-
 #include "PWGEM/Dilepton/Core/DileptonMC.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
   return WorkflowSpec{
diff --git a/.conflict-side-0/PWGEM/Dilepton/Tasks/emEfficiencyEE.cxx b/.conflict-side-0/PWGEM/Dilepton/Tasks/emEfficiencyEE.cxx
index 7cc41a190d2..a29cfc62359 100644
--- a/.conflict-side-0/PWGEM/Dilepton/Tasks/emEfficiencyEE.cxx
+++ b/.conflict-side-0/PWGEM/Dilepton/Tasks/emEfficiencyEE.cxx
@@ -12,41 +12,45 @@
 //
 // Analysis task for calculating single electron and dielectron efficiency
 //
-#include <iostream>
-#include <vector>
-#include <TMath.h>
-#include <TH1F.h>
-#include <THashList.h>
-#include <TLorentzVector.h>
-#include <TString.h>
-#include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/ASoA.h"
-#include "Framework/DataTypes.h"
-#include "Framework/HistogramRegistry.h"
-#include "PWGDQ/Core/VarManager.h"
-#include "PWGDQ/Core/HistogramManager.h"
-#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/AnalysisCompositeCut.h"
-#include "PWGDQ/Core/HistogramsLibrary.h"
+#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/CutsLibrary.h"
+#include "PWGDQ/Core/HistogramManager.h"
+#include "PWGDQ/Core/HistogramsLibrary.h"
 #include "PWGDQ/Core/MCSignal.h"
 #include "PWGDQ/Core/MCSignalLibrary.h"
+#include "PWGDQ/Core/VarManager.h"
 #include "PWGDQ/DataModel/ReducedInfoTables.h"
+#include "PWGEM/Dilepton/DataModel/dileptonTables.h"
+
+#include "Common/CCDB/TriggerAliases.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/CCDB/TriggerAliases.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
 #include "Field/MagneticField.h"
+#include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/DataTypes.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TGeoGlobalMagField.h"
-#include "PWGEM/Dilepton/DataModel/dileptonTables.h"
+#include <TH1F.h>
+#include <THashList.h>
+#include <TLorentzVector.h>
+#include <TMath.h>
+#include <TString.h>
+
+#include <iostream>
+#include <vector>
 
 using std::cout;
 using std::endl;
@@ -1027,8 +1031,8 @@ struct AnalysisTrackSelection {
               fHistManQA->FillHistClass(fHistNamesMCMatchedQA[j][i].Data(), VarManager::fgValues);
           }
         } // end loop over cuts
-      }   // end loop over MC signals
-    }     // end loop over reconstructed track belonging to the events
+      } // end loop over MC signals
+    } // end loop over reconstructed track belonging to the events
   }
 
   template <uint32_t TEventFillMap, uint32_t TTrackFillMap, typename TEvents, typename TEventsMC, typename TTracks, typename TTracksMC, typename TAmbigTracks>
@@ -1275,8 +1279,8 @@ struct AnalysisTrackSelection {
               fHistManQA->FillHistClass(fHistNamesMCMatchedQA[j][i].Data(), VarManager::fgValues);
           }
         } // end loop over cuts
-      }   // end loop over MC signals
-    }     // end loop over reconstructed track belonging to the events
+      } // end loop over MC signals
+    } // end loop over reconstructed track belonging to the events
   }
 
   void processSkimmed(soa::Filtered<MyEventsSelected> const& events, MyBarrelTracks const& tracks, ReducedMCEvents const& eventsMC, ReducedMCTracks const& tracksMC)
@@ -1601,7 +1605,7 @@ struct AnalysisSameEventPairing {
         runRecPair<TTrackFillMap>(groupedTracks, tracksMC);
       }
     } // end loop over reconstructed event
-  }   // end loop pairing function
+  } // end loop pairing function
 
   template <uint32_t TEventMCFillMap, uint32_t TTrackFillMap, typename TEventMC, typename TTracksMC>
   void runMCPairing(TEventMC const& /*eventMC*/, TTracksMC const& tracksMC)
@@ -1716,7 +1720,7 @@ struct AnalysisSameEventPairing {
         }
       }
     } // end of true pairing loop
-  }   // end runMCGen
+  } // end runMCGen
 
   template <uint32_t TTrackFillMap, typename TTracks, typename TTracksMC>
   void runRecPair(TTracks const& tracks, TTracksMC const& /*tracksMC*/)
diff --git a/.conflict-side-0/PWGEM/Dilepton/Tasks/lmeeHFCocktail.cxx b/.conflict-side-0/PWGEM/Dilepton/Tasks/lmeeHFCocktail.cxx
index d3bb410813f..776e51cffa5 100644
--- a/.conflict-side-0/PWGEM/Dilepton/Tasks/lmeeHFCocktail.cxx
+++ b/.conflict-side-0/PWGEM/Dilepton/Tasks/lmeeHFCocktail.cxx
@@ -15,16 +15,18 @@
 /// \author Daniel Samitz, <daniel.samitz@cern.ch>, SMI Vienna
 ///         Elisa Meninno, <elisa.meninno@cern.ch>, SMI Vienna
 
-#include <vector>
+#include "PWGEM/Dilepton/DataModel/dileptonTables.h"
+#include "PWGEM/Dilepton/Utils/MCUtilities.h"
 
-#include "Math/Vector4D.h"
-#include "MathUtils/Utils.h"
-#include "Framework/Task.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "PWGEM/Dilepton/Utils/MCUtilities.h"
-#include "PWGEM/Dilepton/DataModel/dileptonTables.h"
+#include "Framework/Task.h"
+#include "Framework/runDataProcessing.h"
+#include "MathUtils/Utils.h"
+
+#include "Math/Vector4D.h"
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGEM/Dilepton/Tasks/lmeeLFCocktail.cxx b/.conflict-side-0/PWGEM/Dilepton/Tasks/lmeeLFCocktail.cxx
index 1cac2727e98..a4120a48b03 100644
--- a/.conflict-side-0/PWGEM/Dilepton/Tasks/lmeeLFCocktail.cxx
+++ b/.conflict-side-0/PWGEM/Dilepton/Tasks/lmeeLFCocktail.cxx
@@ -14,16 +14,18 @@
 /// \analysis task for lmee light flavour cocktail
 /// \author Daniel Samitz, <daniel.samitz@cern.ch>, SMI Vienna
 
-#include <map>
-#include <vector>
-#include <string>
+#include "PWGEM/Dilepton/DataModel/dileptonTables.h"
+#include "PWGEM/Dilepton/Utils/PairUtilities.h"
 
-#include "Math/Vector4D.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "PWGEM/Dilepton/DataModel/dileptonTables.h"
-#include "PWGEM/Dilepton/Utils/PairUtilities.h"
+#include "Framework/runDataProcessing.h"
+
+#include "Math/Vector4D.h"
+
+#include <map>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGEM/Dilepton/Tasks/prefilterDielectron.cxx b/.conflict-side-0/PWGEM/Dilepton/Tasks/prefilterDielectron.cxx
index 75a92e03c9a..a407547ddbd 100644
--- a/.conflict-side-0/PWGEM/Dilepton/Tasks/prefilterDielectron.cxx
+++ b/.conflict-side-0/PWGEM/Dilepton/Tasks/prefilterDielectron.cxx
@@ -14,32 +14,33 @@
 // This code produces information on prefilter for dielectron.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include <string>
-#include <vector>
-#include <unordered_map>
-#include <map>
-#include <tuple>
+#include "PWGEM/Dilepton/Core/DielectronCut.h"
+#include "PWGEM/Dilepton/Core/EMEventCut.h"
+#include "PWGEM/Dilepton/DataModel/dileptonTables.h"
+#include "PWGEM/Dilepton/Utils/EMTrack.h"
+#include "PWGEM/Dilepton/Utils/EventHistograms.h"
+#include "PWGEM/Dilepton/Utils/PairUtilities.h"
 
-#include "TString.h"
-#include "Math/Vector4D.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
 #include "Common/Core/RecoDecay.h"
 #include "Common/Core/trackUtilities.h"
 
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
 #include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
-#include "PWGEM/Dilepton/DataModel/dileptonTables.h"
-#include "PWGEM/Dilepton/Core/DielectronCut.h"
-#include "PWGEM/Dilepton/Core/EMEventCut.h"
-#include "PWGEM/Dilepton/Utils/EMTrack.h"
-#include "PWGEM/Dilepton/Utils/EventHistograms.h"
-#include "PWGEM/Dilepton/Utils/PairUtilities.h"
+#include "Math/Vector4D.h"
+#include "TString.h"
+
+#include <map>
+#include <string>
+#include <tuple>
+#include <unordered_map>
+#include <vector>
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-side-0/PWGEM/Dilepton/Tasks/singleElectronQC.cxx b/.conflict-side-0/PWGEM/Dilepton/Tasks/singleElectronQC.cxx
index 4a687e82217..21d45ac9a8c 100644
--- a/.conflict-side-0/PWGEM/Dilepton/Tasks/singleElectronQC.cxx
+++ b/.conflict-side-0/PWGEM/Dilepton/Tasks/singleElectronQC.cxx
@@ -14,12 +14,12 @@
 // Analysis task for single electron QC
 //    Please write to: daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-
 #include "PWGEM/Dilepton/Core/SingleTrackQC.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
   return WorkflowSpec{
diff --git a/.conflict-side-0/PWGEM/Dilepton/Tasks/singleElectronQCMC.cxx b/.conflict-side-0/PWGEM/Dilepton/Tasks/singleElectronQCMC.cxx
index da2617158ec..3c9d030d50c 100644
--- a/.conflict-side-0/PWGEM/Dilepton/Tasks/singleElectronQCMC.cxx
+++ b/.conflict-side-0/PWGEM/Dilepton/Tasks/singleElectronQCMC.cxx
@@ -14,12 +14,12 @@
 // Analysis task for single electron QC in MC
 //    Please write to: daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-
 #include "PWGEM/Dilepton/Core/SingleTrackQCMC.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
   return WorkflowSpec{
diff --git a/.conflict-side-0/PWGEM/Dilepton/Tasks/singleMuonQC.cxx b/.conflict-side-0/PWGEM/Dilepton/Tasks/singleMuonQC.cxx
index b9ccb722ea3..a42d68f3d18 100644
--- a/.conflict-side-0/PWGEM/Dilepton/Tasks/singleMuonQC.cxx
+++ b/.conflict-side-0/PWGEM/Dilepton/Tasks/singleMuonQC.cxx
@@ -14,12 +14,12 @@
 // Analysis task for single muon QC
 //    Please write to: daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-
 #include "PWGEM/Dilepton/Core/SingleTrackQC.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
   return WorkflowSpec{
diff --git a/.conflict-side-0/PWGEM/Dilepton/Tasks/singleMuonQCMC.cxx b/.conflict-side-0/PWGEM/Dilepton/Tasks/singleMuonQCMC.cxx
index 7b7176238c1..51d70c187c2 100644
--- a/.conflict-side-0/PWGEM/Dilepton/Tasks/singleMuonQCMC.cxx
+++ b/.conflict-side-0/PWGEM/Dilepton/Tasks/singleMuonQCMC.cxx
@@ -14,12 +14,12 @@
 // Analysis task for single muon QC in MC
 //    Please write to: daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-
 #include "PWGEM/Dilepton/Core/SingleTrackQCMC.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
   return WorkflowSpec{
diff --git a/.conflict-side-0/PWGEM/Dilepton/Tasks/smearing.cxx b/.conflict-side-0/PWGEM/Dilepton/Tasks/smearing.cxx
index 7d2404645ca..59dbf6cc885 100644
--- a/.conflict-side-0/PWGEM/Dilepton/Tasks/smearing.cxx
+++ b/.conflict-side-0/PWGEM/Dilepton/Tasks/smearing.cxx
@@ -13,21 +13,21 @@
 // Analysis task to produce smeared pt, eta, phi for electrons/muons in dilepton analysis
 //    Please write to: daiki.sekihata@cern.ch
 
-#include <array>
-#include <string>
-#include <chrono>
-
 #include "CCDB/BasicCCDBManager.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/DataTypes.h"
 #include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+
+#include <array>
+#include <chrono>
+#include <string>
 // #include "PWGDQ/DataModel/ReducedInfoTables.h" // remove this later, because 2 data tables (covariant matrix) in this header confilict against EM tables.
-#include "PWGEM/Dilepton/Utils/MomentumSmearer.h"
 #include "PWGEM/Dilepton/DataModel/dileptonTables.h"
+#include "PWGEM/Dilepton/Utils/MomentumSmearer.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGEM/Dilepton/Tasks/studyMCTruth.cxx b/.conflict-side-0/PWGEM/Dilepton/Tasks/studyMCTruth.cxx
index 4204a95a9c4..17561e1c023 100644
--- a/.conflict-side-0/PWGEM/Dilepton/Tasks/studyMCTruth.cxx
+++ b/.conflict-side-0/PWGEM/Dilepton/Tasks/studyMCTruth.cxx
@@ -14,19 +14,22 @@
 // This code is to study MC truth. e.g. evet selection bias
 //    Please write to: daiki.sekihata@cern.ch
 
-#include <string>
-#include "Math/Vector4D.h"
+#include "PWGEM/Dilepton/DataModel/dileptonTables.h"
+#include "PWGEM/Dilepton/Utils/MCUtilities.h"
 
+#include "Common/Core/TableHelper.h"
+#include "Common/DataModel/EventSelection.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/StaticFor.h"
 #include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/TableHelper.h"
-#include "Common/DataModel/EventSelection.h"
-#include "PWGEM/Dilepton/DataModel/dileptonTables.h"
-#include "PWGEM/Dilepton/Utils/MCUtilities.h"
+
+#include "Math/Vector4D.h"
+
+#include <string>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGEM/Dilepton/Tasks/tableReaderBarrel.cxx b/.conflict-side-0/PWGEM/Dilepton/Tasks/tableReaderBarrel.cxx
index 819a85efe65..a2d5a465621 100644
--- a/.conflict-side-0/PWGEM/Dilepton/Tasks/tableReaderBarrel.cxx
+++ b/.conflict-side-0/PWGEM/Dilepton/Tasks/tableReaderBarrel.cxx
@@ -12,39 +12,43 @@
 // Contact: iarsene@cern.ch, i.c.arsene@fys.uio.no
 //
 
-#include <map>
-#include <string>
-#include <memory>
-#include <iostream>
-#include <vector>
-#include <algorithm>
-#include <TH1F.h>
-#include <TH3F.h>
-#include <THashList.h>
-#include <TList.h>
-#include <TString.h>
-#include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "PWGDQ/Core/VarManager.h"
-#include "PWGDQ/Core/HistogramManager.h"
-#include "PWGDQ/Core/MixingHandler.h"
-#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/AnalysisCompositeCut.h"
-#include "PWGDQ/Core/HistogramsLibrary.h"
+#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/CutsLibrary.h"
+#include "PWGDQ/Core/HistogramManager.h"
+#include "PWGDQ/Core/HistogramsLibrary.h"
+#include "PWGDQ/Core/MixingHandler.h"
 #include "PWGDQ/Core/MixingLibrary.h"
+#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+
+#include "Common/CCDB/EventSelectionParams.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include "Field/MagneticField.h"
-#include "TGeoGlobalMagField.h"
-#include "DetectorsBase/Propagator.h"
+#include "DataFormatsParameters/GRPObject.h"
 #include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Field/MagneticField.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 #include "ITSMFTBase/DPLAlpideParam.h"
-#include "Common/CCDB/EventSelectionParams.h"
+
+#include "TGeoGlobalMagField.h"
+#include <TH1F.h>
+#include <TH3F.h>
+#include <THashList.h>
+#include <TList.h>
+#include <TString.h>
+
+#include <algorithm>
+#include <iostream>
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
 
 using std::cout;
 using std::endl;
@@ -1072,7 +1076,7 @@ struct AnalysisSameEventPairing {
       }
     }
 
-    if (fConfigNbTrackCut > 0 && fConfigNbTrackCut < 31) {   // if track cuts
+    if (fConfigNbTrackCut > 0 && fConfigNbTrackCut < 31) {           // if track cuts
       for (std::size_t icut = 0; icut < fConfigNbTrackCut; ++icut) { // loop over track cuts
         fTwoTrackFilterMask |= (static_cast<uint32_t>(1) << icut);
         // no pair cuts
diff --git a/.conflict-side-0/PWGEM/Dilepton/Tasks/taggingHFE.cxx b/.conflict-side-0/PWGEM/Dilepton/Tasks/taggingHFE.cxx
index f843b20819a..cc1988e8f47 100644
--- a/.conflict-side-0/PWGEM/Dilepton/Tasks/taggingHFE.cxx
+++ b/.conflict-side-0/PWGEM/Dilepton/Tasks/taggingHFE.cxx
@@ -13,36 +13,38 @@
 /// \brief a task to study tagging e from charm hadron decays in MC
 /// \author daiki.sekihata@cern.ch
 
-#include <vector>
-#include <string>
-#include <array>
-#include <utility>
-#include <iostream>
-
-#include "Math/Vector4D.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "DataFormatsCalibration/MeanVertexObject.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "Common/Core/trackUtilities.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/TableHelper.h"
-#include "Common/Core/RecoDecay.h"
-#include "DCAFitter/DCAFitterN.h"
+#include "PWGEM/Dilepton/Utils/MCUtilities.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/TableHelper.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/CollisionAssociationTables.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGEM/Dilepton/Utils/MCUtilities.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsCalibration/MeanVertexObject.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "Math/Vector4D.h"
+
+#include <array>
+#include <iostream>
+#include <string>
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::soa;
diff --git a/.conflict-side-0/PWGEM/Dilepton/Utils/EMTrack.h b/.conflict-side-0/PWGEM/Dilepton/Utils/EMTrack.h
index 0f894d5b4dc..5042db6d622 100644
--- a/.conflict-side-0/PWGEM/Dilepton/Utils/EMTrack.h
+++ b/.conflict-side-0/PWGEM/Dilepton/Utils/EMTrack.h
@@ -15,9 +15,10 @@
 #ifndef PWGEM_DILEPTON_UTILS_EMTRACK_H_
 #define PWGEM_DILEPTON_UTILS_EMTRACK_H_
 
-#include <vector>
 #include "Math/Vector4D.h"
 
+#include <vector>
+
 namespace o2::aod::pwgem::dilepton::utils
 {
 class EMTrack
diff --git a/.conflict-side-0/PWGEM/Dilepton/Utils/MomentumSmearer.h b/.conflict-side-0/PWGEM/Dilepton/Utils/MomentumSmearer.h
index 7e36dcfed0f..45f491956de 100644
--- a/.conflict-side-0/PWGEM/Dilepton/Utils/MomentumSmearer.h
+++ b/.conflict-side-0/PWGEM/Dilepton/Utils/MomentumSmearer.h
@@ -15,19 +15,19 @@
 #ifndef PWGEM_DILEPTON_UTILS_MOMENTUMSMEARER_H_
 #define PWGEM_DILEPTON_UTILS_MOMENTUMSMEARER_H_
 
-#include <vector>
+#include "CCDB/BasicCCDBManager.h"
+#include "Framework/Logger.h"
 
+#include <TFile.h>
+#include <TGrid.h>
 #include <TH1.h>
 #include <TH2.h>
 #include <TH3.h>
 #include <THnSparse.h>
-#include <TString.h>
-#include <TGrid.h>
-#include <TFile.h>
 #include <TKey.h>
+#include <TString.h>
 
-#include "CCDB/BasicCCDBManager.h"
-#include "Framework/Logger.h"
+#include <vector>
 
 using namespace o2::framework;
 using namespace o2;
diff --git a/.conflict-side-0/PWGEM/PhotonMeson/Core/CutsLibrary.cxx b/.conflict-side-0/PWGEM/PhotonMeson/Core/CutsLibrary.cxx
index c2f313e6e62..44dfae30898 100644
--- a/.conflict-side-0/PWGEM/PhotonMeson/Core/CutsLibrary.cxx
+++ b/.conflict-side-0/PWGEM/PhotonMeson/Core/CutsLibrary.cxx
@@ -11,10 +11,11 @@
 //
 // Contact: daiki.sekihata@cern.ch
 //
+#include "PWGEM/PhotonMeson/Core/CutsLibrary.h"
+
+#include <regex>
 #include <string>
 #include <vector>
-#include <regex>
-#include "PWGEM/PhotonMeson/Core/CutsLibrary.h"
 
 //_______________________________________________
 int customAtoi(const std::string& str)
diff --git a/.conflict-side-0/PWGEM/PhotonMeson/Core/CutsLibrary.h b/.conflict-side-0/PWGEM/PhotonMeson/Core/CutsLibrary.h
index bf4fcfe7037..376ad652b63 100644
--- a/.conflict-side-0/PWGEM/PhotonMeson/Core/CutsLibrary.h
+++ b/.conflict-side-0/PWGEM/PhotonMeson/Core/CutsLibrary.h
@@ -15,13 +15,14 @@
 #ifndef PWGEM_PHOTONMESON_CORE_CUTSLIBRARY_H_
 #define PWGEM_PHOTONMESON_CORE_CUTSLIBRARY_H_
 
-#include <string>
-#include "PWGEM/PhotonMeson/Core/EMPhotonEventCut.h"
-#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
 #include "PWGEM/PhotonMeson/Core/DalitzEECut.h"
-#include "PWGEM/PhotonMeson/Core/PHOSPhotonCut.h"
 #include "PWGEM/PhotonMeson/Core/EMCPhotonCut.h"
+#include "PWGEM/PhotonMeson/Core/EMPhotonEventCut.h"
+#include "PWGEM/PhotonMeson/Core/PHOSPhotonCut.h"
 #include "PWGEM/PhotonMeson/Core/PairCut.h"
+#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
+
+#include <string>
 
 namespace o2::aod
 {
diff --git a/.conflict-side-0/PWGEM/PhotonMeson/Core/EMCPhotonCut.cxx b/.conflict-side-0/PWGEM/PhotonMeson/Core/EMCPhotonCut.cxx
index 582b9754057..0761921b765 100644
--- a/.conflict-side-0/PWGEM/PhotonMeson/Core/EMCPhotonCut.cxx
+++ b/.conflict-side-0/PWGEM/PhotonMeson/Core/EMCPhotonCut.cxx
@@ -13,11 +13,14 @@
 // Class for EMCal cluster selection
 //
 
-#include <string>
-#include "Framework/Logger.h"
 #include "PWGEM/PhotonMeson/Core/EMCPhotonCut.h"
+
 #include "PWGJE/DataModel/EMCALClusters.h"
 
+#include "Framework/Logger.h"
+
+#include <string>
+
 ClassImp(EMCPhotonCut);
 
 const char* EMCPhotonCut::mCutNames[static_cast<int>(EMCPhotonCut::EMCPhotonCuts::kNCuts)] = {"Definition", "Energy", "NCell", "M02", "Timing", "TrackMatching", "Exotic"};
diff --git a/.conflict-side-0/PWGEM/PhotonMeson/Core/EMCPhotonCut.h b/.conflict-side-0/PWGEM/PhotonMeson/Core/EMCPhotonCut.h
index 8bfd8ca630f..372eff52061 100644
--- a/.conflict-side-0/PWGEM/PhotonMeson/Core/EMCPhotonCut.h
+++ b/.conflict-side-0/PWGEM/PhotonMeson/Core/EMCPhotonCut.h
@@ -16,16 +16,19 @@
 #ifndef PWGEM_PHOTONMESON_CORE_EMCPHOTONCUT_H_
 #define PWGEM_PHOTONMESON_CORE_EMCPHOTONCUT_H_
 
-#include <set>
-#include <vector>
-#include <utility>
-#include <string>
-#include <optional>
-#include "Framework/Logger.h"
-#include "Framework/DataTypes.h"
 #include "Rtypes.h"
+
+#include "Framework/DataTypes.h"
+#include "Framework/Logger.h"
+
 #include "TNamed.h"
 
+#include <optional>
+#include <set>
+#include <string>
+#include <utility>
+#include <vector>
+
 class EMCPhotonCut : public TNamed
 {
  public:
diff --git a/.conflict-side-0/PWGEM/PhotonMeson/Core/EMPhotonEventCut.cxx b/.conflict-side-0/PWGEM/PhotonMeson/Core/EMPhotonEventCut.cxx
index 285bf50eba4..6526daa47c9 100644
--- a/.conflict-side-0/PWGEM/PhotonMeson/Core/EMPhotonEventCut.cxx
+++ b/.conflict-side-0/PWGEM/PhotonMeson/Core/EMPhotonEventCut.cxx
@@ -13,9 +13,10 @@
 // Class for em photon event selection
 //
 
-#include "Framework/Logger.h"
 #include "PWGEM/PhotonMeson/Core/EMPhotonEventCut.h"
 
+#include "Framework/Logger.h"
+
 ClassImp(EMPhotonEventCut);
 
 void EMPhotonEventCut::SetRequireEMCReadoutInMB(bool flag)
diff --git a/.conflict-side-0/PWGEM/PhotonMeson/Core/HistogramsLibrary.cxx b/.conflict-side-0/PWGEM/PhotonMeson/Core/HistogramsLibrary.cxx
index 50174ab9e08..59700cbb215 100644
--- a/.conflict-side-0/PWGEM/PhotonMeson/Core/HistogramsLibrary.cxx
+++ b/.conflict-side-0/PWGEM/PhotonMeson/Core/HistogramsLibrary.cxx
@@ -11,26 +11,28 @@
 //
 // Contact: daiki.sekihata@cern.ch
 //
+#include <fstream>
 #include <iostream>
 #include <memory>
-#include <fstream>
 using namespace std;
 
-#include <TObject.h>
-#include <TObjArray.h>
-#include <THashList.h>
+#include "PWGEM/PhotonMeson/Core/HistogramsLibrary.h"
+
+#include "Framework/Logger.h"
+
+#include <TClass.h>
 #include <TH1F.h>
 #include <TH2F.h>
 #include <TH3F.h>
-#include <TProfile.h>
-#include <TProfile2D.h>
-#include <TProfile3D.h>
+#include <THashList.h>
 #include <THn.h>
 #include <THnSparse.h>
 #include <TIterator.h>
-#include <TClass.h>
-#include "Framework/Logger.h"
-#include "PWGEM/PhotonMeson/Core/HistogramsLibrary.h"
+#include <TObjArray.h>
+#include <TObject.h>
+#include <TProfile.h>
+#include <TProfile2D.h>
+#include <TProfile3D.h>
 
 void o2::aod::pwgem::photon::histogram::DefineHistograms(THashList* list, const char* histClass, const char* subGroup)
 {
@@ -184,7 +186,7 @@ void o2::aod::pwgem::photon::histogram::DefineHistograms(THashList* list, const
       list->Add(new TH2F("hEtaRec_DeltaEta", "photon #eta resolution;#eta^{rec} of conversion point;#eta^{rec} - #eta^{gen}", 400, -2, +2, 400, -1.0f, 1.0f));
       list->Add(new TH2F("hEtaRec_DeltaPhi", "photon #varphi resolution;#eta^{rec} of conversion point;#varphi^{rec} - #varphi^{gen} (rad.)", 400, -2, +2, 400, -1.0f, 1.0f));
     } // end of mc
-  }   // end of V0
+  } // end of V0
 
   if (TString(histClass).Contains("Dalitz")) {
     THnSparseF* hs_dilepton_uls_same = nullptr;
@@ -576,7 +578,7 @@ void o2::aod::pwgem::photon::histogram::DefineHistograms(THashList* list, const
       hs_conv_point_mix->Sumw2();
       list->Add(hs_conv_point_mix);
     } // end of pair
-  }   // end of material budget study
+  } // end of material budget study
 
   if (TString(histClass) == "Generated") {
     list->Add(new TH1F("hCollisionCounter", "hCollisionCounter", 5, 0.5f, 5.5f));
diff --git a/.conflict-side-0/PWGEM/PhotonMeson/Core/HistogramsLibrary.h b/.conflict-side-0/PWGEM/PhotonMeson/Core/HistogramsLibrary.h
index 324718a663e..5307f5608a5 100644
--- a/.conflict-side-0/PWGEM/PhotonMeson/Core/HistogramsLibrary.h
+++ b/.conflict-side-0/PWGEM/PhotonMeson/Core/HistogramsLibrary.h
@@ -15,26 +15,27 @@
 #ifndef PWGEM_PHOTONMESON_CORE_HISTOGRAMSLIBRARY_H_
 #define PWGEM_PHOTONMESON_CORE_HISTOGRAMSLIBRARY_H_
 
-#include <iostream>
-#include <array>
-#include <TString.h>
-#include <THashList.h>
-#include <TObject.h>
-#include <TObjArray.h>
-#include <THashList.h>
-#include <TMath.h>
+#include "Common/CCDB/EventSelectionParams.h"
+#include "Common/Core/RecoDecay.h"
+
+#include <TClass.h>
 #include <TH1F.h>
 #include <TH2F.h>
 #include <TH3F.h>
-#include <TProfile.h>
-#include <TProfile2D.h>
-#include <TProfile3D.h>
+#include <THashList.h>
 #include <THn.h>
 #include <THnSparse.h>
 #include <TIterator.h>
-#include <TClass.h>
-#include "Common/CCDB/EventSelectionParams.h"
-#include "Common/Core/RecoDecay.h"
+#include <TMath.h>
+#include <TObjArray.h>
+#include <TObject.h>
+#include <TProfile.h>
+#include <TProfile2D.h>
+#include <TProfile3D.h>
+#include <TString.h>
+
+#include <array>
+#include <iostream>
 
 enum EMHistType {
   kEvent = 0,
diff --git a/.conflict-side-0/PWGEM/PhotonMeson/Core/PHOSPhotonCut.cxx b/.conflict-side-0/PWGEM/PhotonMeson/Core/PHOSPhotonCut.cxx
index 96db9e331b3..083d68078cc 100644
--- a/.conflict-side-0/PWGEM/PhotonMeson/Core/PHOSPhotonCut.cxx
+++ b/.conflict-side-0/PWGEM/PhotonMeson/Core/PHOSPhotonCut.cxx
@@ -13,9 +13,10 @@
 // Class for track selection
 //
 
-#include "Framework/Logger.h"
 #include "PWGEM/PhotonMeson/Core/PHOSPhotonCut.h"
 
+#include "Framework/Logger.h"
+
 ClassImp(PHOSPhotonCut);
 
 const char* PHOSPhotonCut::mCutNames[static_cast<int>(PHOSPhotonCut::PHOSPhotonCuts::kNCuts)] = {"Energy", "Dispersion", "CPV"};
diff --git a/.conflict-side-0/PWGEM/PhotonMeson/Core/PHOSPhotonCut.h b/.conflict-side-0/PWGEM/PhotonMeson/Core/PHOSPhotonCut.h
index c60944dd52b..d7f6ee64805 100644
--- a/.conflict-side-0/PWGEM/PhotonMeson/Core/PHOSPhotonCut.h
+++ b/.conflict-side-0/PWGEM/PhotonMeson/Core/PHOSPhotonCut.h
@@ -16,15 +16,18 @@
 #ifndef PWGEM_PHOTONMESON_CORE_PHOSPHOTONCUT_H_
 #define PWGEM_PHOTONMESON_CORE_PHOSPHOTONCUT_H_
 
-#include <set>
-#include <vector>
-#include <utility>
-#include <string>
-#include "Framework/Logger.h"
-#include "Framework/DataTypes.h"
 #include "Rtypes.h"
+
+#include "Framework/DataTypes.h"
+#include "Framework/Logger.h"
+
 #include "TNamed.h"
 
+#include <set>
+#include <string>
+#include <utility>
+#include <vector>
+
 class PHOSPhotonCut : public TNamed
 {
  public:
diff --git a/.conflict-side-0/PWGEM/PhotonMeson/Core/PairCut.cxx b/.conflict-side-0/PWGEM/PhotonMeson/Core/PairCut.cxx
index be8bee172c7..10161ba3dd4 100644
--- a/.conflict-side-0/PWGEM/PhotonMeson/Core/PairCut.cxx
+++ b/.conflict-side-0/PWGEM/PhotonMeson/Core/PairCut.cxx
@@ -13,9 +13,10 @@
 // Class for track selection
 //
 
-#include "Framework/Logger.h"
 #include "PWGEM/PhotonMeson/Core/PairCut.h"
 
+#include "Framework/Logger.h"
+
 ClassImp(PairCut);
 
 const char* PairCut::mCutNames[static_cast<int>(PairCut::PairCuts::kNCuts)] = {"Asym"};
diff --git a/.conflict-side-0/PWGEM/PhotonMeson/Core/PairCut.h b/.conflict-side-0/PWGEM/PhotonMeson/Core/PairCut.h
index 19ba27c79bf..b9cf1fe5cf0 100644
--- a/.conflict-side-0/PWGEM/PhotonMeson/Core/PairCut.h
+++ b/.conflict-side-0/PWGEM/PhotonMeson/Core/PairCut.h
@@ -16,15 +16,18 @@
 #ifndef PWGEM_PHOTONMESON_CORE_PAIRCUT_H_
 #define PWGEM_PHOTONMESON_CORE_PAIRCUT_H_
 
-#include <set>
-#include <vector>
-#include <utility>
-#include <string>
-#include "Framework/Logger.h"
-#include "Framework/DataTypes.h"
 #include "Rtypes.h"
-#include "TNamed.h"
+
+#include "Framework/DataTypes.h"
+#include "Framework/Logger.h"
+
 #include "TMath.h"
+#include "TNamed.h"
+
+#include <set>
+#include <string>
+#include <utility>
+#include <vector>
 
 class PairCut : public TNamed
 {
diff --git a/.conflict-side-0/PWGEM/PhotonMeson/Core/TaggingPi0.h b/.conflict-side-0/PWGEM/PhotonMeson/Core/TaggingPi0.h
index d74af2ceb0c..7e80b3d466d 100644
--- a/.conflict-side-0/PWGEM/PhotonMeson/Core/TaggingPi0.h
+++ b/.conflict-side-0/PWGEM/PhotonMeson/Core/TaggingPi0.h
@@ -19,40 +19,41 @@
 #ifndef PWGEM_PHOTONMESON_CORE_TAGGINGPI0_H_
 #define PWGEM_PHOTONMESON_CORE_TAGGINGPI0_H_
 
+#include "PWGEM/Dilepton/Utils/EMTrack.h"
+#include "PWGEM/Dilepton/Utils/EMTrackUtilities.h"
+#include "PWGEM/Dilepton/Utils/EventMixingHandler.h"
+#include "PWGEM/PhotonMeson/Core/DalitzEECut.h"
+#include "PWGEM/PhotonMeson/Core/EMCPhotonCut.h"
+#include "PWGEM/PhotonMeson/Core/EMPhotonEventCut.h"
+#include "PWGEM/PhotonMeson/Core/PHOSPhotonCut.h"
+#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+#include "PWGEM/PhotonMeson/Utils/EventHistograms.h"
+#include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
+
+#include "Common/Core/RecoDecay.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "Math/Vector4D.h"
+#include "TString.h"
+
+#include <algorithm>
+#include <array>
 #include <cstring>
 #include <iterator>
-#include <string>
 #include <map>
-#include <vector>
+#include <string>
 #include <tuple>
 #include <utility>
-#include <array>
-#include <algorithm>
-
-#include "TString.h"
-#include "Math/Vector4D.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
-
-#include "Common/Core/RecoDecay.h"
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/DalitzEECut.h"
-#include "PWGEM/PhotonMeson/Core/PHOSPhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/EMCPhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/EMPhotonEventCut.h"
-#include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
-#include "PWGEM/Dilepton/Utils/EMTrack.h"
-#include "PWGEM/Dilepton/Utils/EventMixingHandler.h"
-#include "PWGEM/PhotonMeson/Utils/EventHistograms.h"
-#include "PWGEM/Dilepton/Utils/EMTrackUtilities.h"
+#include <vector>
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-side-0/PWGEM/PhotonMeson/Core/TaggingPi0MC.h b/.conflict-side-0/PWGEM/PhotonMeson/Core/TaggingPi0MC.h
index 56c6274a141..04fe0cadd9c 100644
--- a/.conflict-side-0/PWGEM/PhotonMeson/Core/TaggingPi0MC.h
+++ b/.conflict-side-0/PWGEM/PhotonMeson/Core/TaggingPi0MC.h
@@ -17,35 +17,36 @@
 #ifndef PWGEM_PHOTONMESON_CORE_TAGGINGPI0MC_H_
 #define PWGEM_PHOTONMESON_CORE_TAGGINGPI0MC_H_
 
-#include <string>
-#include <map>
-#include <vector>
+#include "PWGEM/Dilepton/Utils/MCUtilities.h"
+#include "PWGEM/PhotonMeson/Core/DalitzEECut.h"
+#include "PWGEM/PhotonMeson/Core/EMCPhotonCut.h"
+#include "PWGEM/PhotonMeson/Core/EMPhotonEventCut.h"
+#include "PWGEM/PhotonMeson/Core/PHOSPhotonCut.h"
+#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+#include "PWGEM/PhotonMeson/Utils/EventHistograms.h"
+#include "PWGEM/PhotonMeson/Utils/MCUtilities.h"
+#include "PWGEM/PhotonMeson/Utils/NMHistograms.h"
+#include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
 
-#include "TF1.h"
-#include "TString.h"
-#include "Math/Vector4D.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
+#include "Common/Core/RecoDecay.h"
 
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
 #include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
-#include "Common/Core/RecoDecay.h"
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
-#include "PWGEM/PhotonMeson/Utils/MCUtilities.h"
-#include "PWGEM/PhotonMeson/Utils/EventHistograms.h"
-#include "PWGEM/PhotonMeson/Utils/NMHistograms.h"
-#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/DalitzEECut.h"
-#include "PWGEM/PhotonMeson/Core/PHOSPhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/EMCPhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/EMPhotonEventCut.h"
-#include "PWGEM/Dilepton/Utils/MCUtilities.h"
+#include "Math/Vector4D.h"
+#include "TF1.h"
+#include "TString.h"
+
+#include <map>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-side-0/PWGEM/PhotonMeson/Core/V0PhotonCut.cxx b/.conflict-side-0/PWGEM/PhotonMeson/Core/V0PhotonCut.cxx
index 07d805fa291..493565011ff 100644
--- a/.conflict-side-0/PWGEM/PhotonMeson/Core/V0PhotonCut.cxx
+++ b/.conflict-side-0/PWGEM/PhotonMeson/Core/V0PhotonCut.cxx
@@ -13,11 +13,12 @@
 // Class for v0 photon selection
 //
 
-#include <set>
-#include <utility>
+#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
 
 #include "Framework/Logger.h"
-#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
+
+#include <set>
+#include <utility>
 
 ClassImp(V0PhotonCut);
 
diff --git a/.conflict-side-0/PWGEM/PhotonMeson/Core/V0PhotonCut.h b/.conflict-side-0/PWGEM/PhotonMeson/Core/V0PhotonCut.h
index d6064ab8786..c908acb5acd 100644
--- a/.conflict-side-0/PWGEM/PhotonMeson/Core/V0PhotonCut.h
+++ b/.conflict-side-0/PWGEM/PhotonMeson/Core/V0PhotonCut.h
@@ -16,16 +16,18 @@
 #ifndef PWGEM_PHOTONMESON_CORE_V0PHOTONCUT_H_
 #define PWGEM_PHOTONMESON_CORE_V0PHOTONCUT_H_
 
-#include <algorithm>
-#include <set>
-#include <vector>
-#include <utility>
-#include <string>
 #include "Rtypes.h"
-#include "TNamed.h"
-#include "TMath.h"
 
 #include "PWGEM/PhotonMeson/Utils/TrackSelection.h"
+
+#include "TMath.h"
+#include "TNamed.h"
+
+#include <algorithm>
+#include <set>
+#include <string>
+#include <utility>
+#include <vector>
 using namespace o2::pwgem::photonmeson;
 
 class V0PhotonCut : public TNamed
diff --git a/.conflict-side-0/PWGEM/PhotonMeson/DataModel/bcWiseTables.h b/.conflict-side-0/PWGEM/PhotonMeson/DataModel/bcWiseTables.h
index a306d5645ce..1ca1c78b683 100644
--- a/.conflict-side-0/PWGEM/PhotonMeson/DataModel/bcWiseTables.h
+++ b/.conflict-side-0/PWGEM/PhotonMeson/DataModel/bcWiseTables.h
@@ -73,9 +73,9 @@ DECLARE_SOA_COLUMN(StoredFT0MAmplitude, storedFT0MAmplitude, uint16_t); //! ft0a
 DECLARE_SOA_COLUMN(StoredMu, storedMu, uint16_t);                       //! probability of TVX collision per BC (x1000)
 DECLARE_SOA_COLUMN(StoredTimeSinceSOF, storedTimeSinceSOF, uint16_t);   //! time since decreation of ADJUST in seconds (x2)
 
-DECLARE_SOA_DYNAMIC_COLUMN(Centrality, centrality, [](uint8_t storedcentrality) -> float { return std::nextafter(storedcentrality / emdownscaling::downscalingFactors[emdownscaling::kFT0MCent], std::numeric_limits<float>::infinity()); });           //! Centrality (0-100)
-DECLARE_SOA_DYNAMIC_COLUMN(FT0MAmplitude, ft0Amplitude, [](uint16_t storedFT0MAmplitude) -> float { return std::nextafter(storedFT0MAmplitude / emdownscaling::downscalingFactors[emdownscaling::kFT0Amp], std::numeric_limits<float>::infinity()); }); //! FT0M amplitude
-DECLARE_SOA_DYNAMIC_COLUMN(Mu, mu, [](uint16_t storedMu) -> float { return std::nextafter(storedMu / emdownscaling::downscalingFactors[emdownscaling::kMu], std::numeric_limits<float>::infinity()); });                                                //! probability of TVX collision per BC
+DECLARE_SOA_DYNAMIC_COLUMN(Centrality, centrality, [](uint8_t storedcentrality) -> float { return std::nextafter(storedcentrality / emdownscaling::downscalingFactors[emdownscaling::kFT0MCent], std::numeric_limits<float>::infinity()); });              //! Centrality (0-100)
+DECLARE_SOA_DYNAMIC_COLUMN(FT0MAmplitude, ft0Amplitude, [](uint16_t storedFT0MAmplitude) -> float { return std::nextafter(storedFT0MAmplitude / emdownscaling::downscalingFactors[emdownscaling::kFT0Amp], std::numeric_limits<float>::infinity()); });    //! FT0M amplitude
+DECLARE_SOA_DYNAMIC_COLUMN(Mu, mu, [](uint16_t storedMu) -> float { return std::nextafter(storedMu / emdownscaling::downscalingFactors[emdownscaling::kMu], std::numeric_limits<float>::infinity()); });                                                   //! probability of TVX collision per BC
 DECLARE_SOA_DYNAMIC_COLUMN(TimeSinceSOF, timeSinceSOF, [](uint16_t storedTimeSinceSOF) -> float { return std::nextafter(storedTimeSinceSOF / emdownscaling::downscalingFactors[emdownscaling::kTimeSinceSOF], std::numeric_limits<float>::infinity()); }); //! probability of TVX collision per BC
 } // namespace bcwisebc
 DECLARE_SOA_TABLE(BCWiseBCs, "AOD", "BCWISEBC", //! table of bc wise centrality estimation and event selection input
diff --git a/.conflict-side-0/PWGEM/PhotonMeson/DataModel/gammaTables.h b/.conflict-side-0/PWGEM/PhotonMeson/DataModel/gammaTables.h
index 0abbc3bfe76..d73ddcc3f16 100644
--- a/.conflict-side-0/PWGEM/PhotonMeson/DataModel/gammaTables.h
+++ b/.conflict-side-0/PWGEM/PhotonMeson/DataModel/gammaTables.h
@@ -9,15 +9,15 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <vector>
-#include <TMath.h>
+#include "PWGEM/Dilepton/DataModel/dileptonTables.h"
+#include "PWGJE/DataModel/EMCALClusters.h"
 
 #include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/CaloClusters.h"
 
-#include "PWGEM/Dilepton/DataModel/dileptonTables.h"
+#include <TMath.h>
 
-#include "PWGJE/DataModel/EMCALClusters.h"
+#include <vector>
 
 #ifndef PWGEM_PHOTONMESON_DATAMODEL_GAMMATABLES_H_
 #define PWGEM_PHOTONMESON_DATAMODEL_GAMMATABLES_H_
diff --git a/.conflict-side-0/PWGEM/PhotonMeson/TableProducer/associateMCinfoPhoton.cxx b/.conflict-side-0/PWGEM/PhotonMeson/TableProducer/associateMCinfoPhoton.cxx
index 2fafc5118e3..90b97762131 100644
--- a/.conflict-side-0/PWGEM/PhotonMeson/TableProducer/associateMCinfoPhoton.cxx
+++ b/.conflict-side-0/PWGEM/PhotonMeson/TableProducer/associateMCinfoPhoton.cxx
@@ -16,16 +16,17 @@
 /// \author Daiki Sekihata (daiki.sekihata@cern.ch)
 ///
 
-#include <map>
-#include <vector>
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+#include "PWGEM/PhotonMeson/Utils/MCUtilities.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/PhotonMeson/Utils/MCUtilities.h"
+
+#include <map>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGEM/PhotonMeson/TableProducer/createEMEventPhoton.cxx b/.conflict-side-0/PWGEM/PhotonMeson/TableProducer/createEMEventPhoton.cxx
index fc155fe5502..3e08ed6e33f 100644
--- a/.conflict-side-0/PWGEM/PhotonMeson/TableProducer/createEMEventPhoton.cxx
+++ b/.conflict-side-0/PWGEM/PhotonMeson/TableProducer/createEMEventPhoton.cxx
@@ -14,23 +14,22 @@
 ///
 /// \author Daiki Sekihata, daiki.sekihata@cern.ch
 
-#include <string>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+#include "PWGJE/DataModel/Jet.h"
 
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
 #include "Common/CCDB/TriggerAliases.h"
 
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+#include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
-#include "PWGJE/DataModel/Jet.h"
+#include <string>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGEM/PhotonMeson/TableProducer/createPCM.cxx b/.conflict-side-0/PWGEM/PhotonMeson/TableProducer/createPCM.cxx
index 4ca74633e1b..4862ccba420 100644
--- a/.conflict-side-0/PWGEM/PhotonMeson/TableProducer/createPCM.cxx
+++ b/.conflict-side-0/PWGEM/PhotonMeson/TableProducer/createPCM.cxx
@@ -14,26 +14,29 @@
 // This code produces photon data tables.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include <array>
-#include <vector>
-#include <algorithm>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/Core/trackUtilities.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+#include "PWGEM/PhotonMeson/Utils/PCMUtilities.h"
+#include "PWGEM/PhotonMeson/Utils/TrackSelection.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "Common/Core/RecoDecay.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/CollisionAssociationTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "DCAFitter/DCAFitterN.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGEM/PhotonMeson/Utils/PCMUtilities.h"
-#include "PWGEM/PhotonMeson/Utils/TrackSelection.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include <algorithm>
+#include <array>
+#include <vector>
 
 using namespace o2;
 using namespace o2::soa;
@@ -443,9 +446,9 @@ struct createPCM {
               //     collision_in_sw.globalIndex(), ele.collisionId(), pos.collisionId(), ele.globalIndex(), pos.globalIndex());
               fillV0Table(collision_in_sw, ele, pos, false);
             } // end of searching window loop
-          }   // end of pairing loop
-        }     // end of pos track loop in sw
-      }       // end of pos track loop in sw
+          } // end of pairing loop
+        } // end of pos track loop in sw
+      } // end of pos track loop in sw
 
       // LOGF(info, "possible number of V0 = %d", cospa_map.size());
       std::map<std::pair<uint32_t, uint32_t>, bool> used_pair_map;
@@ -550,7 +553,7 @@ struct createPCM {
         }
       }
     } // end of collision loop
-  }   // end of process
+  } // end of process
   PROCESS_SWITCH(createPCM, processTrkCollAsso, "create V0s with track-to-collision associator", false);
 };
 
diff --git a/.conflict-side-0/PWGEM/PhotonMeson/TableProducer/gammaSelection.cxx b/.conflict-side-0/PWGEM/PhotonMeson/TableProducer/gammaSelection.cxx
index 7a3708d480b..ea98a8f255c 100644
--- a/.conflict-side-0/PWGEM/PhotonMeson/TableProducer/gammaSelection.cxx
+++ b/.conflict-side-0/PWGEM/PhotonMeson/TableProducer/gammaSelection.cxx
@@ -14,22 +14,22 @@
 /// \author marvin.hemmer@cern.ch
 
 // TODO: add PCM table
-#include <typeinfo>
-
 #include "PWGEM/PhotonMeson/Utils/gammaSelectionCuts.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
-// includes for the R recalculation
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "CCDB/BasicCCDBManager.h"
+#include <typeinfo>
 
+// includes for the R recalculation
 #include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
 #include "PWGEM/PhotonMeson/Utils/emcalHistoDefinitions.h"
 
+#include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-0/PWGEM/PhotonMeson/TableProducer/photonconversionbuilder.cxx b/.conflict-side-0/PWGEM/PhotonMeson/TableProducer/photonconversionbuilder.cxx
index 8f8e795edfb..67e11f24e16 100644
--- a/.conflict-side-0/PWGEM/PhotonMeson/TableProducer/photonconversionbuilder.cxx
+++ b/.conflict-side-0/PWGEM/PhotonMeson/TableProducer/photonconversionbuilder.cxx
@@ -15,43 +15,43 @@
 //
 // \author Daiki Sekihata <daiki.sekihata@cern.ch>, Tokyo
 
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <map>
-#include <iterator>
-#include <utility>
-#include <string>
-#include <set>
-#include <algorithm>
-#include <vector>
-#include <unordered_map>
-
-#include "Math/Vector4D.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+#include "PWGEM/PhotonMeson/Utils/PCMUtilities.h"
+#include "PWGEM/PhotonMeson/Utils/TrackSelection.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
+#include "Common/Core/TPCVDriftManager.h"
+#include "Common/Core/TableHelper.h"
 #include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+#include "Tools/KFparticle/KFUtilities.h"
+
 #include "CCDB/BasicCCDBManager.h"
-#include "Common/Core/TableHelper.h"
-#include "Common/Core/TPCVDriftManager.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
-#include "Tools/KFparticle/KFUtilities.h"
+#include "Math/Vector4D.h"
 
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/PhotonMeson/Utils/PCMUtilities.h"
-#include "PWGEM/PhotonMeson/Utils/TrackSelection.h"
+#include <algorithm>
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <iterator>
+#include <map>
+#include <set>
+#include <string>
+#include <unordered_map>
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::soa;
diff --git a/.conflict-side-0/PWGEM/PhotonMeson/TableProducer/produceMesonCalo.cxx b/.conflict-side-0/PWGEM/PhotonMeson/TableProducer/produceMesonCalo.cxx
index 7fd19416d3d..face43fb3e4 100644
--- a/.conflict-side-0/PWGEM/PhotonMeson/TableProducer/produceMesonCalo.cxx
+++ b/.conflict-side-0/PWGEM/PhotonMeson/TableProducer/produceMesonCalo.cxx
@@ -21,9 +21,9 @@
 #include "Framework/runDataProcessing.h"
 
 // includes for the R recalculation
+#include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsParameters/GRPObject.h"
 #include "DetectorsBase/GeometryManager.h"
-#include "CCDB/BasicCCDBManager.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGEM/PhotonMeson/TableProducer/skimmerDalitzEE.cxx b/.conflict-side-0/PWGEM/PhotonMeson/TableProducer/skimmerDalitzEE.cxx
index 5eb1bfeb069..b7e5049ebed 100644
--- a/.conflict-side-0/PWGEM/PhotonMeson/TableProducer/skimmerDalitzEE.cxx
+++ b/.conflict-side-0/PWGEM/PhotonMeson/TableProducer/skimmerDalitzEE.cxx
@@ -12,19 +12,19 @@
 /// \brief write relevant information for dalitz ee analysis to an AO2D.root file. This file is then the only necessary input to perform pcm analysis.
 /// \author daiki.sekihata@cern.ch
 
-#include "Math/Vector4D.h"
+#include "PWGEM/Dilepton/Utils/PairUtilities.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
 
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
 #include "CCDB/BasicCCDBManager.h"
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "CommonConstants/PhysicsConstants.h"
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/Dilepton/Utils/PairUtilities.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "Math/Vector4D.h"
 
 using namespace o2;
 using namespace o2::soa;
@@ -290,7 +290,7 @@ struct skimmerDalitzEE {
 
         fRegistry.fill(HIST("hNpairs"), static_cast<int>(pairtype));
         npair++;
-      }      // end of pairing loop
+      } // end of pairing loop
     } else { // LS
       for (auto& [t1, t2] : combinations(CombinationsStrictlyUpperIndexPolicy(tracks1, tracks2))) {
         if (!checkTrack(t1) || !checkTrack(t2)) {
diff --git a/.conflict-side-0/PWGEM/PhotonMeson/TableProducer/skimmerGammaConversion.cxx b/.conflict-side-0/PWGEM/PhotonMeson/TableProducer/skimmerGammaConversion.cxx
index 6a39aea8881..80572200a12 100644
--- a/.conflict-side-0/PWGEM/PhotonMeson/TableProducer/skimmerGammaConversion.cxx
+++ b/.conflict-side-0/PWGEM/PhotonMeson/TableProducer/skimmerGammaConversion.cxx
@@ -23,38 +23,37 @@
 
 // runme like: o2-analysis-trackselection -b --aod-file ${sourceFile} --aod-writer-json ${writerFile} | o2-analysis-timestamp -b | o2-analysis-trackextension -b | o2-analysis-lf-lambdakzerobuilder -b | o2-analysis-pid-tpc -b | o2-analysis-em-skimmermc -b
 
-#include <memory>
 #include <map>
+#include <memory>
 #include <string>
 #include <vector>
 
 // todo: remove reduantant information in GammaConversionsInfoTrue
 #include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/PhotonMeson/Utils/gammaConvDefinitions.h"
 #include "PWGEM/PhotonMeson/Utils/PCMUtilities.h"
+#include "PWGEM/PhotonMeson/Utils/gammaConvDefinitions.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 // includes for the R recalculation
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
+#include "Common/Core/trackUtilities.h"
+#include "Tools/KFparticle/KFUtilities.h"
 
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonConstants/PhysicsConstants.h"
 #include "DCAFitter/HelixHelper.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
 #include "ReconstructionDataFormats/TrackFwd.h"
-#include "Common/Core/trackUtilities.h"
-#include "CommonConstants/PhysicsConstants.h"
 
+#include "Math/Vector4D.h"
 #include <TMath.h>
 #include <TVector2.h>
-#include "Math/Vector4D.h"
-
-#include "Tools/KFparticle/KFUtilities.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGEM/PhotonMeson/TableProducer/skimmerGammaConversionTruthOnlyMc.cxx b/.conflict-side-0/PWGEM/PhotonMeson/TableProducer/skimmerGammaConversionTruthOnlyMc.cxx
index 509a949b0dd..08a90fcf351 100644
--- a/.conflict-side-0/PWGEM/PhotonMeson/TableProducer/skimmerGammaConversionTruthOnlyMc.cxx
+++ b/.conflict-side-0/PWGEM/PhotonMeson/TableProducer/skimmerGammaConversionTruthOnlyMc.cxx
@@ -20,11 +20,11 @@
 #include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
 #include "PWGEM/PhotonMeson/Utils/gammaConvDefinitions.h"
 
-#include "TVector3.h"
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TVector3.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGEM/PhotonMeson/TableProducer/skimmerPHOS.cxx b/.conflict-side-0/PWGEM/PhotonMeson/TableProducer/skimmerPHOS.cxx
index ef825ca5578..f205d74ec78 100644
--- a/.conflict-side-0/PWGEM/PhotonMeson/TableProducer/skimmerPHOS.cxx
+++ b/.conflict-side-0/PWGEM/PhotonMeson/TableProducer/skimmerPHOS.cxx
@@ -13,12 +13,14 @@
 /// dependencies: o2-analysis-calo-cluster
 /// \author daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+
 #include "Common/DataModel/CaloClusters.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 #include "PHOSBase/Geometry.h"
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGEM/PhotonMeson/Tasks/CheckMCV0.cxx b/.conflict-side-0/PWGEM/PhotonMeson/Tasks/CheckMCV0.cxx
index 912e2ffc07a..cfd83f6abe7 100644
--- a/.conflict-side-0/PWGEM/PhotonMeson/Tasks/CheckMCV0.cxx
+++ b/.conflict-side-0/PWGEM/PhotonMeson/Tasks/CheckMCV0.cxx
@@ -13,23 +13,25 @@
 /// \dependencies: o2-analysis-lf-lambdakzeromcfinder
 /// \author daiki.sekihata@cern.ch felix.schlepper@cern.ch
 
-#include "TDatabasePDG.h"
-#include "TMath.h"
+#include "PWGEM/PhotonMeson/DataModel/mcV0Tables.h"
+#include "PWGEM/PhotonMeson/Utils/TrackSelection.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonConstants/LHCConstants.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DetectorsBase/Propagator.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "DetectorsBase/Propagator.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "PWGEM/PhotonMeson/Utils/TrackSelection.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGEM/PhotonMeson/DataModel/mcV0Tables.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "CommonConstants/LHCConstants.h"
+
+#include "TDatabasePDG.h"
+#include "TMath.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGEM/PhotonMeson/Tasks/HeavyNeutralMeson.cxx b/.conflict-side-0/PWGEM/PhotonMeson/Tasks/HeavyNeutralMeson.cxx
index b416f173480..7e8f8250370 100644
--- a/.conflict-side-0/PWGEM/PhotonMeson/Tasks/HeavyNeutralMeson.cxx
+++ b/.conflict-side-0/PWGEM/PhotonMeson/Tasks/HeavyNeutralMeson.cxx
@@ -16,32 +16,34 @@
 /// \author Nicolas Strangmann (nicolas.strangmann@cern.ch) - Goethe University Frankfurt
 ///
 
-#include <vector>
-#include <iterator>
-#include <string>
-
-#include "Math/GenVector/Boost.h"
-#include "Math/Vector4D.h"
-#include "TMath.h"
-#include "TRandom3.h"
-
 #include "PWGEM/PhotonMeson/Utils/HNMUtilities.h"
 #include "PWGJE/DataModel/EMCALMatchedCollisions.h"
 
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/PIDResponseITS.h"
-#include "fairlogger/Logger.h"
-#include "Framework/Configurable.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonConstants/MathConstants.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/Configurable.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
-#include "CommonConstants/MathConstants.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
+
+#include "Math/GenVector/Boost.h"
+#include "Math/Vector4D.h"
+#include "TMath.h"
+#include "TRandom3.h"
+
+#include "fairlogger/Logger.h"
+
+#include <iterator>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGEM/PhotonMeson/Tasks/MaterialBudget.cxx b/.conflict-side-0/PWGEM/PhotonMeson/Tasks/MaterialBudget.cxx
index b5c1a5d8fde..d2f48e3e1ea 100644
--- a/.conflict-side-0/PWGEM/PhotonMeson/Tasks/MaterialBudget.cxx
+++ b/.conflict-side-0/PWGEM/PhotonMeson/Tasks/MaterialBudget.cxx
@@ -14,27 +14,30 @@
 // This code loops over v0 photons for studying material budget.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include <cstring>
-#include <iterator>
+#include "PWGEM/PhotonMeson/Core/CutsLibrary.h"
+#include "PWGEM/PhotonMeson/Core/HistogramsLibrary.h"
+#include "PWGEM/PhotonMeson/Core/PairCut.h"
+#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+#include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
 
-#include "TString.h"
-#include "Math/Vector4D.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/RecoDecay.h"
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
-#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/PairCut.h"
-#include "PWGEM/PhotonMeson/Core/CutsLibrary.h"
-#include "PWGEM/PhotonMeson/Core/HistogramsLibrary.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include "Math/Vector4D.h"
+#include "TString.h"
+
+#include <cstring>
+#include <iterator>
 
 using namespace o2;
 using namespace o2::aod;
@@ -112,8 +115,8 @@ struct MaterialBudget {
           THashList* list_pair_subsys_paircut = reinterpret_cast<THashList*>(list_pair_subsys_photoncut->FindObject(pair_cut_name.data()));
           o2::aod::pwgem::photon::histogram::DefineHistograms(list_pair_subsys_paircut, "material_budget_study", "Pair");
         } // end of cut3 loop pair cut
-      }   // end of cut2 loop
-    }     // end of cut1 loop
+      } // end of cut2 loop
+    } // end of cut1 loop
   }
 
   static constexpr std::string_view pairnames[9] = {"PCMPCM", "PHOSPHOS", "EMCEMC", "PCMPHOS", "PCMEMC", "PCMDalitzEE", "PCMDalitzMuMu", "PHOSEMC", "DalitzEEDalitzEE"};
@@ -245,7 +248,7 @@ struct MaterialBudget {
           reinterpret_cast<THnSparseF*>(list_v0->FindObject(cut.GetName())->FindObject("hs_conv_point"))->Fill(value);
 
         } // end of photon loop
-      }   // end of cut loop
+      } // end of cut loop
 
     } // end of collision loop
   }
@@ -298,11 +301,11 @@ struct MaterialBudget {
                 value[5] = eta_cp2;
                 reinterpret_cast<THnSparseF*>(list_pair_ss->FindObject(Form("%s_%s", tagcut.GetName(), probecut.GetName()))->FindObject(paircut.GetName())->FindObject("hs_conv_point_same"))->Fill(value);
               } // end of pair cut loop
-            }   // end of g2 loop
-          }     // end of g1 loop
-        }       // end of probecut loop
-      }         // end of tagcut loop
-    }           // end of collision loop
+            } // end of g2 loop
+          } // end of g1 loop
+        } // end of probecut loop
+      } // end of tagcut loop
+    } // end of collision loop
   }
 
   Configurable<int> ndepth{"ndepth", 10, "depth for event mixing"};
@@ -368,11 +371,11 @@ struct MaterialBudget {
                 reinterpret_cast<THnSparseF*>(list_pair_ss->FindObject(Form("%s_%s", tagcut.GetName(), probecut.GetName()))->FindObject(paircut.GetName())->FindObject("hs_conv_point_mix"))->Fill(value);
 
               } // end of pair cut loop
-            }   // end of g2 loop
-          }     // end of g1 loop
-        }       // end of probecut loop
-      }         // end of tagcut loop
-    }           // end of different collision combinations
+            } // end of g2 loop
+          } // end of g1 loop
+        } // end of probecut loop
+      } // end of tagcut loop
+    } // end of different collision combinations
   }
 
   Partition<MyCollisions> grouped_collisions = cfgCentMin < o2::aod::cent::centFT0M && o2::aod::cent::centFT0M < cfgCentMax; // this goes to same event.
diff --git a/.conflict-side-0/PWGEM/PhotonMeson/Tasks/MaterialBudgetMC.cxx b/.conflict-side-0/PWGEM/PhotonMeson/Tasks/MaterialBudgetMC.cxx
index 3fe51c1ff7c..57d34165ce8 100644
--- a/.conflict-side-0/PWGEM/PhotonMeson/Tasks/MaterialBudgetMC.cxx
+++ b/.conflict-side-0/PWGEM/PhotonMeson/Tasks/MaterialBudgetMC.cxx
@@ -14,29 +14,32 @@
 // This code loops over v0 photons for studying material budget.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include <cstring>
-#include <iterator>
+#include "PWGEM/Dilepton/Utils/MCUtilities.h"
+#include "PWGEM/PhotonMeson/Core/CutsLibrary.h"
+#include "PWGEM/PhotonMeson/Core/HistogramsLibrary.h"
+#include "PWGEM/PhotonMeson/Core/PairCut.h"
+#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+#include "PWGEM/PhotonMeson/Utils/MCUtilities.h"
+#include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
 
-#include "TString.h"
-#include "Math/Vector4D.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/RecoDecay.h"
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
-#include "PWGEM/PhotonMeson/Utils/MCUtilities.h"
-#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/PairCut.h"
-#include "PWGEM/PhotonMeson/Core/CutsLibrary.h"
-#include "PWGEM/PhotonMeson/Core/HistogramsLibrary.h"
-#include "PWGEM/Dilepton/Utils/MCUtilities.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include "Math/Vector4D.h"
+#include "TString.h"
+
+#include <cstring>
+#include <iterator>
 
 using namespace o2;
 using namespace o2::aod;
@@ -127,8 +130,8 @@ struct MaterialBudgetMC {
           THashList* list_pair_subsys_paircut = reinterpret_cast<THashList*>(list_pair_subsys_photoncut->FindObject(pair_cut_name.data()));
           o2::aod::pwgem::photon::histogram::DefineHistograms(list_pair_subsys_paircut, "material_budget_study", "Pair");
         } // end of cut3 loop pair cut
-      }   // end of probecut loop
-    }     // end of tagcut loop
+      } // end of probecut loop
+    } // end of tagcut loop
   }
 
   static constexpr std::string_view pairnames[9] = {"PCMPCM", "PHOSPHOS", "EMCEMC", "PCMPHOS", "PCMEMC", "PCMDalitzEE", "PCMDalitzMuMu", "PHOSEMC", "DalitzEEDalitzEE"};
@@ -280,7 +283,7 @@ struct MaterialBudgetMC {
           reinterpret_cast<THnSparseF*>(list_v0->FindObject(cut.GetName())->FindObject("hs_conv_point"))->Fill(value);
 
         } // end of photon loop
-      }   // end of cut loop
+      } // end of cut loop
 
     } // end of collision loop
   }
@@ -372,11 +375,11 @@ struct MaterialBudgetMC {
                 value[5] = eta_cp2;
                 reinterpret_cast<THnSparseF*>(list_pair_ss->FindObject(Form("%s_%s", tagcut.GetName(), probecut.GetName()))->FindObject(paircut.GetName())->FindObject("hs_conv_point_same"))->Fill(value);
               } // end of pair cut loop
-            }   // end of g2 loop
-          }     // end of g1 loop
-        }       // end of probecut loop
-      }         // end of tagcut loop
-    }           // end of collision loop
+            } // end of g2 loop
+          } // end of g1 loop
+        } // end of probecut loop
+      } // end of tagcut loop
+    } // end of collision loop
   }
 
   Partition<MyCollisions> grouped_collisions = cfgCentMin < o2::aod::cent::centFT0M && o2::aod::cent::centFT0M < cfgCentMax; // this goes to same event.
diff --git a/.conflict-side-0/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaEMCEMC.cxx b/.conflict-side-0/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaEMCEMC.cxx
index 3b7893f7373..3ea65c53fbd 100644
--- a/.conflict-side-0/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaEMCEMC.cxx
+++ b/.conflict-side-0/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaEMCEMC.cxx
@@ -14,14 +14,14 @@
 // This code loops over photons and makes pairs for neutral mesons analyses.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-
+#include "PWGEM/PhotonMeson/Core/Pi0EtaToGammaGamma.h"
 #include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
 #include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
-#include "PWGEM/PhotonMeson/Core/Pi0EtaToGammaGamma.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-side-0/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaMCEMCEMC.cxx b/.conflict-side-0/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaMCEMCEMC.cxx
index 7cd7ba3c492..cc91949c4a7 100644
--- a/.conflict-side-0/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaMCEMCEMC.cxx
+++ b/.conflict-side-0/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaMCEMCEMC.cxx
@@ -14,14 +14,14 @@
 // This code loops over photons and makes pairs for neutral mesons analyses.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-
+#include "PWGEM/PhotonMeson/Core/Pi0EtaToGammaGammaMC.h"
 #include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
 #include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
-#include "PWGEM/PhotonMeson/Core/Pi0EtaToGammaGammaMC.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-side-0/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaMCPCMDalitzEE.cxx b/.conflict-side-0/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaMCPCMDalitzEE.cxx
index 2d929f1a82a..d4d4e45cecc 100644
--- a/.conflict-side-0/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaMCPCMDalitzEE.cxx
+++ b/.conflict-side-0/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaMCPCMDalitzEE.cxx
@@ -14,14 +14,14 @@
 // This code loops over photons and makes pairs for neutral mesons analyses.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-
+#include "PWGEM/PhotonMeson/Core/Pi0EtaToGammaGammaMC.h"
 #include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
 #include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
-#include "PWGEM/PhotonMeson/Core/Pi0EtaToGammaGammaMC.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-side-0/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaMCPCMPCM.cxx b/.conflict-side-0/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaMCPCMPCM.cxx
index 9b79891739c..12fc3ea5067 100644
--- a/.conflict-side-0/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaMCPCMPCM.cxx
+++ b/.conflict-side-0/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaMCPCMPCM.cxx
@@ -14,14 +14,14 @@
 // This code loops over photons and makes pairs for neutral mesons analyses.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-
+#include "PWGEM/PhotonMeson/Core/Pi0EtaToGammaGammaMC.h"
 #include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
 #include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
-#include "PWGEM/PhotonMeson/Core/Pi0EtaToGammaGammaMC.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-side-0/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaPCMDalitzEE.cxx b/.conflict-side-0/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaPCMDalitzEE.cxx
index 15ccbe72bd4..bbe380442c5 100644
--- a/.conflict-side-0/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaPCMDalitzEE.cxx
+++ b/.conflict-side-0/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaPCMDalitzEE.cxx
@@ -14,15 +14,16 @@
 // This code loops over photons and makes pairs for neutral mesons analyses.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-
-#include "Common/Core/RecoDecay.h"
+#include "PWGEM/PhotonMeson/Core/Pi0EtaToGammaGamma.h"
 #include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
 #include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
-#include "PWGEM/PhotonMeson/Core/Pi0EtaToGammaGamma.h"
+
+#include "Common/Core/RecoDecay.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-side-0/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaPCMPCM.cxx b/.conflict-side-0/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaPCMPCM.cxx
index 24557c828a7..739beddd277 100644
--- a/.conflict-side-0/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaPCMPCM.cxx
+++ b/.conflict-side-0/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaPCMPCM.cxx
@@ -14,14 +14,14 @@
 // This code loops over photons and makes pairs for neutral mesons analyses.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-
+#include "PWGEM/PhotonMeson/Core/Pi0EtaToGammaGamma.h"
 #include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
 #include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
-#include "PWGEM/PhotonMeson/Core/Pi0EtaToGammaGamma.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-side-0/PWGEM/PhotonMeson/Tasks/SinglePhoton.cxx b/.conflict-side-0/PWGEM/PhotonMeson/Tasks/SinglePhoton.cxx
index 9c82fa7b09a..b0e127e5f7a 100644
--- a/.conflict-side-0/PWGEM/PhotonMeson/Tasks/SinglePhoton.cxx
+++ b/.conflict-side-0/PWGEM/PhotonMeson/Tasks/SinglePhoton.cxx
@@ -14,29 +14,32 @@
 // This code loops over photon candidate and fill histograms
 //    Please write to: daiki.sekihata@cern.ch
 
-#include <cstring>
-#include <iterator>
+#include "PWGEM/PhotonMeson/Core/CutsLibrary.h"
+#include "PWGEM/PhotonMeson/Core/EMCPhotonCut.h"
+#include "PWGEM/PhotonMeson/Core/HistogramsLibrary.h"
+#include "PWGEM/PhotonMeson/Core/PHOSPhotonCut.h"
+#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
 
-#include "TString.h"
-#include "Math/Vector4D.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/trackUtilities.h"
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/RecoDecay.h"
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/PHOSPhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/EMCPhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/CutsLibrary.h"
-#include "PWGEM/PhotonMeson/Core/HistogramsLibrary.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include "Math/Vector4D.h"
+#include "TString.h"
+
+#include <cstring>
+#include <iterator>
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-side-0/PWGEM/PhotonMeson/Tasks/SinglePhotonMC.cxx b/.conflict-side-0/PWGEM/PhotonMeson/Tasks/SinglePhotonMC.cxx
index ccb33db7f3a..5e6eded4e78 100644
--- a/.conflict-side-0/PWGEM/PhotonMeson/Tasks/SinglePhotonMC.cxx
+++ b/.conflict-side-0/PWGEM/PhotonMeson/Tasks/SinglePhotonMC.cxx
@@ -14,32 +14,35 @@
 // This code loops over photon candidate and fill histograms
 //    Please write to: daiki.sekihata@cern.ch
 
-#include <cstring>
-#include <iterator>
+#include "PWGEM/Dilepton/Utils/MCUtilities.h"
+#include "PWGEM/PhotonMeson/Core/CutsLibrary.h"
+#include "PWGEM/PhotonMeson/Core/EMCPhotonCut.h"
+#include "PWGEM/PhotonMeson/Core/HistogramsLibrary.h"
+#include "PWGEM/PhotonMeson/Core/PHOSPhotonCut.h"
+#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+#include "PWGEM/PhotonMeson/Utils/MCUtilities.h"
 
-#include "TString.h"
-#include "TMath.h"
-#include "Math/Vector4D.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/trackUtilities.h"
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/RecoDecay.h"
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/PhotonMeson/Utils/MCUtilities.h"
-#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/PHOSPhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/EMCPhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/CutsLibrary.h"
-#include "PWGEM/PhotonMeson/Core/HistogramsLibrary.h"
-#include "PWGEM/Dilepton/Utils/MCUtilities.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include "Math/Vector4D.h"
+#include "TMath.h"
+#include "TString.h"
+
+#include <cstring>
+#include <iterator>
 
 using namespace o2;
 using namespace o2::aod;
@@ -351,8 +354,8 @@ struct SinglePhotonMC {
           }
 
         } // end of photon loop
-      }   // end of cut loop
-    }     // end of collision loop
+      } // end of cut loop
+    } // end of collision loop
   }
 
   Partition<MyCollisions> grouped_collisions = (cfgCentMin < o2::aod::cent::centFT0M && o2::aod::cent::centFT0M < cfgCentMax) || (cfgCentMin < o2::aod::cent::centFT0A && o2::aod::cent::centFT0A < cfgCentMax) || (cfgCentMin < o2::aod::cent::centFT0C && o2::aod::cent::centFT0C < cfgCentMax); // this goes to same event.
diff --git a/.conflict-side-0/PWGEM/PhotonMeson/Tasks/TagAndProbe.cxx b/.conflict-side-0/PWGEM/PhotonMeson/Tasks/TagAndProbe.cxx
index 2f91a62dc43..b305a76228e 100644
--- a/.conflict-side-0/PWGEM/PhotonMeson/Tasks/TagAndProbe.cxx
+++ b/.conflict-side-0/PWGEM/PhotonMeson/Tasks/TagAndProbe.cxx
@@ -14,28 +14,31 @@
 // This code is for data-driven efficiency for photon analyses. tag and probe method
 //    Please write to: daiki.sekihata@cern.ch
 
-#include <cstring>
-#include <iterator>
+#include "PWGEM/PhotonMeson/Core/CutsLibrary.h"
+#include "PWGEM/PhotonMeson/Core/EMCPhotonCut.h"
+#include "PWGEM/PhotonMeson/Core/HistogramsLibrary.h"
+#include "PWGEM/PhotonMeson/Core/PHOSPhotonCut.h"
+#include "PWGEM/PhotonMeson/Core/PairCut.h"
+#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+#include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
 
-#include "TString.h"
-#include "Math/Vector4D.h"
-#include "Math/Vector3D.h"
+#include "Common/Core/RecoDecay.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "Math/AxisAngle.h"
 #include "Math/LorentzRotation.h"
 #include "Math/Rotation3D.h"
-#include "Math/AxisAngle.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/Core/RecoDecay.h"
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
-#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/PHOSPhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/EMCPhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/PairCut.h"
-#include "PWGEM/PhotonMeson/Core/CutsLibrary.h"
-#include "PWGEM/PhotonMeson/Core/HistogramsLibrary.h"
+#include "Math/Vector3D.h"
+#include "Math/Vector4D.h"
+#include "TString.h"
+
+#include <cstring>
+#include <iterator>
 
 using namespace o2;
 using namespace o2::aod;
@@ -126,7 +129,7 @@ struct TagAndProbe {
         THashList* list_pair_subsys_paircut = reinterpret_cast<THashList*>(list_pair_subsys_photoncut->FindObject(pair_cut_name.data()));
         o2::aod::pwgem::photon::histogram::DefineHistograms(list_pair_subsys_paircut, "tag_and_probe", pairname.data());
       } // end of cut3 loop pair cut
-    }   // end of cut2 loop
+    } // end of cut2 loop
   }
 
   static constexpr std::string_view pairnames[6] = {"PCMPCM", "PHOSPHOS", "EMCEMC", "PCMPHOS", "PCMEMC", "PHOSEMC"};
@@ -318,10 +321,10 @@ struct TagAndProbe {
                 RotationBackground<aod::SkimEMCClusters>(v12, v1, v2, photons2_coll, g1.globalIndex(), g2.globalIndex(), probecut, paircut, emcmatchedtracks);
               }
             } // end of probe cut loop
-          }   // end of pair cut loop
-        }     // end of g2 loop
-      }       // end of g1 loop
-    }         // end of collision loop
+          } // end of pair cut loop
+        } // end of g2 loop
+      } // end of g1 loop
+    } // end of collision loop
   }
 
   Configurable<int> ndepth{"ndepth", 10, "depth for event mixing"};
@@ -406,10 +409,10 @@ struct TagAndProbe {
               reinterpret_cast<TH2F*>(list_pair_ss->FindObject(Form("%s_%s", tagcut.GetName(), probecut.GetName()))->FindObject(paircut.GetName())->FindObject("hMggPt_PassingProbe_Mixed"))->Fill(v12.M(), v2.Pt());
 
             } // end of probe cut loop
-          }   // end of pair cut loop
-        }     // end of g2 loop
-      }       // end of g1 loop
-    }         // end of different collision combinations
+          } // end of pair cut loop
+        } // end of g2 loop
+      } // end of g1 loop
+    } // end of different collision combinations
   }
 
   /// \brief Calculate background (using rotation background method only for EMCal!)
diff --git a/.conflict-side-0/PWGEM/PhotonMeson/Tasks/TaggingPi0MCPCMDalitzEE.cxx b/.conflict-side-0/PWGEM/PhotonMeson/Tasks/TaggingPi0MCPCMDalitzEE.cxx
index ccdc4184568..22dfbe45376 100644
--- a/.conflict-side-0/PWGEM/PhotonMeson/Tasks/TaggingPi0MCPCMDalitzEE.cxx
+++ b/.conflict-side-0/PWGEM/PhotonMeson/Tasks/TaggingPi0MCPCMDalitzEE.cxx
@@ -14,10 +14,11 @@
 // This code loops over photons and makes pairs for neutral mesons analyses.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "PWGEM/PhotonMeson/Core/TaggingPi0MC.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::aod;
 
diff --git a/.conflict-side-0/PWGEM/PhotonMeson/Tasks/TaggingPi0PCMDalitzEE.cxx b/.conflict-side-0/PWGEM/PhotonMeson/Tasks/TaggingPi0PCMDalitzEE.cxx
index 2292faef120..ce583e23b5f 100644
--- a/.conflict-side-0/PWGEM/PhotonMeson/Tasks/TaggingPi0PCMDalitzEE.cxx
+++ b/.conflict-side-0/PWGEM/PhotonMeson/Tasks/TaggingPi0PCMDalitzEE.cxx
@@ -14,10 +14,11 @@
 // This code loops over photons and makes pairs for neutral mesons analyses.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "PWGEM/PhotonMeson/Core/TaggingPi0.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::aod;
 
diff --git a/.conflict-side-0/PWGEM/PhotonMeson/Tasks/emcalPi0QC.cxx b/.conflict-side-0/PWGEM/PhotonMeson/Tasks/emcalPi0QC.cxx
index 509e74402b5..743e4a67f25 100644
--- a/.conflict-side-0/PWGEM/PhotonMeson/Tasks/emcalPi0QC.cxx
+++ b/.conflict-side-0/PWGEM/PhotonMeson/Tasks/emcalPi0QC.cxx
@@ -9,36 +9,35 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <climits>
-#include <cstdlib>
-#include <map>
-#include <memory>
-#include <sstream>
-#include <string>
-#include <vector>
-#include <cmath>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoA.h"
-#include "Framework/HistogramRegistry.h"
+#include "PWGJE/DataModel/EMCALClusters.h"
+#include "PWGJE/DataModel/EMCALMatchedCollisions.h"
 
-#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 
-#include "EMCALBase/Geometry.h"
-#include "PWGJE/DataModel/EMCALClusters.h"
-#include "PWGJE/DataModel/EMCALMatchedCollisions.h"
+#include "CommonDataFormat/InteractionRecord.h"
+#include "DataFormatsEMCAL/AnalysisCluster.h"
 #include "DataFormatsEMCAL/Cell.h"
 #include "DataFormatsEMCAL/Constants.h"
-#include "DataFormatsEMCAL/AnalysisCluster.h"
-
-#include "CommonDataFormat/InteractionRecord.h"
+#include "EMCALBase/Geometry.h"
+#include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 
 #include "TLorentzVector.h"
 #include "TVector3.h"
 
+#include <climits>
+#include <cmath>
+#include <cstdlib>
+#include <map>
+#include <memory>
+#include <sstream>
+#include <string>
+#include <vector>
+
 // \struct Pi0QCTask
 /// \brief Simple monitoring task for EMCal clusters
 /// \author Joshua Koenig <joshua.konig@cern.ch>, Goethe University Frankfurt
diff --git a/.conflict-side-0/PWGEM/PhotonMeson/Tasks/emcalQC.cxx b/.conflict-side-0/PWGEM/PhotonMeson/Tasks/emcalQC.cxx
index 4173c26eccf..91b558cb609 100644
--- a/.conflict-side-0/PWGEM/PhotonMeson/Tasks/emcalQC.cxx
+++ b/.conflict-side-0/PWGEM/PhotonMeson/Tasks/emcalQC.cxx
@@ -18,28 +18,32 @@
 /// \author Nicolas Strangmann (nicolas.strangmann@cern.ch) Goethe University Frankfurt
 ///
 
-#include <string>
-#include <vector>
-#include <array>
-#include "TString.h"
-#include "THashList.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/trackUtilities.h"
+#include "PWGEM/PhotonMeson/Core/CutsLibrary.h"
+#include "PWGEM/PhotonMeson/Core/EMCPhotonCut.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+#include "PWGEM/PhotonMeson/Utils/ClusterHistograms.h"
+#include "PWGEM/PhotonMeson/Utils/EventHistograms.h"
+
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/RecoDecay.h"
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/PhotonMeson/Core/EMCPhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/CutsLibrary.h"
-#include "PWGEM/PhotonMeson/Utils/EventHistograms.h"
-#include "PWGEM/PhotonMeson/Utils/ClusterHistograms.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include "THashList.h"
+#include "TString.h"
+
+#include <array>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-side-0/PWGEM/PhotonMeson/Tasks/gammaConversions.cxx b/.conflict-side-0/PWGEM/PhotonMeson/Tasks/gammaConversions.cxx
index 37e4bf4dde1..933dd12944f 100644
--- a/.conflict-side-0/PWGEM/PhotonMeson/Tasks/gammaConversions.cxx
+++ b/.conflict-side-0/PWGEM/PhotonMeson/Tasks/gammaConversions.cxx
@@ -15,21 +15,22 @@
 
 #include "PWGEM/PhotonMeson/Tasks/gammaConversions.h"
 
-#include <map>
-#include <vector>
-#include <string>
-#include <memory>
-
 #include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
 #include "PWGEM/PhotonMeson/Utils/gammaConvDefinitions.h"
 
-#include "Framework/AnalysisTask.h"
+#include "Common/Core/RecoDecay.h"
+
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "Common/Core/RecoDecay.h"
 
-#include <TVector3.h>
 #include <TMath.h> // for ATan2, Cos, Sin, Sqrt
+#include <TVector3.h>
+
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGEM/PhotonMeson/Tasks/gammaConversions.h b/.conflict-side-0/PWGEM/PhotonMeson/Tasks/gammaConversions.h
index 9e1c9ebe7db..a09121baf36 100644
--- a/.conflict-side-0/PWGEM/PhotonMeson/Tasks/gammaConversions.h
+++ b/.conflict-side-0/PWGEM/PhotonMeson/Tasks/gammaConversions.h
@@ -162,4 +162,5 @@ struct tHistoRegistry {
   tHistoFolderCTV mCollision{mPath + "Collision/"};
   tHistoFolderCTV mTrack{mPath + "Track/"};
   tHistoFolderCTV mV0{mPath + "V0/"};
-};
\ No newline at end of file
+};
+  
\ No newline at end of file
diff --git a/.conflict-side-0/PWGEM/PhotonMeson/Tasks/gammaConversionsTruthOnlyMc.cxx b/.conflict-side-0/PWGEM/PhotonMeson/Tasks/gammaConversionsTruthOnlyMc.cxx
index 259a53cd037..89c094c530b 100644
--- a/.conflict-side-0/PWGEM/PhotonMeson/Tasks/gammaConversionsTruthOnlyMc.cxx
+++ b/.conflict-side-0/PWGEM/PhotonMeson/Tasks/gammaConversionsTruthOnlyMc.cxx
@@ -17,12 +17,12 @@
 #include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
 #include "PWGEM/PhotonMeson/Utils/gammaConvDefinitions.h"
 
-#include "TVector3.h"
-
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
 
+#include "TVector3.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
@@ -163,4 +163,5 @@ struct gammaConversionsTruthOnlyMc {
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
   return WorkflowSpec{adaptAnalysisTask<gammaConversionsTruthOnlyMc>(cfgc)};
-}
\ No newline at end of file
+}
+ 
\ No newline at end of file
diff --git a/.conflict-side-0/PWGEM/PhotonMeson/Tasks/mcGeneratorStudies.cxx b/.conflict-side-0/PWGEM/PhotonMeson/Tasks/mcGeneratorStudies.cxx
index 889858359ed..d7c5aafb298 100644
--- a/.conflict-side-0/PWGEM/PhotonMeson/Tasks/mcGeneratorStudies.cxx
+++ b/.conflict-side-0/PWGEM/PhotonMeson/Tasks/mcGeneratorStudies.cxx
@@ -16,11 +16,11 @@
 /// \author Nicolas Strangmann (nicolas.strangmann@cern.ch) - Goethe University Frankfurt
 ///
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 
 #include "TDatabasePDG.h"
 
diff --git a/.conflict-side-0/PWGEM/PhotonMeson/Tasks/pcmQC.cxx b/.conflict-side-0/PWGEM/PhotonMeson/Tasks/pcmQC.cxx
index 077a1be9f7d..9c621c62745 100644
--- a/.conflict-side-0/PWGEM/PhotonMeson/Tasks/pcmQC.cxx
+++ b/.conflict-side-0/PWGEM/PhotonMeson/Tasks/pcmQC.cxx
@@ -14,18 +14,18 @@
 // This code runs loop over v0 photons for PCM QC.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include <string>
-#include <vector>
+#include "PWGEM/PhotonMeson/Core/EMPhotonEventCut.h"
+#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+#include "PWGEM/PhotonMeson/Utils/PCMUtilities.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
-#include "PWGEM/PhotonMeson/Utils/PCMUtilities.h"
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/EMPhotonEventCut.h"
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-side-0/PWGEM/PhotonMeson/Tasks/pcmQCMC.cxx b/.conflict-side-0/PWGEM/PhotonMeson/Tasks/pcmQCMC.cxx
index 0587fe75138..694941112ba 100644
--- a/.conflict-side-0/PWGEM/PhotonMeson/Tasks/pcmQCMC.cxx
+++ b/.conflict-side-0/PWGEM/PhotonMeson/Tasks/pcmQCMC.cxx
@@ -14,20 +14,20 @@
 // This code runs loop over v0 photons for PCM QC.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include <string>
-#include <vector>
+#include "PWGEM/Dilepton/Utils/MCUtilities.h"
+#include "PWGEM/PhotonMeson/Core/EMPhotonEventCut.h"
+#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+#include "PWGEM/PhotonMeson/Utils/MCUtilities.h"
+#include "PWGEM/PhotonMeson/Utils/PCMUtilities.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/PhotonMeson/Utils/PCMUtilities.h"
-#include "PWGEM/PhotonMeson/Utils/MCUtilities.h"
-#include "PWGEM/Dilepton/Utils/MCUtilities.h"
-#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/EMPhotonEventCut.h"
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-side-0/PWGEM/PhotonMeson/Tasks/phosQC.cxx b/.conflict-side-0/PWGEM/PhotonMeson/Tasks/phosQC.cxx
index e7009b94f05..074a517122f 100644
--- a/.conflict-side-0/PWGEM/PhotonMeson/Tasks/phosQC.cxx
+++ b/.conflict-side-0/PWGEM/PhotonMeson/Tasks/phosQC.cxx
@@ -14,25 +14,29 @@
 // This code runs loop over PHOS clusters for PHOS QC.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include <array>
-#include "TString.h"
-#include "THashList.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/trackUtilities.h"
+#include "PWGEM/PhotonMeson/Core/CutsLibrary.h"
+#include "PWGEM/PhotonMeson/Core/HistogramsLibrary.h"
+#include "PWGEM/PhotonMeson/Core/PHOSPhotonCut.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/RecoDecay.h"
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/PhotonMeson/Core/PHOSPhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/CutsLibrary.h"
-#include "PWGEM/PhotonMeson/Core/HistogramsLibrary.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include "THashList.h"
+#include "TString.h"
+
+#include <array>
 
 using namespace o2;
 using namespace o2::aod;
@@ -148,8 +152,8 @@ struct phosQC {
         } // end of v0 loop
         reinterpret_cast<TH1F*>(fMainList->FindObject("Cluster")->FindObject(cut.GetName())->FindObject("hNgamma"))->Fill(ng);
       } // end of cut loop
-    }   // end of collision loop
-  }     // end of process
+    } // end of collision loop
+  } // end of process
 
   void processDummy(MyCollisions const&) {}
 
diff --git a/.conflict-side-0/PWGEM/PhotonMeson/Tasks/prefilterPhoton.cxx b/.conflict-side-0/PWGEM/PhotonMeson/Tasks/prefilterPhoton.cxx
index 4b0ce098f6c..41975a0a9c6 100644
--- a/.conflict-side-0/PWGEM/PhotonMeson/Tasks/prefilterPhoton.cxx
+++ b/.conflict-side-0/PWGEM/PhotonMeson/Tasks/prefilterPhoton.cxx
@@ -14,32 +14,33 @@
 // This code produces information on prefilter for photon.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include <string>
-#include <vector>
-#include <unordered_map>
 #include <map>
+#include <string>
 #include <tuple>
+#include <unordered_map>
+#include <vector>
 
 // #include "TString.h"
-#include "Math/Vector4D.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "Math/Vector4D.h"
 // #include "Common/Core/RecoDecay.h"
+#include "PWGEM/Dilepton/Utils/PairUtilities.h"
+#include "PWGEM/PhotonMeson/Core/DalitzEECut.h"
+#include "PWGEM/PhotonMeson/Core/EMPhotonEventCut.h"
+#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+#include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
+
 #include "Common/Core/trackUtilities.h"
 
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
 #include "CCDB/BasicCCDBManager.h"
-
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
-#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/EMPhotonEventCut.h"
-#include "PWGEM/PhotonMeson/Core/DalitzEECut.h"
-#include "PWGEM/Dilepton/Utils/PairUtilities.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-side-0/PWGEM/PhotonMeson/Tasks/taskPi0FlowEMC.cxx b/.conflict-side-0/PWGEM/PhotonMeson/Tasks/taskPi0FlowEMC.cxx
index 2e64bd6ebe2..b2eb97a3ac4 100644
--- a/.conflict-side-0/PWGEM/PhotonMeson/Tasks/taskPi0FlowEMC.cxx
+++ b/.conflict-side-0/PWGEM/PhotonMeson/Tasks/taskPi0FlowEMC.cxx
@@ -14,47 +14,46 @@
 ///
 /// \author M. Hemmer, marvin.hemmer@cern.ch
 
-#include <numbers>
-#include <iterator>
-#include <array>
-#include <string>
-#include <map>
-#include <algorithm>
-#include <vector>
-#include <tuple>
-#include <utility>
-#include <cmath>
-
-#include "Math/Vector4D.h"
-#include "Math/Vector3D.h"
-#include "Math/LorentzRotation.h"
-#include "Math/Rotation3D.h"
-#include "Math/AxisAngle.h"
-
-#include "CCDB/BasicCCDBManager.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
+#include "PWGEM/Dilepton/Utils/EMTrackUtilities.h"
+#include "PWGEM/PhotonMeson/Core/EMCPhotonCut.h"
+#include "PWGEM/PhotonMeson/Core/EMPhotonEventCut.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+#include "PWGEM/PhotonMeson/Utils/EventHistograms.h"
+#include "PWGEM/PhotonMeson/Utils/NMHistograms.h"
+#include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
+#include "PWGEM/PhotonMeson/Utils/emcalHistoDefinitions.h"
 
 #include "Common/Core/EventPlaneHelper.h"
 #include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/Qvectors.h"
-#include "CommonConstants/MathConstants.h"
 
-#include "DetectorsBase/GeometryManager.h"
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonConstants/MathConstants.h"
 #include "DataFormatsEMCAL/Constants.h"
+#include "DetectorsBase/GeometryManager.h"
 #include "EMCALBase/Geometry.h"
 #include "EMCALCalib/BadChannelMap.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 
-#include "PWGEM/Dilepton/Utils/EMTrackUtilities.h"
-#include "PWGEM/PhotonMeson/Core/EMCPhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/EMPhotonEventCut.h"
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/PhotonMeson/Utils/emcalHistoDefinitions.h"
-#include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
-#include "PWGEM/PhotonMeson/Utils/EventHistograms.h"
-#include "PWGEM/PhotonMeson/Utils/NMHistograms.h"
+#include "Math/AxisAngle.h"
+#include "Math/LorentzRotation.h"
+#include "Math/Rotation3D.h"
+#include "Math/Vector3D.h"
+#include "Math/Vector4D.h"
+
+#include <algorithm>
+#include <array>
+#include <cmath>
+#include <iterator>
+#include <map>
+#include <numbers>
+#include <string>
+#include <tuple>
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-side-0/PWGEM/PhotonMeson/Utils/HNMUtilities.h b/.conflict-side-0/PWGEM/PhotonMeson/Utils/HNMUtilities.h
index bb985686285..24472e677d4 100644
--- a/.conflict-side-0/PWGEM/PhotonMeson/Utils/HNMUtilities.h
+++ b/.conflict-side-0/PWGEM/PhotonMeson/Utils/HNMUtilities.h
@@ -19,23 +19,26 @@
 #ifndef PWGEM_PHOTONMESON_UTILS_HNMUTILITIES_H_
 #define PWGEM_PHOTONMESON_UTILS_HNMUTILITIES_H_
 
-#include <CommonConstants/MathConstants.h>
-#include <CommonConstants/PhysicsConstants.h>
-#include <vector>
-#include "TVector3.h"
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Common/DataModel/EventSelection.h"
-#include "EMCALBase/Geometry.h"
-#include "PWGJE/DataModel/EMCALClusters.h"
 #include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
 #include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
+#include "PWGJE/DataModel/EMCALClusters.h"
+
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 #include "EventFiltering/filterTables.h"
 
+#include "EMCALBase/Geometry.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include <CommonConstants/MathConstants.h>
+#include <CommonConstants/PhysicsConstants.h>
+
+#include "TVector3.h"
+
+#include <vector>
+
 namespace o2::aod::pwgem::photonmeson::hnmutilities
 {
 // -------> Struct to store photons from EMC clusters or V0s
diff --git a/.conflict-side-0/PWGEM/PhotonMeson/Utils/PCMUtilities.h b/.conflict-side-0/PWGEM/PhotonMeson/Utils/PCMUtilities.h
index e82d580cfcd..03c3b366e58 100644
--- a/.conflict-side-0/PWGEM/PhotonMeson/Utils/PCMUtilities.h
+++ b/.conflict-side-0/PWGEM/PhotonMeson/Utils/PCMUtilities.h
@@ -15,11 +15,13 @@
 #ifndef PWGEM_PHOTONMESON_UTILS_PCMUTILITIES_H_
 #define PWGEM_PHOTONMESON_UTILS_PCMUTILITIES_H_
 
-#include <TVector2.h>
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/trackUtilities.h"
+
 #include "DCAFitter/HelixHelper.h"
 #include "DetectorsBase/Propagator.h"
-#include "Common/Core/trackUtilities.h"
-#include "Common/Core/RecoDecay.h"
+
+#include <TVector2.h>
 
 //_______________________________________________________________________
 inline bool checkAP(const float alpha, const float qt, const float alpha_max = 0.95, const float qt_max = 0.05)
diff --git a/.conflict-side-0/PWGEM/PhotonMeson/Utils/PairUtilities.h b/.conflict-side-0/PWGEM/PhotonMeson/Utils/PairUtilities.h
index 86ac4f0eb16..3fa44f1c735 100644
--- a/.conflict-side-0/PWGEM/PhotonMeson/Utils/PairUtilities.h
+++ b/.conflict-side-0/PWGEM/PhotonMeson/Utils/PairUtilities.h
@@ -16,6 +16,7 @@
 #define PWGEM_PHOTONMESON_UTILS_PAIRUTILITIES_H_
 
 #include <TVector2.h>
+
 #include <cmath>
 
 namespace o2::aod::pwgem::photonmeson::utils::pairutil
diff --git a/.conflict-side-0/PWGEM/PhotonMeson/Utils/emcalHistoDefinitions.h b/.conflict-side-0/PWGEM/PhotonMeson/Utils/emcalHistoDefinitions.h
index 6ce678e9c35..2540064309a 100644
--- a/.conflict-side-0/PWGEM/PhotonMeson/Utils/emcalHistoDefinitions.h
+++ b/.conflict-side-0/PWGEM/PhotonMeson/Utils/emcalHistoDefinitions.h
@@ -12,10 +12,10 @@
 /// \brief commonly used histogram (axis) definitions for emcal in PWGEM
 /// \author marvin.hemmer@cern.ch
 
-#include <vector>
-
 #include "Framework/AnalysisTask.h"
 
+#include <vector>
+
 #ifndef PWGEM_PHOTONMESON_UTILS_EMCALHISTODEFINITIONS_H_
 #define PWGEM_PHOTONMESON_UTILS_EMCALHISTODEFINITIONS_H_
 
diff --git a/.conflict-side-0/PWGEM/PhotonMeson/Utils/gammaSelectionCuts.h b/.conflict-side-0/PWGEM/PhotonMeson/Utils/gammaSelectionCuts.h
index 341a6c95e38..8fe140ef92d 100644
--- a/.conflict-side-0/PWGEM/PhotonMeson/Utils/gammaSelectionCuts.h
+++ b/.conflict-side-0/PWGEM/PhotonMeson/Utils/gammaSelectionCuts.h
@@ -12,10 +12,11 @@
 /// \brief cut selection and cut functions for photon candidates
 /// \author marvin.hemmer@cern.ch
 
-#include <vector>
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
 
 #include "Framework/AnalysisTask.h"
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+
+#include <vector>
 
 #ifndef PWGEM_PHOTONMESON_UTILS_GAMMASELECTIONCUTS_H_
 #define PWGEM_PHOTONMESON_UTILS_GAMMASELECTIONCUTS_H_
diff --git a/.conflict-side-0/PWGEM/Tasks/phosAlign.cxx b/.conflict-side-0/PWGEM/Tasks/phosAlign.cxx
index d63d77b84e5..e628250a670 100644
--- a/.conflict-side-0/PWGEM/Tasks/phosAlign.cxx
+++ b/.conflict-side-0/PWGEM/Tasks/phosAlign.cxx
@@ -9,35 +9,35 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <climits>
-#include <cstdlib>
-#include <map>
-#include <memory>
-#include <vector>
-#include "Common/Core/trackUtilities.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/CaloClusters.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "ReconstructionDataFormats/TrackParametrization.h"
 
-#include "Framework/ConfigParamSpec.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonDataFormat/InteractionRecord.h"
+#include "DataFormatsParameters/GRPLHCIFData.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DetectorsBase/Propagator.h"
 #include "Framework/ASoA.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/ConfigParamSpec.h"
 #include "Framework/HistogramRegistry.h"
-
+#include "Framework/runDataProcessing.h"
 #include "PHOSBase/Geometry.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CommonDataFormat/InteractionRecord.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPLHCIFData.h"
-#include "DetectorsBase/Propagator.h"
+#include "ReconstructionDataFormats/TrackParametrization.h"
+
+#include <climits>
+#include <cstdlib>
+#include <map>
+#include <memory>
+#include <vector>
 
 /// \struct PHOS pi0 analysis
 /// \brief Monitoring task for PHOS related quantities
diff --git a/.conflict-side-0/PWGEM/Tasks/phosCalibration.cxx b/.conflict-side-0/PWGEM/Tasks/phosCalibration.cxx
index 1116f47f0f2..59b6c295be2 100644
--- a/.conflict-side-0/PWGEM/Tasks/phosCalibration.cxx
+++ b/.conflict-side-0/PWGEM/Tasks/phosCalibration.cxx
@@ -9,35 +9,35 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <climits>
-#include <cstdlib>
-#include <map>
-#include <memory>
-#include <vector>
-#include "TFile.h"
-#include "TGrid.h"
-#include "TLorentzVector.h"
-
-#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/CaloClusters.h"
+#include "Common/DataModel/EventSelection.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonDataFormat/InteractionRecord.h"
+#include "CommonUtils/NameConf.h"
+#include "DataFormatsPHOS/BadChannelsMap.h"
+#include "DataFormatsPHOS/CalibParams.h"
 #include "DataFormatsPHOS/Cell.h"
 #include "DataFormatsPHOS/Cluster.h"
 #include "DataFormatsPHOS/TriggerRecord.h"
-#include "DataFormatsPHOS/BadChannelsMap.h"
-#include "DataFormatsPHOS/CalibParams.h"
+#include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/ConfigParamSpec.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 #include "PHOSBase/Geometry.h"
 #include "PHOSReconstruction/Clusterer.h"
 
-#include "Framework/ConfigParamSpec.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoA.h"
-#include "Framework/HistogramRegistry.h"
-#include "CommonUtils/NameConf.h"
-#include "CCDB/BasicCCDBManager.h"
+#include "TFile.h"
+#include "TGrid.h"
+#include "TLorentzVector.h"
 
-#include "CommonDataFormat/InteractionRecord.h"
+#include <climits>
+#include <cstdlib>
+#include <map>
+#include <memory>
+#include <vector>
 
 using namespace o2;
 using namespace o2::aod::evsel;
diff --git a/.conflict-side-0/PWGEM/Tasks/phosCellQA.cxx b/.conflict-side-0/PWGEM/Tasks/phosCellQA.cxx
index 710244c1a6d..26a627830ca 100644
--- a/.conflict-side-0/PWGEM/Tasks/phosCellQA.cxx
+++ b/.conflict-side-0/PWGEM/Tasks/phosCellQA.cxx
@@ -9,26 +9,26 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <climits>
-#include <cstdlib>
-#include <map>
-#include <memory>
-#include <vector>
-#include <string>
+#include "Common/DataModel/EventSelection.h"
 
 #include "CCDB/BasicCCDBManager.h"
-#include "Common/DataModel/EventSelection.h"
-#include "DataFormatsPHOS/Cell.h"
+#include "CommonDataFormat/InteractionRecord.h"
 #include "DataFormatsPHOS/CalibParams.h"
-#include "Framework/ConfigParamSpec.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "DataFormatsPHOS/Cell.h"
 #include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/ConfigParamSpec.h"
 #include "Framework/HistogramRegistry.h"
-
+#include "Framework/runDataProcessing.h"
 #include "PHOSBase/Geometry.h"
-#include "CommonDataFormat/InteractionRecord.h"
+
+#include <climits>
+#include <cstdlib>
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
 
 /// \struct PHOS QA
 /// \brief Monitoring task for PHOS related quantities
diff --git a/.conflict-side-0/PWGEM/Tasks/phosCluQA.cxx b/.conflict-side-0/PWGEM/Tasks/phosCluQA.cxx
index e563dc3aebe..6ccf4f2ed3c 100644
--- a/.conflict-side-0/PWGEM/Tasks/phosCluQA.cxx
+++ b/.conflict-side-0/PWGEM/Tasks/phosCluQA.cxx
@@ -9,26 +9,26 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <climits>
-#include <cstdlib>
-#include <map>
-#include <memory>
-#include <vector>
 #include "Common/DataModel/CaloClusters.h"
 #include "Common/DataModel/EventSelection.h"
 
-#include "Framework/ConfigParamSpec.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoA.h"
-#include "Framework/HistogramRegistry.h"
-#include "CommonUtils/NameConf.h"
 #include "CCDB/BasicCCDBManager.h"
+#include "CommonDataFormat/InteractionRecord.h"
+#include "CommonUtils/NameConf.h"
 #include "DataFormatsParameters/GRPLHCIFData.h"
-
+#include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/ConfigParamSpec.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 #include "PHOSBase/Geometry.h"
-#include "CommonDataFormat/InteractionRecord.h"
+
+#include <climits>
+#include <cstdlib>
+#include <map>
+#include <memory>
+#include <vector>
 
 /// \struct PHOS QA
 /// \brief Monitoring task for PHOS related quantities
diff --git a/.conflict-side-0/PWGEM/Tasks/phosElId.cxx b/.conflict-side-0/PWGEM/Tasks/phosElId.cxx
index 23e09da288f..2734e57e1dd 100644
--- a/.conflict-side-0/PWGEM/Tasks/phosElId.cxx
+++ b/.conflict-side-0/PWGEM/Tasks/phosElId.cxx
@@ -16,37 +16,40 @@
 /// \author Yeghishe Hambardzumyan, MIPT
 /// \since Apr, 2024
 
-#include <climits>
-#include <cstdlib>
-#include <map>
-#include <memory>
-#include <vector>
-#include "Common/Core/trackUtilities.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/CaloClusters.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/FT0Corrected.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "ReconstructionDataFormats/TrackParametrization.h"
-#include "Framework/ConfigParamSpec.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonDataFormat/InteractionRecord.h"
+#include "DataFormatsParameters/GRPLHCIFData.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DetectorsBase/Propagator.h"
 #include "Framework/ASoA.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/ConfigParamSpec.h"
 #include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 #include "PHOSBase/Geometry.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CommonDataFormat/InteractionRecord.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPLHCIFData.h"
-#include "DetectorsBase/Propagator.h"
+#include "ReconstructionDataFormats/TrackParametrization.h"
+
 #include "TF1.h"
 
+#include <climits>
+#include <cstdlib>
+#include <map>
+#include <memory>
+#include <vector>
+
 using namespace o2;
 using namespace o2::soa;
 using namespace o2::aod::evsel;
diff --git a/.conflict-side-0/PWGEM/Tasks/phosNbar.cxx b/.conflict-side-0/PWGEM/Tasks/phosNbar.cxx
index 7cd2e4387a7..31e35368a6b 100644
--- a/.conflict-side-0/PWGEM/Tasks/phosNbar.cxx
+++ b/.conflict-side-0/PWGEM/Tasks/phosNbar.cxx
@@ -8,30 +8,30 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include <queue>
-#include "TRandom.h"
-
 #include "Common/Core/trackUtilities.h"
-#include "Framework/ConfigParamSpec.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoA.h"
-#include "Framework/HistogramRegistry.h"
-#include "CommonUtils/NameConf.h"
+#include "Common/DataModel/CaloClusters.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "CommonDataFormat/InteractionRecord.h"
+#include "CommonUtils/NameConf.h"
 #include "DataFormatsParameters/GRPLHCIFData.h"
 #include "DataFormatsParameters/GRPMagField.h"
 #include "DetectorsBase/Propagator.h"
-
+#include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/ConfigParamSpec.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include "PHOSBase/Geometry.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/CaloClusters.h"
 
-#include "PHOSBase/Geometry.h"
-#include "CommonDataFormat/InteractionRecord.h"
+#include "TRandom.h"
+
+#include <queue>
 
 /// \struct phosNbar
 /// \brief account Nbar who's clusters appeared within PHOS
diff --git a/.conflict-side-0/PWGEM/Tasks/phosNonlin.cxx b/.conflict-side-0/PWGEM/Tasks/phosNonlin.cxx
index f25043c5f0c..4cbb9e11219 100644
--- a/.conflict-side-0/PWGEM/Tasks/phosNonlin.cxx
+++ b/.conflict-side-0/PWGEM/Tasks/phosNonlin.cxx
@@ -14,15 +14,6 @@
 /// \author Dmitri Peresunko <Dmitri.Peresunko@cern.ch>
 ///
 
-#include <array>
-#include <climits>
-#include <cstdlib>
-#include <map>
-#include <memory>
-#include <string>
-#include <vector>
-
-#include <TLorentzVector.h>
 #include "Common/DataModel/CaloClusters.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
@@ -30,18 +21,27 @@
 #include "EventFiltering/Zorro.h"
 #include "EventFiltering/ZorroSummary.h"
 
-#include "Framework/ConfigParamSpec.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonDataFormat/InteractionRecord.h"
+#include "DataFormatsParameters/GRPLHCIFData.h"
 #include "Framework/ASoA.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/ConfigParamSpec.h"
 #include "Framework/HistogramRegistry.h"
-
+#include "Framework/runDataProcessing.h"
 #include "PHOSBase/Geometry.h"
-#include "CommonDataFormat/InteractionRecord.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPLHCIFData.h"
+
+#include <TLorentzVector.h>
+
+#include <array>
+#include <climits>
+#include <cstdlib>
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::aod::evsel;
diff --git a/.conflict-side-0/PWGEM/Tasks/phosPi0.cxx b/.conflict-side-0/PWGEM/Tasks/phosPi0.cxx
index a47aaa0d485..cccae5045aa 100644
--- a/.conflict-side-0/PWGEM/Tasks/phosPi0.cxx
+++ b/.conflict-side-0/PWGEM/Tasks/phosPi0.cxx
@@ -14,34 +14,32 @@
 /// \author Dmitri Peresunko <Dmitri.Peresunko@cern.ch>
 ///
 
-#include <algorithm>
-#include <climits>
-#include <cstdlib>
-#include <map>
-#include <memory>
-#include <string>
-#include <vector>
-
 #include "Common/DataModel/CaloClusters.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-
-#include "Framework/ConfigParamSpec.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoA.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/HistogramRegistry.h"
-
 #include "EventFiltering/Zorro.h"
 #include "EventFiltering/ZorroSummary.h"
 
-#include "PHOSBase/Geometry.h"
-#include "CommonDataFormat/InteractionRecord.h"
 #include "CCDB/BasicCCDBManager.h"
+#include "CommonDataFormat/InteractionRecord.h"
 #include "DataFormatsParameters/GRPLHCIFData.h"
+#include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/ConfigParamSpec.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include "PHOSBase/Geometry.h"
+
+#include <algorithm>
+#include <climits>
+#include <cstdlib>
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::aod::evsel;
diff --git a/.conflict-side-0/PWGEM/Tasks/phosTrigQA.cxx b/.conflict-side-0/PWGEM/Tasks/phosTrigQA.cxx
index b0b0949cfb5..c7dab6e4e7a 100644
--- a/.conflict-side-0/PWGEM/Tasks/phosTrigQA.cxx
+++ b/.conflict-side-0/PWGEM/Tasks/phosTrigQA.cxx
@@ -9,28 +9,28 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <climits>
-#include <cstdlib>
-#include <map>
-#include <memory>
-#include <vector>
 #include "Common/DataModel/CaloClusters.h"
 #include "Common/DataModel/EventSelection.h"
+#include "EventFiltering/filterTables.h"
 
-#include "Framework/ConfigParamSpec.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonDataFormat/InteractionRecord.h"
+#include "CommonUtils/NameConf.h"
+#include "DataFormatsParameters/GRPLHCIFData.h"
 #include "Framework/ASoA.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/ConfigParamSpec.h"
 #include "Framework/HistogramRegistry.h"
-#include "CommonUtils/NameConf.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPLHCIFData.h"
-
+#include "Framework/runDataProcessing.h"
 #include "PHOSBase/Geometry.h"
-#include "CommonDataFormat/InteractionRecord.h"
-#include "EventFiltering/filterTables.h"
+
+#include <climits>
+#include <cstdlib>
+#include <map>
+#include <memory>
+#include <vector>
 
 /// \struct PHOS trigger QA
 /// \brief Monitoring task for PHOS related quantities
diff --git a/.conflict-side-0/PWGHF/ALICE3/TableProducer/candidateCreatorChic.cxx b/.conflict-side-0/PWGHF/ALICE3/TableProducer/candidateCreatorChic.cxx
index e01b4fe0a6a..e34932fcdea 100644
--- a/.conflict-side-0/PWGHF/ALICE3/TableProducer/candidateCreatorChic.cxx
+++ b/.conflict-side-0/PWGHF/ALICE3/TableProducer/candidateCreatorChic.cxx
@@ -15,8 +15,12 @@
 ///
 /// \author Alessandro De Falco <alessandro.de.falco@ca.infn.it>, Cagliari University
 
-#include <utility>
-#include <vector>
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
+
+#include "ALICE3/DataModel/ECAL.h"
+#include "Common/Core/trackUtilities.h"
 
 #include "CommonConstants/PhysicsConstants.h"
 #include "DCAFitter/DCAFitterN.h"
@@ -24,12 +28,8 @@
 #include "ReconstructionDataFormats/DCA.h"
 #include "ReconstructionDataFormats/V0.h"
 
-#include "ALICE3/DataModel/ECAL.h"
-#include "Common/Core/trackUtilities.h"
-
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis;
@@ -201,9 +201,9 @@ struct HfCandidateCreatorChic {
           hMassChicToJpsiToMuMuGamma->Fill(massJpsiGamma);
         }
       } // ecal loop
-    }   // Jpsi loop
-  }     // process
-};      // struct
+    } // Jpsi loop
+  } // process
+}; // struct
 
 /// Extends the base table with expression columns.
 struct HfCandidateCreatorChicExpressions {
@@ -299,8 +299,8 @@ struct HfCandidateCreatorChicMc {
 
       rowMcMatchGen(flag, origin, channel);
     } // candidate loop
-  }   // process
-};    // struct
+  } // process
+}; // struct
 
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
diff --git a/.conflict-side-0/PWGHF/ALICE3/TableProducer/candidateCreatorX.cxx b/.conflict-side-0/PWGHF/ALICE3/TableProducer/candidateCreatorX.cxx
index 2e3477dab99..02e5939ec32 100644
--- a/.conflict-side-0/PWGHF/ALICE3/TableProducer/candidateCreatorX.cxx
+++ b/.conflict-side-0/PWGHF/ALICE3/TableProducer/candidateCreatorX.cxx
@@ -16,8 +16,11 @@
 /// \author Rik Spijkers <r.spijkers@students.uu.nl>, Utrecht University
 /// \author Luca Micheletti <luca.micheletti@to.infn.it>, INFN
 
-#include <utility>
-#include <vector>
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
+
+#include "Common/Core/trackUtilities.h"
 
 #include "CommonConstants/PhysicsConstants.h"
 #include "DCAFitter/DCAFitterN.h"
@@ -25,11 +28,8 @@
 #include "ReconstructionDataFormats/DCA.h"
 #include "ReconstructionDataFormats/V0.h"
 
-#include "Common/Core/trackUtilities.h"
-
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis;
@@ -255,10 +255,10 @@ struct HfCandidateCreatorX {
             hMassXToJpsiToMuMuPiPi->Fill(massJpsiPiPi);
           }
         } // pi- loop
-      }   // pi+ loop
-    }     // Jpsi loop
-  }       // process
-};        // struct
+      } // pi+ loop
+    } // Jpsi loop
+  } // process
+}; // struct
 
 /// Extends the base table with expression columns.
 struct HfCandidateCreatorXExpressions {
@@ -363,8 +363,8 @@ struct HfCandidateCreatorXMc {
 
       rowMcMatchGen(flag, origin, channel);
     } // candidate loop
-  }   // process
-};    // struct
+  } // process
+}; // struct
 
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
diff --git a/.conflict-side-0/PWGHF/ALICE3/TableProducer/candidateSelectorChicToJpsiGamma.cxx b/.conflict-side-0/PWGHF/ALICE3/TableProducer/candidateSelectorChicToJpsiGamma.cxx
index 5160a2ba99c..bcd3c25cbe7 100644
--- a/.conflict-side-0/PWGHF/ALICE3/TableProducer/candidateSelectorChicToJpsiGamma.cxx
+++ b/.conflict-side-0/PWGHF/ALICE3/TableProducer/candidateSelectorChicToJpsiGamma.cxx
@@ -15,16 +15,16 @@
 ///
 /// \author Alessandro De Falco <alessandro.de.falco@ca.infn.it>, Università/INFN Cagliari
 
-#include <vector>
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/Core/SelectorCuts.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
 
 #include "CommonConstants/PhysicsConstants.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
 
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/Core/SelectorCuts.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
+#include <vector>
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-side-0/PWGHF/ALICE3/TableProducer/candidateSelectorD0Alice3Barrel.cxx b/.conflict-side-0/PWGHF/ALICE3/TableProducer/candidateSelectorD0Alice3Barrel.cxx
index 705deeeaff2..64a74907928 100644
--- a/.conflict-side-0/PWGHF/ALICE3/TableProducer/candidateSelectorD0Alice3Barrel.cxx
+++ b/.conflict-side-0/PWGHF/ALICE3/TableProducer/candidateSelectorD0Alice3Barrel.cxx
@@ -15,18 +15,18 @@
 /// \author Nima Zardoshti <nima.zardoshti@cern.ch>, CERN
 /// \author Vít Kučera <vit.kucera@cern.ch>, CERN
 
-#include <vector>
-#include <algorithm>
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
+
+#include "ALICE3/DataModel/RICH.h"
 
 #include "CommonConstants/PhysicsConstants.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
 
-#include "ALICE3/DataModel/RICH.h"
-
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
+#include <algorithm>
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis;
diff --git a/.conflict-side-0/PWGHF/ALICE3/TableProducer/candidateSelectorD0Alice3Forward.cxx b/.conflict-side-0/PWGHF/ALICE3/TableProducer/candidateSelectorD0Alice3Forward.cxx
index a213c3edd04..adc59d03ed9 100644
--- a/.conflict-side-0/PWGHF/ALICE3/TableProducer/candidateSelectorD0Alice3Forward.cxx
+++ b/.conflict-side-0/PWGHF/ALICE3/TableProducer/candidateSelectorD0Alice3Forward.cxx
@@ -15,18 +15,18 @@
 /// \author Nima Zardoshti <nima.zardoshti@cern.ch>, CERN
 /// \author Vít Kučera <vit.kucera@cern.ch>, CERN
 
-#include <vector>
-#include <algorithm>
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
+
+#include "ALICE3/DataModel/RICH.h"
 
 #include "CommonConstants/PhysicsConstants.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
 
-#include "ALICE3/DataModel/RICH.h"
-
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
+#include <algorithm>
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis;
diff --git a/.conflict-side-0/PWGHF/ALICE3/TableProducer/candidateSelectorD0ParametrizedPid.cxx b/.conflict-side-0/PWGHF/ALICE3/TableProducer/candidateSelectorD0ParametrizedPid.cxx
index 6a46231b0c2..1ae60aa64b9 100644
--- a/.conflict-side-0/PWGHF/ALICE3/TableProducer/candidateSelectorD0ParametrizedPid.cxx
+++ b/.conflict-side-0/PWGHF/ALICE3/TableProducer/candidateSelectorD0ParametrizedPid.cxx
@@ -15,18 +15,18 @@
 /// \author Nima Zardoshti <nima.zardoshti@cern.ch>, CERN
 /// \author Vít Kučera <vit.kucera@cern.ch>, CERN
 
-#include <vector>
-#include <algorithm>
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
+
+#include "ALICE3/DataModel/RICH.h"
 
 #include "CommonConstants/PhysicsConstants.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
 
-#include "ALICE3/DataModel/RICH.h"
-
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
+#include <algorithm>
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis;
diff --git a/.conflict-side-0/PWGHF/ALICE3/TableProducer/candidateSelectorJpsi.cxx b/.conflict-side-0/PWGHF/ALICE3/TableProducer/candidateSelectorJpsi.cxx
index 391aba49da0..a04b064b1b1 100644
--- a/.conflict-side-0/PWGHF/ALICE3/TableProducer/candidateSelectorJpsi.cxx
+++ b/.conflict-side-0/PWGHF/ALICE3/TableProducer/candidateSelectorJpsi.cxx
@@ -16,18 +16,18 @@
 /// \author Nima Zardoshti <nima.zardoshti@cern.ch>, CERN
 /// \author Vít Kučera <vit.kucera@cern.ch>, CERN
 
-#include <vector>
-
-#include "CommonConstants/PhysicsConstants.h"
-#include "Framework/AnalysisTask.h"
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
 
 #include "ALICE3/DataModel/MID.h"
 #include "ALICE3/DataModel/RICH.h"
 #include "Common/Core/TrackSelectorPID.h"
 
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/AnalysisTask.h"
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis;
diff --git a/.conflict-side-0/PWGHF/ALICE3/TableProducer/candidateSelectorLcAlice3.cxx b/.conflict-side-0/PWGHF/ALICE3/TableProducer/candidateSelectorLcAlice3.cxx
index c9abeedad39..0703dbcaf89 100644
--- a/.conflict-side-0/PWGHF/ALICE3/TableProducer/candidateSelectorLcAlice3.cxx
+++ b/.conflict-side-0/PWGHF/ALICE3/TableProducer/candidateSelectorLcAlice3.cxx
@@ -16,17 +16,17 @@
 /// \author Nima Zardoshti <nima.zardoshti@cern.ch>, CERN
 /// \author Vít Kučera <vit.kucera@cern.ch>, CERN
 
-#include <vector>
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
+
+#include "ALICE3/DataModel/RICH.h"
 
 #include "CommonConstants/PhysicsConstants.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
 
-#include "ALICE3/DataModel/RICH.h"
-
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis;
diff --git a/.conflict-side-0/PWGHF/ALICE3/TableProducer/candidateSelectorLcParametrizedPid.cxx b/.conflict-side-0/PWGHF/ALICE3/TableProducer/candidateSelectorLcParametrizedPid.cxx
index 0a3210a63f6..4b5ab4feaea 100644
--- a/.conflict-side-0/PWGHF/ALICE3/TableProducer/candidateSelectorLcParametrizedPid.cxx
+++ b/.conflict-side-0/PWGHF/ALICE3/TableProducer/candidateSelectorLcParametrizedPid.cxx
@@ -16,17 +16,17 @@
 /// \author Nima Zardoshti <nima.zardoshti@cern.ch>, CERN
 /// \author Vít Kučera <vit.kucera@cern.ch>, CERN
 
-#include <vector>
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
+
+#include "ALICE3/DataModel/RICH.h"
 
 #include "CommonConstants/PhysicsConstants.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
 
-#include "ALICE3/DataModel/RICH.h"
-
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis;
diff --git a/.conflict-side-0/PWGHF/ALICE3/TableProducer/candidateSelectorXToJpsiPiPi.cxx b/.conflict-side-0/PWGHF/ALICE3/TableProducer/candidateSelectorXToJpsiPiPi.cxx
index bff87d84e70..bc1f5da2f7a 100644
--- a/.conflict-side-0/PWGHF/ALICE3/TableProducer/candidateSelectorXToJpsiPiPi.cxx
+++ b/.conflict-side-0/PWGHF/ALICE3/TableProducer/candidateSelectorXToJpsiPiPi.cxx
@@ -16,16 +16,16 @@
 /// \author Rik Spijkers <r.spijkers@students.uu.nl>, Utrecht University
 /// \author Luca Micheletti <luca.micheletti@to.infn.it>, INFN
 
-#include <vector>
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/Core/SelectorCuts.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
 
 #include "CommonConstants/PhysicsConstants.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
 
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/Core/SelectorCuts.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
+#include <vector>
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-side-0/PWGHF/ALICE3/TableProducer/treeCreatorChicToJpsiGamma.cxx b/.conflict-side-0/PWGHF/ALICE3/TableProducer/treeCreatorChicToJpsiGamma.cxx
index 1b164a0fc0e..29019da1884 100644
--- a/.conflict-side-0/PWGHF/ALICE3/TableProducer/treeCreatorChicToJpsiGamma.cxx
+++ b/.conflict-side-0/PWGHF/ALICE3/TableProducer/treeCreatorChicToJpsiGamma.cxx
@@ -18,14 +18,14 @@
 /// \author Alessandro De Falco <alessandro.de.falco@ca.infn.it>, Università/INFN Cagliari
 /// \author Luca Micheletti <luca.micheletti@to.infn.it>, INFN
 
-#include "CommonConstants/PhysicsConstants.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-
 #include "PWGHF/Core/HfHelper.h"
 #include "PWGHF/DataModel/CandidateReconstructionTables.h"
 #include "PWGHF/DataModel/CandidateSelectionTables.h"
 
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::aod;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGHF/ALICE3/TableProducer/treeCreatorXToJpsiPiPi.cxx b/.conflict-side-0/PWGHF/ALICE3/TableProducer/treeCreatorXToJpsiPiPi.cxx
index 7a981b35798..d6cb0c8a83d 100644
--- a/.conflict-side-0/PWGHF/ALICE3/TableProducer/treeCreatorXToJpsiPiPi.cxx
+++ b/.conflict-side-0/PWGHF/ALICE3/TableProducer/treeCreatorXToJpsiPiPi.cxx
@@ -17,13 +17,13 @@
 ///
 /// \author Luca Micheletti <luca.micheletti@to.infn.it>, INFN
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-
 #include "PWGHF/Core/HfHelper.h"
 #include "PWGHF/DataModel/CandidateReconstructionTables.h"
 #include "PWGHF/DataModel/CandidateSelectionTables.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::aod;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGHF/ALICE3/Tasks/taskChic.cxx b/.conflict-side-0/PWGHF/ALICE3/Tasks/taskChic.cxx
index f8cb85454a1..5a7adab7404 100644
--- a/.conflict-side-0/PWGHF/ALICE3/Tasks/taskChic.cxx
+++ b/.conflict-side-0/PWGHF/ALICE3/Tasks/taskChic.cxx
@@ -15,16 +15,16 @@
 /// \author Gian Michele Innocenti <gian.michele.innocenti@cern.ch>, CERN
 /// \author Alessandro De Falco <alessandro.de.falco@ca.infn.it>, Cagliari University
 
-#include <vector>
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/Core/SelectorCuts.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
 
 #include "CommonConstants/PhysicsConstants.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/Core/SelectorCuts.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
+#include <vector>
 
 using namespace o2;
 using namespace o2::aod;
@@ -101,8 +101,8 @@ struct HfTaskChic {
       registry.fill(HIST("hDecLenXYErr"), candidate.errorDecayLengthXY(), candidate.pt());
       //      registry.fill(HIST("hEGamma"), candidate.prong1().e());
     } // candidate loop
-  }   // process
-};    // struct
+  } // process
+}; // struct
 
 struct HfTaskChicMc {
   Configurable<int> selectionFlagChic{"selectionFlagChic", 1, "Selection Flag for Chic"};
@@ -225,8 +225,8 @@ struct HfTaskChicMc {
         registry.fill(HIST("hPtProng1Gen"), ptProngs[1], particle.pt());
       }
     } // gen
-  }   // process
-};    // struct
+  } // process
+}; // struct
 
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
diff --git a/.conflict-side-0/PWGHF/ALICE3/Tasks/taskD0Alice3Barrel.cxx b/.conflict-side-0/PWGHF/ALICE3/Tasks/taskD0Alice3Barrel.cxx
index da86e77a06b..481c85248b0 100644
--- a/.conflict-side-0/PWGHF/ALICE3/Tasks/taskD0Alice3Barrel.cxx
+++ b/.conflict-side-0/PWGHF/ALICE3/Tasks/taskD0Alice3Barrel.cxx
@@ -15,15 +15,15 @@
 /// \author Gian Michele Innocenti <gian.michele.innocenti@cern.ch>, CERN
 /// \author Vít Kučera <vit.kucera@cern.ch>, CERN
 
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
+
 #include "CommonConstants/PhysicsConstants.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
 
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-0/PWGHF/ALICE3/Tasks/taskD0Alice3Forward.cxx b/.conflict-side-0/PWGHF/ALICE3/Tasks/taskD0Alice3Forward.cxx
index dea53a20d70..0b4afc24583 100644
--- a/.conflict-side-0/PWGHF/ALICE3/Tasks/taskD0Alice3Forward.cxx
+++ b/.conflict-side-0/PWGHF/ALICE3/Tasks/taskD0Alice3Forward.cxx
@@ -15,15 +15,15 @@
 /// \author Gian Michele Innocenti <gian.michele.innocenti@cern.ch>, CERN
 /// \author Vít Kučera <vit.kucera@cern.ch>, CERN
 
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
+
 #include "CommonConstants/PhysicsConstants.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
 
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-0/PWGHF/ALICE3/Tasks/taskD0ParametrizedPid.cxx b/.conflict-side-0/PWGHF/ALICE3/Tasks/taskD0ParametrizedPid.cxx
index 3fe2487b2f3..a0df06fd12c 100644
--- a/.conflict-side-0/PWGHF/ALICE3/Tasks/taskD0ParametrizedPid.cxx
+++ b/.conflict-side-0/PWGHF/ALICE3/Tasks/taskD0ParametrizedPid.cxx
@@ -15,15 +15,15 @@
 /// \author Gian Michele Innocenti <gian.michele.innocenti@cern.ch>, CERN
 /// \author Vít Kučera <vit.kucera@cern.ch>, CERN
 
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
+
 #include "CommonConstants/PhysicsConstants.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
 
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-0/PWGHF/ALICE3/Tasks/taskJpsi.cxx b/.conflict-side-0/PWGHF/ALICE3/Tasks/taskJpsi.cxx
index a9210ccca86..d231b55c3d4 100644
--- a/.conflict-side-0/PWGHF/ALICE3/Tasks/taskJpsi.cxx
+++ b/.conflict-side-0/PWGHF/ALICE3/Tasks/taskJpsi.cxx
@@ -16,15 +16,15 @@
 /// \author Vít Kučera <vit.kucera@cern.ch>, CERN
 /// \author Biao Zhang <biao.zhang@cern.ch>, CCNU
 
-#include <vector>
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
 
 #include "CommonConstants/PhysicsConstants.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis;
diff --git a/.conflict-side-0/PWGHF/ALICE3/Tasks/taskLcAlice3.cxx b/.conflict-side-0/PWGHF/ALICE3/Tasks/taskLcAlice3.cxx
index 9bbfdaf91e5..4889ac7d5b3 100644
--- a/.conflict-side-0/PWGHF/ALICE3/Tasks/taskLcAlice3.cxx
+++ b/.conflict-side-0/PWGHF/ALICE3/Tasks/taskLcAlice3.cxx
@@ -15,15 +15,15 @@
 /// \author Gian Michele Innocenti <gian.michele.innocenti@cern.ch>, CERN
 /// \author Vít Kučera <vit.kucera@cern.ch>, CERN
 
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
+
 #include "CommonConstants/PhysicsConstants.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
 
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-0/PWGHF/ALICE3/Tasks/taskLcParametrizedPid.cxx b/.conflict-side-0/PWGHF/ALICE3/Tasks/taskLcParametrizedPid.cxx
index 8936c56e2c1..2457f7a6e88 100644
--- a/.conflict-side-0/PWGHF/ALICE3/Tasks/taskLcParametrizedPid.cxx
+++ b/.conflict-side-0/PWGHF/ALICE3/Tasks/taskLcParametrizedPid.cxx
@@ -15,15 +15,15 @@
 /// \author Gian Michele Innocenti <gian.michele.innocenti@cern.ch>, CERN
 /// \author Vít Kučera <vit.kucera@cern.ch>, CERN
 
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
+
 #include "CommonConstants/PhysicsConstants.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
 
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-0/PWGHF/ALICE3/Tasks/taskQaPidRejection.cxx b/.conflict-side-0/PWGHF/ALICE3/Tasks/taskQaPidRejection.cxx
index f0e819e3086..82156ed8e3f 100644
--- a/.conflict-side-0/PWGHF/ALICE3/Tasks/taskQaPidRejection.cxx
+++ b/.conflict-side-0/PWGHF/ALICE3/Tasks/taskQaPidRejection.cxx
@@ -16,16 +16,7 @@
 /// \author Henrique J C Zanoli <henrique.zanoli@cern.ch>, Utrecht University
 /// \author Nicolo' Jacazio <nicolo.jacazio@cern.ch>, CERN
 
-#include <utility>
-#include <vector>
-
-#include <TEfficiency.h>
-#include <TList.h>
-#include <TPDGCode.h>
-
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "ReconstructionDataFormats/DCA.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
 
 #include "ALICE3/DataModel/MID.h"
 #include "ALICE3/DataModel/RICH.h"
@@ -33,7 +24,16 @@
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "ReconstructionDataFormats/DCA.h"
+
+#include <TEfficiency.h>
+#include <TList.h>
+#include <TPDGCode.h>
+
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGHF/ALICE3/Tasks/taskX.cxx b/.conflict-side-0/PWGHF/ALICE3/Tasks/taskX.cxx
index f090eb57876..295d7517787 100644
--- a/.conflict-side-0/PWGHF/ALICE3/Tasks/taskX.cxx
+++ b/.conflict-side-0/PWGHF/ALICE3/Tasks/taskX.cxx
@@ -16,16 +16,16 @@
 /// \author Rik Spijkers <r.spijkers@students.uu.nl>, Utrecht University
 /// \author Luca Micheletti <luca.micheletti@to.infn.it>, INFN
 
-#include <vector>
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/Core/SelectorCuts.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
 
 #include "CommonConstants/PhysicsConstants.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/Core/SelectorCuts.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
+#include <vector>
 
 using namespace o2;
 using namespace o2::aod;
@@ -102,8 +102,8 @@ struct HfTaskX {
       registry.fill(HIST("hDecLenErr"), candidate.errorDecayLength(), candidate.pt());
       registry.fill(HIST("hDecLenXYErr"), candidate.errorDecayLengthXY(), candidate.pt());
     } // candidate loop
-  }   // process
-};    // struct
+  } // process
+}; // struct
 
 struct HfTaskXMc {
   Configurable<int> selectionFlagX{"selectionFlagX", 1, "Selection Flag for X"};
@@ -230,8 +230,8 @@ struct HfTaskXMc {
         registry.fill(HIST("hPtGenProng2"), ptProngs[2], particle.pt());
       }
     } // gen
-  }   // process
-};    // struct
+  } // process
+}; // struct
 
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
diff --git a/.conflict-side-0/PWGHF/D2H/DataModel/ReducedDataModel.h b/.conflict-side-0/PWGHF/D2H/DataModel/ReducedDataModel.h
index e5a776c02c4..34f844cdc3e 100644
--- a/.conflict-side-0/PWGHF/D2H/DataModel/ReducedDataModel.h
+++ b/.conflict-side-0/PWGHF/D2H/DataModel/ReducedDataModel.h
@@ -1165,7 +1165,7 @@ DECLARE_SOA_COLUMN(Sign, sign, int8_t);                                      //!
 DECLARE_SOA_COLUMN(ItsNClsSoftPi, itsNClsSoftPi, int);                       //! minimum value of number of ITS clusters for the decay daughter tracks
 DECLARE_SOA_COLUMN(TpcNClsCrossedRowsSoftPi, tpcNClsCrossedRowsSoftPi, int); //! minimum value of number of TPC crossed rows for the decay daughter tracks
 DECLARE_SOA_COLUMN(TpcChi2NClSoftPi, tpcChi2NClSoftPi, float);               //! maximum value of TPC chi2 for the decay daughter tracks
-DECLARE_SOA_DYNAMIC_COLUMN(Px, px, //!
+DECLARE_SOA_DYNAMIC_COLUMN(Px, px,                                           //!
                            [](float pxProng0, float pxProng1, float pxProng2) -> float { return 1.f * pxProng0 + 1.f * pxProng1 + 1.f * pxProng2; });
 DECLARE_SOA_DYNAMIC_COLUMN(Py, py, //!
                            [](float pyProng0, float pyProng1, float pyProng2) -> float { return 1.f * pyProng0 + 1.f * pyProng1 + 1.f * pyProng2; });
@@ -1376,16 +1376,16 @@ DECLARE_SOA_COLUMN(InvMassProng1, invMassProng1, float); //! Invariant Mass of V
 DECLARE_SOA_COLUMN(Sign, sign, int8_t);                  //! Sign of the Resonance candidate
 DECLARE_SOA_COLUMN(IsWrongSign, isWrongSign, int8_t);    //! Flag for wrong sign of the Resonance candidate, 1 = wrong sign, 0 = right sign
 
-DECLARE_SOA_COLUMN(FlagMcMatchRec, flagMcMatchRec, int8_t);               // flag for resonance decay channel classification reconstruction level
-DECLARE_SOA_COLUMN(FlagMcMatchRecD, flagMcMatchRecD, int8_t);             // flag for D meson bachelor decay channel classification reconstruction level
-DECLARE_SOA_COLUMN(FlagMcMatchChanD, flagMcMatchChanD, int8_t);           // flag for D meson resonant channel classification reconstruction level
-DECLARE_SOA_COLUMN(FlagMcMatchGen, flagMcMatchGen, int8_t);               // flag for decay channel classification generator level
-DECLARE_SOA_COLUMN(DebugMcRec, debugMcRec, uint16_t);                     // debug flag for mis-association at reconstruction level
-DECLARE_SOA_COLUMN(Origin, origin, int8_t);                               // Flag for origin of MC particle 1=promt, 2=FD
-DECLARE_SOA_COLUMN(SignD0, signD0, int8_t);                               // Sign of the D0 in the channels with D* -> D0 pi, needed in case of non-matched D*
-DECLARE_SOA_COLUMN(PtGen, ptGen, float);                                  // Pt at generation level in GeV/c
-DECLARE_SOA_COLUMN(InvMassGen, invMassGen, float);                        //! Invariant mass at generation level in GeV/c2
-DECLARE_SOA_DYNAMIC_COLUMN(Pt, pt,                                        //!
+DECLARE_SOA_COLUMN(FlagMcMatchRec, flagMcMatchRec, int8_t);     // flag for resonance decay channel classification reconstruction level
+DECLARE_SOA_COLUMN(FlagMcMatchRecD, flagMcMatchRecD, int8_t);   // flag for D meson bachelor decay channel classification reconstruction level
+DECLARE_SOA_COLUMN(FlagMcMatchChanD, flagMcMatchChanD, int8_t); // flag for D meson resonant channel classification reconstruction level
+DECLARE_SOA_COLUMN(FlagMcMatchGen, flagMcMatchGen, int8_t);     // flag for decay channel classification generator level
+DECLARE_SOA_COLUMN(DebugMcRec, debugMcRec, uint16_t);           // debug flag for mis-association at reconstruction level
+DECLARE_SOA_COLUMN(Origin, origin, int8_t);                     // Flag for origin of MC particle 1=promt, 2=FD
+DECLARE_SOA_COLUMN(SignD0, signD0, int8_t);                     // Sign of the D0 in the channels with D* -> D0 pi, needed in case of non-matched D*
+DECLARE_SOA_COLUMN(PtGen, ptGen, float);                        // Pt at generation level in GeV/c
+DECLARE_SOA_COLUMN(InvMassGen, invMassGen, float);              //! Invariant mass at generation level in GeV/c2
+DECLARE_SOA_DYNAMIC_COLUMN(Pt, pt,                              //!
                            [](float pxProng0, float pxProng1, float pyProng0, float pyProng1) -> float { return RecoDecay::pt((1.f * pxProng0 + 1.f * pxProng1), (1.f * pyProng0 + 1.f * pyProng1)); });
 DECLARE_SOA_DYNAMIC_COLUMN(PtProng0, ptProng0, //!
                            [](float pxProng0, float pyProng0) -> float { return RecoDecay::pt(pxProng0, pyProng0); });
diff --git a/.conflict-side-0/PWGHF/HFC/Macros/DhCorrelationExtraction.h b/.conflict-side-0/PWGHF/HFC/Macros/DhCorrelationExtraction.h
index 73b07c61e83..ddfe205372c 100644
--- a/.conflict-side-0/PWGHF/HFC/Macros/DhCorrelationExtraction.h
+++ b/.conflict-side-0/PWGHF/HFC/Macros/DhCorrelationExtraction.h
@@ -17,8 +17,6 @@
 #ifndef PWGHF_HFC_MACROS_DHCORRELATIONEXTRACTION_H_
 #define PWGHF_HFC_MACROS_DHCORRELATIONEXTRACTION_H_
 
-#include <Rtypes.h>
-#include <RtypesCore.h>
 #include <TAttMarker.h>
 #include <TDirectoryFile.h>
 #include <TFile.h>
@@ -28,6 +26,9 @@
 #include <TObject.h>
 #include <TString.h>
 
+#include <Rtypes.h>
+#include <RtypesCore.h>
+
 class DhCorrelationExtraction : public TObject
 {
 
diff --git a/.conflict-side-0/PWGHF/HFC/Macros/DhCorrelationFitter.h b/.conflict-side-0/PWGHF/HFC/Macros/DhCorrelationFitter.h
index a4bdf3c3bb1..e2354624bf2 100644
--- a/.conflict-side-0/PWGHF/HFC/Macros/DhCorrelationFitter.h
+++ b/.conflict-side-0/PWGHF/HFC/Macros/DhCorrelationFitter.h
@@ -17,12 +17,13 @@
 #ifndef PWGHF_HFC_MACROS_DHCORRELATIONFITTER_H_
 #define PWGHF_HFC_MACROS_DHCORRELATIONFITTER_H_
 
-#include <cstdio>
-
-#include <RtypesCore.h>
 #include <TF1.h>
 #include <TH1.h>
 
+#include <RtypesCore.h>
+
+#include <cstdio>
+
 class DhCorrelationFitter
 {
 
diff --git a/.conflict-side-0/PWGHF/HFC/Macros/ExtractOutputCorrel.C b/.conflict-side-0/PWGHF/HFC/Macros/ExtractOutputCorrel.C
index 301434f66e2..872093701ff 100644
--- a/.conflict-side-0/PWGHF/HFC/Macros/ExtractOutputCorrel.C
+++ b/.conflict-side-0/PWGHF/HFC/Macros/ExtractOutputCorrel.C
@@ -16,12 +16,14 @@
 /// \author Samuele Cattaruzzi <samuele.cattaruzzi@cern.ch>
 /// \author Swapnesh Santosh Khade <swapnesh.santosh.khade@cern.ch>
 
+#include "DhCorrelationExtraction.h"
 #include "Riostream.h"
+
 #include <TROOT.h>
 #include <TStyle.h>
+
 #include <rapidjson/document.h>
 #include <rapidjson/filereadstream.h>
-#include "DhCorrelationExtraction.h"
 
 using namespace rapidjson;
 
diff --git a/.conflict-side-0/PWGHF/HFC/Macros/FitCorrel.C b/.conflict-side-0/PWGHF/HFC/Macros/FitCorrel.C
index 37b36a5e1b3..3e15eda604a 100644
--- a/.conflict-side-0/PWGHF/HFC/Macros/FitCorrel.C
+++ b/.conflict-side-0/PWGHF/HFC/Macros/FitCorrel.C
@@ -16,17 +16,19 @@
 /// \author Samuele Cattaruzzi <samuele.cattaruzzi@cern.ch>
 /// \author Swapnesh Santosh Khade <swapnesh.santosh.khade@cern.ch>
 
+#include "DhCorrelationFitter.h"
 #include "Riostream.h"
-#include <TROOT.h>
+
 #include <TF1.h>
 #include <TH1D.h>
 #include <TMath.h>
 #include <TPaveText.h>
-#include <TSystem.h>
+#include <TROOT.h>
 #include <TStyle.h>
+#include <TSystem.h>
+
 #include <rapidjson/document.h>
 #include <rapidjson/filereadstream.h>
-#include "DhCorrelationFitter.h"
 
 using namespace rapidjson;
 
diff --git a/.conflict-side-0/PWGJE/Core/MlResponseHfTagging.h b/.conflict-side-0/PWGJE/Core/MlResponseHfTagging.h
index 2b07e1c1c25..186575205b9 100644
--- a/.conflict-side-0/PWGJE/Core/MlResponseHfTagging.h
+++ b/.conflict-side-0/PWGJE/Core/MlResponseHfTagging.h
@@ -18,11 +18,10 @@
 
 #include "Tools/ML/MlResponse.h"
 
-#include <onnxruntime_cxx_api.h>
-
 #include <Framework/Logger.h>
 
 #include <onnxruntime_c_api.h>
+#include <onnxruntime_cxx_api.h>
 
 #include <cstddef>
 #include <cstdint>
@@ -330,6 +329,7 @@ class TensorAllocator
 {
  protected:
   Ort::MemoryInfo memInfo;
+
  public:
   TensorAllocator()
     : memInfo(Ort::MemoryInfo::CreateCpu(OrtAllocatorType::OrtArenaAllocator, OrtMemType::OrtMemTypeDefault))
diff --git a/.conflict-side-0/PWGJE/DataModel/PhotonChargedTriggerCorrelation.h b/.conflict-side-0/PWGJE/DataModel/PhotonChargedTriggerCorrelation.h
index 53f5e581d82..36806e1f4c0 100644
--- a/.conflict-side-0/PWGJE/DataModel/PhotonChargedTriggerCorrelation.h
+++ b/.conflict-side-0/PWGJE/DataModel/PhotonChargedTriggerCorrelation.h
@@ -18,11 +18,12 @@
 #ifndef PWGJE_DATAMODEL_PHOTONCHARGEDTRIGGERCORRELATION_H_
 #define PWGJE_DATAMODEL_PHOTONCHARGEDTRIGGERCORRELATION_H_
 
-#include "Framework/AnalysisDataModel.h"
-#include "PWGJE/Core/JetDerivedDataUtilities.h"
-#include "PWGJE/DataModel/Jet.h"
 #include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
 #include "PWGEM/PhotonMeson/Utils/PCMUtilities.h"
+#include "PWGJE/Core/JetDerivedDataUtilities.h"
+#include "PWGJE/DataModel/Jet.h"
+
+#include "Framework/AnalysisDataModel.h"
 
 namespace o2::aod
 {
diff --git a/.conflict-side-0/PWGJE/Tasks/photonChargedTriggerCorrelation.cxx b/.conflict-side-0/PWGJE/Tasks/photonChargedTriggerCorrelation.cxx
index 8c62845a145..57d72df74ab 100644
--- a/.conflict-side-0/PWGJE/Tasks/photonChargedTriggerCorrelation.cxx
+++ b/.conflict-side-0/PWGJE/Tasks/photonChargedTriggerCorrelation.cxx
@@ -18,36 +18,37 @@
 /// Also contains checks and monte-carlo (efficiency, purity, mc-true correlation,...)
 /// End goal of studying correlations between direct photons and jets
 
-#include <cmath>
-#include <deque>
-#include <string>
-#include <vector>
-#include <algorithm>
-#include <chrono>
-#include <memory>
-#include <random>
+#include "PWGJE/DataModel/PhotonChargedTriggerCorrelation.h"
 
-#include "TMath.h"
-#include "Math/Vector4D.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+#include "PWGEM/PhotonMeson/Utils/PCMUtilities.h"
+#include "PWGJE/DataModel/Jet.h"
+
+#include "Common/Core/TableHelper.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
 #include "CCDB/BasicCCDBManager.h"
 #include "Framework/ASoAHelpers.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/TableHelper.h"
+#include "Framework/runDataProcessing.h"
 
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/PhotonMeson/Utils/PCMUtilities.h"
+#include "Math/Vector4D.h"
+#include "TMath.h"
 
-#include "PWGJE/DataModel/Jet.h"
-#include "PWGJE/DataModel/PhotonChargedTriggerCorrelation.h"
+#include <algorithm>
+#include <chrono>
+#include <cmath>
+#include <deque>
+#include <memory>
+#include <random>
+#include <string>
+#include <vector>
 
 const double absEtaMax = 0.8;
 #define DPHI_SCALE constants::math::TwoPI - constants::math::PIHalf
diff --git a/.conflict-side-0/PWGJE/Tasks/statPromptPhoton.cxx b/.conflict-side-0/PWGJE/Tasks/statPromptPhoton.cxx
index 977b94741c5..f23bb34df88 100644
--- a/.conflict-side-0/PWGJE/Tasks/statPromptPhoton.cxx
+++ b/.conflict-side-0/PWGJE/Tasks/statPromptPhoton.cxx
@@ -1114,9 +1114,9 @@ struct statPromptPhoton {
 
     histos.fill(HIST("DATA_nEvents"), 2.5);
 
-      if (!jetderiveddatautilities::selectTrigger(collision, triggerMaskBits)) {
-        return;
-      }
+    if (!jetderiveddatautilities::selectTrigger(collision, triggerMaskBits)) {
+      return;
+    }
 
     histos.fill(HIST("DATA_nEvents"), 3.5);
 
diff --git a/.conflict-side-0/PWGJE/Tasks/trackEfficiency.cxx b/.conflict-side-0/PWGJE/Tasks/trackEfficiency.cxx
index bb2683b0918..564e3bf10d0 100644
--- a/.conflict-side-0/PWGJE/Tasks/trackEfficiency.cxx
+++ b/.conflict-side-0/PWGJE/Tasks/trackEfficiency.cxx
@@ -554,7 +554,7 @@ struct TrackEfficiency {
 
       registry.fill(HIST("h3_particle_pt_high_particle_eta_particle_phi_mcpartofinterest"), jMcParticle.pt(), jMcParticle.eta(), jMcParticle.phi(), mcCollEventWeight);
 
-      if ((std::abs(jMcParticle.eta()) < trackEtaAcceptanceCountQA)) { // removed from actual cuts for now because all the histograms have an eta axis
+      if ((std::abs(jMcParticle.eta()) < trackEtaAcceptanceCountQA)) {       // removed from actual cuts for now because all the histograms have an eta axis
         registry.fill(HIST("hMcPartCutsCounts"), 3.5, mcCollision.weight()); // etaAccept // not actually applied here but it will give an idea of what will be done in the post processing
       }
     }
diff --git a/.conflict-side-0/PWGLF/DataModel/EPCalibrationTables.h b/.conflict-side-0/PWGLF/DataModel/EPCalibrationTables.h
index 8954ccd1c9e..a00acd94353 100644
--- a/.conflict-side-0/PWGLF/DataModel/EPCalibrationTables.h
+++ b/.conflict-side-0/PWGLF/DataModel/EPCalibrationTables.h
@@ -16,13 +16,14 @@
 #ifndef PWGLF_DATAMODEL_EPCALIBRATIONTABLES_H_
 #define PWGLF_DATAMODEL_EPCALIBRATIONTABLES_H_
 
-#include <cmath>
-
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/Core/RecoDecay.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/AnalysisDataModel.h"
 
+#include <cmath>
+
 namespace o2::aod
 {
 namespace epcalibrationtable
diff --git a/.conflict-side-0/PWGLF/DataModel/FilterF1ProtonTables.h b/.conflict-side-0/PWGLF/DataModel/FilterF1ProtonTables.h
index 0475e7cebb5..dff0c1c0d00 100644
--- a/.conflict-side-0/PWGLF/DataModel/FilterF1ProtonTables.h
+++ b/.conflict-side-0/PWGLF/DataModel/FilterF1ProtonTables.h
@@ -16,13 +16,14 @@
 #ifndef PWGLF_DATAMODEL_FILTERF1PROTONTABLES_H_
 #define PWGLF_DATAMODEL_FILTERF1PROTONTABLES_H_
 
-#include <cmath>
-
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/Core/RecoDecay.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/AnalysisDataModel.h"
 
+#include <cmath>
+
 namespace o2::aod
 {
 namespace filtering
diff --git a/.conflict-side-0/PWGLF/DataModel/LFClusterStudiesTable.h b/.conflict-side-0/PWGLF/DataModel/LFClusterStudiesTable.h
index 88ca35a85d3..edb9d77edf5 100644
--- a/.conflict-side-0/PWGLF/DataModel/LFClusterStudiesTable.h
+++ b/.conflict-side-0/PWGLF/DataModel/LFClusterStudiesTable.h
@@ -11,8 +11,8 @@
 //
 // Author: Giorgio Alberto Lucia
 
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
 
 #ifndef PWGLF_DATAMODEL_LFCLUSTERSTUDIESTABLE_H_
 #define PWGLF_DATAMODEL_LFCLUSTERSTUDIESTABLE_H_
diff --git a/.conflict-side-0/PWGLF/DataModel/LFDoubleCascTables.h b/.conflict-side-0/PWGLF/DataModel/LFDoubleCascTables.h
index 49e3b6604de..ec17c6a9864 100644
--- a/.conflict-side-0/PWGLF/DataModel/LFDoubleCascTables.h
+++ b/.conflict-side-0/PWGLF/DataModel/LFDoubleCascTables.h
@@ -9,8 +9,8 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
 
 #ifndef PWGLF_DATAMODEL_LFDOUBLECASCTABLES_H_
 #define PWGLF_DATAMODEL_LFDOUBLECASCTABLES_H_
diff --git a/.conflict-side-0/PWGLF/DataModel/LFEbyeTables.h b/.conflict-side-0/PWGLF/DataModel/LFEbyeTables.h
index 59876ae59c1..16d1982f69c 100644
--- a/.conflict-side-0/PWGLF/DataModel/LFEbyeTables.h
+++ b/.conflict-side-0/PWGLF/DataModel/LFEbyeTables.h
@@ -9,8 +9,8 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
 
 #ifndef PWGLF_DATAMODEL_LFEBYETABLES_H_
 #define PWGLF_DATAMODEL_LFEBYETABLES_H_
diff --git a/.conflict-side-0/PWGLF/DataModel/LFF1Tables.h b/.conflict-side-0/PWGLF/DataModel/LFF1Tables.h
index 947e9f0c3a8..a38dc30ea97 100644
--- a/.conflict-side-0/PWGLF/DataModel/LFF1Tables.h
+++ b/.conflict-side-0/PWGLF/DataModel/LFF1Tables.h
@@ -16,13 +16,14 @@
 #ifndef PWGLF_DATAMODEL_LFF1TABLES_H_
 #define PWGLF_DATAMODEL_LFF1TABLES_H_
 
-#include <cmath>
-
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/Core/RecoDecay.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/AnalysisDataModel.h"
 
+#include <cmath>
+
 namespace o2::aod
 {
 /// F1 Collisions
diff --git a/.conflict-side-0/PWGLF/DataModel/LFHyperhelium4Tables.h b/.conflict-side-0/PWGLF/DataModel/LFHyperhelium4Tables.h
index 8d7d5f4d379..256229876ce 100644
--- a/.conflict-side-0/PWGLF/DataModel/LFHyperhelium4Tables.h
+++ b/.conflict-side-0/PWGLF/DataModel/LFHyperhelium4Tables.h
@@ -11,10 +11,12 @@
 #ifndef PWGLF_DATAMODEL_LFHYHEFOURTABLES_H_
 #define PWGLF_DATAMODEL_LFHYHEFOURTABLES_H_
 
-#include <cmath>
-#include "Framework/AnalysisDataModel.h"
 #include "Common/Core/RecoDecay.h"
+
 #include "CommonConstants/PhysicsConstants.h"
+#include "Framework/AnalysisDataModel.h"
+
+#include <cmath>
 
 //===========================================================================
 // For aiding in building: tag those candidates that are interesting
diff --git a/.conflict-side-0/PWGLF/DataModel/LFHypernucleiKfTables.h b/.conflict-side-0/PWGLF/DataModel/LFHypernucleiKfTables.h
index 0e2424f3bb5..5e8ab65ce91 100644
--- a/.conflict-side-0/PWGLF/DataModel/LFHypernucleiKfTables.h
+++ b/.conflict-side-0/PWGLF/DataModel/LFHypernucleiKfTables.h
@@ -16,11 +16,13 @@
 #ifndef PWGLF_DATAMODEL_LFHYPERNUCLEIKFTABLES_H_
 #define PWGLF_DATAMODEL_LFHYPERNUCLEIKFTABLES_H_
 
-#include <cmath>
+#include "Common/Core/RecoDecay.h"
+#include "Common/DataModel/Centrality.h"
+
 #include "Framework/ASoA.h"
 #include "Framework/AnalysisDataModel.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/Core/RecoDecay.h"
+
+#include <cmath>
 
 namespace o2::aod
 {
diff --git a/.conflict-side-0/PWGLF/DataModel/LFHypernucleiTables.h b/.conflict-side-0/PWGLF/DataModel/LFHypernucleiTables.h
index f144daccba6..b04e24a26a2 100644
--- a/.conflict-side-0/PWGLF/DataModel/LFHypernucleiTables.h
+++ b/.conflict-side-0/PWGLF/DataModel/LFHypernucleiTables.h
@@ -14,8 +14,8 @@
 /// \brief Slim hypernuclei tables
 ///
 
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
 
 #ifndef PWGLF_DATAMODEL_LFHYPERNUCLEITABLES_H_
 #define PWGLF_DATAMODEL_LFHYPERNUCLEITABLES_H_
diff --git a/.conflict-side-0/PWGLF/DataModel/LFLithium4Tables.h b/.conflict-side-0/PWGLF/DataModel/LFLithium4Tables.h
index 486e44575ee..95d8a26ef05 100644
--- a/.conflict-side-0/PWGLF/DataModel/LFLithium4Tables.h
+++ b/.conflict-side-0/PWGLF/DataModel/LFLithium4Tables.h
@@ -14,8 +14,8 @@
 /// \brief Slim tables for Lithium4
 ///
 
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
 
 #ifndef PWGLF_DATAMODEL_LFLITHIUM4TABLES_H_
 #define PWGLF_DATAMODEL_LFLITHIUM4TABLES_H_
diff --git a/.conflict-side-0/PWGLF/DataModel/LFLnnTables.h b/.conflict-side-0/PWGLF/DataModel/LFLnnTables.h
index f9ab7fe3989..613d37931d4 100644
--- a/.conflict-side-0/PWGLF/DataModel/LFLnnTables.h
+++ b/.conflict-side-0/PWGLF/DataModel/LFLnnTables.h
@@ -14,8 +14,8 @@
 /// \brief Slim lnn tables
 ///
 
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
 
 #ifndef PWGLF_DATAMODEL_LFLNNTABLES_H_
 #define PWGLF_DATAMODEL_LFLNNTABLES_H_
diff --git a/.conflict-side-0/PWGLF/DataModel/LFNonPromptCascadeTables.h b/.conflict-side-0/PWGLF/DataModel/LFNonPromptCascadeTables.h
index b698164abd4..0651a38eb68 100644
--- a/.conflict-side-0/PWGLF/DataModel/LFNonPromptCascadeTables.h
+++ b/.conflict-side-0/PWGLF/DataModel/LFNonPromptCascadeTables.h
@@ -14,8 +14,8 @@
 /// \brief Non prompt cascade tables
 ///
 
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
 
 #ifndef PWGLF_DATAMODEL_LFNONPROMPTCASCADETABLES_H_
 #define PWGLF_DATAMODEL_LFNONPROMPTCASCADETABLES_H_
diff --git a/.conflict-side-0/PWGLF/DataModel/LFNucleiTables.h b/.conflict-side-0/PWGLF/DataModel/LFNucleiTables.h
index 1cd9ba76c93..be19614fc9b 100644
--- a/.conflict-side-0/PWGLF/DataModel/LFNucleiTables.h
+++ b/.conflict-side-0/PWGLF/DataModel/LFNucleiTables.h
@@ -16,8 +16,9 @@
 ///
 
 #include "Common/CCDB/EventSelectionParams.h"
-#include "Framework/AnalysisDataModel.h"
+
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
 
 #ifndef PWGLF_DATAMODEL_LFNUCLEITABLES_H_
 #define PWGLF_DATAMODEL_LFNUCLEITABLES_H_
diff --git a/.conflict-side-0/PWGLF/DataModel/LFParticleIdentification.h b/.conflict-side-0/PWGLF/DataModel/LFParticleIdentification.h
index 5a688e4c97c..a3c6cf52581 100644
--- a/.conflict-side-0/PWGLF/DataModel/LFParticleIdentification.h
+++ b/.conflict-side-0/PWGLF/DataModel/LFParticleIdentification.h
@@ -20,11 +20,12 @@
 #define PWGLF_DATAMODEL_LFPARTICLEIDENTIFICATION_H_
 
 // O2 includes
+#include "Common/DataModel/PIDResponse.h"
+
 #include "Framework/ASoA.h"
 #include "Framework/AnalysisDataModel.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "ReconstructionDataFormats/PID.h"
 #include "Framework/Logger.h"
+#include "ReconstructionDataFormats/PID.h"
 
 namespace o2::aod
 {
diff --git a/.conflict-side-0/PWGLF/DataModel/LFResonanceTables.h b/.conflict-side-0/PWGLF/DataModel/LFResonanceTables.h
index 67e1fb013c5..fd8cd3b938b 100644
--- a/.conflict-side-0/PWGLF/DataModel/LFResonanceTables.h
+++ b/.conflict-side-0/PWGLF/DataModel/LFResonanceTables.h
@@ -22,15 +22,17 @@
 #ifndef PWGLF_DATAMODEL_LFRESONANCETABLES_H_
 #define PWGLF_DATAMODEL_LFRESONANCETABLES_H_
 
-#include <cmath>
-#include <algorithm>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/Core/RecoDecay.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/AnalysisDataModel.h"
-#include "Common/DataModel/Multiplicity.h"
+
+#include <algorithm>
+#include <cmath>
 
 namespace o2::aod
 {
diff --git a/.conflict-side-0/PWGLF/DataModel/LFSigmaTables.h b/.conflict-side-0/PWGLF/DataModel/LFSigmaTables.h
index bd808cef106..8eb7706f563 100644
--- a/.conflict-side-0/PWGLF/DataModel/LFSigmaTables.h
+++ b/.conflict-side-0/PWGLF/DataModel/LFSigmaTables.h
@@ -9,15 +9,17 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <cmath>
-#include <vector>
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/Qvectors.h"
+
 #include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+
+#include <cmath>
+#include <vector>
 
 #ifndef PWGLF_DATAMODEL_LFSIGMATABLES_H_
 #define PWGLF_DATAMODEL_LFSIGMATABLES_H_
diff --git a/.conflict-side-0/PWGLF/DataModel/LFSlimHeLambda.h b/.conflict-side-0/PWGLF/DataModel/LFSlimHeLambda.h
index 0789c8ee095..1b21b7fc647 100644
--- a/.conflict-side-0/PWGLF/DataModel/LFSlimHeLambda.h
+++ b/.conflict-side-0/PWGLF/DataModel/LFSlimHeLambda.h
@@ -19,6 +19,7 @@
 
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
+
 #include <Math/Vector4D.h>
 
 namespace o2::aod
@@ -78,5 +79,4 @@ struct lambdaCandidate {
   int8_t sign; // Charge sign of the Lambda candidate
 };
 
-
 #endif // PWGLF_DATAMODEL_LFSLIMNUCLEITABLES_H_
diff --git a/.conflict-side-0/PWGLF/DataModel/LFSlimStrangeTables.h b/.conflict-side-0/PWGLF/DataModel/LFSlimStrangeTables.h
index 423a412bb6d..87d5d53957a 100644
--- a/.conflict-side-0/PWGLF/DataModel/LFSlimStrangeTables.h
+++ b/.conflict-side-0/PWGLF/DataModel/LFSlimStrangeTables.h
@@ -9,8 +9,8 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
 
 #ifndef PWGLF_DATAMODEL_LFSLIMSTRANGETABLES_H_
 #define PWGLF_DATAMODEL_LFSLIMSTRANGETABLES_H_
diff --git a/.conflict-side-0/PWGLF/DataModel/LFStrangenessFinderTables.h b/.conflict-side-0/PWGLF/DataModel/LFStrangenessFinderTables.h
index 6bff37f12fd..b0a8325c25e 100644
--- a/.conflict-side-0/PWGLF/DataModel/LFStrangenessFinderTables.h
+++ b/.conflict-side-0/PWGLF/DataModel/LFStrangenessFinderTables.h
@@ -16,9 +16,11 @@
 #ifndef O2_ANALYSIS_STRANGENESSFINDERTABLES_H_
 #define O2_ANALYSIS_STRANGENESSFINDERTABLES_H_
 
-#include "Framework/AnalysisDataModel.h"
 #include "Common/Core/RecoDecay.h"
+
 #include "CommonConstants/PhysicsConstants.h"
+#include "Framework/AnalysisDataModel.h"
+
 #include <cmath>
 
 // V0 auxiliary tables
diff --git a/.conflict-side-0/PWGLF/DataModel/LFStrangenessMLTables.h b/.conflict-side-0/PWGLF/DataModel/LFStrangenessMLTables.h
index abae8814856..c3a1b8a83b7 100644
--- a/.conflict-side-0/PWGLF/DataModel/LFStrangenessMLTables.h
+++ b/.conflict-side-0/PWGLF/DataModel/LFStrangenessMLTables.h
@@ -9,11 +9,13 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <cmath>
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
 #include "Common/Core/RecoDecay.h"
+
 #include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+
+#include <cmath>
 
 #ifndef PWGLF_DATAMODEL_LFSTRANGENESSMLTABLES_H_
 #define PWGLF_DATAMODEL_LFSTRANGENESSMLTABLES_H_
diff --git a/.conflict-side-0/PWGLF/DataModel/LFStrangenessPIDTables.h b/.conflict-side-0/PWGLF/DataModel/LFStrangenessPIDTables.h
index e689dc28141..8dc320d8b55 100644
--- a/.conflict-side-0/PWGLF/DataModel/LFStrangenessPIDTables.h
+++ b/.conflict-side-0/PWGLF/DataModel/LFStrangenessPIDTables.h
@@ -15,10 +15,12 @@
 #ifndef PWGLF_DATAMODEL_LFSTRANGENESSPIDTABLES_H_
 #define PWGLF_DATAMODEL_LFSTRANGENESSPIDTABLES_H_
 
-#include <cmath>
-#include "Framework/AnalysisDataModel.h"
 #include "Common/Core/RecoDecay.h"
+
 #include "CommonConstants/PhysicsConstants.h"
+#include "Framework/AnalysisDataModel.h"
+
+#include <cmath>
 
 namespace o2::aod
 {
@@ -55,8 +57,8 @@ DECLARE_SOA_COLUMN(PosTOFSignal, posTOFSignal, float);         //! positive trac
 DECLARE_SOA_COLUMN(NegTOFSignal, negTOFSignal, float);         //! negative track signal
 DECLARE_SOA_COLUMN(PosTOFEventTime, posTOFEventTime, float);   //! positive track event time
 DECLARE_SOA_COLUMN(NegTOFEventTime, negTOFEventTime, float);   //! negative track event time
-DECLARE_SOA_COLUMN(PosTOFLength, posTOFLength, float); //! positive track length, recalculated
-DECLARE_SOA_COLUMN(NegTOFLength, negTOFLength, float); //! negative track length, recalculated
+DECLARE_SOA_COLUMN(PosTOFLength, posTOFLength, float);         //! positive track length, recalculated
+DECLARE_SOA_COLUMN(NegTOFLength, negTOFLength, float);         //! negative track length, recalculated
 
 // delta-times
 DECLARE_SOA_COLUMN(PosTOFDeltaTLaPi, posTOFDeltaTLaPi, float); //! positive track TOFDeltaT from pion <- lambda expectation
diff --git a/.conflict-side-0/PWGLF/DataModel/LFhe3HadronTables.h b/.conflict-side-0/PWGLF/DataModel/LFhe3HadronTables.h
index f0dbc5cc3dd..ba37e73eba2 100644
--- a/.conflict-side-0/PWGLF/DataModel/LFhe3HadronTables.h
+++ b/.conflict-side-0/PWGLF/DataModel/LFhe3HadronTables.h
@@ -14,8 +14,8 @@
 /// \brief Slim tables for he3Hadron
 ///
 
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
 
 #ifndef PWGLF_DATAMODEL_LFHE3HADRONTABLES_H_
 #define PWGLF_DATAMODEL_LFHE3HADRONTABLES_H_
diff --git a/.conflict-side-0/PWGLF/DataModel/LFzdcSPtables.h b/.conflict-side-0/PWGLF/DataModel/LFzdcSPtables.h
index d5e09d5f9b7..0cdd6234e97 100644
--- a/.conflict-side-0/PWGLF/DataModel/LFzdcSPtables.h
+++ b/.conflict-side-0/PWGLF/DataModel/LFzdcSPtables.h
@@ -12,10 +12,11 @@
 #ifndef PWGLF_DATAMODEL_LFZDCSPTABLES_H_
 #define PWGLF_DATAMODEL_LFZDCSPTABLES_H_
 
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
 #include "Common/DataModel/Centrality.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+
 namespace o2::aod
 {
 namespace ZdcSPTableNS
diff --git a/.conflict-side-0/PWGLF/DataModel/QC/strangenessTablesQC.h b/.conflict-side-0/PWGLF/DataModel/QC/strangenessTablesQC.h
index ccf1724dc4b..e1b2bede6fa 100644
--- a/.conflict-side-0/PWGLF/DataModel/QC/strangenessTablesQC.h
+++ b/.conflict-side-0/PWGLF/DataModel/QC/strangenessTablesQC.h
@@ -16,8 +16,8 @@
 #ifndef PWGLF_DATAMODEL_QC_STRANGENESSTABLESQC_H_
 #define PWGLF_DATAMODEL_QC_STRANGENESSTABLESQC_H_
 
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
 
 namespace o2::aod
 {
diff --git a/.conflict-side-0/PWGLF/DataModel/Reduced3BodyTables.h b/.conflict-side-0/PWGLF/DataModel/Reduced3BodyTables.h
index 3b221d17539..0837e1d72f6 100644
--- a/.conflict-side-0/PWGLF/DataModel/Reduced3BodyTables.h
+++ b/.conflict-side-0/PWGLF/DataModel/Reduced3BodyTables.h
@@ -17,13 +17,16 @@
 #ifndef PWGLF_DATAMODEL_REDUCED3BODYTABLES_H_
 #define PWGLF_DATAMODEL_REDUCED3BODYTABLES_H_
 
-#include <cmath>
-#include "Framework/AnalysisDataModel.h"
+#include "PWGLF/DataModel/Vtx3BodyTables.h"
+
 #include "Common/Core/RecoDecay.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/Centrality.h"
-#include "PWGLF/DataModel/Vtx3BodyTables.h"
+#include "Common/DataModel/Multiplicity.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/AnalysisDataModel.h"
+
+#include <cmath>
 
 namespace o2::aod
 {
diff --git a/.conflict-side-0/PWGLF/DataModel/ReducedDoublePhiTables.h b/.conflict-side-0/PWGLF/DataModel/ReducedDoublePhiTables.h
index 76cc65312a7..cd858b2da95 100644
--- a/.conflict-side-0/PWGLF/DataModel/ReducedDoublePhiTables.h
+++ b/.conflict-side-0/PWGLF/DataModel/ReducedDoublePhiTables.h
@@ -15,15 +15,16 @@
 #ifndef PWGLF_DATAMODEL_REDUCEDDOUBLEPHITABLES_H_
 #define PWGLF_DATAMODEL_REDUCEDDOUBLEPHITABLES_H_
 
-#include <cmath>
-
+#include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Framework/AnalysisDataModel.h"
+
 #include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+
+#include <cmath>
 
 namespace o2::aod
 {
diff --git a/.conflict-side-0/PWGLF/DataModel/ReducedF1ProtonTables.h b/.conflict-side-0/PWGLF/DataModel/ReducedF1ProtonTables.h
index 2f806c4bd1b..bb79ffb87c0 100644
--- a/.conflict-side-0/PWGLF/DataModel/ReducedF1ProtonTables.h
+++ b/.conflict-side-0/PWGLF/DataModel/ReducedF1ProtonTables.h
@@ -16,15 +16,16 @@
 #ifndef PWGLF_DATAMODEL_REDUCEDF1PROTONTABLES_H_
 #define PWGLF_DATAMODEL_REDUCEDF1PROTONTABLES_H_
 
-#include <cmath>
-
+#include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Framework/AnalysisDataModel.h"
+
 #include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+
+#include <cmath>
 
 namespace o2::aod
 {
diff --git a/.conflict-side-0/PWGLF/DataModel/ReducedHeptaQuarkTables.h b/.conflict-side-0/PWGLF/DataModel/ReducedHeptaQuarkTables.h
index a8dd487fe9c..f35d088f71c 100644
--- a/.conflict-side-0/PWGLF/DataModel/ReducedHeptaQuarkTables.h
+++ b/.conflict-side-0/PWGLF/DataModel/ReducedHeptaQuarkTables.h
@@ -15,22 +15,23 @@
 #ifndef PWGLF_DATAMODEL_REDUCEDHEPTAQUARKTABLES_H_
 #define PWGLF_DATAMODEL_REDUCEDHEPTAQUARKTABLES_H_
 
-#include <cmath>
-
+#include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Framework/AnalysisDataModel.h"
+
 #include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+
+#include <cmath>
 
 namespace o2::aod
 {
 namespace redhqevent
 {
-DECLARE_SOA_COLUMN(NumPhi, numPhi, int);       //! Number of negative K
-DECLARE_SOA_COLUMN(NumLambda, numLambda, int); //! Number of lambda
+DECLARE_SOA_COLUMN(NumPhi, numPhi, int);           //! Number of negative K
+DECLARE_SOA_COLUMN(NumLambda, numLambda, int);     //! Number of lambda
 DECLARE_SOA_COLUMN(Centrality, centrality, float); //!
 } // namespace redhqevent
 DECLARE_SOA_TABLE(RedHQEvents, "AOD", "REDHQEVENT",
diff --git a/.conflict-side-0/PWGLF/DataModel/ReducedLambdaLambdaTables.h b/.conflict-side-0/PWGLF/DataModel/ReducedLambdaLambdaTables.h
index 88ea8fb0530..ec2d0b27098 100644
--- a/.conflict-side-0/PWGLF/DataModel/ReducedLambdaLambdaTables.h
+++ b/.conflict-side-0/PWGLF/DataModel/ReducedLambdaLambdaTables.h
@@ -15,15 +15,16 @@
 #ifndef PWGLF_DATAMODEL_REDUCEDLAMBDALAMBDATABLES_H_
 #define PWGLF_DATAMODEL_REDUCEDLAMBDALAMBDATABLES_H_
 
-#include <cmath>
-
+#include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Framework/AnalysisDataModel.h"
+
 #include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+
+#include <cmath>
 
 namespace o2::aod
 {
diff --git a/.conflict-side-0/PWGLF/DataModel/SPCalibrationTables.h b/.conflict-side-0/PWGLF/DataModel/SPCalibrationTables.h
index 2b417ce8758..07bef14d8f8 100644
--- a/.conflict-side-0/PWGLF/DataModel/SPCalibrationTables.h
+++ b/.conflict-side-0/PWGLF/DataModel/SPCalibrationTables.h
@@ -17,13 +17,14 @@
 #ifndef PWGLF_DATAMODEL_SPCALIBRATIONTABLES_H_
 #define PWGLF_DATAMODEL_SPCALIBRATIONTABLES_H_
 
-#include <cmath>
-
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/Core/RecoDecay.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/AnalysisDataModel.h"
 
+#include <cmath>
+
 namespace o2::aod
 {
 namespace spcalibrationtable
diff --git a/.conflict-side-0/PWGLF/DataModel/V0SelectorTables.h b/.conflict-side-0/PWGLF/DataModel/V0SelectorTables.h
index 1283c754819..d47b0bf3462 100644
--- a/.conflict-side-0/PWGLF/DataModel/V0SelectorTables.h
+++ b/.conflict-side-0/PWGLF/DataModel/V0SelectorTables.h
@@ -11,8 +11,9 @@
 #ifndef PWGLF_DATAMODEL_V0SELECTORTABLES_H_
 #define PWGLF_DATAMODEL_V0SELECTORTABLES_H_
 
-#include <cstdint>
 #include <Framework/ASoA.h>
+
+#include <cstdint>
 namespace o2::aod
 {
 
diff --git a/.conflict-side-0/PWGLF/DataModel/cascqaanalysis.h b/.conflict-side-0/PWGLF/DataModel/cascqaanalysis.h
index efe98908517..e734afd3ba1 100644
--- a/.conflict-side-0/PWGLF/DataModel/cascqaanalysis.h
+++ b/.conflict-side-0/PWGLF/DataModel/cascqaanalysis.h
@@ -16,17 +16,20 @@
 #ifndef PWGLF_DATAMODEL_CASCQAANALYSIS_H_
 #define PWGLF_DATAMODEL_CASCQAANALYSIS_H_
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "TRandom.h"
-#include "Math/Vector4D.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 #include "Math/Boost.h"
+#include "Math/Vector4D.h"
+#include "TRandom.h"
 
 namespace o2::aod
 {
diff --git a/.conflict-side-0/PWGLF/DataModel/kfStrangenessStudy.h b/.conflict-side-0/PWGLF/DataModel/kfStrangenessStudy.h
index 120b3cf62f1..5f27acfe89b 100755
--- a/.conflict-side-0/PWGLF/DataModel/kfStrangenessStudy.h
+++ b/.conflict-side-0/PWGLF/DataModel/kfStrangenessStudy.h
@@ -14,10 +14,11 @@
 #ifndef PWGLF_DATAMODEL_KFSTRANGENESSSTUDY_H_
 #define PWGLF_DATAMODEL_KFSTRANGENESSSTUDY_H_
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Common/Core/trackUtilities.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+
 namespace o2::aod
 {
 namespace kfStrangenessStudy
diff --git a/.conflict-side-0/PWGLF/DataModel/lambdaJetpolarization.h b/.conflict-side-0/PWGLF/DataModel/lambdaJetpolarization.h
index 41bd7e26b15..cd1f4b96449 100644
--- a/.conflict-side-0/PWGLF/DataModel/lambdaJetpolarization.h
+++ b/.conflict-side-0/PWGLF/DataModel/lambdaJetpolarization.h
@@ -16,17 +16,20 @@
 #ifndef PWGLF_DATAMODEL_LAMBDAJETPOLARIZATION_H_
 #define PWGLF_DATAMODEL_LAMBDAJETPOLARIZATION_H_
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "TRandom.h"
-#include "Math/Vector4D.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 #include "Math/Boost.h"
+#include "Math/Vector4D.h"
+#include "TRandom.h"
 
 namespace o2::aod
 {
diff --git a/.conflict-side-0/PWGLF/DataModel/mcCentrality.h b/.conflict-side-0/PWGLF/DataModel/mcCentrality.h
index 86e97eb8c33..fdbe1426e52 100644
--- a/.conflict-side-0/PWGLF/DataModel/mcCentrality.h
+++ b/.conflict-side-0/PWGLF/DataModel/mcCentrality.h
@@ -21,9 +21,10 @@
 #define PWGLF_DATAMODEL_MCCENTRALITY_H_
 
 // O2 includes
+#include "Common/DataModel/Centrality.h"
+
 #include "Framework/ASoA.h"
 #include "Framework/AnalysisDataModel.h"
-#include "Common/DataModel/Centrality.h"
 #include "Framework/Logger.h"
 
 namespace o2::aod
diff --git a/.conflict-side-0/PWGLF/DataModel/pidTOFGeneric.h b/.conflict-side-0/PWGLF/DataModel/pidTOFGeneric.h
index a0d287a7643..1942dbecd3d 100644
--- a/.conflict-side-0/PWGLF/DataModel/pidTOFGeneric.h
+++ b/.conflict-side-0/PWGLF/DataModel/pidTOFGeneric.h
@@ -11,9 +11,10 @@
 
 #ifndef PWGLF_DATAMODEL_PIDTOFGENERIC_H_
 #define PWGLF_DATAMODEL_PIDTOFGENERIC_H_
-#include "CommonDataFormat/InteractionRecord.h"
 #include "Common/Core/PID/PIDTOF.h"
 
+#include "CommonDataFormat/InteractionRecord.h"
+
 namespace o2::aod
 {
 namespace evtime
diff --git a/.conflict-side-0/PWGLF/DataModel/spectraTOF.h b/.conflict-side-0/PWGLF/DataModel/spectraTOF.h
index 9cf4b789295..4ae259d171f 100644
--- a/.conflict-side-0/PWGLF/DataModel/spectraTOF.h
+++ b/.conflict-side-0/PWGLF/DataModel/spectraTOF.h
@@ -22,21 +22,23 @@
 #include <memory>
 
 // O2 includes
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/runDataProcessing.h"
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/FT0Corrected.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/StaticFor.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/FT0Corrected.h"
-#include "Common/Core/TrackSelectionDefaults.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
 #include "TPDGCode.h"
 
diff --git a/.conflict-side-0/PWGLF/TableProducer/Common/epvector.cxx b/.conflict-side-0/PWGLF/TableProducer/Common/epvector.cxx
index a662b20bd0b..61996521fdd 100644
--- a/.conflict-side-0/PWGLF/TableProducer/Common/epvector.cxx
+++ b/.conflict-side-0/PWGLF/TableProducer/Common/epvector.cxx
@@ -19,42 +19,46 @@
 ///
 
 // C++/ROOT includes.
+#include <TComplex.h>
 #include <TH1F.h>
+#include <TMath.h>
+
 #include <chrono>
+#include <cstdio>
 #include <string>
 #include <vector>
-#include <TComplex.h>
-#include <TMath.h>
-#include <cstdio>
 
 // o2Physics includes.
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/StepTHn.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
+#include "PWGLF/DataModel/EPCalibrationTables.h"
+
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/Core/trackUtilities.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/TrackSelection.h"
-#include "Framework/ASoAHelpers.h"
 #include "Common/DataModel/FT0Corrected.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonConstants/PhysicsConstants.h"
 #include "FT0Base/Geometry.h"
 #include "FV0Base/Geometry.h"
-#include "PWGLF/DataModel/EPCalibrationTables.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
 #include "TF1.h"
 
 // #include "Common/Core/EventPlaneHelper.h"
 // #include "Common/DataModel/Qvectors.h"
 
 // o2 includes.
-#include "CCDB/CcdbApi.h"
 #include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
 #include "DetectorsCommonDataFormats/AlignParam.h"
 
 using namespace o2;
diff --git a/.conflict-side-0/PWGLF/TableProducer/Common/lfTPCPID.cxx b/.conflict-side-0/PWGLF/TableProducer/Common/lfTPCPID.cxx
index e812633a604..74d0d56c257 100644
--- a/.conflict-side-0/PWGLF/TableProducer/Common/lfTPCPID.cxx
+++ b/.conflict-side-0/PWGLF/TableProducer/Common/lfTPCPID.cxx
@@ -17,26 +17,29 @@
 ///
 
 // ROOT includes
-#include "TFile.h"
-#include "TSystem.h"
 #include "TF1.h"
+#include "TFile.h"
 #include "TGraph.h"
 #include "TList.h"
+#include "TSystem.h"
 
 // O2 includes
-#include "CCDB/BasicCCDBManager.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "CCDB/CcdbApi.h"
+#include "TableHelper.h"
+
 #include "PWGLF/DataModel/LFParticleIdentification.h"
+
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Framework/AnalysisTask.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
+#include "DataFormatsTPC/BetheBlochAleph.h"
 #include "Framework/AnalysisDataModel.h"
-#include "Framework/runDataProcessing.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StaticFor.h"
-#include "DataFormatsTPC/BetheBlochAleph.h"
-#include "TableHelper.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/TableProducer/Common/mcCentrality.cxx b/.conflict-side-0/PWGLF/TableProducer/Common/mcCentrality.cxx
index 690d049af4d..4a55503ada8 100644
--- a/.conflict-side-0/PWGLF/TableProducer/Common/mcCentrality.cxx
+++ b/.conflict-side-0/PWGLF/TableProducer/Common/mcCentrality.cxx
@@ -18,21 +18,25 @@
 ///
 
 // O2 includes
+#include "PWGLF/DataModel/mcCentrality.h"
+
+#include "TableHelper.h"
+
+#include "PWGLF/Utils/inelGt.h"
+
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "CCDB/CcdbApi.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
-#include "Framework/runDataProcessing.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StaticFor.h"
-#include "TableHelper.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "Common/DataModel/Centrality.h"
-#include "PWGLF/DataModel/mcCentrality.h"
-#include "PWGLF/Utils/inelGt.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/TableProducer/Common/zdcSP.cxx b/.conflict-side-0/PWGLF/TableProducer/Common/zdcSP.cxx
index 783526e1400..c10ac4804d0 100644
--- a/.conflict-side-0/PWGLF/TableProducer/Common/zdcSP.cxx
+++ b/.conflict-side-0/PWGLF/TableProducer/Common/zdcSP.cxx
@@ -12,43 +12,39 @@
 // Minimal example to run this task:
 // o2-analysis-centrality-table -b --configuration json://configuration.json | o2-analysis-timestamp -b --configuration json://configuration.json | o2-analysis-event-selection -b --configuration json://configuration.json | o2-analysis-multiplicity-table -b --configuration json://configuration.json | o2-analysis-lf-zdcsp -b --configuration json://configuration.json --aod-file @input_data.txt --aod-writer-json OutputDirector.json
 
-#include <array>
-#include <cmath>
-
-#include "Math/Vector4D.h"
-
-#include "CCDB/BasicCCDBManager.h"
+#include "PWGLF/DataModel/LFzdcSPtables.h"
 
+#include "Common/CCDB/ctpRateFetcher.h"
+#include "Common/Core/EventPlaneHelper.h"
+#include "Common/Core/PID/PIDTOF.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/Qvectors.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/Core/PID/PIDTOF.h"
 #include "Common/TableProducer/PID/pidTOFBase.h"
-#include "Common/Core/EventPlaneHelper.h"
-#include "Common/DataModel/Qvectors.h"
-#include "Common/CCDB/ctpRateFetcher.h"
 
+#include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsParameters/GRPMagField.h"
 #include "DataFormatsParameters/GRPObject.h"
 #include "DataFormatsTPC/BetheBlochAleph.h"
 #include "DetectorsBase/GeometryManager.h"
 #include "DetectorsBase/Propagator.h"
-
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
-
 #include "ReconstructionDataFormats/Track.h"
 
-#include "PWGLF/DataModel/LFzdcSPtables.h"
-
+#include "Math/Vector4D.h"
 #include "TRandom3.h"
 
+#include <array>
+#include <cmath>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-0/PWGLF/TableProducer/Nuspex/LFTreeCreatorClusterStudies.cxx b/.conflict-side-0/PWGLF/TableProducer/Nuspex/LFTreeCreatorClusterStudies.cxx
index d8df6f0bbf6..c05fcddfb61 100644
--- a/.conflict-side-0/PWGLF/TableProducer/Nuspex/LFTreeCreatorClusterStudies.cxx
+++ b/.conflict-side-0/PWGLF/TableProducer/Nuspex/LFTreeCreatorClusterStudies.cxx
@@ -14,45 +14,45 @@
 //
 // Author: Giorgio Alberto Lucia
 
-#include <vector>
-#include <utility>
-#include <random>
-#include <cstdint>
-#include <cstring>
-#include <unordered_map>
-#include <numeric>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "Common/DataModel/EventSelection.h"
+#include "PWGLF/DataModel/LFClusterStudiesTable.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
 
 #include "Common/Core/PID/PIDTOF.h"
-#include "Common/TableProducer/PID/pidTOFBase.h"
 #include "Common/Core/PID/TPCPIDResponse.h"
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/PIDResponseITS.h"
-#include "DCAFitter/DCAFitterN.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/TableProducer/PID/pidTOFBase.h"
 
-#include "PWGLF/DataModel/LFClusterStudiesTable.h"
+#include "CCDB/BasicCCDBManager.h"
+#include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
 #include "TDatabasePDG.h"
 #include "TPDGCode.h"
 
+#include <cstdint>
+#include <cstring>
+#include <numeric>
+#include <random>
+#include <unordered_map>
+#include <utility>
+#include <vector>
+
 using namespace ::o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-0/PWGLF/TableProducer/Nuspex/he3HadronFemto.cxx b/.conflict-side-0/PWGLF/TableProducer/Nuspex/he3HadronFemto.cxx
index 547d4b08c3b..1afb97fe35c 100644
--- a/.conflict-side-0/PWGLF/TableProducer/Nuspex/he3HadronFemto.cxx
+++ b/.conflict-side-0/PWGLF/TableProducer/Nuspex/he3HadronFemto.cxx
@@ -15,30 +15,9 @@
 /// \author Your Name (your.email@cern.ch)
 /// \since April 2025
 
-#include <TH1F.h>
-#include <TDirectory.h>
-#include <THn.h>
-#include <TMath.h>
-#include <TObjArray.h>
-#include <TFile.h>
-#include <TH2F.h>
-#include <TPDGCode.h>
-#include <TDatabasePDG.h>
-
-#include <cmath>
-#include <string>
-#include <algorithm>
-#include <vector>
-#include <array>
-#include <cstdlib>
-#include <iterator> // std::prev
-
-#include "Framework/ASoAHelpers.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/StepTHn.h"
+#include "PWGLF/DataModel/EPCalibrationTables.h"
+#include "PWGLF/DataModel/LFhe3HadronTables.h"
+#include "PWGLF/Utils/svPoolCreator.h"
 
 #include "Common/Core/PID/PIDTOF.h"
 #include "Common/Core/PID/TPCPIDResponse.h"
@@ -52,21 +31,40 @@
 #include "Common/DataModel/PIDResponseITS.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/TableProducer/PID/pidTOFBase.h"
-
 #include "EventFiltering/Zorro.h"
 #include "EventFiltering/ZorroSummary.h"
 
 #include "CCDB/BasicCCDBManager.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsTPC/BetheBlochAleph.h"
-#include "DataFormatsParameters/GRPObject.h"
 #include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DataFormatsTPC/BetheBlochAleph.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
 
-#include "PWGLF/DataModel/EPCalibrationTables.h"
-#include "PWGLF/DataModel/LFhe3HadronTables.h"
-#include "PWGLF/Utils/svPoolCreator.h"
+#include <TDatabasePDG.h>
+#include <TDirectory.h>
+#include <TFile.h>
+#include <TH1F.h>
+#include <TH2F.h>
+#include <THn.h>
+#include <TMath.h>
+#include <TObjArray.h>
+#include <TPDGCode.h>
+
+#include <algorithm>
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <iterator> // std::prev
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/TableProducer/Nuspex/he3LambdaAnalysis.cxx b/.conflict-side-0/PWGLF/TableProducer/Nuspex/he3LambdaAnalysis.cxx
index 6f936659dd1..1d6c80fc3fa 100644
--- a/.conflict-side-0/PWGLF/TableProducer/Nuspex/he3LambdaAnalysis.cxx
+++ b/.conflict-side-0/PWGLF/TableProducer/Nuspex/he3LambdaAnalysis.cxx
@@ -18,7 +18,6 @@
 #include "Common/DataModel/PIDResponseTPC.h"
 #include "EventFiltering/Zorro.h"
 #include "EventFiltering/ZorroSummary.h"
-#include "PWGLF/DataModel/LFSlimHeLambda.h"
 
 #include <CCDB/BasicCCDBManager.h>
 #include <DCAFitter/DCAFitterN.h>
diff --git a/.conflict-side-0/PWGLF/TableProducer/Nuspex/hyhe4builder.cxx b/.conflict-side-0/PWGLF/TableProducer/Nuspex/hyhe4builder.cxx
index 66fe812f7a2..1c56cff15dd 100644
--- a/.conflict-side-0/PWGLF/TableProducer/Nuspex/hyhe4builder.cxx
+++ b/.conflict-side-0/PWGLF/TableProducer/Nuspex/hyhe4builder.cxx
@@ -19,32 +19,34 @@
 // --- kumar.lokesh@cern.ch
 // --- david.dobrigkeit.chinellato@cern.ch
 
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <map>
-#include <iterator>
-#include <utility>
+#include "PWGLF/DataModel/LFHyperhelium4Tables.h"
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
 #include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+
 #include "CCDB/BasicCCDBManager.h"
-#include "PWGLF/DataModel/LFHyperhelium4Tables.h"
+#include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <iterator>
+#include <map>
+#include <utility>
 
 using namespace std;
 using namespace o2;
diff --git a/.conflict-side-0/PWGLF/TableProducer/Nuspex/hypKfRecoTask.cxx b/.conflict-side-0/PWGLF/TableProducer/Nuspex/hypKfRecoTask.cxx
index 160310d5bd8..f36a2c7b362 100644
--- a/.conflict-side-0/PWGLF/TableProducer/Nuspex/hypKfRecoTask.cxx
+++ b/.conflict-side-0/PWGLF/TableProducer/Nuspex/hypKfRecoTask.cxx
@@ -13,45 +13,50 @@
 /// \brief Hypernuclei rconstruction using KFParticle package
 /// \author Janik Ditzel <jditzel@cern.ch> and Michael Hartung <mhartung@cern.ch>
 
-#include <limits>
-#include <vector>
-#include <string>
-#include <map>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
+#include "MetadataHelper.h"
+
+#include "PWGLF/DataModel/LFHypernucleiKfTables.h"
+
+#include "Common/Core/PID/TPCPIDResponse.h"
 #include "Common/Core/RecoDecay.h"
 #include "Common/Core/trackUtilities.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Centrality.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+#include "Common/DataModel/CollisionAssociationTables.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/PIDResponseTPC.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/TableProducer/PID/pidTPCBase.h"
+
 #include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/PID/TPCPIDResponse.h"
-#include "DataFormatsTPC/BetheBlochAleph.h"
 #include "DCAFitter/DCAFitterN.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGLF/DataModel/LFHypernucleiKfTables.h"
-#include "TRandom3.h"
-#include "Common/DataModel/CollisionAssociationTables.h"
-#include "Common/TableProducer/PID/pidTPCBase.h"
-#include "Common/DataModel/PIDResponseTPC.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DataFormatsTPC/BetheBlochAleph.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/PID.h"
-#include "MetadataHelper.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include "TRandom3.h"
+
+#include <limits>
+#include <map>
+#include <string>
+#include <vector>
 
 // KFParticle
 #ifndef HomogeneousField
 #define HomogeneousField // o2-linter: disable=name/macro (Name is defined in KFParticle package)
 #endif
-#include "KFParticle.h"
 #include "KFPTrack.h"
 #include "KFPVertex.h"
+#include "KFParticle.h"
 #include "KFParticleBase.h"
 #include "KFVertex.h"
 
diff --git a/.conflict-side-0/PWGLF/TableProducer/Nuspex/hypKfTreeCreator.cxx b/.conflict-side-0/PWGLF/TableProducer/Nuspex/hypKfTreeCreator.cxx
index 246a67f57d6..90295290025 100644
--- a/.conflict-side-0/PWGLF/TableProducer/Nuspex/hypKfTreeCreator.cxx
+++ b/.conflict-side-0/PWGLF/TableProducer/Nuspex/hypKfTreeCreator.cxx
@@ -13,28 +13,31 @@
 /// \brief Creates flat tree for ML analysis
 /// \author Janik Ditzel <jditzel@cern.ch> and Michael Hartung <mhartung@cern.ch>
 
-#include <vector>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
+#include "PWGLF/DataModel/LFHypernucleiKfTables.h"
+
+#include "Common/Core/PID/TPCPIDResponse.h"
 #include "Common/Core/RecoDecay.h"
 #include "Common/Core/trackUtilities.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Centrality.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/PID/TPCPIDResponse.h"
-#include "DataFormatsTPC/BetheBlochAleph.h"
 #include "DCAFitter/DCAFitterN.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGLF/DataModel/LFHypernucleiKfTables.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DataFormatsTPC/BetheBlochAleph.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/TableProducer/Nuspex/lnnRecoTask.cxx b/.conflict-side-0/PWGLF/TableProducer/Nuspex/lnnRecoTask.cxx
index e607057e5c6..88db18c376f 100644
--- a/.conflict-side-0/PWGLF/TableProducer/Nuspex/lnnRecoTask.cxx
+++ b/.conflict-side-0/PWGLF/TableProducer/Nuspex/lnnRecoTask.cxx
@@ -11,43 +11,40 @@
 //
 // Build \Lambda-n-n candidates from V0s and tracks
 // ==============================================================================
-#include <array>
-#include <memory>
-#include <string>
-#include <vector>
-#include <algorithm>
-
-#include <TLorentzVector.h>
+#include "PWGLF/DataModel/EPCalibrationTables.h"
+#include "PWGLF/DataModel/LFLnnTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
+#include "Common/Core/PID/PIDTOF.h"
+#include "Common/Core/PID/TPCPIDResponse.h"
 #include "Common/Core/RecoDecay.h"
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "PWGLF/DataModel/EPCalibrationTables.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
-
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/TableProducer/PID/pidTOFBase.h"
 
-#include "Common/Core/PID/TPCPIDResponse.h"
-#include "DataFormatsTPC/BetheBlochAleph.h"
+#include "CCDB/BasicCCDBManager.h"
 #include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DataFormatsTPC/BetheBlochAleph.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
-#include "Common/DataModel/TrackSelectionTables.h"
-
-#include "Common/Core/PID/PIDTOF.h"
-#include "Common/TableProducer/PID/pidTOFBase.h"
+#include <TLorentzVector.h>
 
-#include "PWGLF/DataModel/LFLnnTables.h"
+#include <algorithm>
+#include <array>
+#include <memory>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/TableProducer/Nuspex/nucleiFlowTree.cxx b/.conflict-side-0/PWGLF/TableProducer/Nuspex/nucleiFlowTree.cxx
index 14192166fae..238cf021cfd 100644
--- a/.conflict-side-0/PWGLF/TableProducer/Nuspex/nucleiFlowTree.cxx
+++ b/.conflict-side-0/PWGLF/TableProducer/Nuspex/nucleiFlowTree.cxx
@@ -19,54 +19,49 @@
 // o2-analysis-pid-tof-base, o2-analysis-multiplicity-table, o2-analysis-event-selection
 // (to add flow: o2-analysis-qvector-table, o2-analysis-centrality-table)
 
-#include <algorithm>
-#include <cmath>
-#include <memory>
-#include <string>
-#include <vector>
-
-#include "Math/Vector4D.h"
+#include "nucleiUtils.h"
 
-#include "CCDB/BasicCCDBManager.h"
+#include "PWGLF/DataModel/EPCalibrationTables.h"
+#include "PWGLF/DataModel/LFSlimNucleiTables.h"
 
+#include "Common/Core/EventPlaneHelper.h"
+#include "Common/Core/PID/PIDTOF.h"
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/PIDResponseITS.h"
+#include "Common/DataModel/Qvectors.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/Core/PID/PIDTOF.h"
 #include "Common/TableProducer/PID/pidTOFBase.h"
-#include "Common/Core/EventPlaneHelper.h"
-#include "Common/DataModel/Qvectors.h"
 #include "Common/Tools/TrackTuner.h"
-#include "Common/Core/RecoDecay.h"
+#include "EventFiltering/Zorro.h"
+#include "EventFiltering/ZorroSummary.h"
 
+#include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsParameters/GRPMagField.h"
 #include "DataFormatsParameters/GRPObject.h"
 #include "DataFormatsTPC/BetheBlochAleph.h"
 #include "DetectorsBase/GeometryManager.h"
 #include "DetectorsBase/Propagator.h"
-
-#include "EventFiltering/Zorro.h"
-#include "EventFiltering/ZorroSummary.h"
-
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
-
 #include "ReconstructionDataFormats/Track.h"
 
-#include "PWGLF/DataModel/EPCalibrationTables.h"
-#include "PWGLF/DataModel/LFSlimNucleiTables.h"
-
+#include "Math/Vector4D.h"
 #include "TRandom3.h"
 
-#include "nucleiUtils.h"
+#include <algorithm>
+#include <cmath>
+#include <memory>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/TableProducer/Nuspex/pidTOFGeneric.cxx b/.conflict-side-0/PWGLF/TableProducer/Nuspex/pidTOFGeneric.cxx
index 9997d4d27c8..5e934fec44e 100644
--- a/.conflict-side-0/PWGLF/TableProducer/Nuspex/pidTOFGeneric.cxx
+++ b/.conflict-side-0/PWGLF/TableProducer/Nuspex/pidTOFGeneric.cxx
@@ -16,28 +16,30 @@
 ///         In order to redo TOF PID for tracks which are linked to wrong collisions
 ///
 
+#include <string>
 #include <utility>
 #include <vector>
-#include <string>
 
 // O2 includes
 #include "CCDB/BasicCCDBManager.h"
-#include "TOFBase/EventTimeMaker.h"
 #include "Framework/AnalysisTask.h"
 #include "ReconstructionDataFormats/Track.h"
+#include "TOFBase/EventTimeMaker.h"
 
 // O2Physics includes
+#include "PWGLF/DataModel/pidTOFGeneric.h"
+
 #include "Common/Core/TableHelper.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/FT0Corrected.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
-#include "PID/ParamBase.h"
 #include "PID/PIDTOF.h"
-#include "PWGLF/DataModel/pidTOFGeneric.h"
+#include "PID/ParamBase.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/TableProducer/Nuspex/spectraDerivedMaker.cxx b/.conflict-side-0/PWGLF/TableProducer/Nuspex/spectraDerivedMaker.cxx
index bce0c9153d1..4e7de3c2821 100644
--- a/.conflict-side-0/PWGLF/TableProducer/Nuspex/spectraDerivedMaker.cxx
+++ b/.conflict-side-0/PWGLF/TableProducer/Nuspex/spectraDerivedMaker.cxx
@@ -18,20 +18,22 @@
 ///
 
 // O2 includes
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/spectraTOF.h"
+
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
 #include "Framework/StaticFor.h"
-#include "Common/Core/TrackSelectionDefaults.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
-#include "PWGLF/DataModel/spectraTOF.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
 #include "TPDGCode.h"
 
diff --git a/.conflict-side-0/PWGLF/TableProducer/Nuspex/threebodymcfinder.cxx b/.conflict-side-0/PWGLF/TableProducer/Nuspex/threebodymcfinder.cxx
index 875128758b8..a10510153bc 100644
--- a/.conflict-side-0/PWGLF/TableProducer/Nuspex/threebodymcfinder.cxx
+++ b/.conflict-side-0/PWGLF/TableProducer/Nuspex/threebodymcfinder.cxx
@@ -25,36 +25,38 @@
 //    david.dobrigkeit.chinellato@cern.ch
 //
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "ReconstructionDataFormats/Track.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/McCollisionExtra.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "Common/Core/TrackSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
+#include <Math/Vector4D.h>
+#include <TDatabasePDG.h>
 #include <TFile.h>
-#include <TLorentzVector.h>
 #include <TH1F.h>
 #include <TH2F.h>
-#include <TProfile.h>
-#include <Math/Vector4D.h>
+#include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
-#include <cmath>
+#include <TProfile.h>
+
 #include <array>
+#include <cmath>
 #include <cstdlib>
 
 using namespace o2;
diff --git a/.conflict-side-0/PWGLF/TableProducer/Nuspex/trHeAnalysis.cxx b/.conflict-side-0/PWGLF/TableProducer/Nuspex/trHeAnalysis.cxx
index 40378ba6df4..2f06f165046 100644
--- a/.conflict-side-0/PWGLF/TableProducer/Nuspex/trHeAnalysis.cxx
+++ b/.conflict-side-0/PWGLF/TableProducer/Nuspex/trHeAnalysis.cxx
@@ -16,8 +16,10 @@
 ///
 /// \author Matthias Herzer <matthias.herzer@cern.ch>, Goethe University Frankfurt
 ///
-#include <string>
-#include <vector>
+#include "PWGLF/DataModel/LFNucleiTables.h"
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/pidTOFGeneric.h"
+
 #include "Common/CCDB/EventSelectionParams.h"
 #include "Common/Core/PID/TPCPIDResponse.h"
 #include "Common/Core/trackUtilities.h"
@@ -26,18 +28,20 @@
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFNucleiTables.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
 #include "ReconstructionDataFormats/PID.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "PWGLF/DataModel/pidTOFGeneric.h"
+
 #include <TF1.h>
 
+#include <string>
+#include <vector>
+
 namespace o2::aod
 {
 namespace h3_data
diff --git a/.conflict-side-0/PWGLF/TableProducer/QC/strangenessQC.cxx b/.conflict-side-0/PWGLF/TableProducer/QC/strangenessQC.cxx
index f35ad82899c..9452899f913 100644
--- a/.conflict-side-0/PWGLF/TableProducer/QC/strangenessQC.cxx
+++ b/.conflict-side-0/PWGLF/TableProducer/QC/strangenessQC.cxx
@@ -14,15 +14,17 @@
 /// In case of questions please write to:
 /// \author Roman Nepeivoda (roman.nepeivoda@cern.ch)
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "PWGLF/DataModel/QC/strangenessTablesQC.h"
 
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-0/PWGLF/TableProducer/Resonances/HeptaQuarktable.cxx b/.conflict-side-0/PWGLF/TableProducer/Resonances/HeptaQuarktable.cxx
index ccb0c61465f..36765795b05 100644
--- a/.conflict-side-0/PWGLF/TableProducer/Resonances/HeptaQuarktable.cxx
+++ b/.conflict-side-0/PWGLF/TableProducer/Resonances/HeptaQuarktable.cxx
@@ -14,39 +14,38 @@
 ///
 /// \author Junlee Kim, (junlee.kim@cern.ch)
 
-#include <Framework/Configurable.h>
-#include <Math/GenVector/Boost.h>
-#include <Math/Vector4D.h>
-#include <TMath.h>
-#include <fairlogger/Logger.h>
-
-#include <iostream>
-#include <iterator>
-#include <string>
-#include <vector>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/DataModel/ReducedHeptaQuarkTables.h"
 
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/PIDResponseITS.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 #include "EventFiltering/Zorro.h"
 #include "EventFiltering/ZorroSummary.h"
 
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
+#include "CommonConstants/MathConstants.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
+#include <Framework/Configurable.h>
 
-#include "CommonConstants/MathConstants.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/PIDResponseITS.h"
+#include <Math/GenVector/Boost.h>
+#include <Math/Vector4D.h>
+#include <TMath.h>
 
-#include "CCDB/BasicCCDBManager.h"
-#include "CCDB/CcdbApi.h"
+#include <fairlogger/Logger.h>
 
-#include "PWGLF/DataModel/ReducedHeptaQuarkTables.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include <iostream>
+#include <iterator>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/TableProducer/Resonances/doublephitable.cxx b/.conflict-side-0/PWGLF/TableProducer/Resonances/doublephitable.cxx
index d02ab3d3734..4279cff1c02 100644
--- a/.conflict-side-0/PWGLF/TableProducer/Resonances/doublephitable.cxx
+++ b/.conflict-side-0/PWGLF/TableProducer/Resonances/doublephitable.cxx
@@ -14,39 +14,41 @@
 ///
 /// \author Sourav Kundu, sourav.kundu@cern.ch
 
+#include "PWGLF/DataModel/ReducedDoublePhiTables.h"
+
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/PIDResponseITS.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+#include "EventFiltering/Zorro.h"
+#include "EventFiltering/ZorroSummary.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
+#include "CommonConstants/MathConstants.h"
+#include "DataFormatsTPC/BetheBlochAleph.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 #include <Framework/Configurable.h>
+
 #include <Math/GenVector/Boost.h>
 #include <Math/Vector4D.h>
+#include <TDatabasePDG.h> // FIXME
 #include <TMath.h>
+#include <TPDGCode.h> // FIXME
+
 #include <fairlogger/Logger.h>
-#include <TDatabasePDG.h> // FIXME
-#include <TPDGCode.h>     // FIXME
 
 #include <iostream>
 #include <iterator>
 #include <string>
 #include <vector>
 
-#include "EventFiltering/Zorro.h"
-#include "EventFiltering/ZorroSummary.h"
-
-#include "PWGLF/DataModel/ReducedDoublePhiTables.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
-#include "CommonConstants/MathConstants.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "DataFormatsTPC/BetheBlochAleph.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "CCDB/CcdbApi.h"
-#include "Common/DataModel/PIDResponseITS.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-0/PWGLF/TableProducer/Resonances/f1protonInitializer.cxx b/.conflict-side-0/PWGLF/TableProducer/Resonances/f1protonInitializer.cxx
index e7240c72f90..a6db6759a68 100644
--- a/.conflict-side-0/PWGLF/TableProducer/Resonances/f1protonInitializer.cxx
+++ b/.conflict-side-0/PWGLF/TableProducer/Resonances/f1protonInitializer.cxx
@@ -12,39 +12,40 @@
 /// \file f1protonInitializer.cxx
 /// check if the event have f1-p candidate
 /// \author Sourav Kundu <sourav.kundu@cern.ch>
-#include <TH1F.h>
-#include <TDirectory.h>
-#include <THn.h>
-#include <TLorentzVector.h>
-#include <TMath.h>
-#include <TObjArray.h>
-#include <TFile.h>
-#include <TH2F.h>
-#include <TLorentzVector.h>
-#include <TPDGCode.h>
-#include <TDatabasePDG.h>
-
-#include <cmath>
-#include <array>
-#include <cstdlib>
+#include "PWGLF/DataModel/LFF1Tables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/Utils/collisionCuts.h"
 
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Multiplicity.h"
 #include "Common/Core/trackUtilities.h"
-#include "CommonConstants/PhysicsConstants.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonConstants/PhysicsConstants.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFF1Tables.h"
-#include "PWGLF/Utils/collisionCuts.h"
 #include "ReconstructionDataFormats/Track.h"
 
+#include <TDatabasePDG.h>
+#include <TDirectory.h>
+#include <TFile.h>
+#include <TH1F.h>
+#include <TH2F.h>
+#include <THn.h>
+#include <TLorentzVector.h>
+#include <TMath.h>
+#include <TObjArray.h>
+#include <TPDGCode.h>
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-0/PWGLF/TableProducer/Resonances/f1protonreducedtable.cxx b/.conflict-side-0/PWGLF/TableProducer/Resonances/f1protonreducedtable.cxx
index ce0cdcf3af5..4a3959ab776 100644
--- a/.conflict-side-0/PWGLF/TableProducer/Resonances/f1protonreducedtable.cxx
+++ b/.conflict-side-0/PWGLF/TableProducer/Resonances/f1protonreducedtable.cxx
@@ -14,40 +14,42 @@
 ///
 /// \author Sourav Kundu, sourav.kundu@cern.ch
 
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/DataModel/ReducedF1ProtonTables.h"
+
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/PIDResponseITS.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+#include "EventFiltering/Zorro.h"
+#include "EventFiltering/ZorroSummary.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
+#include "CommonConstants/MathConstants.h"
+#include "DataFormatsTPC/BetheBlochAleph.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 #include <Framework/Configurable.h>
+
 #include <Math/GenVector/Boost.h>
 #include <Math/Vector4D.h>
+#include <TDatabasePDG.h> // FIXME
 #include <TMath.h>
+#include <TPDGCode.h> // FIXME
+
 #include <fairlogger/Logger.h>
-#include <TDatabasePDG.h> // FIXME
-#include <TPDGCode.h>     // FIXME
 
 #include <iostream>
 #include <iterator>
 #include <string>
 #include <vector>
 
-#include "EventFiltering/Zorro.h"
-#include "EventFiltering/ZorroSummary.h"
-
-#include "PWGLF/DataModel/ReducedF1ProtonTables.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
-#include "CommonConstants/MathConstants.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "DataFormatsTPC/BetheBlochAleph.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "CCDB/CcdbApi.h"
-#include "Common/DataModel/PIDResponseITS.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
@@ -767,10 +769,10 @@ struct f1protonreducedtable {
                 F1KaonIndex.push_back(KaonIndex.at(i2));
                 F1KshortDaughterPositiveIndex.push_back(KshortPosDaughIndex.at(i3));
                 F1KshortDaughterNegativeIndex.push_back(KshortNegDaughIndex.at(i3));
-                PionTOFHitFinal.push_back(PionTOFHit.at(i1)); // Pion TOF Hit
-                KaonTOFHitFinal.push_back(KaonTOFHit.at(i2)); // Kaon TOF Hit
-                PionTPCFinal.push_back(PionTPC.at(i1));       // Pion TPC
-                KaonTPCFinal.push_back(KaonTPC.at(i2));       // Kaon TPC
+                PionTOFHitFinal.push_back(PionTOFHit.at(i1));           // Pion TOF Hit
+                KaonTOFHitFinal.push_back(KaonTOFHit.at(i2));           // Kaon TOF Hit
+                PionTPCFinal.push_back(PionTPC.at(i1));                 // Pion TPC
+                KaonTPCFinal.push_back(KaonTPC.at(i2));                 // Kaon TPC
                 KaonTPCPionHypoFinal.push_back(KaonTPCPionHypo.at(i2)); // Kaon TPC
                 if (pairsign == 1) {
                   qaRegistry.fill(HIST("hInvMassf1"), F1Vector.M(), F1Vector.Pt());
diff --git a/.conflict-side-0/PWGLF/TableProducer/Resonances/filterf1proton.cxx b/.conflict-side-0/PWGLF/TableProducer/Resonances/filterf1proton.cxx
index 831209b0905..df684770709 100644
--- a/.conflict-side-0/PWGLF/TableProducer/Resonances/filterf1proton.cxx
+++ b/.conflict-side-0/PWGLF/TableProducer/Resonances/filterf1proton.cxx
@@ -14,32 +14,36 @@
 ///
 /// \author Sourav Kundu, sourav.kundu@cern.ch
 
-#include <Framework/Configurable.h>
-#include <Math/GenVector/Boost.h>
-#include <Math/Vector4D.h>
-#include <TMath.h>
-#include <fairlogger/Logger.h>
-#include <iostream>
-#include <iterator>
-#include <string>
-
 #include "PWGLF/DataModel/FilterF1ProtonTables.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
-#include "CommonConstants/MathConstants.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "DataFormatsTPC/BetheBlochAleph.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
 #include "CCDB/CcdbApi.h"
+#include "CommonConstants/MathConstants.h"
 #include "CommonConstants/PhysicsConstants.h"
+#include "DataFormatsTPC/BetheBlochAleph.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include <Framework/Configurable.h>
+
+#include <Math/GenVector/Boost.h>
+#include <Math/Vector4D.h>
+#include <TMath.h>
+
+#include <fairlogger/Logger.h>
+
+#include <iostream>
+#include <iterator>
+#include <string>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/TableProducer/Resonances/resonanceInitializer.cxx b/.conflict-side-0/PWGLF/TableProducer/Resonances/resonanceInitializer.cxx
index c318d1d57d9..23d4b0df3ae 100644
--- a/.conflict-side-0/PWGLF/TableProducer/Resonances/resonanceInitializer.cxx
+++ b/.conflict-side-0/PWGLF/TableProducer/Resonances/resonanceInitializer.cxx
@@ -14,32 +14,35 @@
 /// \author Bong-Hwi Lim <bong-hwi.lim@cern.ch>
 ///
 
-#include <string>
-#include <vector>
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/Centrality.h"
+#include "PWGLF/DataModel/LFResonanceTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/Utils/collisionCuts.h"
+
+#include "Common/Core/EventPlaneHelper.h"
 #include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/Qvectors.h"
-#include "Common/Core/EventPlaneHelper.h"
-#include "Framework/ASoAHelpers.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonConstants/MathConstants.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
 #include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
-#include "PWGLF/Utils/collisionCuts.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "CommonConstants/MathConstants.h"
+
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/TableProducer/Resonances/resonanceMergeDF.cxx b/.conflict-side-0/PWGLF/TableProducer/Resonances/resonanceMergeDF.cxx
index 99ba4ec391d..c94d5940ff2 100644
--- a/.conflict-side-0/PWGLF/TableProducer/Resonances/resonanceMergeDF.cxx
+++ b/.conflict-side-0/PWGLF/TableProducer/Resonances/resonanceMergeDF.cxx
@@ -26,31 +26,33 @@
 /// \author Bong-Hwi Lim <bong-hwi.lim@cern.ch>
 ///         Nasir Mehdi Malik <nasir.mehdi.malik@cern.ch>
 ///         Min-jae Kim <minjae.kim@cern.ch>
-#include <vector>
+#include "PWGLF/DataModel/LFResonanceTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/Utils/collisionCuts.h"
 
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Multiplicity.h"
+#include "Common/Core/EventPlaneHelper.h"
 #include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/Qvectors.h"
-#include "Common/Core/EventPlaneHelper.h"
-#include "Framework/ASoAHelpers.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
 #include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
-#include "PWGLF/Utils/collisionCuts.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/TableProducer/Resonances/resonanceModuleInitializer.cxx b/.conflict-side-0/PWGLF/TableProducer/Resonances/resonanceModuleInitializer.cxx
index 54d2533b05a..d369995d3fd 100644
--- a/.conflict-side-0/PWGLF/TableProducer/Resonances/resonanceModuleInitializer.cxx
+++ b/.conflict-side-0/PWGLF/TableProducer/Resonances/resonanceModuleInitializer.cxx
@@ -14,34 +14,37 @@
 ///
 /// \author Bong-Hwi Lim <bong-hwi.lim@cern.ch>
 
-#include <string>
-#include <vector>
-#include "CCDB/BasicCCDBManager.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/Centrality.h"
+#include "PWGLF/DataModel/LFResonanceTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/DataModel/mcCentrality.h"
+#include "PWGLF/Utils/collisionCuts.h"
+
+#include "Common/Core/EventPlaneHelper.h"
 #include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/Qvectors.h"
-#include "Common/Core/EventPlaneHelper.h"
-#include "CommonConstants/PhysicsConstants.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/MathConstants.h"
-#include "DataFormatsParameters/GRPObject.h"
+#include "CommonConstants/PhysicsConstants.h"
 #include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
 #include "DetectorsBase/Propagator.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
-#include "PWGLF/DataModel/mcCentrality.h"
-#include "PWGLF/Utils/collisionCuts.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
 
+#include <string>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-0/PWGLF/TableProducer/Strangeness/Converters/stracentconverter.cxx b/.conflict-side-0/PWGLF/TableProducer/Strangeness/Converters/stracentconverter.cxx
index 74a786101e9..150b3734301 100644
--- a/.conflict-side-0/PWGLF/TableProducer/Strangeness/Converters/stracentconverter.cxx
+++ b/.conflict-side-0/PWGLF/TableProducer/Strangeness/Converters/stracentconverter.cxx
@@ -8,11 +8,12 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-side-0/PWGLF/TableProducer/Strangeness/Converters/stradautracksconverter.cxx b/.conflict-side-0/PWGLF/TableProducer/Strangeness/Converters/stradautracksconverter.cxx
index 5fe25abb572..e5b4533350e 100644
--- a/.conflict-side-0/PWGLF/TableProducer/Strangeness/Converters/stradautracksconverter.cxx
+++ b/.conflict-side-0/PWGLF/TableProducer/Strangeness/Converters/stradautracksconverter.cxx
@@ -8,11 +8,12 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/TableProducer/Strangeness/Converters/stradautracksextraconverter.cxx b/.conflict-side-0/PWGLF/TableProducer/Strangeness/Converters/stradautracksextraconverter.cxx
index ad436f4dfee..e40250a1ab3 100644
--- a/.conflict-side-0/PWGLF/TableProducer/Strangeness/Converters/stradautracksextraconverter.cxx
+++ b/.conflict-side-0/PWGLF/TableProducer/Strangeness/Converters/stradautracksextraconverter.cxx
@@ -8,11 +8,12 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
@@ -37,4 +38,5 @@ WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
   return WorkflowSpec{
     adaptAnalysisTask<stradautracksextraconverter>(cfgc)};
-}
\ No newline at end of file
+}
+ 
\ No newline at end of file
diff --git a/.conflict-side-0/PWGLF/TableProducer/Strangeness/Converters/stradautracksextraconverter2.cxx b/.conflict-side-0/PWGLF/TableProducer/Strangeness/Converters/stradautracksextraconverter2.cxx
index 22c9fc7eea4..e9c2f78c407 100644
--- a/.conflict-side-0/PWGLF/TableProducer/Strangeness/Converters/stradautracksextraconverter2.cxx
+++ b/.conflict-side-0/PWGLF/TableProducer/Strangeness/Converters/stradautracksextraconverter2.cxx
@@ -8,11 +8,12 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/TableProducer/Strangeness/Converters/stradautracksextraconverter3.cxx b/.conflict-side-0/PWGLF/TableProducer/Strangeness/Converters/stradautracksextraconverter3.cxx
index a4144c1ee9a..9f4d341ff39 100644
--- a/.conflict-side-0/PWGLF/TableProducer/Strangeness/Converters/stradautracksextraconverter3.cxx
+++ b/.conflict-side-0/PWGLF/TableProducer/Strangeness/Converters/stradautracksextraconverter3.cxx
@@ -8,11 +8,12 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/TableProducer/Strangeness/Converters/stradautrackstofpidconverter.cxx b/.conflict-side-0/PWGLF/TableProducer/Strangeness/Converters/stradautrackstofpidconverter.cxx
index 8731939ca53..063b318657f 100644
--- a/.conflict-side-0/PWGLF/TableProducer/Strangeness/Converters/stradautrackstofpidconverter.cxx
+++ b/.conflict-side-0/PWGLF/TableProducer/Strangeness/Converters/stradautrackstofpidconverter.cxx
@@ -8,11 +8,12 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
@@ -62,4 +63,5 @@ WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
   return WorkflowSpec{
     adaptAnalysisTask<stradautrackstofpidconverter>(cfgc)};
-}
\ No newline at end of file
+}
+ 
\ No newline at end of file
diff --git a/.conflict-side-0/PWGLF/TableProducer/Strangeness/Converters/straevselsconverter.cxx b/.conflict-side-0/PWGLF/TableProducer/Strangeness/Converters/straevselsconverter.cxx
index 9806e15abfc..8cadcdacd2a 100644
--- a/.conflict-side-0/PWGLF/TableProducer/Strangeness/Converters/straevselsconverter.cxx
+++ b/.conflict-side-0/PWGLF/TableProducer/Strangeness/Converters/straevselsconverter.cxx
@@ -8,11 +8,12 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-side-0/PWGLF/TableProducer/Strangeness/Converters/straevselsconverter2rawcents.cxx b/.conflict-side-0/PWGLF/TableProducer/Strangeness/Converters/straevselsconverter2rawcents.cxx
index deeafa8eeca..90ce25774c7 100644
--- a/.conflict-side-0/PWGLF/TableProducer/Strangeness/Converters/straevselsconverter2rawcents.cxx
+++ b/.conflict-side-0/PWGLF/TableProducer/Strangeness/Converters/straevselsconverter2rawcents.cxx
@@ -8,11 +8,12 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-side-0/PWGLF/TableProducer/Strangeness/Converters/straevselsconverter2rawcents2.cxx b/.conflict-side-0/PWGLF/TableProducer/Strangeness/Converters/straevselsconverter2rawcents2.cxx
index ffed58e9072..fa3a2ba8e48 100644
--- a/.conflict-side-0/PWGLF/TableProducer/Strangeness/Converters/straevselsconverter2rawcents2.cxx
+++ b/.conflict-side-0/PWGLF/TableProducer/Strangeness/Converters/straevselsconverter2rawcents2.cxx
@@ -8,11 +8,12 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-side-0/PWGLF/TableProducer/Strangeness/Converters/straevselsconverter2rawcents3.cxx b/.conflict-side-0/PWGLF/TableProducer/Strangeness/Converters/straevselsconverter2rawcents3.cxx
index 8d92146d6f7..0a5e98462ce 100644
--- a/.conflict-side-0/PWGLF/TableProducer/Strangeness/Converters/straevselsconverter2rawcents3.cxx
+++ b/.conflict-side-0/PWGLF/TableProducer/Strangeness/Converters/straevselsconverter2rawcents3.cxx
@@ -8,11 +8,12 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-side-0/PWGLF/TableProducer/Strangeness/Converters/stramccollisionconverter.cxx b/.conflict-side-0/PWGLF/TableProducer/Strangeness/Converters/stramccollisionconverter.cxx
index 8c7950dc4fd..c29ad673dbc 100644
--- a/.conflict-side-0/PWGLF/TableProducer/Strangeness/Converters/stramccollisionconverter.cxx
+++ b/.conflict-side-0/PWGLF/TableProducer/Strangeness/Converters/stramccollisionconverter.cxx
@@ -8,11 +8,12 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-side-0/PWGLF/TableProducer/Strangeness/Converters/stramccollisionconverter2.cxx b/.conflict-side-0/PWGLF/TableProducer/Strangeness/Converters/stramccollisionconverter2.cxx
index c821c6fb5fe..2f330820509 100644
--- a/.conflict-side-0/PWGLF/TableProducer/Strangeness/Converters/stramccollisionconverter2.cxx
+++ b/.conflict-side-0/PWGLF/TableProducer/Strangeness/Converters/stramccollisionconverter2.cxx
@@ -16,11 +16,12 @@
 /// \author Romain Schotter <romain.schotter@cern.ch>, Austrian Academy of Sciences & SMI
 //
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-side-0/PWGLF/TableProducer/Strangeness/Converters/stramccollmultconverter.cxx b/.conflict-side-0/PWGLF/TableProducer/Strangeness/Converters/stramccollmultconverter.cxx
index 411e3c15da5..2b25192cce1 100644
--- a/.conflict-side-0/PWGLF/TableProducer/Strangeness/Converters/stramccollmultconverter.cxx
+++ b/.conflict-side-0/PWGLF/TableProducer/Strangeness/Converters/stramccollmultconverter.cxx
@@ -8,11 +8,12 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-side-0/PWGLF/TableProducer/Strangeness/Converters/strarawcentsconverter.cxx b/.conflict-side-0/PWGLF/TableProducer/Strangeness/Converters/strarawcentsconverter.cxx
index e912c724870..7986a02ca1e 100644
--- a/.conflict-side-0/PWGLF/TableProducer/Strangeness/Converters/strarawcentsconverter.cxx
+++ b/.conflict-side-0/PWGLF/TableProducer/Strangeness/Converters/strarawcentsconverter.cxx
@@ -8,11 +8,12 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-side-0/PWGLF/TableProducer/Strangeness/Converters/strarawcentsconverter2v4.cxx b/.conflict-side-0/PWGLF/TableProducer/Strangeness/Converters/strarawcentsconverter2v4.cxx
index c94227e31cd..1eeb4b20ec9 100644
--- a/.conflict-side-0/PWGLF/TableProducer/Strangeness/Converters/strarawcentsconverter2v4.cxx
+++ b/.conflict-side-0/PWGLF/TableProducer/Strangeness/Converters/strarawcentsconverter2v4.cxx
@@ -8,11 +8,12 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-side-0/PWGLF/TableProducer/Strangeness/Converters/strastampsconverter.cxx b/.conflict-side-0/PWGLF/TableProducer/Strangeness/Converters/strastampsconverter.cxx
index 7f5f129d623..8a6ee0c52d0 100644
--- a/.conflict-side-0/PWGLF/TableProducer/Strangeness/Converters/strastampsconverter.cxx
+++ b/.conflict-side-0/PWGLF/TableProducer/Strangeness/Converters/strastampsconverter.cxx
@@ -8,11 +8,12 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-side-0/PWGLF/TableProducer/Strangeness/Converters/v0coresconverter.cxx b/.conflict-side-0/PWGLF/TableProducer/Strangeness/Converters/v0coresconverter.cxx
index 06fafc1cc1a..9fa5142bc6d 100644
--- a/.conflict-side-0/PWGLF/TableProducer/Strangeness/Converters/v0coresconverter.cxx
+++ b/.conflict-side-0/PWGLF/TableProducer/Strangeness/Converters/v0coresconverter.cxx
@@ -8,11 +8,12 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-side-0/PWGLF/TableProducer/Strangeness/Converters/v0coresconverter2.cxx b/.conflict-side-0/PWGLF/TableProducer/Strangeness/Converters/v0coresconverter2.cxx
index c918f227525..66cafa8eeb6 100644
--- a/.conflict-side-0/PWGLF/TableProducer/Strangeness/Converters/v0coresconverter2.cxx
+++ b/.conflict-side-0/PWGLF/TableProducer/Strangeness/Converters/v0coresconverter2.cxx
@@ -8,11 +8,12 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-side-0/PWGLF/TableProducer/Strangeness/Converters/v0mlscoresconverter.cxx b/.conflict-side-0/PWGLF/TableProducer/Strangeness/Converters/v0mlscoresconverter.cxx
index 9f2020bf20d..6cc3f4536fb 100644
--- a/.conflict-side-0/PWGLF/TableProducer/Strangeness/Converters/v0mlscoresconverter.cxx
+++ b/.conflict-side-0/PWGLF/TableProducer/Strangeness/Converters/v0mlscoresconverter.cxx
@@ -8,11 +8,12 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "PWGLF/DataModel/LFStrangenessMLTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/TableProducer/Strangeness/Converters/zdcneutronsconverter.cxx b/.conflict-side-0/PWGLF/TableProducer/Strangeness/Converters/zdcneutronsconverter.cxx
index ad081a43052..7ee0c368480 100644
--- a/.conflict-side-0/PWGLF/TableProducer/Strangeness/Converters/zdcneutronsconverter.cxx
+++ b/.conflict-side-0/PWGLF/TableProducer/Strangeness/Converters/zdcneutronsconverter.cxx
@@ -8,11 +8,12 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "PWGLF/DataModel/LFStrangenessMLTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/TableProducer/Strangeness/LambdaLambdatable.cxx b/.conflict-side-0/PWGLF/TableProducer/Strangeness/LambdaLambdatable.cxx
index 778f39ed442..bb7c517e1e7 100644
--- a/.conflict-side-0/PWGLF/TableProducer/Strangeness/LambdaLambdatable.cxx
+++ b/.conflict-side-0/PWGLF/TableProducer/Strangeness/LambdaLambdatable.cxx
@@ -11,38 +11,37 @@
 ///
 /// \author Junlee Kim, (junlee.kim@cern.ch)
 
-#include <Framework/Configurable.h>
-#include <Math/GenVector/Boost.h>
-#include <Math/Vector4D.h>
-#include <TMath.h>
-#include <fairlogger/Logger.h>
-
-#include <iostream>
-#include <iterator>
-#include <string>
-#include <vector>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/DataModel/ReducedLambdaLambdaTables.h"
 
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 #include "EventFiltering/Zorro.h"
 #include "EventFiltering/ZorroSummary.h"
 
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
+#include "CommonConstants/MathConstants.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
+#include <Framework/Configurable.h>
 
-#include "CommonConstants/MathConstants.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/PIDResponse.h"
+#include <Math/GenVector/Boost.h>
+#include <Math/Vector4D.h>
+#include <TMath.h>
 
-#include "CCDB/BasicCCDBManager.h"
-#include "CCDB/CcdbApi.h"
+#include <fairlogger/Logger.h>
 
-#include "PWGLF/DataModel/ReducedLambdaLambdaTables.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include <iostream>
+#include <iterator>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/TableProducer/Strangeness/cascadeMLSelectionTreeCreator.cxx b/.conflict-side-0/PWGLF/TableProducer/Strangeness/cascadeMLSelectionTreeCreator.cxx
index f3bfc813c89..9eefdea0c8a 100644
--- a/.conflict-side-0/PWGLF/TableProducer/Strangeness/cascadeMLSelectionTreeCreator.cxx
+++ b/.conflict-side-0/PWGLF/TableProducer/Strangeness/cascadeMLSelectionTreeCreator.cxx
@@ -23,37 +23,40 @@
 //    david.dobrigkeit.chinellato@cern.ch
 //
 
-#include <Math/Vector4D.h> // C system
-#include <cmath>           // C++ system
-#include <array>           // C++ system
-#include <cstdlib>         // C++ system
+#include "PWGLF/DataModel/LFStrangenessMLTables.h"
+#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/ASoA.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
-#include "PWGLF/DataModel/LFStrangenessMLTables.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/TableProducer/PID/pidTOFBase.h"
+
 #include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/PhysicsConstants.h"
-#include "Common/TableProducer/PID/pidTOFBase.h"
+#include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <Math/Vector4D.h> // C system
+#include <TDatabasePDG.h>
 #include <TFile.h>
 #include <TH2F.h>
-#include <TProfile.h>
 #include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
+#include <TProfile.h>
+
+#include <array>   // C++ system
+#include <cmath>   // C++ system
+#include <cstdlib> // C++ system
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/TableProducer/Strangeness/cascadebuilder.cxx b/.conflict-side-0/PWGLF/TableProducer/Strangeness/cascadebuilder.cxx
index b4a19e6660b..607445f0fda 100644
--- a/.conflict-side-0/PWGLF/TableProducer/Strangeness/cascadebuilder.cxx
+++ b/.conflict-side-0/PWGLF/TableProducer/Strangeness/cascadebuilder.cxx
@@ -36,47 +36,47 @@
 //    david.dobrigkeit.chinellato@cern.ch
 //
 
-#include <string>
-#include <vector>
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <map>
-#include <iterator>
-#include <utility>
-#include <string>
-#include <vector>
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/LFStrangenessMLTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFStrangenessMLTables.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
 #include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
 #include "Tools/ML/MlResponse.h"
 #include "Tools/ML/model.h"
 
+#include "CCDB/BasicCCDBManager.h"
+#include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <iterator>
+#include <map>
+#include <string>
+#include <utility>
+#include <vector>
+
 #ifndef HomogeneousField
 #define HomogeneousField
 #endif
 
 /// includes KFParticle
-#include "KFParticle.h"
 #include "KFPTrack.h"
 #include "KFPVertex.h"
+#include "KFParticle.h"
 #include "KFParticleBase.h"
 #include "KFVertex.h"
 
@@ -2202,11 +2202,11 @@ struct cascadePreselector {
                   }
                 }
               } // end conditional V0-bach pair
-            }   // end neg = pos mother conditional
+            } // end neg = pos mother conditional
           }
         } // end loop neg/pos mothers
-      }   // end conditional of mothers existing
-    }     // end association check
+      } // end conditional of mothers existing
+    } // end association check
     // Construct tag table (note: this will be joinable with CascDatas)
     if (lPDG == 3312)
       bitset(maskElement, bitTrueXiMinus);
diff --git a/.conflict-side-0/PWGLF/TableProducer/Strangeness/cascadefinder.cxx b/.conflict-side-0/PWGLF/TableProducer/Strangeness/cascadefinder.cxx
index 3901d3f14c3..4d6de573b2a 100644
--- a/.conflict-side-0/PWGLF/TableProducer/Strangeness/cascadefinder.cxx
+++ b/.conflict-side-0/PWGLF/TableProducer/Strangeness/cascadefinder.cxx
@@ -28,33 +28,36 @@
 //    david.dobrigkeit.chinellato@cern.ch
 //
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
 #include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "ReconstructionDataFormats/Track.h"
+#include "PWGLF/DataModel/LFStrangenessFinderTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFStrangenessFinderTables.h"
-#include "Common/Core/TrackSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
 
+#include "DCAFitter/DCAFitterN.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <Math/Vector4D.h>
+#include <TDatabasePDG.h>
 #include <TFile.h>
-#include <TLorentzVector.h>
 #include <TH1F.h>
 #include <TH2F.h>
-#include <TProfile.h>
-#include <Math/Vector4D.h>
+#include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
-#include <cmath>
+#include <TProfile.h>
+
 #include <array>
+#include <cmath>
 #include <cstdlib>
 
 using namespace o2;
@@ -270,9 +273,9 @@ struct cascadefinder {
                      t0id.dcaXY(),
                      dcaInfo[0], dcaInfo[1]);
           } // end if cascade recoed
-        }   // end loop over bachelor
-      }     // end if v0 recoed
-    }       // end loop over cascades
+        } // end loop over bachelor
+      } // end if v0 recoed
+    } // end loop over cascades
 
     // Anticascades
     for (auto& v0id : antiLambdas) {
@@ -361,9 +364,9 @@ struct cascadefinder {
                      t0id.dcaXY(),
                      dcaInfo[0], dcaInfo[1]);
           } // end if cascade recoed
-        }   // end loop over bachelor
-      }     // end if v0 recoed
-    }       // end loop over anticascades
+        } // end loop over bachelor
+      } // end if v0 recoed
+    } // end loop over anticascades
 
     hCandPerEvent->Fill(lNCand);
   }
diff --git a/.conflict-side-0/PWGLF/TableProducer/Strangeness/cascadeflow.cxx b/.conflict-side-0/PWGLF/TableProducer/Strangeness/cascadeflow.cxx
index c66a1db16fd..a8135e5c1b5 100644
--- a/.conflict-side-0/PWGLF/TableProducer/Strangeness/cascadeflow.cxx
+++ b/.conflict-side-0/PWGLF/TableProducer/Strangeness/cascadeflow.cxx
@@ -12,25 +12,29 @@
 /// \brief Task to create derived data for cascade flow analyses
 /// \authors: Chiara De Martin (chiara.de.martin@cern.ch), Maximiliano Puccio (maximiliano.puccio@cern.ch)
 
-#include <vector>
-#include <string>
-#include <memory>
-#include "Math/Vector3D.h"
-#include "TRandom3.h"
+#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/DataModel/cascqaanalysis.h"
+
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Framework/AnalysisTask.h"
+#include "Tools/ML/MlResponse.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/cascqaanalysis.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
-#include "Tools/ML/MlResponse.h"
-#include "CCDB/BasicCCDBManager.h"
+
+#include "Math/Vector3D.h"
+#include "TRandom3.h"
+
+#include <memory>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/TableProducer/Strangeness/cascademcbuilder.cxx b/.conflict-side-0/PWGLF/TableProducer/Strangeness/cascademcbuilder.cxx
index 3d4a5642004..384707d3d57 100644
--- a/.conflict-side-0/PWGLF/TableProducer/Strangeness/cascademcbuilder.cxx
+++ b/.conflict-side-0/PWGLF/TableProducer/Strangeness/cascademcbuilder.cxx
@@ -18,23 +18,25 @@
 //    david.dobrigkeit.chinellato@cern.ch
 //
 
-#include <cmath>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/trackUtilities.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
 #include <array>
+#include <cmath>
 #include <cstdlib>
-#include <map>
 #include <iterator>
+#include <map>
 #include <utility>
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
@@ -45,11 +47,11 @@ using LabeledTracks = soa::Join<aod::Tracks, aod::McTrackLabels>;
 
 //*+-+*+-+*+-+*+-+*+-+*+-+*+-+*+-+*+-+*+-+*
 struct cascademcbuilder {
-  Produces<aod::McCascLabels> casclabels;       // MC labels for cascades
-  Produces<aod::McKFCascLabels> kfcasclabels;   // MC labels for tracked cascades
-  Produces<aod::McTraCascLabels> tracasclabels; // MC labels for tracked cascades
-  Produces<aod::McCascBBTags> bbtags;           // bb tags (inv structure tagging)
-  Produces<aod::CascMCCores> cascmccores;       // optionally aggregate information from MC side for posterior analysis (derived data)
+  Produces<aod::McCascLabels> casclabels;           // MC labels for cascades
+  Produces<aod::McKFCascLabels> kfcasclabels;       // MC labels for tracked cascades
+  Produces<aod::McTraCascLabels> tracasclabels;     // MC labels for tracked cascades
+  Produces<aod::McCascBBTags> bbtags;               // bb tags (inv structure tagging)
+  Produces<aod::CascMCCores> cascmccores;           // optionally aggregate information from MC side for posterior analysis (derived data)
   Produces<aod::CascCoreMCLabels> cascCoreMClabels; // optionally aggregate information from MC side for posterior analysis (derived data)
   Produces<aod::CascMCCollRefs> cascmccollrefs;     // references MC collisions from MC cascades
 
@@ -225,7 +227,7 @@ struct cascademcbuilder {
             } // end v0 mother loop
           } // end has_mothers check for V0
         } // end conditional of pos/neg originating being the same
-      }     // end association check
+      } // end association check
       // Construct label table (note: this will be joinable with CascDatas)
       casclabels(
         thisInfo.label, thisInfo.motherLabel);
@@ -421,11 +423,11 @@ struct cascademcbuilder {
                     }
                   }
                 } // end conditional V0-bach pair
-              }   // end neg = pos mother conditional
+              } // end neg = pos mother conditional
             }
           } // end loop neg/pos mothers
-        }   // end conditional of mothers existing
-      }     // end association check
+        } // end conditional of mothers existing
+      } // end association check
       // Construct label table (note: this will be joinable with CascDatas)
       kfcasclabels(
         lLabel);
@@ -464,11 +466,11 @@ struct cascademcbuilder {
                     }
                   }
                 } // end conditional V0-bach pair
-              }   // end neg = pos mother conditional
+              } // end neg = pos mother conditional
             }
           } // end loop neg/pos mothers
-        }   // end conditional of mothers existing
-      }     // end association check
+        } // end conditional of mothers existing
+      } // end association check
       // Construct label table (note: this will be joinable with CascDatas)
       tracasclabels(
         lLabel);
@@ -505,7 +507,7 @@ struct cascademcbuilder {
               }
             }
           }
-        }                                         // end if-pion
+        } // end if-pion
         if (bachelorParticle.pdgCode() == -211) { // pi-, look for proton in positive prong
           if (lNegTrack.has_mcParticle()) {
             auto baryonParticle = lPosTrack.mcParticle_as<aod::McParticles>();
@@ -520,7 +522,7 @@ struct cascademcbuilder {
             }
           }
         } // end if-pion
-      }   // end bachelor has mcparticle
+      } // end bachelor has mcparticle
       // Construct label table (note: this will be joinable with CascDatas)
       bbtags(bbTag);
     } // end casctable loop
diff --git a/.conflict-side-0/PWGLF/TableProducer/Strangeness/cascademcfinder.cxx b/.conflict-side-0/PWGLF/TableProducer/Strangeness/cascademcfinder.cxx
index 8d26f0ea33c..41bb2863a47 100644
--- a/.conflict-side-0/PWGLF/TableProducer/Strangeness/cascademcfinder.cxx
+++ b/.conflict-side-0/PWGLF/TableProducer/Strangeness/cascademcfinder.cxx
@@ -24,37 +24,39 @@
 //    david.dobrigkeit.chinellato@cern.ch
 //
 
-#include <Math/Vector4D.h>
-#include <cmath>
-#include <array>
-#include <cstdlib>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/McCollisionExtra.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "Common/Core/TrackSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
+#include <Math/Vector4D.h>
+#include <TDatabasePDG.h>
 #include <TFile.h>
-#include <TLorentzVector.h>
 #include <TH1F.h>
 #include <TH2F.h>
-#include <TProfile.h>
+#include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
+#include <TProfile.h>
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/TableProducer/Strangeness/cascademlselection.cxx b/.conflict-side-0/PWGLF/TableProducer/Strangeness/cascademlselection.cxx
index 6da4bc669e4..f8710e5e3ff 100644
--- a/.conflict-side-0/PWGLF/TableProducer/Strangeness/cascademlselection.cxx
+++ b/.conflict-side-0/PWGLF/TableProducer/Strangeness/cascademlselection.cxx
@@ -20,37 +20,40 @@
 //    david.dobrigkeit.chinellato@cern.ch
 //
 
-#include <Math/Vector4D.h>
-#include <cmath>
-#include <array>
-#include <cstdlib>
+#include "PWGLF/DataModel/LFStrangenessMLTables.h"
+#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/ASoA.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
-#include "PWGLF/DataModel/LFStrangenessMLTables.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+#include "Tools/ML/MlResponse.h"
+#include "Tools/ML/model.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <Math/Vector4D.h>
+#include <TDatabasePDG.h>
 #include <TFile.h>
 #include <TH2F.h>
-#include <TProfile.h>
 #include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
-#include "Tools/ML/MlResponse.h"
-#include "Tools/ML/model.h"
+#include <TProfile.h>
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
 
 using namespace o2;
 using namespace o2::analysis;
diff --git a/.conflict-side-0/PWGLF/TableProducer/Strangeness/cascadepid.cxx b/.conflict-side-0/PWGLF/TableProducer/Strangeness/cascadepid.cxx
index 3c7c82dacdd..830d5ca1577 100644
--- a/.conflict-side-0/PWGLF/TableProducer/Strangeness/cascadepid.cxx
+++ b/.conflict-side-0/PWGLF/TableProducer/Strangeness/cascadepid.cxx
@@ -23,35 +23,37 @@
 // (strange, weakly-decaying) particle. This task is meant to be a test, as
 // it hasn't been fully tested yet! Use at your own peril for now :-)
 
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <map>
-#include <iterator>
-#include <utility>
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
 #include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+#include "Common/TableProducer/PID/pidTOFBase.h"
+
 #include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/PhysicsConstants.h"
-#include "Common/TableProducer/PID/pidTOFBase.h"
-#include "Common/DataModel/PIDResponse.h"
+#include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <iterator>
+#include <map>
+#include <utility>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/TableProducer/Strangeness/cascadespawner.cxx b/.conflict-side-0/PWGLF/TableProducer/Strangeness/cascadespawner.cxx
index ab3f4cb7c3d..3b10901349b 100644
--- a/.conflict-side-0/PWGLF/TableProducer/Strangeness/cascadespawner.cxx
+++ b/.conflict-side-0/PWGLF/TableProducer/Strangeness/cascadespawner.cxx
@@ -16,19 +16,20 @@
 //  Creates Cascade extension tables for derived data.
 //  A minimal task that saves a lot of disk space.
 
-#include <cmath>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+
 #include <array>
+#include <cmath>
 #include <cstdlib>
 #include <iterator>
 #include <utility>
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-0/PWGLF/TableProducer/Strangeness/cascqaanalysis.cxx b/.conflict-side-0/PWGLF/TableProducer/Strangeness/cascqaanalysis.cxx
index 6a3310d316f..e051501d18f 100644
--- a/.conflict-side-0/PWGLF/TableProducer/Strangeness/cascqaanalysis.cxx
+++ b/.conflict-side-0/PWGLF/TableProducer/Strangeness/cascqaanalysis.cxx
@@ -13,23 +13,27 @@
 /// \brief Analysis of cascades in pp collisions
 /// \author Roman Nepeivoda (roman.nepeivoda@cern.ch)
 
-#include <algorithm>
-#include <vector>
-#include <TPDGCode.h>
+#include "PWGLF/DataModel/cascqaanalysis.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/DataModel/mcCentrality.h"
+#include "PWGLF/Utils/inelGt.h"
+
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "PWGLF/DataModel/cascqaanalysis.h"
-#include "TRandom2.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "PWGLF/Utils/inelGt.h"
-#include "PWGLF/DataModel/mcCentrality.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TRandom2.h"
+#include <TPDGCode.h>
+
+#include <algorithm>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/TableProducer/Strangeness/doubleCascTreeCreator.cxx b/.conflict-side-0/PWGLF/TableProducer/Strangeness/doubleCascTreeCreator.cxx
index 5ecffca742f..80b95b1c34a 100644
--- a/.conflict-side-0/PWGLF/TableProducer/Strangeness/doubleCascTreeCreator.cxx
+++ b/.conflict-side-0/PWGLF/TableProducer/Strangeness/doubleCascTreeCreator.cxx
@@ -9,38 +9,38 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <vector>
-#include <utility>
-#include <random>
+#include "PWGLF/DataModel/LFDoubleCascTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Multiplicity.h"
+#include "Common/Core/PID/TPCPIDResponse.h"
 #include "Common/Core/RecoDecay.h"
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
-
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 #include "EventFiltering/Zorro.h"
 #include "EventFiltering/ZorroSummary.h"
 
-#include "Common/Core/PID/TPCPIDResponse.h"
-#include "Common/DataModel/PIDResponse.h"
+#include "CCDB/BasicCCDBManager.h"
 #include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
-#include "PWGLF/DataModel/LFDoubleCascTables.h"
 #include "TDatabasePDG.h"
 
+#include <random>
+#include <utility>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-0/PWGLF/TableProducer/Strangeness/hStrangeCorrelationFilter.cxx b/.conflict-side-0/PWGLF/TableProducer/Strangeness/hStrangeCorrelationFilter.cxx
index 61f9e2f5086..6bb0ac92517 100644
--- a/.conflict-side-0/PWGLF/TableProducer/Strangeness/hStrangeCorrelationFilter.cxx
+++ b/.conflict-side-0/PWGLF/TableProducer/Strangeness/hStrangeCorrelationFilter.cxx
@@ -18,23 +18,26 @@
 /// \author David Dobrigkeit Chinellato (david.dobrigkeit.chinellato@cern.ch)
 /// \author Zhongbao Yin (Zhong-Bao.Yin@cern.ch)
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "PWGLF/DataModel/LFHStrangeCorrelationTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Framework/ASoAHelpers.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+#include "EventFiltering/Zorro.h"
+#include "EventFiltering/ZorroSummary.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TF1.h"
-#include <string>
 #include <TPDGCode.h>
 
-#include "EventFiltering/Zorro.h"
-#include "EventFiltering/ZorroSummary.h"
+#include <string>
 
 using namespace o2;
 using namespace o2::constants::math;
diff --git a/.conflict-side-0/PWGLF/TableProducer/Strangeness/lambdaJetpolarizationbuilder.cxx b/.conflict-side-0/PWGLF/TableProducer/Strangeness/lambdaJetpolarizationbuilder.cxx
index cc21c8def05..579177eecf2 100644
--- a/.conflict-side-0/PWGLF/TableProducer/Strangeness/lambdaJetpolarizationbuilder.cxx
+++ b/.conflict-side-0/PWGLF/TableProducer/Strangeness/lambdaJetpolarizationbuilder.cxx
@@ -12,25 +12,29 @@
 
 /// \author Youpeng Su (yousu@cern.ch)
 
-#include <iostream>
-#include <string>
-#include <vector>
-#include <cmath>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/EventSelection.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Framework/O2DatabasePDGPlugin.h"
 #include "PWGJE/Core/JetDerivedDataUtilities.h"
 #include "PWGJE/DataModel/Jet.h"
-#include <TLorentzVector.h>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/DataModel/lambdaJetpolarization.h"
+
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+
 #include "Framework/ASoA.h"
 #include "Framework/AnalysisDataModel.h"
-#include <TTree.h>
+#include "Framework/AnalysisTask.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
 #include <TFile.h>
+#include <TLorentzVector.h>
 #include <TMatrixD.h>
-#include "PWGLF/DataModel/lambdaJetpolarization.h"
+#include <TTree.h>
+
+#include <cmath>
+#include <iostream>
+#include <string>
+#include <vector>
 
 using std::cout;
 using std::endl;
diff --git a/.conflict-side-0/PWGLF/TableProducer/Strangeness/lambdakzeroMLSelectionTreeCreator.cxx b/.conflict-side-0/PWGLF/TableProducer/Strangeness/lambdakzeroMLSelectionTreeCreator.cxx
index d70552c4c71..d965f6490b9 100644
--- a/.conflict-side-0/PWGLF/TableProducer/Strangeness/lambdakzeroMLSelectionTreeCreator.cxx
+++ b/.conflict-side-0/PWGLF/TableProducer/Strangeness/lambdakzeroMLSelectionTreeCreator.cxx
@@ -24,37 +24,40 @@
 //    david.dobrigkeit.chinellato@cern.ch
 //
 
-#include <Math/Vector4D.h> // C system
-#include <cmath>           // C++ system
-#include <array>           // C++ system
-#include <cstdlib>         // C++ system
+#include "PWGLF/DataModel/LFStrangenessMLTables.h"
+#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/ASoA.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
-#include "PWGLF/DataModel/LFStrangenessMLTables.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/TableProducer/PID/pidTOFBase.h"
+
 #include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/PhysicsConstants.h"
-#include "Common/TableProducer/PID/pidTOFBase.h"
+#include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <Math/Vector4D.h> // C system
+#include <TDatabasePDG.h>
 #include <TFile.h>
 #include <TH2F.h>
-#include <TProfile.h>
 #include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
+#include <TProfile.h>
+
+#include <array>   // C++ system
+#include <cmath>   // C++ system
+#include <cstdlib> // C++ system
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/TableProducer/Strangeness/lambdakzerobuilder.cxx b/.conflict-side-0/PWGLF/TableProducer/Strangeness/lambdakzerobuilder.cxx
index 7b898bfa98e..912a64e6176 100644
--- a/.conflict-side-0/PWGLF/TableProducer/Strangeness/lambdakzerobuilder.cxx
+++ b/.conflict-side-0/PWGLF/TableProducer/Strangeness/lambdakzerobuilder.cxx
@@ -36,40 +36,44 @@
 //    david.dobrigkeit.chinellato@cern.ch
 //
 
-#include <string>
-#include <vector>
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <map>
-#include <iterator>
-#include <utility>
+#include "TableHelper.h"
 
-#include "TRandom3.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFStrangenessMLTables.h"
 #include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/LFStrangenessMLTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsCalibration/MeanVertexObject.h"
-#include "TableHelper.h"
 #include "Tools/ML/MlResponse.h"
 #include "Tools/ML/model.h"
 
+#include "CCDB/BasicCCDBManager.h"
+#include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsCalibration/MeanVertexObject.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include "TRandom3.h"
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <iterator>
+#include <map>
+#include <string>
+#include <utility>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-0/PWGLF/TableProducer/Strangeness/lambdakzerofinder.cxx b/.conflict-side-0/PWGLF/TableProducer/Strangeness/lambdakzerofinder.cxx
index e75c72c77f4..9be2f0238ae 100644
--- a/.conflict-side-0/PWGLF/TableProducer/Strangeness/lambdakzerofinder.cxx
+++ b/.conflict-side-0/PWGLF/TableProducer/Strangeness/lambdakzerofinder.cxx
@@ -28,37 +28,39 @@
 //    david.dobrigkeit.chinellato@cern.ch
 //
 
-#include <Math/Vector4D.h>
-#include <cmath>
-#include <array>
-#include <cstdlib>
-
-#include <TFile.h>
-#include <TLorentzVector.h>
-#include <TH1F.h>
-#include <TH2F.h>
-#include <TProfile.h>
-#include <TPDGCode.h>
-#include <TDatabasePDG.h>
+#include "PWGLF/DataModel/LFStrangenessFinderTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFStrangenessFinderTables.h"
-#include "Common/Core/TrackSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <Math/Vector4D.h>
+#include <TDatabasePDG.h>
+#include <TFile.h>
+#include <TH1F.h>
+#include <TH2F.h>
+#include <TLorentzVector.h>
+#include <TPDGCode.h>
+#include <TProfile.h>
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/TableProducer/Strangeness/lambdakzeromcbuilder.cxx b/.conflict-side-0/PWGLF/TableProducer/Strangeness/lambdakzeromcbuilder.cxx
index 1d7b1c29490..51c3045cca2 100644
--- a/.conflict-side-0/PWGLF/TableProducer/Strangeness/lambdakzeromcbuilder.cxx
+++ b/.conflict-side-0/PWGLF/TableProducer/Strangeness/lambdakzeromcbuilder.cxx
@@ -18,23 +18,25 @@
 //    david.dobrigkeit.chinellato@cern.ch
 //
 
-#include <cmath>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/trackUtilities.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
 #include <array>
+#include <cmath>
 #include <cstdlib>
-#include <map>
 #include <iterator>
+#include <map>
 #include <utility>
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
@@ -42,8 +44,8 @@ using std::array;
 
 //*+-+*+-+*+-+*+-+*+-+*+-+*+-+*+-+*+-+*+-+*
 struct lambdakzeromcbuilder {
-  Produces<aod::McV0Labels> v0labels; // MC labels for V0s
-  Produces<aod::V0MCCores> v0mccores; // optionally aggregate information from MC side for posterior analysis (derived data)
+  Produces<aod::McV0Labels> v0labels;           // MC labels for V0s
+  Produces<aod::V0MCCores> v0mccores;           // optionally aggregate information from MC side for posterior analysis (derived data)
   Produces<aod::V0CoreMCLabels> v0CoreMCLabels; // interlink V0Cores -> V0MCCores in asymmetric mode
   Produces<aod::V0MCCollRefs> v0mccollref;      // references collisions from V0MCCores
 
@@ -152,7 +154,7 @@ struct lambdakzeromcbuilder {
   void process(aod::V0Datas const& v0table, aod::McTrackLabels const&, aod::McParticles const& mcParticles)
   {
     // to be used if using the populateV0MCCoresAsymmetric mode, kept empty otherwise
-    std::vector<mcV0info> mcV0infos; // V0MCCore information
+    std::vector<mcV0info> mcV0infos;                               // V0MCCore information
     std::vector<bool> mcParticleIsReco(mcParticles.size(), false); // mc Particle not recoed by V0s
 
     for (auto& v0 : v0table) {
diff --git a/.conflict-side-0/PWGLF/TableProducer/Strangeness/lambdakzeromcfinder.cxx b/.conflict-side-0/PWGLF/TableProducer/Strangeness/lambdakzeromcfinder.cxx
index 0a0db73ea6d..db38d03437a 100644
--- a/.conflict-side-0/PWGLF/TableProducer/Strangeness/lambdakzeromcfinder.cxx
+++ b/.conflict-side-0/PWGLF/TableProducer/Strangeness/lambdakzeromcfinder.cxx
@@ -24,39 +24,41 @@
 //    david.dobrigkeit.chinellato@cern.ch
 //
 
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <vector>
-
-#include "Math/Vector4D.h"
-#include <TFile.h>
-#include <TLorentzVector.h>
-#include <TH1F.h>
-#include <TH2F.h>
-#include <TProfile.h>
-#include <TPDGCode.h>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGMM/Mult/DataModel/Index.h" // for Particles2Tracks table
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/McCollisionExtra.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "Common/Core/TrackSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+
 #include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/PhysicsConstants.h"
-#include "PWGMM/Mult/DataModel/Index.h" // for Particles2Tracks table
+#include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include "Math/Vector4D.h"
+#include <TFile.h>
+#include <TH1F.h>
+#include <TH2F.h>
+#include <TLorentzVector.h>
+#include <TPDGCode.h>
+#include <TProfile.h>
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
@@ -228,7 +230,7 @@ struct lambdakzeromcfinder {
                 nPosReco++;
               }
             } // end track list loop
-          }   // end positive pdg check
+          } // end positive pdg check
           if (daughter.pdgCode() == negativePdg) {
             auto const& thisDaughterTracks = daughter.template tracks_as<LabeledTracks>();
             bool tpcOnlyFound = false;
@@ -245,7 +247,7 @@ struct lambdakzeromcfinder {
                 nNegReco++;
               }
             } // end track list loop
-          }   // end negative pdg check
+          } // end negative pdg check
         }
       }
     }
diff --git a/.conflict-side-0/PWGLF/TableProducer/Strangeness/lambdakzeromlselection.cxx b/.conflict-side-0/PWGLF/TableProducer/Strangeness/lambdakzeromlselection.cxx
index 412161ebe52..ff52e6918c4 100644
--- a/.conflict-side-0/PWGLF/TableProducer/Strangeness/lambdakzeromlselection.cxx
+++ b/.conflict-side-0/PWGLF/TableProducer/Strangeness/lambdakzeromlselection.cxx
@@ -20,37 +20,40 @@
 //    david.dobrigkeit.chinellato@cern.ch
 //
 
-#include <Math/Vector4D.h>
-#include <cmath>
-#include <array>
-#include <cstdlib>
+#include "PWGLF/DataModel/LFStrangenessMLTables.h"
+#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/ASoA.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
-#include "PWGLF/DataModel/LFStrangenessMLTables.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+#include "Tools/ML/MlResponse.h"
+#include "Tools/ML/model.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <Math/Vector4D.h>
+#include <TDatabasePDG.h>
 #include <TFile.h>
 #include <TH2F.h>
-#include <TProfile.h>
 #include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
-#include "Tools/ML/MlResponse.h"
-#include "Tools/ML/model.h"
+#include <TProfile.h>
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
 
 using namespace o2;
 using namespace o2::analysis;
@@ -75,8 +78,8 @@ struct lambdakzeromlselection {
 
   std::map<std::string, std::string> metadata;
 
-  Produces<aod::V0GammaMLScores> gammaMLSelections;   // optionally aggregate information from ML output for posterior analysis (derived data)
-  Produces<aod::V0LambdaMLScores> lambdaMLSelections; // optionally aggregate information from ML output for posterior analysis (derived data)
+  Produces<aod::V0GammaMLScores> gammaMLSelections;           // optionally aggregate information from ML output for posterior analysis (derived data)
+  Produces<aod::V0LambdaMLScores> lambdaMLSelections;         // optionally aggregate information from ML output for posterior analysis (derived data)
   Produces<aod::V0AntiLambdaMLScores> antiLambdaMLSelections; // optionally aggregate information from ML output for posterior analysis (derived data)
   Produces<aod::V0K0ShortMLScores> kzeroShortMLSelections;    // optionally aggregate information from ML output for posterior analysis (derived data)
 
diff --git a/.conflict-side-0/PWGLF/TableProducer/Strangeness/lambdakzeropid.cxx b/.conflict-side-0/PWGLF/TableProducer/Strangeness/lambdakzeropid.cxx
index c6041aa0e02..5fa295cbd07 100644
--- a/.conflict-side-0/PWGLF/TableProducer/Strangeness/lambdakzeropid.cxx
+++ b/.conflict-side-0/PWGLF/TableProducer/Strangeness/lambdakzeropid.cxx
@@ -23,36 +23,38 @@
 // (strange, weakly-decaying) particle. This task is meant to be a test, as
 // it hasn't been fully tested yet! Use at your own peril for now :-)
 
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <map>
-#include <iterator>
-#include <utility>
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
 #include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+#include "Common/TableProducer/PID/pidTOFBase.h"
+
 #include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsCalibration/MeanVertexObject.h"
 #include "CommonConstants/PhysicsConstants.h"
-#include "Common/TableProducer/PID/pidTOFBase.h"
-#include "Common/DataModel/PIDResponse.h"
+#include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsCalibration/MeanVertexObject.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <iterator>
+#include <map>
+#include <utility>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/TableProducer/Strangeness/lambdakzerospawner.cxx b/.conflict-side-0/PWGLF/TableProducer/Strangeness/lambdakzerospawner.cxx
index 19c174aef7f..ae22362ace9 100644
--- a/.conflict-side-0/PWGLF/TableProducer/Strangeness/lambdakzerospawner.cxx
+++ b/.conflict-side-0/PWGLF/TableProducer/Strangeness/lambdakzerospawner.cxx
@@ -16,19 +16,20 @@
 //  Creates V0 extension tables for derived data.
 //  A minimal task that saves a lot of disk space.
 
-#include <cmath>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+
 #include <array>
+#include <cmath>
 #include <cstdlib>
 #include <iterator>
 #include <utility>
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-0/PWGLF/TableProducer/Strangeness/sigma0builder.cxx b/.conflict-side-0/PWGLF/TableProducer/Strangeness/sigma0builder.cxx
index 32ed292dddd..51e8386e96c 100644
--- a/.conflict-side-0/PWGLF/TableProducer/Strangeness/sigma0builder.cxx
+++ b/.conflict-side-0/PWGLF/TableProducer/Strangeness/sigma0builder.cxx
@@ -20,36 +20,39 @@
 //    gianni.shigeru.setoue.liveraro@cern.ch
 //
 
-#include <Math/Vector4D.h>
-#include <cmath>
-#include <array>
-#include <cstdlib>
+#include "PWGLF/DataModel/LFSigmaTables.h"
+#include "PWGLF/DataModel/LFStrangenessMLTables.h"
+#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/ASoA.h"
-#include "ReconstructionDataFormats/Track.h"
+#include "Common/CCDB/ctpRateFetcher.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "Common/CCDB/ctpRateFetcher.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
-#include "PWGLF/DataModel/LFStrangenessMLTables.h"
-#include "PWGLF/DataModel/LFSigmaTables.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <Math/Vector4D.h>
+#include <TDatabasePDG.h>
 #include <TFile.h>
 #include <TH2F.h>
-#include <TProfile.h>
 #include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
+#include <TProfile.h>
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
 
 using namespace o2;
 using namespace o2::framework;
@@ -1188,8 +1191,8 @@ struct sigma0builder {
         if (v0MC.pdgCode() == 22) {
           histos.fill(HIST("MC/h2dGammaXYConversion"), v0.x(), v0.y());
           float GammaY = TMath::Abs(RecoDecay::y(std::array{v0.px(), v0.py(), v0.pz()}, o2::constants::physics::MassGamma));
-          if (GammaY < 0.5) {                                                                                                                // rapidity selection
-            histos.fill(HIST("MC/h2dPtVsCentralityBeforeSel_MCAssocGamma"), centrality, v0.pt());                                            // isgamma
+          if (GammaY < 0.5) {                                                                     // rapidity selection
+            histos.fill(HIST("MC/h2dPtVsCentralityBeforeSel_MCAssocGamma"), centrality, v0.pt()); // isgamma
           }
         }
 
diff --git a/.conflict-side-0/PWGLF/TableProducer/Strangeness/stCollIds.cxx b/.conflict-side-0/PWGLF/TableProducer/Strangeness/stCollIds.cxx
index 3cc94389197..f08650fa3c4 100644
--- a/.conflict-side-0/PWGLF/TableProducer/Strangeness/stCollIds.cxx
+++ b/.conflict-side-0/PWGLF/TableProducer/Strangeness/stCollIds.cxx
@@ -14,11 +14,12 @@
 ///
 /// \author Jochen Klein
 
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Framework/ASoA.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/ASoA.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/TableProducer/Strangeness/stracents.cxx b/.conflict-side-0/PWGLF/TableProducer/Strangeness/stracents.cxx
index ce5597563da..9b58d541ddc 100644
--- a/.conflict-side-0/PWGLF/TableProducer/Strangeness/stracents.cxx
+++ b/.conflict-side-0/PWGLF/TableProducer/Strangeness/stracents.cxx
@@ -15,25 +15,29 @@
 /// \author ALICE
 //
 
-#include <string>
-#include <vector>
-#include <algorithm>
-#include <map>
+#include "MetadataHelper.h"
+#include "TableHelper.h"
 
-#include <CCDB/BasicCCDBManager.h>
-#include <TH1F.h>
-#include <TFormula.h>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/RunningWorkflowInfo.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "Framework/HistogramRegistry.h"
-#include "Common/DataModel/Multiplicity.h"
+
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "MetadataHelper.h"
-#include "TableHelper.h"
+#include "Common/DataModel/Multiplicity.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include <CCDB/BasicCCDBManager.h>
+
 #include "TList.h"
+#include <TFormula.h>
+#include <TH1F.h>
+
+#include <algorithm>
+#include <map>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/TableProducer/Strangeness/strangederivedbuilder.cxx b/.conflict-side-0/PWGLF/TableProducer/Strangeness/strangederivedbuilder.cxx
index 8140448576a..0d2f8a5cdce 100644
--- a/.conflict-side-0/PWGLF/TableProducer/Strangeness/strangederivedbuilder.cxx
+++ b/.conflict-side-0/PWGLF/TableProducer/Strangeness/strangederivedbuilder.cxx
@@ -15,42 +15,44 @@
 // It is meant to help with providing auxiliary information
 // when dealing with derived data.
 
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <map>
-#include <iterator>
-#include <utility>
-#include <string>
-#include <vector>
+#include "PWGLF/DataModel/EPCalibrationTables.h"
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
 #include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/McCollisionExtra.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/Qvectors.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+#include "Common/TableProducer/PID/pidTOFBase.h"
+
 #include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/PhysicsConstants.h"
-#include "Common/TableProducer/PID/pidTOFBase.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Qvectors.h"
-#include "Framework/StaticFor.h"
+#include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "Common/DataModel/McCollisionExtra.h"
-#include "PWGLF/DataModel/EPCalibrationTables.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <iterator>
+#include <map>
+#include <string>
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/TableProducer/Strangeness/strangenessbuilder.cxx b/.conflict-side-0/PWGLF/TableProducer/Strangeness/strangenessbuilder.cxx
index 800b1105732..38da9798864 100644
--- a/.conflict-side-0/PWGLF/TableProducer/Strangeness/strangenessbuilder.cxx
+++ b/.conflict-side-0/PWGLF/TableProducer/Strangeness/strangenessbuilder.cxx
@@ -32,22 +32,25 @@
 //  -- v0builderopts ......: V0-specific building options (topological, deduplication, etc)
 //  -- cascadebuilderopts .: cascade-specific building options (topological, etc)
 
-#include <string>
-#include <vector>
-
-#include "Framework/DataSpecUtils.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "TableHelper.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "PWGLF/Utils/strangenessBuilderHelper.h"
+
+#include "Common/Core/TPCVDriftManager.h"
+#include "Common/DataModel/PIDResponse.h"
+
 #include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPObject.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include "Common/Core/TPCVDriftManager.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/DataSpecUtils.h"
+#include "Framework/runDataProcessing.h"
+
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/TableProducer/Strangeness/v0qaanalysis.cxx b/.conflict-side-0/PWGLF/TableProducer/Strangeness/v0qaanalysis.cxx
index bafe557c237..547570ba7df 100644
--- a/.conflict-side-0/PWGLF/TableProducer/Strangeness/v0qaanalysis.cxx
+++ b/.conflict-side-0/PWGLF/TableProducer/Strangeness/v0qaanalysis.cxx
@@ -13,21 +13,24 @@
 ///
 /// \author Francesca Ercolessi (francesca.ercolessi@cern.ch)
 
-#include <vector>
-#include <utility>
+#include "PWGLF/DataModel/v0qaanalysis.h"
 
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/v0qaanalysis.h"
+#include "PWGLF/DataModel/mcCentrality.h"
+#include "PWGLF/Utils/inelGt.h"
+
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CommonConstants/PhysicsConstants.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "PWGLF/DataModel/mcCentrality.h"
-#include "PWGLF/Utils/inelGt.h"
+
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/TableProducer/Strangeness/v0selector.cxx b/.conflict-side-0/PWGLF/TableProducer/Strangeness/v0selector.cxx
index 7d06871d78c..3d6a227609d 100644
--- a/.conflict-side-0/PWGLF/TableProducer/Strangeness/v0selector.cxx
+++ b/.conflict-side-0/PWGLF/TableProducer/Strangeness/v0selector.cxx
@@ -13,21 +13,22 @@
 ///
 /// \author Gijs van Weelden <g.van.weelden@cern.ch>
 
-#include <vector>
-#include <string>
-#include <algorithm>
-#include <TRandom3.h>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/DataModel/V0SelectorTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoA.h"
+#include "Common/Core/RecoDecay.h"
 
 #include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/RecoDecay.h"
+#include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/V0SelectorTables.h"
+#include <TRandom3.h>
+
+#include <algorithm>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/Tasks/GlobalEventProperties/heavyionMultiplicity.cxx b/.conflict-side-0/PWGLF/Tasks/GlobalEventProperties/heavyionMultiplicity.cxx
index b91db8d09e0..be8a1a6e2d7 100644
--- a/.conflict-side-0/PWGLF/Tasks/GlobalEventProperties/heavyionMultiplicity.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/GlobalEventProperties/heavyionMultiplicity.cxx
@@ -15,20 +15,20 @@
 /// \author Abhi Modak (abhi.modak@cern.ch)
 /// \since September 15, 2023
 
-#include <cmath>
-#include <cstdlib>
-#include <TPDGCode.h>
-#include <vector>
-
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGMM/Mult/DataModel/Index.h"
 #include "PWGMM/Mult/DataModel/bestCollisionTable.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "Common/Core/trackUtilities.h"
+
 #include "Common/CCDB/EventSelectionParams.h"
 #include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/MathConstants.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
@@ -38,9 +38,12 @@
 #include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/GlobalTrackID.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "PWGMM/Mult/DataModel/Index.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include <TPDGCode.h>
+
+#include <cmath>
+#include <cstdlib>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/Tasks/Nuspex/AntimatterAbsorptionHMPID.cxx b/.conflict-side-0/PWGLF/Tasks/Nuspex/AntimatterAbsorptionHMPID.cxx
index b5a5a2c3ee4..68af7268e35 100644
--- a/.conflict-side-0/PWGLF/Tasks/Nuspex/AntimatterAbsorptionHMPID.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/Nuspex/AntimatterAbsorptionHMPID.cxx
@@ -12,33 +12,34 @@
 /// \author Alberto Caliva (alberto.caliva@cern.ch)
 /// \since June 27, 2023
 
-#include <TMath.h>
-#include <TPDGCode.h>
-#include <TRandom.h>
-#include <TDatabasePDG.h>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoA.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/DataTypes.h"
+#include "Common/Core/PID/PIDTOF.h"
 #include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/Core/PID/PIDTOF.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "ReconstructionDataFormats/TrackParametrization.h"
-#include "ReconstructionDataFormats/DCA.h"
-#include "DetectorsBase/Propagator.h"
-#include "Common/Core/trackUtilities.h"
-#include "ReconstructionDataFormats/PID.h"
+
 #include "CCDB/BasicCCDBManager.h"
 #include "CCDB/CcdbApi.h"
 #include "DataFormatsParameters/GRPMagField.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/DataTypes.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/DCA.h"
+#include "ReconstructionDataFormats/PID.h"
+#include "ReconstructionDataFormats/Track.h"
+#include "ReconstructionDataFormats/TrackParametrization.h"
+
+#include <TDatabasePDG.h>
+#include <TMath.h>
+#include <TPDGCode.h>
+#include <TRandom.h>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/Tasks/Nuspex/NucleiEfficiencyTask.cxx b/.conflict-side-0/PWGLF/Tasks/Nuspex/NucleiEfficiencyTask.cxx
index 4ca2bd51c6f..23f968e3fc9 100644
--- a/.conflict-side-0/PWGLF/Tasks/Nuspex/NucleiEfficiencyTask.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/Nuspex/NucleiEfficiencyTask.cxx
@@ -12,37 +12,40 @@
 // Authors: Rafael Manhart,
 // Date: 06.05.2024
 
-#include <cmath>
-#include <TLorentzVector.h>
-#include <TMath.h>
-#include <TObjArray.h>
-#include <vector>
-#include <TF1.h>
-#include <string>
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/mcCentrality.h"
+#include "PWGLF/DataModel/spectraTOF.h"
+#include "PWGLF/Utils/inelGt.h"
 
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/McCollisionExtra.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/McCollisionExtra.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "TPDGCode.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/Core/TrackSelection.h"
-#include "Framework/StaticFor.h"
-#include "Common/Core/TrackSelectionDefaults.h"
-#include "PWGLF/DataModel/spectraTOF.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "PWGLF/Utils/inelGt.h"
-#include "PWGLF/DataModel/mcCentrality.h"
-#include "Common/Core/RecoDecay.h"
+#include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include "TPDGCode.h"
+#include <TF1.h>
+#include <TLorentzVector.h>
+#include <TMath.h>
+#include <TObjArray.h>
+
+#include <cmath>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::track;
diff --git a/.conflict-side-0/PWGLF/Tasks/Nuspex/NucleiHistTask.cxx b/.conflict-side-0/PWGLF/Tasks/Nuspex/NucleiHistTask.cxx
index e3152c05cfb..b4f0ba70aed 100644
--- a/.conflict-side-0/PWGLF/Tasks/Nuspex/NucleiHistTask.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/Nuspex/NucleiHistTask.cxx
@@ -12,37 +12,40 @@
 // Authors: Rafael Manhart,
 // Date: 30.11.2022
 
-#include <cmath>
-#include <TLorentzVector.h>
-#include <TMath.h>
-#include <TObjArray.h>
-#include <vector>
-#include <TF1.h>
-#include <string>
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/mcCentrality.h"
+#include "PWGLF/DataModel/spectraTOF.h"
+#include "PWGLF/Utils/inelGt.h"
 
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/McCollisionExtra.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/McCollisionExtra.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "TPDGCode.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/Core/TrackSelection.h"
-#include "Framework/StaticFor.h"
-#include "Common/Core/TrackSelectionDefaults.h"
-#include "PWGLF/DataModel/spectraTOF.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "PWGLF/Utils/inelGt.h"
-#include "PWGLF/DataModel/mcCentrality.h"
-#include "Common/Core/RecoDecay.h"
+#include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include "TPDGCode.h"
+#include <TF1.h>
+#include <TLorentzVector.h>
+#include <TMath.h>
+#include <TObjArray.h>
+
+#include <cmath>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::track;
diff --git a/.conflict-side-0/PWGLF/Tasks/Nuspex/QAHistTask.cxx b/.conflict-side-0/PWGLF/Tasks/Nuspex/QAHistTask.cxx
index 2afc40a7261..ff902ace030 100644
--- a/.conflict-side-0/PWGLF/Tasks/Nuspex/QAHistTask.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/Nuspex/QAHistTask.cxx
@@ -12,30 +12,30 @@
 // Authors: Rafael Manhart,
 // Date: 05.10.2023
 
-#include <cmath>
-#include <TLorentzVector.h>
-#include <TMath.h>
-#include <TObjArray.h>
-#include <string>
-#include <vector>
-
-#include "ReconstructionDataFormats/Track.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+#include "PWGLF/DataModel/LFParticleIdentification.h"
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
 #include "TPDGCode.h"
 #include <TH1F.h>
-#include "Framework/runDataProcessing.h"
+#include <TLorentzVector.h>
+#include <TMath.h>
+#include <TObjArray.h>
+
+#include <cmath>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/Tasks/Nuspex/QCspectraTPC.cxx b/.conflict-side-0/PWGLF/Tasks/Nuspex/QCspectraTPC.cxx
index 079b0d44a31..afe0d07b608 100644
--- a/.conflict-side-0/PWGLF/Tasks/Nuspex/QCspectraTPC.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/Nuspex/QCspectraTPC.cxx
@@ -9,22 +9,24 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/runDataProcessing.h"
+#include "PWGLF/DataModel/LFParticleIdentification.h"
 
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/McCollisionExtra.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/StaticFor.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/McCollisionExtra.h"
-#include "Common/Core/TrackSelectionDefaults.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
 #include "TPDGCode.h"
 
 using namespace o2;
@@ -496,7 +498,7 @@ struct QCspectraTPC {
             histos.fill(HIST("MC/pr/neg/prm/pt/numtof"), track.pt(), multiplicity, track.dcaXY());
           }
         }
-      }                                      // primaries
+      } // primaries
       if (!mcParticle.isPhysicalPrimary()) { // secondaries loop start
         if (mcParticle.pdgCode() == 211) {
           if (std::abs(mcParticle.y()) > cfgCutY) {
diff --git a/.conflict-side-0/PWGLF/Tasks/Nuspex/angularCorrelationsInJets.cxx b/.conflict-side-0/PWGLF/Tasks/Nuspex/angularCorrelationsInJets.cxx
index 20e1604e206..a6fc4bf6032 100644
--- a/.conflict-side-0/PWGLF/Tasks/Nuspex/angularCorrelationsInJets.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/Nuspex/angularCorrelationsInJets.cxx
@@ -14,33 +14,36 @@
 /// \author Lars Jörgensen (lars.christian.joergensen@cern.ch)
 /// \brief task for analysis of angular correlations in jets using Fastjet
 
-#include <vector>
-#include <utility>
-#include <map>
-#include <string>
-#include <random>
-#include <algorithm>
+#include "PWGJE/Core/JetBkgSubUtils.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/Core/PID/PIDTOF.h"
+#include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/PID/PIDTOF.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/TableProducer/PID/pidTOFBase.h"
-#include "Common/Core/RecoDecay.h"
 
-#include "fastjet/PseudoJet.hh"
+#include "CCDB/BasicCCDBManager.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include "TPDGCode.h"
+#include "TVector3.h"
+
 #include "fastjet/AreaDefinition.hh"
 #include "fastjet/ClusterSequenceArea.hh"
 #include "fastjet/GhostedAreaSpec.hh"
-#include "PWGJE/Core/JetBkgSubUtils.h"
-#include "TVector3.h"
-#include "TPDGCode.h"
+#include "fastjet/PseudoJet.hh"
+
+#include <algorithm>
+#include <map>
+#include <random>
+#include <string>
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/Tasks/Nuspex/deutRtTask.cxx b/.conflict-side-0/PWGLF/Tasks/Nuspex/deutRtTask.cxx
index f0092793232..18e5b9cd5d3 100644
--- a/.conflict-side-0/PWGLF/Tasks/Nuspex/deutRtTask.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/Nuspex/deutRtTask.cxx
@@ -9,21 +9,23 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/runDataProcessing.h"
-#include "TVector2.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/Core/TrackSelection.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
-#include "Common/Core/TrackSelectionDefaults.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "TVector2.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/Tasks/Nuspex/he3LambdaDerivedAnalysis.cxx b/.conflict-side-0/PWGLF/Tasks/Nuspex/he3LambdaDerivedAnalysis.cxx
index 682d0f5a85e..6963186ed4b 100644
--- a/.conflict-side-0/PWGLF/Tasks/Nuspex/he3LambdaDerivedAnalysis.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/Nuspex/he3LambdaDerivedAnalysis.cxx
@@ -11,8 +11,8 @@
 
 #include "PWGLF/DataModel/LFSlimHeLambda.h"
 
-#include <Framework/AnalysisTask.h>
 #include <Framework/ASoAHelpers.h>
+#include <Framework/AnalysisTask.h>
 #include <Framework/HistogramRegistry.h>
 #include <Framework/runDataProcessing.h>
 
@@ -20,17 +20,18 @@
 
 #include <memory>
 
-namespace {
-  std::shared_ptr<TH2> hInvariantMassUS[2];
-  std::shared_ptr<TH2> hInvariantMassLS[2];
-  std::shared_ptr<TH2> hRotationInvariantMassUS[2];
-  std::shared_ptr<TH2> hRotationInvariantMassLS[2];
-  std::shared_ptr<TH2> hRotationInvariantMassAntiLSeta[2];
-  std::shared_ptr<TH2> hInvariantMassLambda[2];
-  std::shared_ptr<TH2> hCosPALambda;
-  std::shared_ptr<TH2> hNsigmaHe3;
-  std::shared_ptr<TH2> hNsigmaProton;
-};
+namespace
+{
+std::shared_ptr<TH2> hInvariantMassUS[2];
+std::shared_ptr<TH2> hInvariantMassLS[2];
+std::shared_ptr<TH2> hRotationInvariantMassUS[2];
+std::shared_ptr<TH2> hRotationInvariantMassLS[2];
+std::shared_ptr<TH2> hRotationInvariantMassAntiLSeta[2];
+std::shared_ptr<TH2> hInvariantMassLambda[2];
+std::shared_ptr<TH2> hCosPALambda;
+std::shared_ptr<TH2> hNsigmaHe3;
+std::shared_ptr<TH2> hNsigmaProton;
+}; // namespace
 
 using namespace o2;
 using namespace o2::framework;
@@ -51,13 +52,12 @@ struct he3LambdaDerivedAnalysis {
   {
     constexpr double ConstituentsMass = o2::constants::physics::MassProton + o2::constants::physics::MassNeutron * 2 + o2::constants::physics::MassSigmaPlus;
     for (int i = 0; i < 2; ++i) {
-      hInvariantMassUS[i] = mRegistry.add<TH2>(Form("hInvariantMassUS%i",i), "Invariant Mass", {HistType::kTH2D, {{45, 1., 10}, {100, ConstituentsMass - 0.05, ConstituentsMass + 0.05}}});
-      hInvariantMassLS[i] = mRegistry.add<TH2>(Form("hInvariantMassLS%i",i), "Invariant Mass", {HistType::kTH2D, {{45, 1., 10}, {100, ConstituentsMass - 0.05, ConstituentsMass + 0.05}}});
-      hRotationInvariantMassUS[i] = mRegistry.add<TH2>(Form("hRotationInvariantMassUS%i",i), "Rotation Invariant Mass", {HistType::kTH2D, {{45, 1., 10}, {100, ConstituentsMass - 0.05, ConstituentsMass + 0.05}}});
-      hRotationInvariantMassLS[i] = mRegistry.add<TH2>(Form("hRotationInvariantMassLS%i",i), "Rotation Invariant Mass", {HistType::kTH2D, {{45, 1., 10}, {100, ConstituentsMass - 0.05, ConstituentsMass + 0.05}}});
-      hInvariantMassLambda[i] = mRegistry.add<TH2>(Form("hInvariantMassLambda%i",i), "Invariant Mass Lambda", {HistType::kTH2D, {{50, 0., 10.}, {30, o2::constants::physics::MassLambda0 - 0.015, o2::constants::physics::MassLambda0 + 0.015}}});
-      hRotationInvariantMassAntiLSeta[i] = mRegistry.add<TH2>(Form("hRotationInvariantMassAntiLSeta%i",i), "Rotation Invariant Mass Anti-Lambda", {HistType::kTH2D, {{45, 1., 10}, {100, ConstituentsMass - 0.05, ConstituentsMass + 0.05}}});
-
+      hInvariantMassUS[i] = mRegistry.add<TH2>(Form("hInvariantMassUS%i", i), "Invariant Mass", {HistType::kTH2D, {{45, 1., 10}, {100, ConstituentsMass - 0.05, ConstituentsMass + 0.05}}});
+      hInvariantMassLS[i] = mRegistry.add<TH2>(Form("hInvariantMassLS%i", i), "Invariant Mass", {HistType::kTH2D, {{45, 1., 10}, {100, ConstituentsMass - 0.05, ConstituentsMass + 0.05}}});
+      hRotationInvariantMassUS[i] = mRegistry.add<TH2>(Form("hRotationInvariantMassUS%i", i), "Rotation Invariant Mass", {HistType::kTH2D, {{45, 1., 10}, {100, ConstituentsMass - 0.05, ConstituentsMass + 0.05}}});
+      hRotationInvariantMassLS[i] = mRegistry.add<TH2>(Form("hRotationInvariantMassLS%i", i), "Rotation Invariant Mass", {HistType::kTH2D, {{45, 1., 10}, {100, ConstituentsMass - 0.05, ConstituentsMass + 0.05}}});
+      hInvariantMassLambda[i] = mRegistry.add<TH2>(Form("hInvariantMassLambda%i", i), "Invariant Mass Lambda", {HistType::kTH2D, {{50, 0., 10.}, {30, o2::constants::physics::MassLambda0 - 0.015, o2::constants::physics::MassLambda0 + 0.015}}});
+      hRotationInvariantMassAntiLSeta[i] = mRegistry.add<TH2>(Form("hRotationInvariantMassAntiLSeta%i", i), "Rotation Invariant Mass Anti-Lambda", {HistType::kTH2D, {{45, 1., 10}, {100, ConstituentsMass - 0.05, ConstituentsMass + 0.05}}});
     }
     hCosPALambda = mRegistry.add<TH2>("hCosPALambda", "Cosine of Pointing Angle for Lambda", {HistType::kTH2D, {{50, 0., 10.}, {500, 0.9, 1.}}});
     hNsigmaHe3 = mRegistry.add<TH2>("hNsigmaHe3", "nSigma TPC for He3", {HistType::kTH2D, {{100, -10., 10.}, {200, -5, 5.}}});
@@ -128,7 +128,6 @@ struct he3LambdaDerivedAnalysis {
           }
         }
       }
-
     }
   }
   PROCESS_SWITCH(he3LambdaDerivedAnalysis, processSameEvent, "Process same event", true);
diff --git a/.conflict-side-0/PWGLF/Tasks/Nuspex/helium_flow.cxx b/.conflict-side-0/PWGLF/Tasks/Nuspex/helium_flow.cxx
index cc791f7fb2f..380e820ff96 100644
--- a/.conflict-side-0/PWGLF/Tasks/Nuspex/helium_flow.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/Nuspex/helium_flow.cxx
@@ -12,30 +12,33 @@
 /// \author Alberto Caliva (alberto.caliva@cern.ch)
 /// \since November 27, 2023
 
-#include <vector>
-#include <TMath.h>
-#include <TPDGCode.h>
-#include <TRandom.h>
-#include <TVector2.h>
-#include <TVector3.h>
-#include <TDatabasePDG.h>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoA.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/DataTypes.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/RunningWorkflowInfo.h"
-#include "Framework/DataTypes.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "ReconstructionDataFormats/PID.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/DCA.h"
-#include "Common/Core/trackUtilities.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/PIDResponse.h"
+#include "ReconstructionDataFormats/PID.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <TDatabasePDG.h>
+#include <TMath.h>
+#include <TPDGCode.h>
+#include <TRandom.h>
+#include <TVector2.h>
+#include <TVector3.h>
+
+#include <vector>
 
 using namespace std;
 using namespace o2;
diff --git a/.conflict-side-0/PWGLF/Tasks/Nuspex/hyhe4analysis.cxx b/.conflict-side-0/PWGLF/Tasks/Nuspex/hyhe4analysis.cxx
index 3766e57a61b..5a180dacdac 100644
--- a/.conflict-side-0/PWGLF/Tasks/Nuspex/hyhe4analysis.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/Nuspex/hyhe4analysis.cxx
@@ -19,32 +19,34 @@
 // --- kumar.lokesh@cern.ch
 // --- david.dobrigkeit.chinellato@cern.ch
 
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <map>
-#include <iterator>
-#include <utility>
+#include "PWGLF/DataModel/LFHyperhelium4Tables.h"
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
 #include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+
 #include "CCDB/BasicCCDBManager.h"
-#include "PWGLF/DataModel/LFHyperhelium4Tables.h"
+#include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <iterator>
+#include <map>
+#include <utility>
 
 using namespace std;
 using namespace o2;
diff --git a/.conflict-side-0/PWGLF/Tasks/Nuspex/hypertritonAnalysis.cxx b/.conflict-side-0/PWGLF/Tasks/Nuspex/hypertritonAnalysis.cxx
index 42470a606b0..9290648a12e 100644
--- a/.conflict-side-0/PWGLF/Tasks/Nuspex/hypertritonAnalysis.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/Nuspex/hypertritonAnalysis.cxx
@@ -18,37 +18,39 @@
 //    Please write to:
 //    david.dobrigkeit.chinellato@cern.ch
 //
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
+#include <Math/Vector4D.h>
+#include <TDatabasePDG.h>
 #include <TFile.h>
 #include <TH2F.h>
-#include <TProfile.h>
 #include <TLorentzVector.h>
-#include <Math/Vector4D.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
-#include <cmath>
+#include <TProfile.h>
+
 #include <array>
+#include <cmath>
 #include <cstdlib>
-#include "Framework/ASoAHelpers.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/Tasks/Nuspex/identifiedraa.cxx b/.conflict-side-0/PWGLF/Tasks/Nuspex/identifiedraa.cxx
index 3086152d226..bbaff5350c5 100644
--- a/.conflict-side-0/PWGLF/Tasks/Nuspex/identifiedraa.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/Nuspex/identifiedraa.cxx
@@ -30,6 +30,7 @@
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/AnalysisTask.h"
 
 using namespace o2;
diff --git a/.conflict-side-0/PWGLF/Tasks/Nuspex/mcspectraefficiency.cxx b/.conflict-side-0/PWGLF/Tasks/Nuspex/mcspectraefficiency.cxx
index 3442b00ab33..0beffe622c5 100644
--- a/.conflict-side-0/PWGLF/Tasks/Nuspex/mcspectraefficiency.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/Nuspex/mcspectraefficiency.cxx
@@ -10,14 +10,15 @@
 // or submit itself to any jurisdiction.
 
 // O2 includes
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+
 // ROOT includes
-#include <TH1F.h>
 #include "TPDGCode.h"
+#include <TH1F.h>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/Tasks/Nuspex/nucleiEbye.cxx b/.conflict-side-0/PWGLF/Tasks/Nuspex/nucleiEbye.cxx
index 681d8b2892e..177454e57ec 100644
--- a/.conflict-side-0/PWGLF/Tasks/Nuspex/nucleiEbye.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/Nuspex/nucleiEbye.cxx
@@ -9,22 +9,22 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <vector>
-#include <utility>
-#include <random>
-#include <iostream>
-#include <memory>
-#include <algorithm>
+#include "PWGLF/DataModel/LFEbyeTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
-
-#include "PWGLF/DataModel/LFEbyeTables.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 #include "TDatabasePDG.h"
 
+#include <algorithm>
+#include <iostream>
+#include <memory>
+#include <random>
+#include <utility>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-0/PWGLF/Tasks/Nuspex/nucleiFromHypertritonMap.cxx b/.conflict-side-0/PWGLF/Tasks/Nuspex/nucleiFromHypertritonMap.cxx
index 2d959f9488d..1becfae15f4 100644
--- a/.conflict-side-0/PWGLF/Tasks/Nuspex/nucleiFromHypertritonMap.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/Nuspex/nucleiFromHypertritonMap.cxx
@@ -12,30 +12,33 @@
 /// \author Roberta Ferioli (roberta.ferioli@cern.ch)
 /// \since November, 2024
 
-#include <vector>
-#include <TMath.h>
-#include <TPDGCode.h>
-#include <TRandom.h>
-#include <TVector2.h>
-#include <TVector3.h>
-#include <TDatabasePDG.h>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoA.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/DataTypes.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/RunningWorkflowInfo.h"
-#include "Framework/DataTypes.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "ReconstructionDataFormats/PID.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/DCA.h"
-#include "Common/Core/trackUtilities.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/PIDResponse.h"
+#include "ReconstructionDataFormats/PID.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <TDatabasePDG.h>
+#include <TMath.h>
+#include <TPDGCode.h>
+#include <TRandom.h>
+#include <TVector2.h>
+#include <TVector3.h>
+
+#include <vector>
 
 using namespace std;
 using namespace o2;
diff --git a/.conflict-side-0/PWGLF/Tasks/Nuspex/nuclei_in_toward_transv_regions.cxx b/.conflict-side-0/PWGLF/Tasks/Nuspex/nuclei_in_toward_transv_regions.cxx
index a64ba6dc09c..103b2200f4a 100644
--- a/.conflict-side-0/PWGLF/Tasks/Nuspex/nuclei_in_toward_transv_regions.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/Nuspex/nuclei_in_toward_transv_regions.cxx
@@ -12,31 +12,34 @@
 /// \author Alberto Caliva (alberto.caliva@cern.ch)
 /// \since August 22, 2024
 
-#include <vector>
-#include <TMath.h>
-#include <TPDGCode.h>
-#include <TRandom.h>
-#include <TVector2.h>
-#include <TVector3.h>
-#include <TLorentzVector.h>
-#include <TDatabasePDG.h>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoA.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/DataTypes.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/RunningWorkflowInfo.h"
-#include "Framework/DataTypes.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "ReconstructionDataFormats/PID.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/DCA.h"
-#include "Common/Core/trackUtilities.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/PIDResponse.h"
+#include "ReconstructionDataFormats/PID.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <TDatabasePDG.h>
+#include <TLorentzVector.h>
+#include <TMath.h>
+#include <TPDGCode.h>
+#include <TRandom.h>
+#include <TVector2.h>
+#include <TVector3.h>
+
+#include <vector>
 
 using namespace std;
 using namespace o2;
diff --git a/.conflict-side-0/PWGLF/Tasks/Nuspex/spectraCharged.cxx b/.conflict-side-0/PWGLF/Tasks/Nuspex/spectraCharged.cxx
index 94e3b30dc4a..a7a0453c395 100644
--- a/.conflict-side-0/PWGLF/Tasks/Nuspex/spectraCharged.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/Nuspex/spectraCharged.cxx
@@ -12,14 +12,16 @@
 // task for charged particle pt spectra vs multiplicity analysis with 2d unfolding for run3+
 // mimics https://github.com/alisw/AliPhysics/blob/master/PWGLF/SPECTRA/ChargedHadrons/MultDepSpec/AliMultDepSpecAnalysisTask.cxx
 
-#include "Framework/HistogramRegistry.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
 #include "TDatabasePDG.h"
 
 using namespace o2;
diff --git a/.conflict-side-0/PWGLF/Tasks/Nuspex/spectraTOF.cxx b/.conflict-side-0/PWGLF/Tasks/Nuspex/spectraTOF.cxx
index f80b2870959..e8b29ba35ae 100644
--- a/.conflict-side-0/PWGLF/Tasks/Nuspex/spectraTOF.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/Nuspex/spectraTOF.cxx
@@ -19,28 +19,33 @@
 
 // O2 includes
 
-#include <string>
-#include <vector>
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/McCollisionExtra.h"
-#include "Common/Core/TrackSelection.h"
-#include "Framework/StaticFor.h"
-#include "Common/Core/TrackSelectionDefaults.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
 #include "PWGLF/DataModel/spectraTOF.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "PWGLF/Utils/inelGt.h"
+
+#include "PWGLF/DataModel/LFParticleIdentification.h"
 #include "PWGLF/DataModel/mcCentrality.h"
+#include "PWGLF/Utils/inelGt.h"
+
 #include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/McCollisionExtra.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
 #include "TPDGCode.h"
+
+#include <string>
+#include <vector>
 using namespace o2;
 using namespace o2::track;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/Tasks/Nuspex/spectraTOFRun2.cxx b/.conflict-side-0/PWGLF/Tasks/Nuspex/spectraTOFRun2.cxx
index 9c31160f0a1..cb287907b9e 100644
--- a/.conflict-side-0/PWGLF/Tasks/Nuspex/spectraTOFRun2.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/Nuspex/spectraTOFRun2.cxx
@@ -18,20 +18,22 @@
 ///
 
 // O2 includes
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/spectraTOF.h"
+
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
 #include "Framework/StaticFor.h"
-#include "Common/Core/TrackSelectionDefaults.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
-#include "PWGLF/DataModel/spectraTOF.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
 #include "TPDGCode.h"
 
diff --git a/.conflict-side-0/PWGLF/Tasks/Nuspex/spectraTPC.cxx b/.conflict-side-0/PWGLF/Tasks/Nuspex/spectraTPC.cxx
index fd929553fb6..5488378dc9f 100644
--- a/.conflict-side-0/PWGLF/Tasks/Nuspex/spectraTPC.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/Nuspex/spectraTPC.cxx
@@ -18,14 +18,15 @@
 ///
 
 // O2 includes
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "ReconstructionDataFormats/Track.h"
 
 using namespace o2;
 using namespace o2::track;
@@ -186,7 +187,7 @@ struct tpcSpectra {
       fillParticleHistos<PID::Alpha>(track);
     }
   } // end of the process function
-};  // end of spectra task
+}; // end of spectra task
 
 struct tpcPidQaSignalwTof {
   static constexpr int Np = 9;
diff --git a/.conflict-side-0/PWGLF/Tasks/Nuspex/spectraTPCPiKaPr.cxx b/.conflict-side-0/PWGLF/Tasks/Nuspex/spectraTPCPiKaPr.cxx
index 0b856a92e6b..6f1b0b21c7d 100644
--- a/.conflict-side-0/PWGLF/Tasks/Nuspex/spectraTPCPiKaPr.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/Nuspex/spectraTPCPiKaPr.cxx
@@ -17,13 +17,14 @@
 ///
 
 // O2 includes
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/HistogramRegistry.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-0/PWGLF/Tasks/Nuspex/spectraTPCtiny.cxx b/.conflict-side-0/PWGLF/Tasks/Nuspex/spectraTPCtiny.cxx
index d58a8777771..3a1249c48ae 100644
--- a/.conflict-side-0/PWGLF/Tasks/Nuspex/spectraTPCtiny.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/Nuspex/spectraTPCtiny.cxx
@@ -17,13 +17,14 @@
 ///
 
 // O2 includes
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-0/PWGLF/Tasks/Nuspex/spectraTPCtinyPiKaPr.cxx b/.conflict-side-0/PWGLF/Tasks/Nuspex/spectraTPCtinyPiKaPr.cxx
index 9c9a340bfcf..9b0fbe79352 100644
--- a/.conflict-side-0/PWGLF/Tasks/Nuspex/spectraTPCtinyPiKaPr.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/Nuspex/spectraTPCtinyPiKaPr.cxx
@@ -17,13 +17,14 @@
 ///
 
 // O2 includes
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/HistogramRegistry.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-0/PWGLF/Tasks/QC/efficiencyQA.cxx b/.conflict-side-0/PWGLF/Tasks/QC/efficiencyQA.cxx
index 4a0257bb6e5..969c71000ef 100644
--- a/.conflict-side-0/PWGLF/Tasks/QC/efficiencyQA.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/QC/efficiencyQA.cxx
@@ -9,27 +9,27 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <array>
-#include <vector>
-#include <random>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
+#include "Common/Core/PID/TPCPIDResponse.h"
 #include "Common/Core/RecoDecay.h"
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/EventSelection.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
-
-#include "Common/Core/PID/TPCPIDResponse.h"
 #include "Common/DataModel/PIDResponse.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <array>
+#include <random>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/Tasks/QC/findableStudy.cxx b/.conflict-side-0/PWGLF/Tasks/QC/findableStudy.cxx
index d8ca8cc8c80..51fd1efde22 100644
--- a/.conflict-side-0/PWGLF/Tasks/QC/findableStudy.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/QC/findableStudy.cxx
@@ -19,42 +19,44 @@
 //    david.dobrigkeit.chinellato@cern.ch
 //
 
-#include <Math/Vector4D.h>
-#include <cmath>
-#include <array>
-#include <cstdlib>
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/Utils/v0SelectionBits.h"
+#include "PWGLF/Utils/v0SelectionGroup.h"
+#include "PWGLF/Utils/v0SelectionTools.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/McCollisionExtra.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/McCollisionExtra.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
-#include "PWGLF/Utils/v0SelectionBits.h"
-#include "PWGLF/Utils/v0SelectionGroup.h"
-#include "PWGLF/Utils/v0SelectionTools.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
+#include <Math/Vector4D.h>
+#include <TDatabasePDG.h>
 #include <TFile.h>
 #include <TH2F.h>
-#include <TProfile.h>
 #include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
+#include <TProfile.h>
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/Tasks/QC/kfPerformanceStudy.cxx b/.conflict-side-0/PWGLF/Tasks/QC/kfPerformanceStudy.cxx
index 5a9f49ecabf..5a26c7d1f36 100644
--- a/.conflict-side-0/PWGLF/Tasks/QC/kfPerformanceStudy.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/QC/kfPerformanceStudy.cxx
@@ -13,22 +13,24 @@
 //         cascades computed with standard DCAFitter methods and the KFparticle
 //         package. It is meant for the purposes of larger-scale QA of KF reco.
 
-#include <cmath>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <cmath>
 
 using namespace o2;
 using namespace o2::framework;
@@ -151,8 +153,8 @@ struct kfPerformanceStudy {
       }
 
       histos.fill(HIST("hPtCorrelation"), pt, ptKF);
-      histos.fill(HIST("h3dMassLambda"), pt, massLambda, massLambdaKF); // <- implicit pT choice, beware
-      histos.fill(HIST("h3dDCAxy"), pt, dcaXY, dcaXYKF);                // <- implicit pT choice, beware
+      histos.fill(HIST("h3dMassLambda"), pt, massLambda, massLambdaKF);          // <- implicit pT choice, beware
+      histos.fill(HIST("h3dDCAxy"), pt, dcaXY, dcaXYKF);                         // <- implicit pT choice, beware
       histos.fill(HIST("h3dPointingAngle"), pt, pointingAngle, pointingAngleKF); // <- implicit pT choice, beware
 
       histos.fill(HIST("hPointingAngle"), pointingAngle);
diff --git a/.conflict-side-0/PWGLF/Tasks/QC/kfStrangenessStudy.cxx b/.conflict-side-0/PWGLF/Tasks/QC/kfStrangenessStudy.cxx
index 24c5621e948..ecf18910f5e 100644
--- a/.conflict-side-0/PWGLF/Tasks/QC/kfStrangenessStudy.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/QC/kfStrangenessStudy.cxx
@@ -15,26 +15,29 @@
 
 /// \brief cascadebuilder.cxx and lambdakzerobuilder.cxx tasks need to be added to the workflow. Flag createCascCovMats needs to be enabled!
 
-#include <cmath>
-#include <iostream>
+#include "PWGLF/DataModel/kfStrangenessStudy.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/kfStrangenessStudy.h"
+
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/EventSelection.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <cmath>
+#include <iostream>
 
 using namespace o2;
 using namespace o2::framework;
@@ -462,9 +465,9 @@ struct kfStrangenessStudy {
           } else {
             LOG(debug) << "Daughter is no Lambda and/or has no daughters. V0 PDG code: " << MCv0.pdgCode();
           } // end v0 has daughters and is Lambda
-        }   // end loop cascade daughters
-      }     // end cascade has daughters
-    }       // end cascade has MC particle
+        } // end loop cascade daughters
+      } // end cascade has daughters
+    } // end cascade has MC particle
   }
 
   template <typename TCollision>
@@ -699,7 +702,7 @@ struct kfStrangenessStudy {
         fillCascDataTable(collision);
       }
     } // end cascade loop
-  }   // end process
+  } // end process
   PROCESS_SWITCH(kfStrangenessStudy, processData, "process data", false);
 
   void processMC(soa::Filtered<soa::Join<aod::Collisions, aod::EvSels>>::iterator const& collision,
@@ -801,7 +804,7 @@ struct kfStrangenessStudy {
       }
 
     } // end cascade loop
-  }   // end process
+  } // end process
   PROCESS_SWITCH(kfStrangenessStudy, processMC, "process MC", true);
 };
 
diff --git a/.conflict-side-0/PWGLF/Tasks/QC/lfITSTPCMatchingQA.cxx b/.conflict-side-0/PWGLF/Tasks/QC/lfITSTPCMatchingQA.cxx
index c31258d51ae..311db578caa 100644
--- a/.conflict-side-0/PWGLF/Tasks/QC/lfITSTPCMatchingQA.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/QC/lfITSTPCMatchingQA.cxx
@@ -9,26 +9,27 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <vector>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
+#include "Common/Core/PID/PIDTOF.h"
+#include "Common/Core/PID/TPCPIDResponse.h"
 #include "Common/Core/RecoDecay.h"
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "DataFormatsTPC/BetheBlochAleph.h"
-#include "Common/Core/PID/PIDTOF.h"
 #include "Common/TableProducer/PID/pidTOFBase.h"
+
+#include "DataFormatsTPC/BetheBlochAleph.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "Common/Core/PID/TPCPIDResponse.h"
-#include "Common/DataModel/PIDResponse.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
 #include "TDatabasePDG.h"
 
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-0/PWGLF/Tasks/QC/lfITSTPCMatchingSecondaryTracksQA.cxx b/.conflict-side-0/PWGLF/Tasks/QC/lfITSTPCMatchingSecondaryTracksQA.cxx
index 14aebdb354a..803d3ccfb4d 100644
--- a/.conflict-side-0/PWGLF/Tasks/QC/lfITSTPCMatchingSecondaryTracksQA.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/QC/lfITSTPCMatchingSecondaryTracksQA.cxx
@@ -15,28 +15,32 @@
 /// \author Alberto Caliva (alberto.caliva@cern.ch), Francesca Ercolessi (francesca.ercolessi@cern.ch), Nicolò Jacazio (nicolo.jacazio@cern.ch)
 /// \since Feb 11, 2025
 
-#include <TLorentzVector.h>
-#include <TMath.h>
-#include <TObjArray.h>
-#include <TPDGCode.h>
-#include <TVector2.h>
-#include <TVector3.h>
-#include <cmath>
-#include <vector>
-#include <string>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "Common/Core/RecoDecay.h"
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "ReconstructionDataFormats/Track.h"
 
+#include <TLorentzVector.h>
+#include <TMath.h>
+#include <TObjArray.h>
+#include <TPDGCode.h>
+#include <TVector2.h>
+#include <TVector3.h>
+
+#include <cmath>
+#include <string>
+#include <vector>
+
 using namespace std;
 using namespace o2;
 using namespace o2::soa;
diff --git a/.conflict-side-0/PWGLF/Tasks/QC/lfpidqa.cxx b/.conflict-side-0/PWGLF/Tasks/QC/lfpidqa.cxx
index 746473fd0a7..b82bdb2cd85 100644
--- a/.conflict-side-0/PWGLF/Tasks/QC/lfpidqa.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/QC/lfpidqa.cxx
@@ -17,21 +17,23 @@
 /// \brief  Task to produce the PID QA information for the TPC for the purpose of the Light flavor PWG
 ///
 
-#include <string_view>
+#include "PWGLF/DataModel/LFParticleIdentification.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/StaticFor.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
+#include "Common/Core/TrackSelection.h"
 #include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/Core/TrackSelection.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
+
+#include <string_view>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/Tasks/QC/lfpropStudy.cxx b/.conflict-side-0/PWGLF/Tasks/QC/lfpropStudy.cxx
index ab3c88ebbb3..b3995b496f8 100644
--- a/.conflict-side-0/PWGLF/Tasks/QC/lfpropStudy.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/QC/lfpropStudy.cxx
@@ -14,20 +14,22 @@
 /// \author Carolina Reetz <c.reetz@cern.ch>
 /// \brief QA task to study properties of propagated tracks
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "ReconstructionDataFormats/DCA.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/DCA.h"
+#include "ReconstructionDataFormats/Track.h"
+
 #include "TPDGCode.h"
 
 using namespace o2;
diff --git a/.conflict-side-0/PWGLF/Tasks/QC/mcParticlePrediction.cxx b/.conflict-side-0/PWGLF/Tasks/QC/mcParticlePrediction.cxx
index 0c1fca899f3..958773e0412 100644
--- a/.conflict-side-0/PWGLF/Tasks/QC/mcParticlePrediction.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/QC/mcParticlePrediction.cxx
@@ -16,18 +16,20 @@
 /// \brief Task to build the predictions from the models based on the generated particles
 ///
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/StaticFor.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "Common/DataModel/FT0Corrected.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/Utils/inelGt.h"
+#include "PWGLF/Utils/mcParticle.h"
+
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/FT0Corrected.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "PWGLF/Utils/mcParticle.h"
-#include "PWGLF/Utils/inelGt.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "CommonConstants/LHCConstants.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
 
 #include "TPDGCode.h"
 
@@ -60,9 +62,9 @@ struct Estimators {
   static constexpr estID ITSIB = 13;
   static constexpr estID ETA05 = 14;
   static constexpr estID ETA08 = 15;
-  static constexpr estID V0A = 16;  // (Run2)
-  static constexpr estID V0C = 17;  // (Run2)
-  static constexpr estID V0AC = 18; // (Run2 V0M)
+  static constexpr estID V0A = 16;             // (Run2)
+  static constexpr estID V0C = 17;             // (Run2)
+  static constexpr estID V0AC = 18;            // (Run2 V0M)
   static constexpr estID ImpactParameter = 19; // (Run2 V0M)
   static constexpr estID nEstimators = 20;
 
diff --git a/.conflict-side-0/PWGLF/Tasks/QC/mcSignalLoss.cxx b/.conflict-side-0/PWGLF/Tasks/QC/mcSignalLoss.cxx
index aefb6c98c1b..68909d4f610 100644
--- a/.conflict-side-0/PWGLF/Tasks/QC/mcSignalLoss.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/QC/mcSignalLoss.cxx
@@ -24,25 +24,27 @@
 //
 // Build hypertriton candidates from V0s and tracks
 
-#include <vector>
+#include "PWGLF/Utils/inelGt.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
+#include "Common/Core/PID/PIDTOF.h"
+#include "Common/Core/PID/TPCPIDResponse.h"
 #include "Common/Core/RecoDecay.h"
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "DataFormatsTPC/BetheBlochAleph.h"
-#include "Common/Core/PID/PIDTOF.h"
 #include "Common/TableProducer/PID/pidTOFBase.h"
+
+#include "DataFormatsTPC/BetheBlochAleph.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "Common/Core/PID/TPCPIDResponse.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "PWGLF/Utils/inelGt.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/Tasks/QC/mcinelgt0.cxx b/.conflict-side-0/PWGLF/Tasks/QC/mcinelgt0.cxx
index 40acd66a67f..63c2287abd1 100644
--- a/.conflict-side-0/PWGLF/Tasks/QC/mcinelgt0.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/QC/mcinelgt0.cxx
@@ -9,11 +9,12 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
+#include "PWGLF/Utils/inelGt.h"
+
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "PWGLF/Utils/inelGt.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/Tasks/QC/resonanceqa.cxx b/.conflict-side-0/PWGLF/Tasks/QC/resonanceqa.cxx
index 21c17a6e31b..7e102359590 100644
--- a/.conflict-side-0/PWGLF/Tasks/QC/resonanceqa.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/QC/resonanceqa.cxx
@@ -16,38 +16,38 @@
 // (5) particle = 2 --> lambdastar
 // (6) 4 process function (a) Data same event (b) Data mixed event (c) MC generated (d) MC reconstructed
 
-#include <TH1F.h>
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <TDatabasePDG.h>
 #include <TDirectory.h>
+#include <TFile.h>
+#include <TH1F.h>
+#include <TH2F.h>
 #include <THn.h>
 #include <TLorentzVector.h>
 #include <TMath.h>
 #include <TObjArray.h>
-#include <TFile.h>
-#include <TH2F.h>
-#include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
 
-#include <cmath>
 #include <array>
+#include <cmath>
 #include <cstdlib>
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/StepTHn.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/Core/trackUtilities.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/TrackSelection.h"
-#include "Framework/ASoAHelpers.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-0/PWGLF/Tasks/QC/stqa.cxx b/.conflict-side-0/PWGLF/Tasks/QC/stqa.cxx
index 0ab354233ff..fac64b91e1c 100644
--- a/.conflict-side-0/PWGLF/Tasks/QC/stqa.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/QC/stqa.cxx
@@ -9,14 +9,16 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/Core/trackUtilities.h"
 #include "ReconstructionDataFormats/DCA.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/Tasks/QC/straRecoStudy.cxx b/.conflict-side-0/PWGLF/Tasks/QC/straRecoStudy.cxx
index 1f7851cdbef..6caa238aea0 100644
--- a/.conflict-side-0/PWGLF/Tasks/QC/straRecoStudy.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/QC/straRecoStudy.cxx
@@ -20,38 +20,40 @@
 //    Please write to:
 //    david.dobrigkeit.chinellato@cern.ch
 //
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/McCollisionExtra.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/McCollisionExtra.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
+#include <Math/Vector4D.h>
+#include <TDatabasePDG.h>
 #include <TFile.h>
 #include <TH2F.h>
-#include <TProfile.h>
 #include <TLorentzVector.h>
-#include <Math/Vector4D.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
-#include <cmath>
+#include <TProfile.h>
+
 #include <array>
+#include <cmath>
 #include <cstdlib>
-#include "Framework/ASoAHelpers.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/Tasks/QC/strangederivedqa.cxx b/.conflict-side-0/PWGLF/Tasks/QC/strangederivedqa.cxx
index 2e709e07338..0c252538858 100644
--- a/.conflict-side-0/PWGLF/Tasks/QC/strangederivedqa.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/QC/strangederivedqa.cxx
@@ -14,26 +14,28 @@
 //
 // This code does basic QA of strangeness derived data
 
-#include <Math/Vector4D.h>
-#include <cmath>
-#include <array>
-#include <cstdlib>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/Core/trackUtilities.h"
 
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <Math/Vector4D.h>
+#include <TDatabasePDG.h>
 #include <TFile.h>
 #include <TH2F.h>
-#include <TProfile.h>
 #include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
+#include <TProfile.h>
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include <array>
+#include <cmath>
+#include <cstdlib>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/Tasks/QC/strangenessQCPP.cxx b/.conflict-side-0/PWGLF/Tasks/QC/strangenessQCPP.cxx
index 6dab146b363..b9e3990149c 100644
--- a/.conflict-side-0/PWGLF/Tasks/QC/strangenessQCPP.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/QC/strangenessQCPP.cxx
@@ -14,13 +14,15 @@
 /// In case of questions please write to:
 /// \author Roman Nepeivoda (roman.nepeivoda@cern.ch)
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
+#include "PWGLF/DataModel/QC/strangenessTablesQC.h"
+
 #include "Common/DataModel/EventSelection.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGLF/DataModel/QC/strangenessTablesQC.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
@@ -454,4 +456,5 @@ WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
   return WorkflowSpec{
     adaptAnalysisTask<strangenessQCPP>(cfgc, TaskName{"lf-strangenessqcpp"})};
-}
\ No newline at end of file
+}
+ 
\ No newline at end of file
diff --git a/.conflict-side-0/PWGLF/Tasks/QC/strangenessTrackingQC.cxx b/.conflict-side-0/PWGLF/Tasks/QC/strangenessTrackingQC.cxx
index 09c5698fd92..2458a769496 100644
--- a/.conflict-side-0/PWGLF/Tasks/QC/strangenessTrackingQC.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/QC/strangenessTrackingQC.cxx
@@ -9,29 +9,31 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "CCDB/BasicCCDBManager.h"
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "DCAFitter/DCAFitterN.h"
 #include "DataFormatsParameters/GRPMagField.h"
 #include "DataFormatsParameters/GRPObject.h"
 #include "DataFormatsTPC/BetheBlochAleph.h"
-#include "DCAFitter/DCAFitterN.h"
 #include "DetectorsBase/Propagator.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoA.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
 // #include "PWGHF/Core/PDG.h"
+#include "PWGLF/DataModel/LFNonPromptCascadeTables.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "ReconstructionDataFormats/DCA.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "PWGLF/DataModel/LFNonPromptCascadeTables.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/Tasks/QC/strangepidqa.cxx b/.conflict-side-0/PWGLF/Tasks/QC/strangepidqa.cxx
index c2bd9d89774..838b5bfc6b0 100644
--- a/.conflict-side-0/PWGLF/Tasks/QC/strangepidqa.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/QC/strangepidqa.cxx
@@ -12,32 +12,34 @@
 // This task is designed to do QA to the TOF PID applied to strangeness
 // in the regular framework
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <Math/Vector4D.h>
+#include <TDatabasePDG.h>
 #include <TFile.h>
 #include <TH2F.h>
-#include <TProfile.h>
 #include <TLorentzVector.h>
-#include <Math/Vector4D.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
-#include <cmath>
+#include <TProfile.h>
+
 #include <array>
+#include <cmath>
 #include <cstdlib>
-#include "Framework/ASoAHelpers.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/Tasks/QC/strderivedGenQA.cxx b/.conflict-side-0/PWGLF/Tasks/QC/strderivedGenQA.cxx
index 201dcd99ac2..73e6a214363 100644
--- a/.conflict-side-0/PWGLF/Tasks/QC/strderivedGenQA.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/QC/strderivedGenQA.cxx
@@ -19,36 +19,38 @@
 //    gianni.shigeru.setoue.liveraro@cern.ch
 //
 
-#include <Math/Vector4D.h>
-#include <cmath>
-#include <array>
-#include <vector>
-#include <cstdlib>
-
-#include <TFile.h>
-#include <TH2F.h>
-#include <TProfile.h>
-#include <TLorentzVector.h>
-#include <TPDGCode.h>
-#include <TDatabasePDG.h>
+#include "PWGLF/DataModel/LFStrangenessMLTables.h"
+#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/trackUtilities.h"
 #include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
-#include "PWGLF/DataModel/LFStrangenessMLTables.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <Math/Vector4D.h>
+#include <TDatabasePDG.h>
+#include <TFile.h>
+#include <TH2F.h>
+#include <TLorentzVector.h>
+#include <TPDGCode.h>
+#include <TProfile.h>
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/Tasks/QC/tpc_dEdx_postcalibration.cxx b/.conflict-side-0/PWGLF/Tasks/QC/tpc_dEdx_postcalibration.cxx
index 1e9fbd43851..c92c7f20251 100644
--- a/.conflict-side-0/PWGLF/Tasks/QC/tpc_dEdx_postcalibration.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/QC/tpc_dEdx_postcalibration.cxx
@@ -12,17 +12,19 @@
 /// \author Alberto Caliva (alberto.caliva@cern.ch)
 /// \since June 27, 2023
 
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "ReconstructionDataFormats/Track.h"
 
 using namespace o2;
diff --git a/.conflict-side-0/PWGLF/Tasks/QC/tpc_dedx_qa.cxx b/.conflict-side-0/PWGLF/Tasks/QC/tpc_dedx_qa.cxx
index 38f73b8edcb..6d2da6aa5d8 100644
--- a/.conflict-side-0/PWGLF/Tasks/QC/tpc_dedx_qa.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/QC/tpc_dedx_qa.cxx
@@ -12,19 +12,21 @@
 /// \author Alberto Caliva (alberto.caliva@cern.ch)
 /// \since September 19, 2023
 
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Multiplicity.h"
+
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "ReconstructionDataFormats/Track.h"
 
 using namespace o2;
diff --git a/.conflict-side-0/PWGLF/Tasks/QC/trackchecks.cxx b/.conflict-side-0/PWGLF/Tasks/QC/trackchecks.cxx
index 70eaa28dd3b..fb318965662 100644
--- a/.conflict-side-0/PWGLF/Tasks/QC/trackchecks.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/QC/trackchecks.cxx
@@ -8,21 +8,22 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include <cmath>
-#include <array>
-#include <utility>
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
+#include "Framework/runDataProcessing.h"
 
 #include <TF1.h>
 
+#include <array>
+#include <cmath>
+#include <utility>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-0/PWGLF/Tasks/QC/v0assoqa.cxx b/.conflict-side-0/PWGLF/Tasks/QC/v0assoqa.cxx
index fcfd8d59b01..60030e421d5 100644
--- a/.conflict-side-0/PWGLF/Tasks/QC/v0assoqa.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/QC/v0assoqa.cxx
@@ -11,40 +11,42 @@
 //
 // Strangeness-to-collision association tests
 //
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/Utils/strangenessBuilderHelper.h"
+
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/TPCVDriftManager.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/McCollisionExtra.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/McCollisionExtra.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
-#include "PWGLF/Utils/strangenessBuilderHelper.h"
-#include "Common/Core/TPCVDriftManager.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
+#include <Math/Vector4D.h>
+#include <TDatabasePDG.h>
 #include <TFile.h>
 #include <TH2F.h>
-#include <TProfile.h>
 #include <TLorentzVector.h>
-#include <Math/Vector4D.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
-#include <cmath>
+#include <TProfile.h>
+
 #include <array>
+#include <cmath>
 #include <cstdlib>
-#include "Framework/ASoAHelpers.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/Tasks/QC/v0cascadesqa.cxx b/.conflict-side-0/PWGLF/Tasks/QC/v0cascadesqa.cxx
index 5be2b6d4ba5..a75a9b22959 100644
--- a/.conflict-side-0/PWGLF/Tasks/QC/v0cascadesqa.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/QC/v0cascadesqa.cxx
@@ -18,20 +18,22 @@
 
 #include <cmath>
 // #include <cstdlib>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/trackUtilities.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/Tasks/QC/vertexQA.cxx b/.conflict-side-0/PWGLF/Tasks/QC/vertexQA.cxx
index 66ae298813d..844c9f8df81 100644
--- a/.conflict-side-0/PWGLF/Tasks/QC/vertexQA.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/QC/vertexQA.cxx
@@ -9,19 +9,20 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <algorithm>
-#include <cmath>
-#include <deque>
-#include <string>
-#include <vector>
-#include <utility>
+#include "Common/CCDB/ctpRateFetcher.h"
 
 #include "CCDB/BasicCCDBManager.h"
-#include "Common/CCDB/ctpRateFetcher.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
 
+#include <algorithm>
+#include <cmath>
+#include <deque>
+#include <string>
+#include <utility>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-0/PWGLF/Tasks/Resonances/chargedkstaranalysis.cxx b/.conflict-side-0/PWGLF/Tasks/Resonances/chargedkstaranalysis.cxx
index 8286f876bc8..7b729dcee7b 100644
--- a/.conflict-side-0/PWGLF/Tasks/Resonances/chargedkstaranalysis.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/Resonances/chargedkstaranalysis.cxx
@@ -17,23 +17,8 @@
 
 #include "TF1.h"
 // #include <TDatabasePDG.h>
-#include <TDirectory.h>
-#include <TFile.h>
-#include <TH1F.h>
-#include <TH2F.h>
-#include <THn.h>
-#include <TLorentzVector.h>
-#include <TMath.h>
-#include <TObjArray.h>
-#include <TPDGCode.h>
-#include <string>
-
-#include <array>
-#include <cmath>
-#include <cstdlib>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "CCDB/BasicCCDBManager.h"
-#include "CCDB/CcdbApi.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
@@ -41,6 +26,9 @@
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
 #include "CommonConstants/PhysicsConstants.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
@@ -48,9 +36,23 @@
 #include "Framework/HistogramRegistry.h"
 #include "Framework/StepTHn.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "ReconstructionDataFormats/Track.h"
 
+#include <TDirectory.h>
+#include <TFile.h>
+#include <TH1F.h>
+#include <TH2F.h>
+#include <THn.h>
+#include <TLorentzVector.h>
+#include <TMath.h>
+#include <TObjArray.h>
+#include <TPDGCode.h>
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <string>
+
 // For charged kstarpp analysis
 #include "PWGLF/DataModel/LFResonanceTables.h"
 
diff --git a/.conflict-side-0/PWGLF/Tasks/Resonances/chk892Flow.cxx b/.conflict-side-0/PWGLF/Tasks/Resonances/chk892Flow.cxx
index 2c616d81406..f0dadbcdb7a 100644
--- a/.conflict-side-0/PWGLF/Tasks/Resonances/chk892Flow.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/Resonances/chk892Flow.cxx
@@ -14,64 +14,58 @@
 /// \author Su-Jeong Ji <su-jeong.ji@cern.ch>, Bong-Hwi Lim <Bong-Hwi.Lim@cern.ch>
 ///
 
-#include <TH1F.h>
-#include <TH1D.h>
-#include <TDirectory.h>
-#include <THn.h>
-#include <TLorentzVector.h>
-#include <TObjArray.h>
-#include <TFile.h>
-#include <TH2F.h>
-
-#include <vector>
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <chrono>
-#include <string>
-
-#include "TRandom3.h"
-#include "TF1.h"
-#include "TVector2.h"
-#include "Math/Vector3D.h"
-#include "Math/Vector4D.h"
-#include "Math/GenVector/Boost.h"
-#include <TMath.h>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/StaticFor.h"
-#include "DCAFitter/DCAFitterN.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/Utils/collisionCuts.h"
 
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/Qvectors.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "Common/Core/trackUtilities.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/Core/RecoDecay.h"
-
-#include "CommonConstants/PhysicsConstants.h"
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
 #include "CommonConstants/MathConstants.h"
-
-#include "ReconstructionDataFormats/Track.h"
-
-#include "DataFormatsParameters/GRPObject.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "DCAFitter/DCAFitterN.h"
 #include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/StaticFor.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
-#include "CCDB/CcdbApi.h"
-#include "CCDB/BasicCCDBManager.h"
+#include "Math/GenVector/Boost.h"
+#include "Math/Vector3D.h"
+#include "Math/Vector4D.h"
+#include "TF1.h"
+#include "TRandom3.h"
+#include "TVector2.h"
+#include <TDirectory.h>
+#include <TFile.h>
+#include <TH1D.h>
+#include <TH1F.h>
+#include <TH2F.h>
+#include <THn.h>
+#include <TLorentzVector.h>
+#include <TMath.h>
+#include <TObjArray.h>
 
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/Utils/collisionCuts.h"
+#include <array>
+#include <chrono>
+#include <cmath>
+#include <cstdlib>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/Tasks/Resonances/chk892flow_pp.cxx b/.conflict-side-0/PWGLF/Tasks/Resonances/chk892flow_pp.cxx
index 7e1d65bd7e8..916deec5193 100644
--- a/.conflict-side-0/PWGLF/Tasks/Resonances/chk892flow_pp.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/Resonances/chk892flow_pp.cxx
@@ -15,65 +15,58 @@
 ///
 /// \author Su-Jeong Ji <su-jeong.ji@cern.ch>
 
-#include <TH1F.h>
-#include <TH1D.h>
-#include <TDirectory.h>
-#include <THn.h>
-#include <TLorentzVector.h>
-#include <TMath.h>
-#include <TObjArray.h>
-#include <TFile.h>
-#include <TH2F.h>
-#include <TDatabasePDG.h> // FIXME
-#include <TPDGCode.h>     // FIXME
-
-#include <vector>
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <chrono>
-#include <string>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/Utils/collisionCuts.h"
 
-#include "TRandom3.h"
-#include "TF1.h"
-#include "TVector2.h"
-#include "Math/Vector3D.h"
-#include "Math/Vector4D.h"
-#include "Math/GenVector/Boost.h"
-#include <TMath.h>
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/StepTHn.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/StaticFor.h"
-#include "DCAFitter/DCAFitterN.h"
-
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-
-#include "Common/Core/trackUtilities.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/Core/RecoDecay.h"
-
-#include "CommonConstants/PhysicsConstants.h"
-
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
 
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-
-#include "CCDB/CcdbApi.h"
-#include "CCDB/BasicCCDBManager.h"
+#include "Math/GenVector/Boost.h"
+#include "Math/Vector3D.h"
+#include "Math/Vector4D.h"
+#include "TF1.h"
+#include "TRandom3.h"
+#include "TVector2.h"
+#include <TDatabasePDG.h> // FIXME
+#include <TDirectory.h>
+#include <TFile.h>
+#include <TH1D.h>
+#include <TH1F.h>
+#include <TH2F.h>
+#include <THn.h>
+#include <TLorentzVector.h>
+#include <TMath.h>
+#include <TObjArray.h>
+#include <TPDGCode.h> // FIXME
 
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/Utils/collisionCuts.h"
+#include <array>
+#include <chrono>
+#include <cmath>
+#include <cstdlib>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/Tasks/Resonances/chk892pp.cxx b/.conflict-side-0/PWGLF/Tasks/Resonances/chk892pp.cxx
index 269e8d0845d..c4cc01298ca 100644
--- a/.conflict-side-0/PWGLF/Tasks/Resonances/chk892pp.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/Resonances/chk892pp.cxx
@@ -15,65 +15,58 @@
 ///
 /// \author Su-Jeong Ji <su-jeong.ji@cern.ch>
 
-#include <TH1F.h>
-#include <TH1D.h>
-#include <TDirectory.h>
-#include <THn.h>
-#include <TLorentzVector.h>
-#include <TMath.h>
-#include <TObjArray.h>
-#include <TFile.h>
-#include <TH2F.h>
-#include <TDatabasePDG.h> // FIXME
-#include <TPDGCode.h>     // FIXME
-
-#include <vector>
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <chrono>
-#include <string>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/Utils/collisionCuts.h"
 
-#include "TRandom3.h"
-#include "TF1.h"
-#include "TVector2.h"
-#include "Math/Vector3D.h"
-#include "Math/Vector4D.h"
-#include "Math/GenVector/Boost.h"
-#include <TMath.h>
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/StepTHn.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/StaticFor.h"
-#include "DCAFitter/DCAFitterN.h"
-
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-
-#include "Common/Core/trackUtilities.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/Core/RecoDecay.h"
-
-#include "CommonConstants/PhysicsConstants.h"
-
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
 
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-
-#include "CCDB/CcdbApi.h"
-#include "CCDB/BasicCCDBManager.h"
+#include "Math/GenVector/Boost.h"
+#include "Math/Vector3D.h"
+#include "Math/Vector4D.h"
+#include "TF1.h"
+#include "TRandom3.h"
+#include "TVector2.h"
+#include <TDatabasePDG.h> // FIXME
+#include <TDirectory.h>
+#include <TFile.h>
+#include <TH1D.h>
+#include <TH1F.h>
+#include <TH2F.h>
+#include <THn.h>
+#include <TLorentzVector.h>
+#include <TMath.h>
+#include <TObjArray.h>
+#include <TPDGCode.h> // FIXME
 
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/Utils/collisionCuts.h"
+#include <array>
+#include <chrono>
+#include <cmath>
+#include <cstdlib>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/Tasks/Resonances/deltaanalysis.cxx b/.conflict-side-0/PWGLF/Tasks/Resonances/deltaanalysis.cxx
index 10c0d3071d2..0d52228cc8f 100644
--- a/.conflict-side-0/PWGLF/Tasks/Resonances/deltaanalysis.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/Resonances/deltaanalysis.cxx
@@ -10,44 +10,43 @@
 // or submit itself to any jurisdiction.
 // Analysis task for delta analysis
 
-#include <TH1F.h>
-#include <TDirectory.h>
-#include <THn.h>
-#include <TLorentzVector.h>
-#include <TMath.h>
-#include <TObjArray.h>
-#include <TFile.h>
-#include <TH2F.h>
-#include <TLorentzVector.h>
-#include <TPDGCode.h>
-#include <TDatabasePDG.h>
-
-#include <cmath>
-#include <array>
-#include <cstdlib>
+#include "PWGLF/DataModel/LFLithium4Tables.h"
 
 #include "Common/Core/PID/PIDTOF.h"
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/TableProducer/PID/pidTOFBase.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
+#include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsTPC/BetheBlochAleph.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/Core/trackUtilities.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/TrackSelection.h"
-#include "Framework/ASoAHelpers.h"
-#include "DataFormatsTPC/BetheBlochAleph.h"
-#include "CCDB/BasicCCDBManager.h"
 
-#include "PWGLF/DataModel/LFLithium4Tables.h"
+#include <TDatabasePDG.h>
+#include <TDirectory.h>
+#include <TFile.h>
+#include <TH1F.h>
+#include <TH2F.h>
+#include <THn.h>
+#include <TLorentzVector.h>
+#include <TMath.h>
+#include <TObjArray.h>
+#include <TPDGCode.h>
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/Tasks/Resonances/doubleResonanceScan.cxx b/.conflict-side-0/PWGLF/Tasks/Resonances/doubleResonanceScan.cxx
index 4b67171c448..48358d1b4ef 100644
--- a/.conflict-side-0/PWGLF/Tasks/Resonances/doubleResonanceScan.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/Resonances/doubleResonanceScan.cxx
@@ -15,16 +15,17 @@
 /// \since 27/03/2025
 ///
 
-#include <vector>
-#include <TLorentzVector.h>
+#include "PWGLF/DataModel/LFResonanceTables.h"
 
-#include "Framework/AnalysisTask.h"
+#include "CommonConstants/MathConstants.h"
+#include "CommonConstants/PhysicsConstants.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
 
-#include "CommonConstants/PhysicsConstants.h"
-#include "CommonConstants/MathConstants.h"
+#include <TLorentzVector.h>
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/Tasks/Resonances/doublephimeson.cxx b/.conflict-side-0/PWGLF/Tasks/Resonances/doublephimeson.cxx
index 0c8f9c2c780..07c86976f25 100644
--- a/.conflict-side-0/PWGLF/Tasks/Resonances/doublephimeson.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/Resonances/doublephimeson.cxx
@@ -13,27 +13,31 @@
 /// \author sourav kundu
 /// \since 02/11/2023
 
+#include "PWGLF/DataModel/ReducedDoublePhiTables.h"
+
+#include "Common/Core/trackUtilities.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
 #include <Framework/Configurable.h>
-#include <TLorentzVector.h>
+
 #include <Math/GenVector/Boost.h>
-#include <Math/Vector4D.h>
 #include <Math/Vector3D.h>
+#include <Math/Vector4D.h>
+#include <TLorentzVector.h>
 #include <TMath.h>
+
 #include <fairlogger/Logger.h>
+
 #include <iostream>
 #include <iterator>
 #include <string>
 #include <vector>
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/StepTHn.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/ReducedDoublePhiTables.h"
-#include "CommonConstants/PhysicsConstants.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-0/PWGLF/Tasks/Resonances/f1protoncorrelation.cxx b/.conflict-side-0/PWGLF/Tasks/Resonances/f1protoncorrelation.cxx
index af45b89b8da..23e41a8f7f9 100644
--- a/.conflict-side-0/PWGLF/Tasks/Resonances/f1protoncorrelation.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/Resonances/f1protoncorrelation.cxx
@@ -13,25 +13,29 @@
 /// \author sourav kundu
 /// \since 02/11/2023
 
+#include "PWGLF/DataModel/ReducedF1ProtonTables.h"
+
+#include "Common/Core/trackUtilities.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
 #include <Framework/Configurable.h>
-#include <TLorentzVector.h>
+
 #include <Math/GenVector/Boost.h>
 #include <Math/Vector4D.h>
+#include <TLorentzVector.h>
 #include <TMath.h>
+
 #include <fairlogger/Logger.h>
+
 #include <iostream>
 #include <iterator>
 #include <string>
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/StepTHn.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/ReducedF1ProtonTables.h"
-#include "CommonConstants/PhysicsConstants.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-0/PWGLF/Tasks/Resonances/heptaquark.cxx b/.conflict-side-0/PWGLF/Tasks/Resonances/heptaquark.cxx
index 407c3199073..4f3caaf197a 100644
--- a/.conflict-side-0/PWGLF/Tasks/Resonances/heptaquark.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/Resonances/heptaquark.cxx
@@ -12,28 +12,32 @@
 /// \brief this is a starting point for the Resonances tutorial
 /// \author junlee kim
 
+#include "PWGLF/DataModel/ReducedHeptaQuarkTables.h"
+
+#include "Common/Core/trackUtilities.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
 #include <Framework/Configurable.h>
-#include <TLorentzVector.h>
+
 #include <Math/GenVector/Boost.h>
-#include <Math/Vector4D.h>
 #include <Math/Vector3D.h>
+#include <Math/Vector4D.h>
+#include <TLorentzVector.h>
 #include <TMath.h>
 #include <TRandom3.h>
+
 #include <fairlogger/Logger.h>
+
 #include <iostream>
 #include <iterator>
 #include <string>
 #include <vector>
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/StepTHn.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/ReducedHeptaQuarkTables.h"
-#include "CommonConstants/PhysicsConstants.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-0/PWGLF/Tasks/Resonances/highmasslambda.cxx b/.conflict-side-0/PWGLF/Tasks/Resonances/highmasslambda.cxx
index c799c1d0ba7..41e3a48e48a 100644
--- a/.conflict-side-0/PWGLF/Tasks/Resonances/highmasslambda.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/Resonances/highmasslambda.cxx
@@ -11,57 +11,59 @@
 // Phi meson spin alignment task
 // sourav.kundu@cern.ch
 
-#include <TH1F.h>
+#include "PWGLF/DataModel/EPCalibrationTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/PIDResponseITS.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include "Math/GenVector/Boost.h"
+#include "Math/Vector3D.h"
+#include "Math/Vector4D.h"
+#include "TF1.h"
+#include "TRandom3.h"
+#include <TDatabasePDG.h>
 #include <TDirectory.h>
+#include <TFile.h>
+#include <TH1F.h>
+#include <TH2F.h>
 #include <THn.h>
 #include <TLorentzVector.h>
 #include <TMath.h>
 #include <TObjArray.h>
-#include <TFile.h>
-#include <TH2F.h>
-#include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
-#include <cmath>
+
 #include <array>
+#include <cmath>
 #include <cstdlib>
-#include <vector>
 #include <string>
-
-#include "TRandom3.h"
-#include "Math/Vector3D.h"
-#include "Math/Vector4D.h"
-#include "Math/GenVector/Boost.h"
-#include "TF1.h"
-
-#include "PWGLF/DataModel/EPCalibrationTables.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/Core/trackUtilities.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/TrackSelection.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "Common/DataModel/PIDResponseITS.h"
+#include <vector>
 // #include "PWGHF/Utils/utilsBfieldCCDB.h"
 #include "PWGHF/Utils/utilsEvSelHf.h"
 #include "PWGHF/Utils/utilsTrkCandHf.h"
+
+#include "DCAFitter/DCAFitterN.h"
 #include "ReconstructionDataFormats/DCA.h"
 #include "ReconstructionDataFormats/V0.h"
-#include "DCAFitter/DCAFitterN.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/Tasks/Resonances/highmasslambdasvx.cxx b/.conflict-side-0/PWGLF/Tasks/Resonances/highmasslambdasvx.cxx
index d6405483d13..d285c487e26 100644
--- a/.conflict-side-0/PWGLF/Tasks/Resonances/highmasslambdasvx.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/Resonances/highmasslambdasvx.cxx
@@ -11,55 +11,56 @@
 // Phi meson spin alignment task
 // sourav.kundu@cern.ch
 
-#include <TH1F.h>
-#include <TDirectory.h>
-#include <THn.h>
-#include <TLorentzVector.h>
-#include <TMath.h>
-#include <TObjArray.h>
-#include <TFile.h>
-#include <TH2F.h>
-#include <TLorentzVector.h>
-#include <TPDGCode.h>
-#include <TDatabasePDG.h>
-#include <cmath>
-#include <array>
-#include <cstdlib>
-
-#include "TRandom3.h"
-#include "Math/Vector3D.h"
-#include "Math/Vector4D.h"
-#include "Math/GenVector/Boost.h"
-#include "TF1.h"
+#include "PWGHF/Utils/utilsBfieldCCDB.h"
+#include "PWGHF/Utils/utilsEvSelHf.h"
+#include "PWGHF/Utils/utilsTrkCandHf.h"
+#include "PWGLF/DataModel/EPCalibrationTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Common/Core/TrackSelection.h"
 #include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/EPCalibrationTables.h"
-#include "Framework/runDataProcessing.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/TrackSelection.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "DataFormatsParameters/GRPObject.h"
+#include "DCAFitter/DCAFitterN.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGHF/Utils/utilsBfieldCCDB.h"
-#include "PWGHF/Utils/utilsEvSelHf.h"
-#include "PWGHF/Utils/utilsTrkCandHf.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/DCA.h"
+#include "ReconstructionDataFormats/Track.h"
 #include "ReconstructionDataFormats/V0.h"
 
+#include "Math/GenVector/Boost.h"
+#include "Math/Vector3D.h"
+#include "Math/Vector4D.h"
+#include "TF1.h"
+#include "TRandom3.h"
+#include <TDatabasePDG.h>
+#include <TDirectory.h>
+#include <TFile.h>
+#include <TH1F.h>
+#include <TH2F.h>
+#include <THn.h>
+#include <TLorentzVector.h>
+#include <TMath.h>
+#include <TObjArray.h>
+#include <TPDGCode.h>
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-0/PWGLF/Tasks/Resonances/k1AnalysisMicro.cxx b/.conflict-side-0/PWGLF/Tasks/Resonances/k1AnalysisMicro.cxx
index 35d6224da36..506365a642a 100644
--- a/.conflict-side-0/PWGLF/Tasks/Resonances/k1AnalysisMicro.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/Resonances/k1AnalysisMicro.cxx
@@ -14,20 +14,23 @@
 /// \author Su-Jeong Ji <su-jeong.ji@cern.ch>, Bong-Hwi Lim <bong-hwi.lim@cern.ch>
 ///
 
-#include <vector>
-#include <TLorentzVector.h>
-#include <TDatabasePDG.h> // FIXME
-#include <TPDGCode.h>     // FIXME
+#include "PWGLF/DataModel/LFResonanceTables.h"
 
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Framework/AnalysisTask.h"
+#include "Common/DataModel/PIDResponse.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "DataFormatsParameters/GRPObject.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "CommonConstants/PhysicsConstants.h"
+
+#include <TDatabasePDG.h> // FIXME
+#include <TLorentzVector.h>
+#include <TPDGCode.h> // FIXME
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/Tasks/Resonances/k1analysis.cxx b/.conflict-side-0/PWGLF/Tasks/Resonances/k1analysis.cxx
index 601227b666e..af106a29189 100644
--- a/.conflict-side-0/PWGLF/Tasks/Resonances/k1analysis.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/Resonances/k1analysis.cxx
@@ -15,20 +15,23 @@
 ///
 /// \author Bong-Hwi Lim <bong-hwi.lim@cern.ch>
 
-#include <vector>
-#include <TLorentzVector.h>
-#include <TDatabasePDG.h> // FIXME
-#include <TPDGCode.h>     // FIXME
+#include "PWGLF/DataModel/LFResonanceTables.h"
 
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Framework/AnalysisTask.h"
+#include "Common/DataModel/PIDResponse.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "DataFormatsParameters/GRPObject.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "CommonConstants/PhysicsConstants.h"
+
+#include <TDatabasePDG.h> // FIXME
+#include <TLorentzVector.h>
+#include <TPDGCode.h> // FIXME
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/Tasks/Resonances/k892SpherocityAnalysis.cxx b/.conflict-side-0/PWGLF/Tasks/Resonances/k892SpherocityAnalysis.cxx
index 7081f79c751..83f93a83134 100644
--- a/.conflict-side-0/PWGLF/Tasks/Resonances/k892SpherocityAnalysis.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/Resonances/k892SpherocityAnalysis.cxx
@@ -13,17 +13,19 @@
 /// \brief Invariant Mass Reconstruction of K*(892) Resonance
 /// \author Sayan Dhani <sayan.dhani@cern.ch>
 
-#include <TLorentzVector.h>
-#include <TRandom.h>
+#include "PWGLF/DataModel/LFResonanceTables.h"
 
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Framework/AnalysisTask.h"
+#include "Common/DataModel/PIDResponse.h"
+
+#include "CommonConstants/PhysicsConstants.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
-#include "CommonConstants/PhysicsConstants.h"
+
+#include <TLorentzVector.h>
+#include <TRandom.h>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/Tasks/Resonances/k892analysis.cxx b/.conflict-side-0/PWGLF/Tasks/Resonances/k892analysis.cxx
index 34e4cc662a0..83bca847de5 100644
--- a/.conflict-side-0/PWGLF/Tasks/Resonances/k892analysis.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/Resonances/k892analysis.cxx
@@ -15,19 +15,21 @@
 ///
 /// \author Bong-Hwi Lim <bong-hwi.lim@cern.ch>, Sawan Sawan <sawan.sawan@cern.ch>
 
-#include <TLorentzVector.h>
-#include "TF1.h"
-#include "TRandom3.h"
+#include "PWGLF/DataModel/LFResonanceTables.h"
 
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Framework/AnalysisTask.h"
+#include "Common/DataModel/PIDResponse.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "DataFormatsParameters/GRPObject.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "CommonConstants/PhysicsConstants.h"
+
+#include "TF1.h"
+#include "TRandom3.h"
+#include <TLorentzVector.h>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/Tasks/Resonances/k892analysispbpb.cxx b/.conflict-side-0/PWGLF/Tasks/Resonances/k892analysispbpb.cxx
index 303a6cd6fc9..b15bc0d7217 100644
--- a/.conflict-side-0/PWGLF/Tasks/Resonances/k892analysispbpb.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/Resonances/k892analysispbpb.cxx
@@ -13,39 +13,40 @@
 /// \brief K*0 spectra in Pb-Pb
 /// \author Marta Urioni <marta.urioni@cern.ch>
 
-#include <TH1F.h>
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <Math/Vector4D.h>
 #include <TDirectory.h>
+#include <TFile.h>
+#include <TH1F.h>
+#include <TH2F.h>
 #include <THn.h>
 #include <TLorentzVector.h>
 #include <TMath.h>
 #include <TObjArray.h>
-#include <TFile.h>
-#include <TH2F.h>
-#include <TRandom3.h>
-#include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <Math/Vector4D.h>
-#include <cmath>
+#include <TRandom3.h>
+
 #include <array>
+#include <cmath>
 #include <cstdlib>
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/StepTHn.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/Core/trackUtilities.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/TrackSelection.h"
-#include "Framework/ASoAHelpers.h"
-#include "DataFormatsParameters/GRPObject.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-0/PWGLF/Tasks/Resonances/k892pmanalysis.cxx b/.conflict-side-0/PWGLF/Tasks/Resonances/k892pmanalysis.cxx
index 16963b77e6b..dcdfba8865c 100644
--- a/.conflict-side-0/PWGLF/Tasks/Resonances/k892pmanalysis.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/Resonances/k892pmanalysis.cxx
@@ -15,17 +15,19 @@
 ///
 /// \author Bong-Hwi Lim <bong-hwi.lim@cern.ch>, Alessandro Sturniolo <a.sturniolo@cern.ch>
 
-#include <TLorentzVector.h>
+#include "PWGLF/DataModel/LFResonanceTables.h"
 
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Framework/AnalysisTask.h"
+#include "Common/DataModel/PIDResponse.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "DataFormatsParameters/GRPObject.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "CommonConstants/PhysicsConstants.h"
+
+#include <TLorentzVector.h>
 
 using namespace o2;
 using namespace o2::framework;
@@ -443,7 +445,7 @@ struct k892pmanalysis {
 
   void processMCTrue(aod::ResoMCParents& resoParents)
   {
-    for (auto& part : resoParents) {  // loop over all pre-filtered MC particles
+    for (auto& part : resoParents) {       // loop over all pre-filtered MC particles
       if (std::abs(part.pdgCode()) != 323) // K*892(pm)
         continue;
       if (std::abs(part.y()) > 0.5) // rapidity cut
diff --git a/.conflict-side-0/PWGLF/Tasks/Resonances/kshortlambda.cxx b/.conflict-side-0/PWGLF/Tasks/Resonances/kshortlambda.cxx
index 225ea15e447..304c2511bc6 100644
--- a/.conflict-side-0/PWGLF/Tasks/Resonances/kshortlambda.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/Resonances/kshortlambda.cxx
@@ -13,6 +13,29 @@
 /// \brief higher mass resonance search in non-identical V0 pairs (K0s-L)
 /// \author  dukhishyam Mallick (dukhishyam.mallick@cern.ch)
 
+#include "PWGLF/DataModel/LFStrangenessTables.h" //
+
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h" //
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h" //
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h" //
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h" //
+#include "ReconstructionDataFormats/Track.h"
+
+#include "Math/GenVector/Boost.h"
+#include "Math/Vector3D.h"
+#include "Math/Vector4D.h"
+#include "TF1.h"
+#include "TRandom3.h"
 #include <TDirectory.h>
 #include <TFile.h>
 #include <TH1F.h>
@@ -22,32 +45,11 @@
 #include <TMath.h>
 #include <TObjArray.h>
 #include <TPDGCode.h>
+
 #include <array>
 #include <cmath>
 #include <cstdlib>
 #include <vector>
-#include "TF1.h"
-#include "TRandom3.h"
-#include "Math/Vector3D.h"
-#include "Math/Vector4D.h"
-#include "Math/GenVector/Boost.h"
-
-#include "Common/Core/TrackSelection.h"
-#include "Common/Core/trackUtilities.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/StepTHn.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/EventSelection.h" //
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/PIDResponse.h" //
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/AnalysisTask.h"              //
-#include "Framework/runDataProcessing.h"         //
-#include "PWGLF/DataModel/LFStrangenessTables.h" //
 
 using namespace o2;
 using namespace o2::framework;
@@ -795,11 +797,11 @@ struct Kshortlambda {
           lv1.SetPtEtaPhiM(t1.pt(), t1.eta(), t1.phi(), massK0s);
           lvLambda.SetPtEtaPhiM(lambdaVec.pt(), lambdaVec.eta(), lambdaVec.phi(), massLambda);
           lv3 = lv1 + lvLambda;
-          fourVecDau = ROOT::Math::PxPyPzMVector(daughter1.Px(), daughter1.Py(), daughter1.Pz(), massK0s);                           // Kshort
-          fourVecMother = ROOT::Math::PxPyPzMVector(lv3.Px(), lv3.Py(), lv3.Pz(), lv3.M());                                          // mass of KshortKshort pair
-          ROOT::Math::Boost boost{fourVecMother.BoostToCM()};                                                                        // boost mother to center of mass frame
-          fourVecDauCM = boost(fourVecDau);                                                                                          // boost the frame of daughter same as mother
-          threeVecDauCM = fourVecDauCM.Vect();                                                                                       // get the 3 vector of daughter in the frame of mother
+          fourVecDau = ROOT::Math::PxPyPzMVector(daughter1.Px(), daughter1.Py(), daughter1.Pz(), massK0s); // Kshort
+          fourVecMother = ROOT::Math::PxPyPzMVector(lv3.Px(), lv3.Py(), lv3.Pz(), lv3.M());                // mass of KshortKshort pair
+          ROOT::Math::Boost boost{fourVecMother.BoostToCM()};                                              // boost mother to center of mass frame
+          fourVecDauCM = boost(fourVecDau);                                                                // boost the frame of daughter same as mother
+          threeVecDauCM = fourVecDauCM.Vect();                                                             // get the 3 vector of daughter in the frame of mother
 
           if (std::abs(lv3.Rapidity()) < 0.5) {
             if (activateTHnSparseCosThStarHelicity) {
@@ -901,11 +903,11 @@ struct Kshortlambda {
           lvLambda.SetPtEtaPhiM(lambdaVec.pt(), lambdaVec.eta(), lambdaVec.phi(), massLambda);
           lv3 = lv1 + lvLambda;
 
-          fourVecDau = ROOT::Math::PxPyPzMVector(daughter1.Px(), daughter1.Py(), daughter1.Pz(), massK0s);            // Kshort
-          fourVecMother = ROOT::Math::PxPyPzMVector(lv3.Px(), lv3.Py(), lv3.Pz(), lv3.M());                           // mass of KshortKshort pair
-          ROOT::Math::Boost boost{fourVecMother.BoostToCM()};                                                         // boost mother to center of mass frame
-          fourVecDauCM = boost(fourVecDau);                                                                           // boost the frame of daughter same as mother
-          threeVecDauCM = fourVecDauCM.Vect();                                                                        // get the 3 vector of daughter in the frame of mother
+          fourVecDau = ROOT::Math::PxPyPzMVector(daughter1.Px(), daughter1.Py(), daughter1.Pz(), massK0s); // Kshort
+          fourVecMother = ROOT::Math::PxPyPzMVector(lv3.Px(), lv3.Py(), lv3.Pz(), lv3.M());                // mass of KshortKshort pair
+          ROOT::Math::Boost boost{fourVecMother.BoostToCM()};                                              // boost mother to center of mass frame
+          fourVecDauCM = boost(fourVecDau);                                                                // boost the frame of daughter same as mother
+          threeVecDauCM = fourVecDauCM.Vect();                                                             // get the 3 vector of daughter in the frame of mother
 
           if (std::abs(lv3.Rapidity()) < 0.5) {
 
diff --git a/.conflict-side-0/PWGLF/Tasks/Resonances/kstar892analysis.cxx b/.conflict-side-0/PWGLF/Tasks/Resonances/kstar892analysis.cxx
index 0a43e73bb5b..74ee0c5496c 100644
--- a/.conflict-side-0/PWGLF/Tasks/Resonances/kstar892analysis.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/Resonances/kstar892analysis.cxx
@@ -16,20 +16,23 @@
 /// adaped from k892analysis.cxx by Bong-Hwi Lim <bong-hwi.lim@cern.ch>, Sawan Sawan <sawan.sawan@cern.ch>
 /// \author Marta Urioni <marta.urioni@cern.ch>
 
-#include <TLorentzVector.h>
-#include "TF1.h"
-#include <vector>
+#include "PWGLF/DataModel/LFResonanceTables.h"
 
 #include "Common/Core/RecoDecay.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Framework/AnalysisTask.h"
+#include "Common/DataModel/PIDResponse.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "DataFormatsParameters/GRPObject.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "CommonConstants/PhysicsConstants.h"
+
+#include "TF1.h"
+#include <TLorentzVector.h>
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/Tasks/Resonances/kstarFlowv1.cxx b/.conflict-side-0/PWGLF/Tasks/Resonances/kstarFlowv1.cxx
index 08139c3c2d2..ab860f966c4 100644
--- a/.conflict-side-0/PWGLF/Tasks/Resonances/kstarFlowv1.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/Resonances/kstarFlowv1.cxx
@@ -14,53 +14,52 @@
 /// \author  Prottay Das <prottay.das@cern.ch>, Dukhishyam Mallick <dukhishyam.mallick@cern.ch>
 ///
 
-#include <TH1F.h>
 #include <TDirectory.h>
+#include <TFile.h>
+#include <TH1F.h>
+#include <TH2F.h>
 #include <THn.h>
 #include <TLorentzVector.h>
 #include <TMath.h>
 #include <TObjArray.h>
-#include <TFile.h>
-#include <TH2F.h>
-#include <TLorentzVector.h>
 #include <TPDGCode.h>
+
 #include <string>
 #include <vector>
 // #include <TDatabasePDG.h>
-#include <cmath>
-#include <array>
-#include <cstdlib>
-
-#include "TRandom3.h"
-#include "Math/Vector3D.h"
-#include "Math/Vector4D.h"
-#include "Math/GenVector/Boost.h"
-#include "TF1.h"
+#include "PWGLF/DataModel/SPCalibrationTables.h"
 
-#include "Common/Core/trackUtilities.h"
-#include "Common/Core/TrackSelection.h"
 #include "Common/Core/RecoDecay.h"
-
-#include "PWGLF/DataModel/SPCalibrationTables.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/TrackSelection.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
+
+#include "Math/GenVector/Boost.h"
+#include "Math/Vector3D.h"
+#include "Math/Vector4D.h"
+#include "TF1.h"
+#include "TRandom3.h"
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/Tasks/Resonances/lambda1520SpherocityAnalysis.cxx b/.conflict-side-0/PWGLF/Tasks/Resonances/lambda1520SpherocityAnalysis.cxx
index b8d6cfeae29..7d53afebf5b 100644
--- a/.conflict-side-0/PWGLF/Tasks/Resonances/lambda1520SpherocityAnalysis.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/Resonances/lambda1520SpherocityAnalysis.cxx
@@ -13,19 +13,22 @@
 /// \brief Invariant Mass Reconstruction of Lambda(1520) Resonance
 /// \author Yash Patley <yash.patley@cern.ch>
 
-#include <TLorentzVector.h>
-#include <TRandom.h>
-#include <vector>
+#include "PWGLF/DataModel/LFResonanceTables.h"
 
-#include "Common/DataModel/PIDResponse.h"
+#include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Framework/AnalysisTask.h"
+#include "Common/DataModel/PIDResponse.h"
+
+#include "CommonConstants/PhysicsConstants.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/RecoDecay.h"
+
+#include <TLorentzVector.h>
+#include <TRandom.h>
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/Tasks/Resonances/lambda1520_PbPb.cxx b/.conflict-side-0/PWGLF/Tasks/Resonances/lambda1520_PbPb.cxx
index d032d0c90aa..1298ef07c4f 100644
--- a/.conflict-side-0/PWGLF/Tasks/Resonances/lambda1520_PbPb.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/Resonances/lambda1520_PbPb.cxx
@@ -15,22 +15,25 @@
 /// \author Yash Patley <yash.patley@cern.ch>
 /// \author Nasir Mehdi Malik
 
+#include "PWGLF/DataModel/LFResonanceTables.h"
+
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 #include <Framework/ASoA.h>
 #include <Framework/AnalysisDataModel.h>
 #include <Framework/HistogramRegistry.h>
 #include <Framework/HistogramSpec.h>
+
 #include <TLorentzVector.h>
 #include <TRandom.h>
-#include <fairlogger/Logger.h>
 
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
-#include "CommonConstants/PhysicsConstants.h"
+#include <fairlogger/Logger.h>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/Tasks/Resonances/lambda1520analysis.cxx b/.conflict-side-0/PWGLF/Tasks/Resonances/lambda1520analysis.cxx
index 3e6749d451d..12130bfe422 100644
--- a/.conflict-side-0/PWGLF/Tasks/Resonances/lambda1520analysis.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/Resonances/lambda1520analysis.cxx
@@ -13,13 +13,15 @@
 /// \brief This task reconstructs track-track decay lambda(1520) resonance candidate
 /// \author Hirak Kumar Koley <hirak.koley@cern.ch>
 
-#include "TLorentzVector.h"
-#include "TF1.h"
-#include "TRandom3.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "PWGLF/DataModel/LFResonanceTables.h"
+
 #include "CommonConstants/PhysicsConstants.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TF1.h"
+#include "TLorentzVector.h"
+#include "TRandom3.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/Tasks/Resonances/lambdav2.cxx b/.conflict-side-0/PWGLF/Tasks/Resonances/lambdav2.cxx
index ae8c1b6446c..3aebbb27334 100644
--- a/.conflict-side-0/PWGLF/Tasks/Resonances/lambdav2.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/Resonances/lambdav2.cxx
@@ -11,50 +11,51 @@
 // Particle flow task
 // prottay.das@cern.ch
 
-#include <TH1F.h>
+#include "Math/GenVector/Boost.h"
+#include "Math/Vector3D.h"
+#include "Math/Vector4D.h"
+#include "TF1.h"
+#include "TRandom3.h"
+#include <TDatabasePDG.h>
 #include <TDirectory.h>
+#include <TFile.h>
+#include <TH1F.h>
+#include <TH2F.h>
 #include <THn.h>
 #include <TLorentzVector.h>
 #include <TMath.h>
 #include <TObjArray.h>
-#include <TFile.h>
-#include <TH2F.h>
-#include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
-#include <cmath>
+
 #include <array>
+#include <cmath>
 #include <cstdlib>
 
-#include "TRandom3.h"
-#include "Math/Vector3D.h"
-#include "Math/Vector4D.h"
-#include "Math/GenVector/Boost.h"
-#include "TF1.h"
-
 // #include "Common/DataModel/Qvectors.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "PWGLF/DataModel/SPCalibrationTables.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
+
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/FT0Corrected.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/TrackSelection.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "Common/DataModel/FT0Corrected.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/Tasks/Resonances/lstarpbpbv2.cxx b/.conflict-side-0/PWGLF/Tasks/Resonances/lstarpbpbv2.cxx
index 4b9bdb5aede..ce6094b71ee 100644
--- a/.conflict-side-0/PWGLF/Tasks/Resonances/lstarpbpbv2.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/Resonances/lstarpbpbv2.cxx
@@ -11,50 +11,51 @@
 // L* baryon v2
 // Prottay Das (prottay.das@cern.ch)
 
-#include <TH1F.h>
+#include "PWGLF/DataModel/EPCalibrationTables.h"
+
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/PIDResponseITS.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include "Math/GenVector/Boost.h"
+#include "Math/Vector3D.h"
+#include "Math/Vector4D.h"
+#include "TF1.h"
+#include "TRandom3.h"
+#include <TDatabasePDG.h>
 #include <TDirectory.h>
+#include <TFile.h>
+#include <TH1F.h>
+#include <TH2F.h>
 #include <THn.h>
 #include <TLorentzVector.h>
 #include <TMath.h>
 #include <TObjArray.h>
-#include <TFile.h>
-#include <TH2F.h>
-#include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <string>
-#include <vector>
-#include <TDatabasePDG.h>
-#include <cmath>
+
 #include <array>
+#include <cmath>
 #include <cstdlib>
-
-#include "TRandom3.h"
-#include "Math/Vector3D.h"
-#include "Math/Vector4D.h"
-#include "Math/GenVector/Boost.h"
-#include "TF1.h"
-
-#include "PWGLF/DataModel/EPCalibrationTables.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/Core/trackUtilities.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/TrackSelection.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "Common/DataModel/PIDResponseITS.h"
-#include "CCDB/BasicCCDBManager.h"
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/Tasks/Resonances/phianalysis.cxx b/.conflict-side-0/PWGLF/Tasks/Resonances/phianalysis.cxx
index b529cc1fb81..7bbe03013c6 100644
--- a/.conflict-side-0/PWGLF/Tasks/Resonances/phianalysis.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/Resonances/phianalysis.cxx
@@ -15,17 +15,19 @@
 ///
 /// \author Bong-Hwi Lim <bong-hwi.lim@cern.ch>
 
-#include <TLorentzVector.h>
+#include "PWGLF/DataModel/LFResonanceTables.h"
 
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Framework/AnalysisTask.h"
+#include "Common/DataModel/PIDResponse.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "DataFormatsParameters/GRPObject.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "CommonConstants/PhysicsConstants.h"
+
+#include <TLorentzVector.h>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/Tasks/Resonances/phianalysisTHnSparse.cxx b/.conflict-side-0/PWGLF/Tasks/Resonances/phianalysisTHnSparse.cxx
index f9fa43c1d7f..09b6f505843 100644
--- a/.conflict-side-0/PWGLF/Tasks/Resonances/phianalysisTHnSparse.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/Resonances/phianalysisTHnSparse.cxx
@@ -13,21 +13,24 @@
 /// \brief Analysis of phi resonance using THnSparse histograms.
 /// \author Veronika Barbasova (veronika.barbasova@cern.ch)
 
-#include <TLorentzVector.h>
-#include <vector>
-#include <string>
+#include "PWGLF/Utils/rsnOutput.h"
 
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/PID.h"
-#include "PWGLF/Utils/rsnOutput.h"
+
+#include <TLorentzVector.h>
+
+#include <string>
+#include <vector>
 // #include "TDatabasePDG.h"
 
 using namespace o2;
diff --git a/.conflict-side-0/PWGLF/Tasks/Resonances/phianalysisrun3.cxx b/.conflict-side-0/PWGLF/Tasks/Resonances/phianalysisrun3.cxx
index a865482393a..05e2b0e414e 100644
--- a/.conflict-side-0/PWGLF/Tasks/Resonances/phianalysisrun3.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/Resonances/phianalysisrun3.cxx
@@ -16,38 +16,39 @@
 // (5) particle = 2 --> lambdastar
 // (6) 4 process function (a) Data same event (b) Data mixed event (c) MC generated (d) MC reconstructed
 
-#include <TH1F.h>
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <Math/Vector4D.h>
+#include <TDatabasePDG.h>
 #include <TDirectory.h>
+#include <TFile.h>
+#include <TH1F.h>
+#include <TH2F.h>
 #include <THn.h>
 #include <TLorentzVector.h>
 #include <TMath.h>
 #include <TObjArray.h>
-#include <TFile.h>
-#include <TH2F.h>
-#include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
-#include <Math/Vector4D.h>
-#include <cmath>
+
 #include <array>
+#include <cmath>
 #include <cstdlib>
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/StepTHn.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/Core/trackUtilities.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/TrackSelection.h"
-#include "Framework/ASoAHelpers.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-0/PWGLF/Tasks/Resonances/rho770analysis.cxx b/.conflict-side-0/PWGLF/Tasks/Resonances/rho770analysis.cxx
index 07531afc724..fb4d9cbf643 100644
--- a/.conflict-side-0/PWGLF/Tasks/Resonances/rho770analysis.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/Resonances/rho770analysis.cxx
@@ -14,19 +14,21 @@
 /// \author Hyunji Lim (hyunji.lim@cern.ch)
 /// \since 03/12/2025
 
-#include <Framework/Configurable.h>
-#include <TLorentzVector.h>
-#include "TVector2.h"
+#include "PWGLF/DataModel/LFResonanceTables.h"
 
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+
+#include "CommonConstants/PhysicsConstants.h"
 #include "DataFormatsParameters/GRPObject.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
-#include "CommonConstants/PhysicsConstants.h"
+#include <Framework/Configurable.h>
+
+#include "TVector2.h"
+#include <TLorentzVector.h>
 
 using namespace o2;
 using namespace o2::framework;
@@ -67,8 +69,8 @@ struct rho770analysis {
   Configurable<bool> cfgHasTOF{"cfgHasTOF", false, "Require TOF"};
 
   // PID
-  Configurable<double> cMaxTOFnSigmaPion{"cMaxTOFnSigmaPion", 3.0, "TOF nSigma cut for Pion"}; // TOF
-  Configurable<double> cMaxTPCnSigmaPion{"cMaxTPCnSigmaPion", 5.0, "TPC nSigma cut for Pion"}; // TPC
+  Configurable<double> cMaxTOFnSigmaPion{"cMaxTOFnSigmaPion", 3.0, "TOF nSigma cut for Pion"};                          // TOF
+  Configurable<double> cMaxTPCnSigmaPion{"cMaxTPCnSigmaPion", 5.0, "TPC nSigma cut for Pion"};                          // TPC
   Configurable<double> cMaxTPCnSigmaPionnoTOF{"cMaxTPCnSigmaPionnoTOF", 2.0, "TPC nSigma cut for Pion in no TOF case"}; // TPC
   Configurable<double> nsigmaCutCombinedPion{"nsigmaCutCombinedPion", 3.0, "Combined nSigma cut for Pion"};
   Configurable<int> selectType{"selectType", 0, "PID selection type"};
diff --git a/.conflict-side-0/PWGLF/Tasks/Resonances/rhoanalysis.cxx b/.conflict-side-0/PWGLF/Tasks/Resonances/rhoanalysis.cxx
index ab1112f4995..e6bfac44bf1 100644
--- a/.conflict-side-0/PWGLF/Tasks/Resonances/rhoanalysis.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/Resonances/rhoanalysis.cxx
@@ -15,23 +15,25 @@
 ///
 /// \author Nasir Mehdi Malik
 
-#include <array>
+#include "RecoDecay.h"
 
-#include <TPDGCode.h>
+#include "Common/Core/RecoDecay.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
-#include "Framework/DataProcessorSpec.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/RecoDecay.h"
+#include "Framework/DataProcessorSpec.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "RecoDecay.h"
+#include "Framework/runDataProcessing.h"
+
+#include <TPDGCode.h>
+
+#include <array>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/Tasks/Resonances/rsnanalysis.cxx b/.conflict-side-0/PWGLF/Tasks/Resonances/rsnanalysis.cxx
index 7a672fe59a8..0e662918f5d 100644
--- a/.conflict-side-0/PWGLF/Tasks/Resonances/rsnanalysis.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/Resonances/rsnanalysis.cxx
@@ -17,9 +17,11 @@
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "Framework/ASoAHelpers.h"
+
 #include "TLorentzVector.h"
 
 using namespace std;
diff --git a/.conflict-side-0/PWGLF/Tasks/Resonances/sigma.cxx b/.conflict-side-0/PWGLF/Tasks/Resonances/sigma.cxx
index 9bcad07c143..5245c2eb5ae 100644
--- a/.conflict-side-0/PWGLF/Tasks/Resonances/sigma.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/Resonances/sigma.cxx
@@ -11,23 +11,8 @@
 ///
 /// \brief sigma resonance
 /// \author sarjeeta gami (sarjeeta.gami@cern.ch)
-#include <TDatabasePDG.h>
-#include <TDirectory.h>
-#include <TFile.h>
-#include <TH1F.h>
-#include <TH2F.h>
-#include <THn.h>
-#include <TLorentzVector.h>
-#include <TMath.h>
-#include <TObjArray.h>
-#include <TPDGCode.h>
-
-#include <array>
-#include <cmath>
-#include <cstdlib>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "CCDB/BasicCCDBManager.h"
-#include "CCDB/CcdbApi.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
@@ -35,6 +20,9 @@
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
 #include "CommonConstants/PhysicsConstants.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
@@ -42,9 +30,23 @@
 #include "Framework/HistogramRegistry.h"
 #include "Framework/StepTHn.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "ReconstructionDataFormats/Track.h"
 
+#include <TDatabasePDG.h>
+#include <TDirectory.h>
+#include <TFile.h>
+#include <TH1F.h>
+#include <TH2F.h>
+#include <THn.h>
+#include <TLorentzVector.h>
+#include <TMath.h>
+#include <TObjArray.h>
+#include <TPDGCode.h>
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-0/PWGLF/Tasks/Resonances/xi1530Analysis.cxx b/.conflict-side-0/PWGLF/Tasks/Resonances/xi1530Analysis.cxx
index 73694dda058..ada855ae4fb 100644
--- a/.conflict-side-0/PWGLF/Tasks/Resonances/xi1530Analysis.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/Resonances/xi1530Analysis.cxx
@@ -13,20 +13,23 @@
 /// \brief Invariant Mass Reconstruction of Xi(1530) Resonance
 /// \author Yash Patley <yash.patley@cern.ch>
 
-#include <TLorentzVector.h>
-#include <TRandom.h>
-#include <vector>
+#include "PWGLF/DataModel/LFResonanceTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Common/DataModel/PIDResponse.h"
+#include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Framework/AnalysisTask.h"
+#include "Common/DataModel/PIDResponse.h"
+
+#include "CommonConstants/PhysicsConstants.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/RecoDecay.h"
+
+#include <TLorentzVector.h>
+#include <TRandom.h>
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/Tasks/Resonances/xi1530Analysisqa.cxx b/.conflict-side-0/PWGLF/Tasks/Resonances/xi1530Analysisqa.cxx
index 42773fa2947..0fa785a0579 100644
--- a/.conflict-side-0/PWGLF/Tasks/Resonances/xi1530Analysisqa.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/Resonances/xi1530Analysisqa.cxx
@@ -14,21 +14,23 @@
 ///
 /// \author Min-jae Kim <minjae.kim@cern.ch>, Bong-Hwi Lim <bong-hwi.lim@cern.ch>
 // #include <TLorentzVector.h>
-#include "Math/Vector4D.h"
-#include "TF1.h"
-#include "TRandom3.h"
+#include "PWGLF/DataModel/LFResonanceTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Common/DataModel/PIDResponse.h"
+#include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "Common/DataModel/PIDResponse.h"
+
 #include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/RecoDecay.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
+#include "Math/Vector4D.h"
+#include "TF1.h"
+#include "TRandom3.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/Tasks/Strangeness/cascadeanalysis.cxx b/.conflict-side-0/PWGLF/Tasks/Strangeness/cascadeanalysis.cxx
index baf37b72717..4f9de5dbb74 100644
--- a/.conflict-side-0/PWGLF/Tasks/Strangeness/cascadeanalysis.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/Strangeness/cascadeanalysis.cxx
@@ -28,31 +28,33 @@
 //    david.dobrigkeit.chinellato@cern.ch
 //
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
+#include <Math/Vector4D.h>
+#include <TDatabasePDG.h>
 #include <TFile.h>
 #include <TH2F.h>
-#include <TProfile.h>
 #include <TLorentzVector.h>
-#include <Math/Vector4D.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
-#include <cmath>
+#include <TProfile.h>
+
 #include <array>
+#include <cmath>
 #include <cstdlib>
-#include "Framework/ASoAHelpers.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/Tasks/Strangeness/cascadeanalysisMC.cxx b/.conflict-side-0/PWGLF/Tasks/Strangeness/cascadeanalysisMC.cxx
index a1947c8b6b5..e4fe51055bd 100644
--- a/.conflict-side-0/PWGLF/Tasks/Strangeness/cascadeanalysisMC.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/Strangeness/cascadeanalysisMC.cxx
@@ -31,31 +31,33 @@
 //    david.dobrigkeit.chinellato@cern.ch
 //
 
-#include <Math/Vector4D.h>
-#include <cmath>
-#include <array>
-#include <cstdlib>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
+#include <Math/Vector4D.h>
+#include <TDatabasePDG.h>
 #include <TFile.h>
 #include <TH2F.h>
-#include <TProfile.h>
 #include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
+#include <TProfile.h>
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/Tasks/Strangeness/cascpolsp.cxx b/.conflict-side-0/PWGLF/Tasks/Strangeness/cascpolsp.cxx
index 237fe8ba375..68fa15f699e 100644
--- a/.conflict-side-0/PWGLF/Tasks/Strangeness/cascpolsp.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/Strangeness/cascpolsp.cxx
@@ -11,52 +11,53 @@
 // Cascade polarisation task
 // prottay.das@cern.ch
 
-#include <TH1F.h>
+#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/DataModel/SPCalibrationTables.h"
+#include "PWGLF/DataModel/cascqaanalysis.h"
+
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/FT0Corrected.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include "Math/GenVector/Boost.h"
+#include "Math/Vector3D.h"
+#include "Math/Vector4D.h"
+#include "TF1.h"
+#include "TRandom3.h"
+#include <TDatabasePDG.h>
 #include <TDirectory.h>
+#include <TFile.h>
+#include <TH1F.h>
+#include <TH2F.h>
 #include <THn.h>
 #include <TLorentzVector.h>
 #include <TMath.h>
 #include <TObjArray.h>
-#include <TFile.h>
-#include <TH2F.h>
-#include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
-#include <cmath>
+
 #include <array>
+#include <cmath>
 #include <cstdlib>
 
-#include "TRandom3.h"
-#include "Math/Vector3D.h"
-#include "Math/Vector4D.h"
-#include "Math/GenVector/Boost.h"
-#include "TF1.h"
-
-#include "PWGLF/DataModel/SPCalibrationTables.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/Core/trackUtilities.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/TrackSelection.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
-#include "Common/DataModel/FT0Corrected.h"
-#include "PWGLF/DataModel/cascqaanalysis.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-0/PWGLF/Tasks/Strangeness/cascpostprocessing.cxx b/.conflict-side-0/PWGLF/Tasks/Strangeness/cascpostprocessing.cxx
index d92e48733b5..5d521b5348a 100644
--- a/.conflict-side-0/PWGLF/Tasks/Strangeness/cascpostprocessing.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/Strangeness/cascpostprocessing.cxx
@@ -16,14 +16,16 @@
 /// \modified by Roman Nepeivoda (roman.nepeivoda@cern.ch)
 /// \since June 1, 2023
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/DataModel/cascqaanalysis.h"
+
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGLF/DataModel/cascqaanalysis.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 
 // constants
 const float ctauxiPDG = 4.91;     // from PDG
diff --git a/.conflict-side-0/PWGLF/Tasks/Strangeness/derivedcascadeanalysis.cxx b/.conflict-side-0/PWGLF/Tasks/Strangeness/derivedcascadeanalysis.cxx
index 95a25f589e3..b49650dce88 100644
--- a/.conflict-side-0/PWGLF/Tasks/Strangeness/derivedcascadeanalysis.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/Strangeness/derivedcascadeanalysis.cxx
@@ -13,44 +13,47 @@
 /// \brief Tasks processing derived data for Cascade analysis in PbPb collisions
 /// \author Lucia Anna Tarasovicova (lucia.anna.husova@cern.ch)
 
-#include <string>
-#include <vector>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "Common/CCDB/ctpRateFetcher.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "MetadataHelper.h"
+
 #include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/CCDB/EventSelectionParams.h"
+#include "Common/CCDB/TriggerAliases.h"
+#include "Common/CCDB/ctpRateFetcher.h"
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "Framework/StaticFor.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "Framework/ConfigParamSpec.h"
-#include "Common/CCDB/EventSelectionParams.h"
-#include "Common/CCDB/TriggerAliases.h"
 #include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/LHCConstants.h"
-#include "Framework/HistogramRegistry.h"
 #include "DataFormatsFT0/Digit.h"
-#include "DataFormatsParameters/GRPLHCIFData.h"
+#include "DataFormatsParameters/AggregatedRunInfo.h"
 #include "DataFormatsParameters/GRPECSObject.h"
+#include "DataFormatsParameters/GRPLHCIFData.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/ConfigParamSpec.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
 #include "ITSMFTBase/DPLAlpideParam.h"
-#include "MetadataHelper.h"
-#include "DataFormatsParameters/AggregatedRunInfo.h"
+#include "ReconstructionDataFormats/Track.h"
 
 #include <TFile.h>
 #include <TH2F.h>
-#include <TProfile.h>
 #include <TLorentzVector.h>
 #include <TPDGCode.h>
+#include <TProfile.h>
+
+#include <string>
+#include <vector>
 
 // constants
 const float ctauxiPDG = 4.91;     // from PDG
diff --git a/.conflict-side-0/PWGLF/Tasks/Strangeness/derivedlambdakzeroanalysis.cxx b/.conflict-side-0/PWGLF/Tasks/Strangeness/derivedlambdakzeroanalysis.cxx
index 544ed23807a..97ab9a0ad53 100644
--- a/.conflict-side-0/PWGLF/Tasks/Strangeness/derivedlambdakzeroanalysis.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/Strangeness/derivedlambdakzeroanalysis.cxx
@@ -28,44 +28,45 @@
 //    david.dobrigkeit.chinellato@cern.ch
 //
 
-#include <Math/Vector4D.h>
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <string>
-#include <map>
-#include <algorithm>
-#include <vector>
-
-#include <TFile.h>
-#include <TH2D.h>
-#include <TProfile.h>
-#include <TLorentzVector.h>
-#include <TPDGCode.h>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "CommonConstants/MathConstants.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/trackUtilities.h"
-#include "Common/CCDB/ctpRateFetcher.h"
-#include "Common/DataModel/EventSelection.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "PWGLF/DataModel/LFStrangenessMLTables.h"
 #include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGUD/Core/SGSelector.h"
+
+#include "Common/CCDB/ctpRateFetcher.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/Core/SGSelector.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 #include "Tools/ML/MlResponse.h"
 #include "Tools/ML/model.h"
 
+#include "CommonConstants/MathConstants.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <Math/Vector4D.h>
+#include <TFile.h>
+#include <TH2D.h>
+#include <TLorentzVector.h>
+#include <TPDGCode.h>
+#include <TProfile.h>
+
+#include <algorithm>
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <map>
+#include <string>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-0/PWGLF/Tasks/Strangeness/derivedupcanalysis.cxx b/.conflict-side-0/PWGLF/Tasks/Strangeness/derivedupcanalysis.cxx
index b3021033d32..386a61a1e25 100644
--- a/.conflict-side-0/PWGLF/Tasks/Strangeness/derivedupcanalysis.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/Strangeness/derivedupcanalysis.cxx
@@ -13,34 +13,37 @@
 /// \brief Analysis of strangeness production in UPC collisions
 /// \author Roman Nepeivoda (roman.nepeivoda@cern.ch)
 
-#include <bitset>
-#include <TFile.h>
-#include <TH2F.h>
-#include <TProfile.h>
-#include <TPDGCode.h>
-#include <vector>
-#include <algorithm>
-#include <cmath>
-#include <string>
+#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/Utils/strangenessMasks.h"
+#include "PWGUD/Core/SGSelector.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/StaticFor.h"
-#include "PWGUD/Core/SGSelector.h"
-#include "PWGLF/Utils/strangenessMasks.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <TFile.h>
+#include <TH2F.h>
+#include <TPDGCode.h>
+#include <TProfile.h>
+
+#include <algorithm>
+#include <bitset>
+#include <cmath>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/Tasks/Strangeness/hyperon-reco-test.cxx b/.conflict-side-0/PWGLF/Tasks/Strangeness/hyperon-reco-test.cxx
index 5605730d709..85054f07f7b 100644
--- a/.conflict-side-0/PWGLF/Tasks/Strangeness/hyperon-reco-test.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/Strangeness/hyperon-reco-test.cxx
@@ -9,31 +9,31 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <cmath>
-#include <vector>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
 
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/Core/trackUtilities.h"
-#include "Common/DataModel/Centrality.h"
-#include "Framework/ASoAHelpers.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-
 #include "TMath.h"
-
 #include <TDatabasePDG.h>
 #include <TH2F.h>
 #include <TPDGCode.h>
 
+#include <cmath>
+#include <vector>
+
 using namespace std;
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/Tasks/Strangeness/k0_mixed_events.cxx b/.conflict-side-0/PWGLF/Tasks/Strangeness/k0_mixed_events.cxx
index 5de8a32c122..73fc5ac67f7 100644
--- a/.conflict-side-0/PWGLF/Tasks/Strangeness/k0_mixed_events.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/Strangeness/k0_mixed_events.cxx
@@ -14,40 +14,40 @@
 /// \author Sofia Tomassini, Gleb Romanenko, Nicolò Jacazio
 /// \since 31 May 2023
 
-#include <vector>
-#include <map>
-#include <memory>
-#include <string>
-#include <utility>
+#include "PWGCF/Femto3D/Core/femto3dPairTask.h"
+#include "PWGCF/Femto3D/DataModel/singletrackselector.h"
+#include "PWGLF/DataModel/mcCentrality.h"
+#include "PWGLF/Utils/inelGt.h"
 
-#include <TParameter.h>
-#include <TH1F.h>
-#include <TLorentzVector.h>
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
+#include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/Propagator.h"
 #include "Framework/ASoA.h"
-#include "Framework/DataTypes.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/DataTypes.h"
 #include "Framework/Expressions.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/StaticFor.h"
-
+#include "Framework/runDataProcessing.h"
 #include "MathUtils/Utils.h"
-#include "Common/DataModel/Multiplicity.h"
 
-#include "PWGCF/Femto3D/DataModel/singletrackselector.h"
-#include "PWGCF/Femto3D/Core/femto3dPairTask.h"
-#include "Common/DataModel/Centrality.h"
-#include "PWGLF/DataModel/mcCentrality.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "PWGLF/Utils/inelGt.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "DetectorsBase/Propagator.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+#include <TH1F.h>
+#include <TLorentzVector.h>
+#include <TParameter.h>
+
+#include <map>
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::soa;
diff --git a/.conflict-side-0/PWGLF/Tasks/Strangeness/lambdaJetpolarization.cxx b/.conflict-side-0/PWGLF/Tasks/Strangeness/lambdaJetpolarization.cxx
index cca1bdf193e..62420403d65 100644
--- a/.conflict-side-0/PWGLF/Tasks/Strangeness/lambdaJetpolarization.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/Strangeness/lambdaJetpolarization.cxx
@@ -11,41 +11,46 @@
 ///
 
 /// \author Youpeng Su (yousu@cern.ch)
-#include <iostream>
-#include <string>
-#include <vector>
-#include <cmath>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/EventSelection.h"
+#include "PWGLF/DataModel/lambdaJetpolarization.h"
+
+#include "PWGJE/Core/JetBkgSubUtils.h"
+#include "PWGJE/Core/JetDerivedDataUtilities.h"
+#include "PWGJE/DataModel/Jet.h"
+#include "PWGJE/DataModel/JetReducedData.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include <TLorentzVector.h>
+
 #include "Framework/ASoA.h"
 #include "Framework/AnalysisDataModel.h"
-#include <TTree.h>
-#include <TFile.h>
-#include <TMatrixD.h>
-#include "TProfile2D.h"
-#include "PWGLF/DataModel/lambdaJetpolarization.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
+#include "Math/GenVector/Boost.h"
 #include "Math/Vector3D.h"
 #include "Math/Vector4D.h"
-#include "Math/GenVector/Boost.h"
+#include "TProfile2D.h"
+#include <TFile.h>
+#include <TLorentzVector.h>
+#include <TMatrixD.h>
+#include <TTree.h>
 
+#include <fastjet/AreaDefinition.hh>
 #include <fastjet/ClusterSequence.hh>
 #include <fastjet/ClusterSequenceArea.hh>
+#include <fastjet/GhostedAreaSpec.hh>
+#include <fastjet/PseudoJet.hh>
+#include <fastjet/Selector.hh>
 #include <fastjet/tools/JetMedianBackgroundEstimator.hh>
 #include <fastjet/tools/Subtractor.hh>
-#include <fastjet/Selector.hh>
-#include <fastjet/PseudoJet.hh>
-#include <fastjet/AreaDefinition.hh>
-#include <fastjet/GhostedAreaSpec.hh>
-#include "PWGJE/Core/JetBkgSubUtils.h"
-#include "PWGJE/Core/JetDerivedDataUtilities.h"
-#include "PWGJE/DataModel/JetReducedData.h"
-#include "PWGJE/DataModel/Jet.h"
-#include "Common/Core/trackUtilities.h"
+
+#include <cmath>
+#include <iostream>
+#include <string>
+#include <vector>
 
 using std::cout;
 using std::endl;
diff --git a/.conflict-side-0/PWGLF/Tasks/Strangeness/lambdak0sflattenicity.cxx b/.conflict-side-0/PWGLF/Tasks/Strangeness/lambdak0sflattenicity.cxx
index 4114d614b90..e8fa858b0b4 100755
--- a/.conflict-side-0/PWGLF/Tasks/Strangeness/lambdak0sflattenicity.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/Strangeness/lambdak0sflattenicity.cxx
@@ -17,26 +17,27 @@
 /// \brief V0 task for production of strange hadrons as a function of flattenicity
 /// \author Suraj Prasad (suraj.prasad@cern.ch)
 
-#include <CommonConstants/MathConstants.h>
-#include <Framework/Configurable.h>
-#include <cmath>
-#include <vector>
-#include <TGraph.h>
-#include <TRandom2.h>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/Utils/inelGt.h"
+
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+#include <CommonConstants/MathConstants.h>
+#include <Framework/Configurable.h>
 
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
+#include <TGraph.h>
+#include <TRandom2.h>
 
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/Utils/inelGt.h"
+#include <cmath>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/Tasks/Strangeness/lambdakzeroanalysisMC.cxx b/.conflict-side-0/PWGLF/Tasks/Strangeness/lambdakzeroanalysisMC.cxx
index afbe1a8a061..7451c31dcf9 100644
--- a/.conflict-side-0/PWGLF/Tasks/Strangeness/lambdakzeroanalysisMC.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/Strangeness/lambdakzeroanalysisMC.cxx
@@ -22,31 +22,33 @@
 //    aimeric.landou@cern.ch (MC adaptation)
 //    david.dobrigkeit.chinellato@cern.ch (original lambdakzeroanalysis task)
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/trackUtilities.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
+#include <Math/Vector4D.h>
+#include <TDatabasePDG.h>
 #include <TFile.h>
 #include <TH2F.h>
-#include <TProfile.h>
 #include <TLorentzVector.h>
-#include <Math/Vector4D.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
-#include <cmath>
+#include <TProfile.h>
+
 #include <array>
+#include <cmath>
 #include <cstdlib>
-#include "Framework/ASoAHelpers.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/Tasks/Strangeness/lambdalambda.cxx b/.conflict-side-0/PWGLF/Tasks/Strangeness/lambdalambda.cxx
index bf8579f105d..0b43d1e85c1 100644
--- a/.conflict-side-0/PWGLF/Tasks/Strangeness/lambdalambda.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/Strangeness/lambdalambda.cxx
@@ -11,51 +11,46 @@
 
 /// \author Junlee Kim (jikim1290@gmail.com)
 
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <chrono>
-#include <string>
-#include <vector>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "TLorentzVector.h"
-#include "TRandom3.h"
-#include "TF1.h"
-#include "TVector3.h"
-#include "Math/Vector3D.h"
-#include "Math/Vector4D.h"
-#include "Math/GenVector/Boost.h"
-#include <TMath.h>
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/StepTHn.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/StaticFor.h"
-
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-
-#include "Common/Core/trackUtilities.h"
-#include "Common/Core/TrackSelection.h"
-
-#include "CommonConstants/PhysicsConstants.h"
-
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
 
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-
-#include "CCDB/CcdbApi.h"
-#include "CCDB/BasicCCDBManager.h"
+#include "Math/GenVector/Boost.h"
+#include "Math/Vector3D.h"
+#include "Math/Vector4D.h"
+#include "TF1.h"
+#include "TLorentzVector.h"
+#include "TRandom3.h"
+#include "TVector3.h"
+#include <TMath.h>
 
-#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include <array>
+#include <chrono>
+#include <cmath>
+#include <cstdlib>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/Tasks/Strangeness/lambdapolarization.cxx b/.conflict-side-0/PWGLF/Tasks/Strangeness/lambdapolarization.cxx
index 38e17ba338a..8a09414f37d 100644
--- a/.conflict-side-0/PWGLF/Tasks/Strangeness/lambdapolarization.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/Strangeness/lambdapolarization.cxx
@@ -11,54 +11,49 @@
 
 /// \author Junlee Kim (jikim1290@gmail.com)
 
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <chrono>
-#include <string>
-#include <vector>
-
-#include "TLorentzVector.h"
-#include "TRandom3.h"
-#include "TF1.h"
-#include "TVector2.h"
-#include "Math/Vector3D.h"
-#include "Math/Vector4D.h"
-#include "Math/GenVector/Boost.h"
-#include <TMath.h>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/StaticFor.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGMM/Mult/DataModel/Index.h" // for Particles2Tracks table
 
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Qvectors.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/PIDResponseITS.h"
+#include "Common/DataModel/Qvectors.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "Common/Core/trackUtilities.h"
-#include "Common/Core/TrackSelection.h"
-
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
 #include "CommonConstants/PhysicsConstants.h"
-
-#include "ReconstructionDataFormats/Track.h"
-
-#include "DataFormatsParameters/GRPObject.h"
 #include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/StaticFor.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
-#include "CCDB/CcdbApi.h"
-#include "CCDB/BasicCCDBManager.h"
+#include "Math/GenVector/Boost.h"
+#include "Math/Vector3D.h"
+#include "Math/Vector4D.h"
+#include "TF1.h"
+#include "TLorentzVector.h"
+#include "TRandom3.h"
+#include "TVector2.h"
+#include <TMath.h>
 
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGMM/Mult/DataModel/Index.h" // for Particles2Tracks table
+#include <array>
+#include <chrono>
+#include <cmath>
+#include <cstdlib>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/Tasks/Strangeness/nonPromptCascade.cxx b/.conflict-side-0/PWGLF/Tasks/Strangeness/nonPromptCascade.cxx
index 79e8ad6f4e0..ec4c573a644 100644
--- a/.conflict-side-0/PWGLF/Tasks/Strangeness/nonPromptCascade.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/Strangeness/nonPromptCascade.cxx
@@ -9,41 +9,43 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <cmath>
-#include <memory>
-#include <string>
-#include <vector>
-
-#include "Math/Vector4D.h"
-
-#include "CCDB/BasicCCDBManager.h"
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "DetectorsVertexing/PVertexer.h"
-#include "ReconstructionDataFormats/Vertex.h"
+#include "EventFiltering/Zorro.h"
+#include "EventFiltering/ZorroSummary.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "DCAFitter/DCAFitterN.h"
 #include "DataFormatsParameters/GRPMagField.h"
 #include "DataFormatsParameters/GRPObject.h"
 #include "DataFormatsTPC/BetheBlochAleph.h"
-#include "DCAFitter/DCAFitterN.h"
 #include "DetectorsBase/Propagator.h"
-#include "EventFiltering/Zorro.h"
-#include "EventFiltering/ZorroSummary.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "DetectorsVertexing/PVertexer.h"
 #include "Framework/ASoA.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Vertex.h"
+
+#include "Math/Vector4D.h"
+
+#include <cmath>
+#include <memory>
+#include <string>
+#include <vector>
 // #include "PWGHF/Core/PDG.h"
+#include "PWGLF/DataModel/LFNonPromptCascadeTables.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "ReconstructionDataFormats/DCA.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "PWGLF/DataModel/LFNonPromptCascadeTables.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/Tasks/Strangeness/sigmaanalysis.cxx b/.conflict-side-0/PWGLF/Tasks/Strangeness/sigmaanalysis.cxx
index c01a0a71cae..eb16b8f4b04 100644
--- a/.conflict-side-0/PWGLF/Tasks/Strangeness/sigmaanalysis.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/Strangeness/sigmaanalysis.cxx
@@ -19,35 +19,39 @@
 //    gianni.shigeru.setoue.liveraro@cern.ch
 //
 
-#include <Math/Vector4D.h>
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <string>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/ASoA.h"
-#include "ReconstructionDataFormats/Track.h"
+#include "PWGLF/DataModel/LFSigmaTables.h"
+#include "PWGLF/DataModel/LFStrangenessMLTables.h"
+#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
-#include "PWGLF/DataModel/LFStrangenessMLTables.h"
-#include "PWGLF/DataModel/LFSigmaTables.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <Math/Vector4D.h>
+#include <TDatabasePDG.h>
 #include <TFile.h>
 #include <TH2F.h>
-#include <TProfile.h>
 #include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
+#include <TProfile.h>
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <string>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/Tasks/Strangeness/v0postprocessing.cxx b/.conflict-side-0/PWGLF/Tasks/Strangeness/v0postprocessing.cxx
index 4f6ab094f46..43e93b06ec6 100644
--- a/.conflict-side-0/PWGLF/Tasks/Strangeness/v0postprocessing.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/Strangeness/v0postprocessing.cxx
@@ -13,14 +13,16 @@
 /// \author Francesca Ercolessi (francesca.ercolessi@cern.ch)
 /// \since
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "PWGLF/DataModel/v0qaanalysis.h"
+
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CommonConstants/PhysicsConstants.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/Tasks/Strangeness/v0topologicalcuts.cxx b/.conflict-side-0/PWGLF/Tasks/Strangeness/v0topologicalcuts.cxx
index fd351646bee..d04a84c114d 100644
--- a/.conflict-side-0/PWGLF/Tasks/Strangeness/v0topologicalcuts.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/Strangeness/v0topologicalcuts.cxx
@@ -22,15 +22,18 @@ that are filled with the V0 invariant mass under the K0, Lambda and Antilambda m
 The cuts are passed as configurable strings for convenience.
 This analysis includes two processes, one for Real Data and one for MC Data switchable at the end of the code, only run one at a time*/
 
-#include <memory>
-#include <vector>
-#include <string>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/EventSelection.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+
 #include "CommonUtils/StringUtils.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include <memory>
+#include <string>
+#include <vector>
 
 // namespaces to be used for the plot names and topological cuts that will be given by a configurable string
 namespace cuthistoskzerosh
diff --git a/.conflict-side-0/PWGLF/Tasks/Strangeness/vzero_cascade_absorption.cxx b/.conflict-side-0/PWGLF/Tasks/Strangeness/vzero_cascade_absorption.cxx
index 6ca2e43ba69..3d83711e27b 100644
--- a/.conflict-side-0/PWGLF/Tasks/Strangeness/vzero_cascade_absorption.cxx
+++ b/.conflict-side-0/PWGLF/Tasks/Strangeness/vzero_cascade_absorption.cxx
@@ -12,25 +12,28 @@
 /// \author Alberto Caliva (alberto.caliva@cern.ch)
 /// \since September 26, 2023
 
-#include <cmath>
-#include <TMath.h>
-#include <TPDGCode.h>
-#include <TObjArray.h>
-#include <TLorentzVector.h>
-#include <TDatabasePDG.h>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <TDatabasePDG.h>
+#include <TLorentzVector.h>
+#include <TMath.h>
+#include <TObjArray.h>
+#include <TPDGCode.h>
+
+#include <cmath>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGLF/Utils/collisionCuts.h b/.conflict-side-0/PWGLF/Utils/collisionCuts.h
index 399454e9368..c676edd995e 100644
--- a/.conflict-side-0/PWGLF/Utils/collisionCuts.h
+++ b/.conflict-side-0/PWGLF/Utils/collisionCuts.h
@@ -20,11 +20,12 @@
 #ifndef PWGLF_UTILS_COLLISIONCUTS_H_
 #define PWGLF_UTILS_COLLISIONCUTS_H_
 
-#include <vector>
+#include "Common/DataModel/EventSelection.h"
 
 #include "Framework/HistogramRegistry.h"
 #include "Framework/Logger.h"
-#include "Common/DataModel/EventSelection.h"
+
+#include <vector>
 
 namespace o2::analysis
 {
diff --git a/.conflict-side-0/PWGLF/Utils/mcParticle.h b/.conflict-side-0/PWGLF/Utils/mcParticle.h
index e85d98ca5f0..b8a9ffd5def 100644
--- a/.conflict-side-0/PWGLF/Utils/mcParticle.h
+++ b/.conflict-side-0/PWGLF/Utils/mcParticle.h
@@ -20,11 +20,11 @@
 #ifndef PWGLF_UTILS_MCPARTICLE_H_
 #define PWGLF_UTILS_MCPARTICLE_H_
 
+#include "ReconstructionDataFormats/PID.h"
+
 #include <string>
 #include <vector>
 
-#include "ReconstructionDataFormats/PID.h"
-
 namespace o2
 {
 namespace pwglf
diff --git a/.conflict-side-0/PWGLF/Utils/rsnOutput.h b/.conflict-side-0/PWGLF/Utils/rsnOutput.h
index 592eaef40cc..6915aedd052 100644
--- a/.conflict-side-0/PWGLF/Utils/rsnOutput.h
+++ b/.conflict-side-0/PWGLF/Utils/rsnOutput.h
@@ -16,13 +16,13 @@
 #ifndef PWGLF_UTILS_RSNOUTPUT_H_
 #define PWGLF_UTILS_RSNOUTPUT_H_
 
-#include <utility>
-#include <string>
-#include <vector>
-
 #include "Framework/HistogramRegistry.h"
 #include "Framework/Logger.h"
 
+#include <string>
+#include <utility>
+#include <vector>
+
 namespace o2::analysis
 {
 namespace rsn
diff --git a/.conflict-side-0/PWGLF/Utils/strangenessBuilderHelper.h b/.conflict-side-0/PWGLF/Utils/strangenessBuilderHelper.h
index 85257418e0a..5e693ab941f 100644
--- a/.conflict-side-0/PWGLF/Utils/strangenessBuilderHelper.h
+++ b/.conflict-side-0/PWGLF/Utils/strangenessBuilderHelper.h
@@ -12,25 +12,27 @@
 #ifndef PWGLF_UTILS_STRANGENESSBUILDERHELPER_H_
 #define PWGLF_UTILS_STRANGENESSBUILDERHELPER_H_
 
-#include <cstdlib>
-#include <cmath>
-#include <array>
+#include "Common/Core/trackUtilities.h"
+#include "Tools/KFparticle/KFUtilities.h"
+
+#include "CommonConstants/PhysicsConstants.h"
 #include "DCAFitter/DCAFitterN.h"
+#include "DetectorsBase/GeometryManager.h"
 #include "Framework/AnalysisDataModel.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/trackUtilities.h"
-#include "Tools/KFparticle/KFUtilities.h"
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
 
 #ifndef HomogeneousField
 #define HomogeneousField
 #endif
 
 /// includes KFParticle
-#include "KFParticle.h"
 #include "KFPTrack.h"
 #include "KFPVertex.h"
+#include "KFParticle.h"
 #include "KFParticleBase.h"
 #include "KFVertex.h"
 
diff --git a/.conflict-side-0/PWGLF/Utils/svPoolCreator.h b/.conflict-side-0/PWGLF/Utils/svPoolCreator.h
index c0b32c2574e..0a4c3c2d75a 100644
--- a/.conflict-side-0/PWGLF/Utils/svPoolCreator.h
+++ b/.conflict-side-0/PWGLF/Utils/svPoolCreator.h
@@ -12,15 +12,17 @@
 #ifndef PWGLF_UTILS_SVPOOLCREATOR_H_
 #define PWGLF_UTILS_SVPOOLCREATOR_H_
 
-#include <array>
-#include <unordered_map>
-#include <vector>
-#include <utility>
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
 #include "Common/Core/trackUtilities.h"
+
 #include "DCAFitter/DCAFitterN.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+
+#include <array>
+#include <unordered_map>
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::constants;
diff --git a/.conflict-side-0/PWGLF/Utils/v0SelectionGroup.h b/.conflict-side-0/PWGLF/Utils/v0SelectionGroup.h
index a353a86c742..298342d1076 100644
--- a/.conflict-side-0/PWGLF/Utils/v0SelectionGroup.h
+++ b/.conflict-side-0/PWGLF/Utils/v0SelectionGroup.h
@@ -12,12 +12,16 @@
 #ifndef PWGLF_UTILS_V0SELECTIONGROUP_H_
 #define PWGLF_UTILS_V0SELECTIONGROUP_H_
 
-#include <iosfwd>
-#include <Rtypes.h>
-#include <TMath.h>
 #include "v0SelectionBits.h"
-#include "Framework/Logger.h"
+
 #include "CommonConstants/PhysicsConstants.h"
+#include "Framework/Logger.h"
+
+#include <TMath.h>
+
+#include <Rtypes.h>
+
+#include <iosfwd>
 
 class v0SelectionGroup
 {
diff --git a/.conflict-side-0/PWGMM/Lumi/Tasks/LumiFDDFT0.cxx b/.conflict-side-0/PWGMM/Lumi/Tasks/LumiFDDFT0.cxx
index 878e0482f7c..c51de496afe 100644
--- a/.conflict-side-0/PWGMM/Lumi/Tasks/LumiFDDFT0.cxx
+++ b/.conflict-side-0/PWGMM/Lumi/Tasks/LumiFDDFT0.cxx
@@ -10,41 +10,38 @@
 // or submit itself to any jurisdiction.
 // author: akhuntia@cern.ch
 
-#include <array>
-#include <cmath>
-#include <iostream>
-#include <vector>
-
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "CommonUtils/NameConf.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
+#include "CommonConstants/GeomConstants.h"
+#include "CommonUtils/NameConf.h"
+#include "DataFormatsCalibration/MeanVertexObject.h"
+#include "DataFormatsFDD/Digit.h"
+#include "DataFormatsFIT/Triggers.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "DetectorsVertexing/PVertexer.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisDataModel.h"
-
-#include "DetectorsVertexing/PVertexer.h"
 #include "ReconstructionDataFormats/DCA.h"
 #include "ReconstructionDataFormats/PrimaryVertex.h"
 #include "ReconstructionDataFormats/Vertex.h"
 
-#include "DataFormatsFDD/Digit.h"
-#include "DataFormatsFIT/Triggers.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-
-#include "DetectorsBase/GeometryManager.h"
-#include "DetectorsBase/Propagator.h"
-#include "CommonConstants/GeomConstants.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "CCDB/CcdbApi.h"
-#include "DataFormatsCalibration/MeanVertexObject.h"
+#include <array>
+#include <cmath>
+#include <iostream>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGMM/Lumi/Tasks/fitLumi.cxx b/.conflict-side-0/PWGMM/Lumi/Tasks/fitLumi.cxx
index a62771cda66..54e6d0dfc74 100644
--- a/.conflict-side-0/PWGMM/Lumi/Tasks/fitLumi.cxx
+++ b/.conflict-side-0/PWGMM/Lumi/Tasks/fitLumi.cxx
@@ -11,19 +11,20 @@
 
 // author: arvind.khuntia@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Common/DataModel/EventSelection.h"
-#include "DataFormatsFDD/Digit.h"
-#include "DataFormatsFIT/Triggers.h"
 #include "Common/DataModel/FT0Corrected.h"
 
+#include "CCDB/BasicCCDBManager.h"
 #include "CCDB/CcdbApi.h"
 #include "CommonDataFormat/BunchFilling.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPObject.h"
+#include "DataFormatsFDD/Digit.h"
+#include "DataFormatsFIT/Triggers.h"
 #include "DataFormatsParameters/GRPLHCIFData.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TH1F.h"
 #include "TH2F.h"
 
@@ -111,7 +112,7 @@ struct VdMAO2D {
           registry.get<TH1>(HIST("FT0/bcVertexCollBC"))->Fill(localBC);
         }
       } // vertex
-    }   // ft0
+    } // ft0
     nTF++;
   } // process
 
@@ -174,7 +175,7 @@ struct VdMAO2D {
         }
 
       } // vertex
-    }   // fdd
+    } // fdd
   }
   PROCESS_SWITCH(VdMAO2D, processFDD, "Process FDD trigger rates for VdM", true);
 
diff --git a/.conflict-side-0/PWGMM/Lumi/Tasks/lumi.cxx b/.conflict-side-0/PWGMM/Lumi/Tasks/lumi.cxx
index cc0149dbde7..f7d873cbbff 100644
--- a/.conflict-side-0/PWGMM/Lumi/Tasks/lumi.cxx
+++ b/.conflict-side-0/PWGMM/Lumi/Tasks/lumi.cxx
@@ -15,43 +15,35 @@
 // o2-analysis-trackselection -b --isRun3 0 | o2-analysis-mm-lumi -b
 // --configuration json://./config.json
 
-#include <array>
-#include <cmath>
-#include <iostream>
-#include <vector>
-
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
+#include "CommonConstants/GeomConstants.h"
 #include "CommonUtils/NameConf.h"
-
+#include "DataFormatsCalibration/MeanVertexObject.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "DetectorsVertexing/PVertexer.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/runDataProcessing.h"
-
-#include "DetectorsVertexing/PVertexer.h"
-
 #include "ReconstructionDataFormats/DCA.h"
 #include "ReconstructionDataFormats/PrimaryVertex.h"
 #include "ReconstructionDataFormats/Vertex.h"
 
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-
-#include "DetectorsBase/GeometryManager.h"
-#include "DetectorsBase/Propagator.h"
-
-#include "CommonConstants/GeomConstants.h"
-
-#include "CCDB/BasicCCDBManager.h"
-#include "CCDB/CcdbApi.h"
-
-#include "DataFormatsCalibration/MeanVertexObject.h"
+#include <array>
+#include <cmath>
+#include <iostream>
+#include <vector>
 
 namespace o2::aod
 {
diff --git a/.conflict-side-0/PWGMM/Lumi/Tasks/lumiStability.cxx b/.conflict-side-0/PWGMM/Lumi/Tasks/lumiStability.cxx
index 5938ec42cdd..3d57896d080 100644
--- a/.conflict-side-0/PWGMM/Lumi/Tasks/lumiStability.cxx
+++ b/.conflict-side-0/PWGMM/Lumi/Tasks/lumiStability.cxx
@@ -14,26 +14,27 @@
 ///
 /// \author Josue Martinez Garcia, josuem@cern.ch
 
-#include <utility>
-#include <map>
-#include <string>
-#include <vector>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "Common/CCDB/EventSelectionParams.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Framework/ASoAHelpers.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonDataFormat/BunchFilling.h"
 #include "DataFormatsFDD/Digit.h"
 #include "DataFormatsFT0/Digit.h"
 #include "DataFormatsFV0/Digit.h"
-#include "Framework/ASoA.h"
-#include "Common/CCDB/EventSelectionParams.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "CommonDataFormat/BunchFilling.h"
-#include "DataFormatsParameters/GRPLHCIFData.h"
 #include "DataFormatsParameters/GRPECSObject.h"
+#include "DataFormatsParameters/GRPLHCIFData.h"
+#include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include <map>
+#include <string>
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGMM/Mult/Core/include/Axes.h b/.conflict-side-0/PWGMM/Mult/Core/include/Axes.h
index c215a8ba357..7cd9e1f8cc6 100644
--- a/.conflict-side-0/PWGMM/Mult/Core/include/Axes.h
+++ b/.conflict-side-0/PWGMM/Mult/Core/include/Axes.h
@@ -11,8 +11,8 @@
 
 #ifndef PWGMM_MULT_CORE_INCLUDE_AXES_H_
 #define PWGMM_MULT_CORE_INCLUDE_AXES_H_
-#include "Framework/HistogramSpec.h"
 #include "CommonConstants/MathConstants.h"
+#include "Framework/HistogramSpec.h"
 
 namespace pwgmm::mult
 {
diff --git a/.conflict-side-0/PWGMM/Mult/Core/include/Histograms.h b/.conflict-side-0/PWGMM/Mult/Core/include/Histograms.h
index 2b41c9ecefe..a173c0b9460 100644
--- a/.conflict-side-0/PWGMM/Mult/Core/include/Histograms.h
+++ b/.conflict-side-0/PWGMM/Mult/Core/include/Histograms.h
@@ -12,6 +12,7 @@
 #ifndef PWGMM_MULT_CORE_INCLUDE_HISTOGRAMS_H_
 #define PWGMM_MULT_CORE_INCLUDE_HISTOGRAMS_H_
 #include "TPDGCode.h"
+
 #include <array>
 #include <string_view>
 
diff --git a/.conflict-side-0/PWGMM/Mult/DataModel/ReducedTables.h b/.conflict-side-0/PWGMM/Mult/DataModel/ReducedTables.h
index fbdd68b89db..90ebdffbf1a 100644
--- a/.conflict-side-0/PWGMM/Mult/DataModel/ReducedTables.h
+++ b/.conflict-side-0/PWGMM/Mult/DataModel/ReducedTables.h
@@ -11,13 +11,14 @@
 
 #ifndef PWGMM_MULT_DATAMODEL_REDUCEDTABLES_H_
 #define PWGMM_MULT_DATAMODEL_REDUCEDTABLES_H_
-#include <vector>
-
-#include "Framework/AnalysisDataModel.h"
-#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+
+#include <vector>
+
 namespace o2::aod
 {
 
diff --git a/.conflict-side-0/PWGMM/Mult/TableProducer/particles2tracks.cxx b/.conflict-side-0/PWGMM/Mult/TableProducer/particles2tracks.cxx
index 6b7e7db6a17..70db2e8349b 100644
--- a/.conflict-side-0/PWGMM/Mult/TableProducer/particles2tracks.cxx
+++ b/.conflict-side-0/PWGMM/Mult/TableProducer/particles2tracks.cxx
@@ -16,11 +16,11 @@
 /// \brief  A task to create a reverse index from McParticles to Tracks
 ///
 
-#include "Framework/runDataProcessing.h"
+#include "Index.h"
+
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-
-#include "Index.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGMM/Mult/TableProducer/percentiles.cxx b/.conflict-side-0/PWGMM/Mult/TableProducer/percentiles.cxx
index c11fca858f8..1df708f4298 100644
--- a/.conflict-side-0/PWGMM/Mult/TableProducer/percentiles.cxx
+++ b/.conflict-side-0/PWGMM/Mult/TableProducer/percentiles.cxx
@@ -8,20 +8,20 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
+#include "Gencentralities.h"
 #include "Selections.h"
 
+#include "Common/DataModel/Centrality.h"
+#include <Common/DataModel/EventSelection.h>
+#include <Common/DataModel/TrackSelectionTables.h>
+
+#include <CCDB/BasicCCDBManager.h>
 #include <Framework/AnalysisDataModel.h>
 #include <Framework/AnalysisTask.h>
 #include <Framework/Configurable.h>
-#include <Common/DataModel/EventSelection.h>
-#include "Common/DataModel/Centrality.h"
-#include <Common/DataModel/TrackSelectionTables.h>
 #include <Framework/O2DatabasePDGPlugin.h>
-#include <CCDB/BasicCCDBManager.h>
 #include <Framework/runDataProcessing.h>
 
-#include "Gencentralities.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-0/PWGMM/Mult/TableProducer/reducer.cxx b/.conflict-side-0/PWGMM/Mult/TableProducer/reducer.cxx
index de9d516703b..e507ca0d2c4 100644
--- a/.conflict-side-0/PWGMM/Mult/TableProducer/reducer.cxx
+++ b/.conflict-side-0/PWGMM/Mult/TableProducer/reducer.cxx
@@ -9,15 +9,15 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <random>
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-
-#include "Selections.h"
 #include "ReducedTables.h"
+#include "Selections.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
 
+#include <random>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-0/PWGMM/Mult/TableProducer/reducerPostprocess.cxx b/.conflict-side-0/PWGMM/Mult/TableProducer/reducerPostprocess.cxx
index d05f5534eb0..9d4b33a87da 100644
--- a/.conflict-side-0/PWGMM/Mult/TableProducer/reducerPostprocess.cxx
+++ b/.conflict-side-0/PWGMM/Mult/TableProducer/reducerPostprocess.cxx
@@ -9,10 +9,9 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/AnalysisTask.h"
-
 #include "ReducedTables.h"
 
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
 
 using namespace o2;
diff --git a/.conflict-side-0/PWGMM/Mult/TableProducer/trackPropagation.cxx b/.conflict-side-0/PWGMM/Mult/TableProducer/trackPropagation.cxx
index 8eaa59e850b..707c92b324a 100644
--- a/.conflict-side-0/PWGMM/Mult/TableProducer/trackPropagation.cxx
+++ b/.conflict-side-0/PWGMM/Mult/TableProducer/trackPropagation.cxx
@@ -17,25 +17,26 @@
 // collisions to this track, picks the one with the smallest DCAxy and puts it
 // in a table
 
-#include "CCDB/BasicCCDBManager.h"
+#include "bestCollisionTable.h"
+
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/CollisionAssociationTables.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/GeomConstants.h"
 #include "DataFormatsParameters/GRPMagField.h"
 #include "DetectorsBase/Propagator.h"
+#include "Field/MagneticField.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/TrackFwd.h"
+
 #include "Math/MatrixFunctions.h"
 #include "Math/SMatrix.h"
-
-#include "Field/MagneticField.h"
 #include "TGeoGlobalMagField.h"
 
-#include "Common/DataModel/CollisionAssociationTables.h"
-#include "bestCollisionTable.h"
-
 using SMatrix55 = ROOT::Math::SMatrix<double, 5, 5, ROOT::Math::MatRepSym<double, 5>>;
 using SMatrix5 = ROOT::Math::SVector<Double_t, 5>;
 
diff --git a/.conflict-side-0/PWGMM/Mult/Tasks/assessment-mft.cxx b/.conflict-side-0/PWGMM/Mult/Tasks/assessment-mft.cxx
index 70304229e1e..eb2cbba5a22 100644
--- a/.conflict-side-0/PWGMM/Mult/Tasks/assessment-mft.cxx
+++ b/.conflict-side-0/PWGMM/Mult/Tasks/assessment-mft.cxx
@@ -15,11 +15,10 @@
 // \brief This code loops over MFT tracks and fills basic histograms
 //        close to the QC ones
 
-#include "Framework/runDataProcessing.h"
+#include "CommonConstants/LHCConstants.h"
 #include "Framework/AnalysisTask.h"
-
+#include "Framework/runDataProcessing.h"
 #include "MathUtils/Utils.h"
-#include "CommonConstants/LHCConstants.h"
 
 using namespace o2;
 using namespace o2::framework;
@@ -35,7 +34,7 @@ struct AssessmentMFT {
       {"TracksChi2", "; #chi^{2}; tracks", {HistType::kTH1F, {{600, 0, 20}}}},                             //
       {"TracksNclustersEta", "; nClusters; #eta; tracks", {HistType::kTH2F, {{7, 4, 10}, {100, -8, 8}}}},  //
       {"TracksTime", "; time; #count", {HistType::kTH1D, {{6000000, 0, 60000}}}},                          //
-    }                                                                                                      //
+    } //
   };
 
   void process(aod::Collisions::iterator const& collision, aod::MFTTracks const& tracks, aod::BCs const& bcs)
diff --git a/.conflict-side-0/PWGMM/Mult/Tasks/dndeta-hi.cxx b/.conflict-side-0/PWGMM/Mult/Tasks/dndeta-hi.cxx
index 7ac1bc49bb5..f26376eff27 100644
--- a/.conflict-side-0/PWGMM/Mult/Tasks/dndeta-hi.cxx
+++ b/.conflict-side-0/PWGMM/Mult/Tasks/dndeta-hi.cxx
@@ -9,29 +9,25 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <Math/Vector4D.h>
-#include <array>
-#include <cmath>
-#include <chrono>
-#include <cstdlib>
-#include <iostream>
-#include <TFile.h>
-#include <TH2F.h>
-#include <TProfile.h>
-#include <TPDGCode.h>
-#include <TDatabasePDG.h>
-
+#include "Index.h"
 #include "bestCollisionTable.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
+
+#include "PWGHF/Core/SelectorCuts.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "Common/CCDB/EventSelectionParams.h"
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/PIDResponse.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/MathConstants.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
@@ -41,14 +37,21 @@
 #include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/RuntimeError.h"
 #include "Framework/runDataProcessing.h"
-#include "Index.h"
 #include "ReconstructionDataFormats/GlobalTrackID.h"
 #include "ReconstructionDataFormats/Track.h"
 
-#include "PWGHF/Core/SelectorCuts.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include <Math/Vector4D.h>
+#include <TDatabasePDG.h>
+#include <TFile.h>
+#include <TH2F.h>
+#include <TPDGCode.h>
+#include <TProfile.h>
+
+#include <array>
+#include <chrono>
+#include <cmath>
+#include <cstdlib>
+#include <iostream>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGMM/Mult/Tasks/dndeta-mft.cxx b/.conflict-side-0/PWGMM/Mult/Tasks/dndeta-mft.cxx
index f70cc1d638a..e7c925f4a16 100644
--- a/.conflict-side-0/PWGMM/Mult/Tasks/dndeta-mft.cxx
+++ b/.conflict-side-0/PWGMM/Mult/Tasks/dndeta-mft.cxx
@@ -15,9 +15,14 @@
 // \brief This code loops over MFT tracks and collisions and fills histograms
 //        useful to compute dNdeta
 
-#include <chrono>
-#include <cmath>
+#include "bestCollisionTable.h"
+
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
+#include "CommonConstants/MathConstants.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
@@ -25,17 +30,13 @@
 #include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/RuntimeError.h"
 #include "Framework/runDataProcessing.h"
-
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "CommonConstants/MathConstants.h"
 #include "MathUtils/Utils.h"
 #include "ReconstructionDataFormats/GlobalTrackID.h"
+
 #include "TDatabasePDG.h"
 
-#include "bestCollisionTable.h"
+#include <chrono>
+#include <cmath>
 
 using namespace o2;
 using namespace o2::framework;
@@ -108,7 +109,7 @@ struct PseudorapidityDensityMFT {
       {"EventSelection",
        ";status;events",
        {HistType::kTH1F, {{7, 0.5, 7.5}}}}, //
-    }                                       //
+    } //
   };
 
   void init(InitContext&)
diff --git a/.conflict-side-0/PWGMM/Mult/Tasks/dndeta.cxx b/.conflict-side-0/PWGMM/Mult/Tasks/dndeta.cxx
index 220bdbdebb8..97ed3227b9b 100644
--- a/.conflict-side-0/PWGMM/Mult/Tasks/dndeta.cxx
+++ b/.conflict-side-0/PWGMM/Mult/Tasks/dndeta.cxx
@@ -9,27 +9,28 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
+#include "Axes.h"
+#include "Functions.h"
+#include "Gencentralities.h"
+#include "Histograms.h"
+#include "Index.h"
+#include "Selections.h"
+#include "bestCollisionTable.h"
+
 #include "Common/CCDB/EventSelectionParams.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Centrality.h"
+
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/Configurable.h"
 #include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/runDataProcessing.h"
+
 #include <TDatabasePDG.h>
 #include <TPDGCode.h>
 
-#include "Gencentralities.h"
-#include "Index.h"
-#include "bestCollisionTable.h"
-
-#include "Axes.h"
-#include "Functions.h"
-#include "Selections.h"
-#include "Histograms.h"
-
 using namespace o2;
 using namespace o2::aod::track;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGMM/Mult/Tasks/dndetaMFTPbPb.cxx b/.conflict-side-0/PWGMM/Mult/Tasks/dndetaMFTPbPb.cxx
index 4cc9a98d524..35da69384d7 100644
--- a/.conflict-side-0/PWGMM/Mult/Tasks/dndetaMFTPbPb.cxx
+++ b/.conflict-side-0/PWGMM/Mult/Tasks/dndetaMFTPbPb.cxx
@@ -15,15 +15,19 @@
 /// \author Gyula Bencedi, gyula.bencedi@cern.ch
 /// \since  Nov 2024
 
-#include <algorithm>
-#include <chrono>
-#include <cmath>
-#include <numeric>
-#include <vector>
-#include <string>
+#include "Functions.h"
+#include "Index.h"
+#include "bestCollisionTable.h"
 
-#include "CCDB/BasicCCDBManager.h"
+#include "Common/CCDB/ctpRateFetcher.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/CollisionAssociationTables.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonConstants/MathConstants.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
@@ -31,22 +35,17 @@
 #include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/RuntimeError.h"
 #include "Framework/runDataProcessing.h"
-
-#include "Common/CCDB/ctpRateFetcher.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/CollisionAssociationTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "CommonConstants/MathConstants.h"
-
 #include "MathUtils/Utils.h"
 #include "ReconstructionDataFormats/GlobalTrackID.h"
+
 #include "TPDGCode.h"
 
-#include "Functions.h"
-#include "Index.h"
-#include "bestCollisionTable.h"
+#include <algorithm>
+#include <chrono>
+#include <cmath>
+#include <numeric>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGMM/Mult/Tasks/effpt-mft.cxx b/.conflict-side-0/PWGMM/Mult/Tasks/effpt-mft.cxx
index 2d3a9919922..3b343e605a2 100644
--- a/.conflict-side-0/PWGMM/Mult/Tasks/effpt-mft.cxx
+++ b/.conflict-side-0/PWGMM/Mult/Tasks/effpt-mft.cxx
@@ -9,24 +9,27 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <cmath>
-#include "Framework/Configurable.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RuntimeError.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "Framework/runDataProcessing.h"
+#include "Index.h"
 
-#include "ReconstructionDataFormats/GlobalTrackID.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CommonConstants/MathConstants.h"
-#include "TDatabasePDG.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/Configurable.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/RuntimeError.h"
+#include "Framework/runDataProcessing.h"
 #include "MathUtils/Utils.h"
-#include "Index.h"
+#include "ReconstructionDataFormats/GlobalTrackID.h"
+
+#include "TDatabasePDG.h"
+
+#include <cmath>
 
 using namespace o2;
 using namespace o2::framework;
@@ -219,9 +222,9 @@ struct EffPtMFT {
             registry.fill(HIST("TracksPhiEtaGenDuplicates"), particle.phi(), particle.eta());
           }
         } // the particle has a track
-      }   // loop on particlesI
-    }     // loop on collisions
-  }       // end of processTrackEfficiencyIndexed
+      } // loop on particlesI
+    } // loop on collisions
+  } // end of processTrackEfficiencyIndexed
 
   PROCESS_SWITCH(EffPtMFT, processTrackEfficiencyIndexed, "Calculate tracking efficiency vs pt (indexed)", false);
 };
diff --git a/.conflict-side-0/PWGMM/Mult/Tasks/flatenicityFV0.cxx b/.conflict-side-0/PWGMM/Mult/Tasks/flatenicityFV0.cxx
index 3a403d9ea1b..61128107a83 100644
--- a/.conflict-side-0/PWGMM/Mult/Tasks/flatenicityFV0.cxx
+++ b/.conflict-side-0/PWGMM/Mult/Tasks/flatenicityFV0.cxx
@@ -8,8 +8,11 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include <cmath>
-#include <vector>
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
@@ -17,16 +20,13 @@
 #include "Framework/HistogramRegistry.h"
 #include "Framework/StaticFor.h"
 #include "Framework/runDataProcessing.h"
-
 #include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 
 #include <TGraph.h>
 
+#include <cmath>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-0/PWGMM/Mult/Tasks/flattenicty-chrg.cxx b/.conflict-side-0/PWGMM/Mult/Tasks/flattenicty-chrg.cxx
index fbfa4ab578d..9e49ff8918b 100644
--- a/.conflict-side-0/PWGMM/Mult/Tasks/flattenicty-chrg.cxx
+++ b/.conflict-side-0/PWGMM/Mult/Tasks/flattenicty-chrg.cxx
@@ -17,29 +17,29 @@
 //
 // \since 2024
 
-#include <cmath>
-#include <string>
-#include <string_view>
-#include <vector>
-
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 #include "EventFiltering/filterTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
+#include "DataFormatsFT0/Digit.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/StaticFor.h"
 #include "Framework/runDataProcessing.h"
-
-#include "CCDB/BasicCCDBManager.h"
-#include "CCDB/CcdbApi.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "DataFormatsFT0/Digit.h"
 #include "ReconstructionDataFormats/Track.h"
 
+#include <cmath>
+#include <string>
+#include <string_view>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-0/PWGMM/Mult/Tasks/heavy-ion-mult.cxx b/.conflict-side-0/PWGMM/Mult/Tasks/heavy-ion-mult.cxx
index bb12521502d..b6de125b7f0 100644
--- a/.conflict-side-0/PWGMM/Mult/Tasks/heavy-ion-mult.cxx
+++ b/.conflict-side-0/PWGMM/Mult/Tasks/heavy-ion-mult.cxx
@@ -18,22 +18,21 @@
 // 3. https://github.com/AliceO2Group/O2Physics/blob/master/PWGMM/Mult/Tasks/puremc-dndeta.cxx
 // 4. O2 analysis tutorial: https://indico.cern.ch/event/1267433/
 
-#include <cmath>
-#include <cstdlib>
-#include <iostream>
-#include <TPDGCode.h>
-#include <TDatabasePDG.h>
-#include <vector>
-
+#include "Index.h"
 #include "bestCollisionTable.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "Common/Core/trackUtilities.h"
+
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "Common/CCDB/EventSelectionParams.h"
 #include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/MathConstants.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
@@ -43,9 +42,14 @@
 #include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/GlobalTrackID.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "Index.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include <TDatabasePDG.h>
+#include <TPDGCode.h>
+
+#include <cmath>
+#include <cstdlib>
+#include <iostream>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGMM/Mult/Tasks/mcdata_split_test.cxx b/.conflict-side-0/PWGMM/Mult/Tasks/mcdata_split_test.cxx
index 5d5194be4be..731e8877b8a 100644
--- a/.conflict-side-0/PWGMM/Mult/Tasks/mcdata_split_test.cxx
+++ b/.conflict-side-0/PWGMM/Mult/Tasks/mcdata_split_test.cxx
@@ -13,17 +13,15 @@
 ///
 /// \author hhesouno
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
-
-#include "ReconstructionDataFormats/GlobalTrackID.h"
-
-#include "Common/DataModel/EventSelection.h"
-
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/GlobalTrackID.h"
 
 #include <TRandom.h>
 
diff --git a/.conflict-side-0/PWGMM/Mult/Tasks/multiplicityPbPb.cxx b/.conflict-side-0/PWGMM/Mult/Tasks/multiplicityPbPb.cxx
index 367b7e991a6..c3a4d1baeab 100644
--- a/.conflict-side-0/PWGMM/Mult/Tasks/multiplicityPbPb.cxx
+++ b/.conflict-side-0/PWGMM/Mult/Tasks/multiplicityPbPb.cxx
@@ -13,17 +13,15 @@
 ///
 /// \author hhesouno
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
-
-#include "ReconstructionDataFormats/GlobalTrackID.h"
-
-#include "Common/DataModel/EventSelection.h"
-
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/GlobalTrackID.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGMM/Mult/Tasks/puremc-dndeta.cxx b/.conflict-side-0/PWGMM/Mult/Tasks/puremc-dndeta.cxx
index 86e52b38850..bc033151387 100644
--- a/.conflict-side-0/PWGMM/Mult/Tasks/puremc-dndeta.cxx
+++ b/.conflict-side-0/PWGMM/Mult/Tasks/puremc-dndeta.cxx
@@ -9,17 +9,19 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
+#include "Axes.h"
+#include "Histograms.h"
+
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/runDataProcessing.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+
 #include <TDatabasePDG.h>
 #include <TPDGCode.h>
 
-#include "Axes.h"
-#include "Histograms.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-0/PWGMM/Mult/Tasks/run2dndeta.cxx b/.conflict-side-0/PWGMM/Mult/Tasks/run2dndeta.cxx
index 9db9fd291d9..f3b5012010b 100644
--- a/.conflict-side-0/PWGMM/Mult/Tasks/run2dndeta.cxx
+++ b/.conflict-side-0/PWGMM/Mult/Tasks/run2dndeta.cxx
@@ -8,25 +8,26 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include <cmath>
-#include "Framework/Configurable.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonConstants/MathConstants.h"
 #include "Framework/ASoAHelpers.h"
-#include "Framework/RuntimeError.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/Configurable.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/RuntimeError.h"
 #include "Framework/runDataProcessing.h"
-
 #include "ReconstructionDataFormats/GlobalTrackID.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "CommonConstants/MathConstants.h"
-#include "TDatabasePDG.h"
 
+#include "TDatabasePDG.h"
 #include <TF1.h>
 
+#include <cmath>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
@@ -56,7 +57,7 @@ struct PseudorapidityDensity {
       {"TracksEtaZvtx_gt0", "; #eta; Z_{vtx}; tracks", {HistType::kTH2F, {{21, -2.1, 2.1}, {201, -20.1, 20.1}}}},    //
       {"TracksPhiEta", "; #varphi; #eta; tracks", {HistType::kTH2F, {{600, 0, 2 * M_PI}, {21, -2.1, 2.1}}}},         //
       {"EventSelection", ";status;events", {HistType::kTH1F, {{4, 0.5, 4.5}}}}                                       //
-    }                                                                                                                //
+    } //
   };
 
   void init(InitContext&)
diff --git a/.conflict-side-0/PWGMM/Mult/Tasks/vertexing-fwd.cxx b/.conflict-side-0/PWGMM/Mult/Tasks/vertexing-fwd.cxx
index aecb9e7cd9c..cce0162eb7e 100644
--- a/.conflict-side-0/PWGMM/Mult/Tasks/vertexing-fwd.cxx
+++ b/.conflict-side-0/PWGMM/Mult/Tasks/vertexing-fwd.cxx
@@ -16,18 +16,19 @@
 // \brief This code loops over every ambiguous MFT tracks and associates
 // them to a collision that has the smallest DCAxy
 
-#include <cmath>
+#include "CommonConstants/LHCConstants.h"
+#include "CommonConstants/MathConstants.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/Configurable.h"
+#include "Framework/runDataProcessing.h"
+#include "MathUtils/Utils.h"
 #include "ReconstructionDataFormats/TrackFwd.h"
+
 #include "Math/MatrixFunctions.h"
 #include "Math/SMatrix.h"
-#include "MathUtils/Utils.h"
-#include "Framework/Configurable.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/runDataProcessing.h"
 
-#include "CommonConstants/MathConstants.h"
-#include "CommonConstants/LHCConstants.h"
+#include <cmath>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGMM/UE/Tasks/dedx_analysys.cxx b/.conflict-side-0/PWGMM/UE/Tasks/dedx_analysys.cxx
index 13c8b32b20e..37b67cb01b6 100644
--- a/.conflict-side-0/PWGMM/UE/Tasks/dedx_analysys.cxx
+++ b/.conflict-side-0/PWGMM/UE/Tasks/dedx_analysys.cxx
@@ -12,19 +12,21 @@
 /// \author Paola Vargas
 /// \since January 8, 2025
 
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Multiplicity.h"
+
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "ReconstructionDataFormats/Track.h"
 
 using namespace o2;
diff --git a/.conflict-side-0/PWGMM/UE/Tasks/ue-zdc-analysys.cxx b/.conflict-side-0/PWGMM/UE/Tasks/ue-zdc-analysys.cxx
index ec5294f7248..9f7c48a0aaf 100644
--- a/.conflict-side-0/PWGMM/UE/Tasks/ue-zdc-analysys.cxx
+++ b/.conflict-side-0/PWGMM/UE/Tasks/ue-zdc-analysys.cxx
@@ -12,16 +12,17 @@
 /// \brief Task for ZDC
 /// \author
 /// \since
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/CCDB/EventSelectionParams.h"
 #include "Common/CCDB/TriggerAliases.h"
+#include "Common/Core/TrackSelection.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/Core/TrackSelection.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/GlobalTrackID.h"
 #include "ReconstructionDataFormats/Track.h"
 
diff --git a/.conflict-side-0/PWGMM/UE/Tasks/uecharged.cxx b/.conflict-side-0/PWGMM/UE/Tasks/uecharged.cxx
index 9cfaeb96022..8e2d6a01bc0 100644
--- a/.conflict-side-0/PWGMM/UE/Tasks/uecharged.cxx
+++ b/.conflict-side-0/PWGMM/UE/Tasks/uecharged.cxx
@@ -12,30 +12,30 @@
 /// \since November 2021
 /// \last update: July 2024
 
-#include <cmath>
-#include <vector>
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/StaticFor.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-
+#include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/Core/TrackSelectionDefaults.h"
 
 #include "TDatabasePDG.h"
+#include <TF1.h>
 #include <TH1F.h>
 #include <TH2F.h>
-#include <TF1.h>
 #include <TRandom.h>
 
+#include <cmath>
+#include <vector>
+
 // TODO: implement 50% stat for MC closure vs 50% for testing, add flag for weak decays
 
 using namespace o2;
diff --git a/.conflict-side-0/PWGUD/AQC/FITtest.cxx b/.conflict-side-0/PWGUD/AQC/FITtest.cxx
index bdeaaa34426..a522d758d4a 100644
--- a/.conflict-side-0/PWGUD/AQC/FITtest.cxx
+++ b/.conflict-side-0/PWGUD/AQC/FITtest.cxx
@@ -13,18 +13,19 @@
 /// \author Anisa Khatun, anisa.khatun@cern.ch
 /// \since  04.08.2023
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "ReconstructionDataFormats/BCRange.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/DataModel/FT0Corrected.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/DataModel/FT0Corrected.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "CommonConstants/LHCConstants.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
+#include "CommonConstants/LHCConstants.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/BCRange.h"
+
 #include "TLorentzVector.h"
 
 using namespace o2;
diff --git a/.conflict-side-0/PWGUD/AQC/udQC.cxx b/.conflict-side-0/PWGUD/AQC/udQC.cxx
index 3da67d1f683..0c1ad7dba40 100644
--- a/.conflict-side-0/PWGUD/AQC/udQC.cxx
+++ b/.conflict-side-0/PWGUD/AQC/udQC.cxx
@@ -14,18 +14,22 @@
 /// \author Paul Buehler, paul.buehler@oeaw.ac.at
 /// \since  04.05.2023
 
-#include <vector>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "ReconstructionDataFormats/BCRange.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/DataModel/FT0Corrected.h"
 #include "PWGUD/Core/UDHelpers.h"
+
+#include "Common/DataModel/FT0Corrected.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/BCRange.h"
+
 #include "TLorentzVector.h"
 #include "TMath.h"
 
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-0/PWGUD/AQC/udQCmidRap.cxx b/.conflict-side-0/PWGUD/AQC/udQCmidRap.cxx
index acb35f21f57..43643d33707 100644
--- a/.conflict-side-0/PWGUD/AQC/udQCmidRap.cxx
+++ b/.conflict-side-0/PWGUD/AQC/udQCmidRap.cxx
@@ -14,14 +14,17 @@
 /// \author Paul Buehler
 /// \since 17.01.2023
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "ReconstructionDataFormats/BCRange.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/DataModel/FT0Corrected.h"
 #include "PWGUD/Core/UDHelpers.h"
+
+#include "Common/DataModel/FT0Corrected.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/BCRange.h"
+
 #include "TLorentzVector.h"
 #include "TMath.h"
 
diff --git a/.conflict-side-0/PWGUD/Core/DGCutparHolder.h b/.conflict-side-0/PWGUD/Core/DGCutparHolder.h
index 8312d72ac32..a67aefc4080 100644
--- a/.conflict-side-0/PWGUD/Core/DGCutparHolder.h
+++ b/.conflict-side-0/PWGUD/Core/DGCutparHolder.h
@@ -13,6 +13,7 @@
 #define PWGUD_CORE_DGCUTPARHOLDER_H_
 
 #include <Rtypes.h>
+
 #include <vector>
 
 // object to hold customizable cut values
diff --git a/.conflict-side-0/PWGUD/Core/DGPIDSelector.cxx b/.conflict-side-0/PWGUD/Core/DGPIDSelector.cxx
index 04dab87ef7a..2efc0372916 100644
--- a/.conflict-side-0/PWGUD/Core/DGPIDSelector.cxx
+++ b/.conflict-side-0/PWGUD/Core/DGPIDSelector.cxx
@@ -8,11 +8,13 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include <vector>
-#include <string>
-#include "CommonConstants/PhysicsConstants.h"
 #include "DGPIDSelector.h"
 
+#include "CommonConstants/PhysicsConstants.h"
+
+#include <string>
+#include <vector>
+
 // -----------------------------------------------------------------------------
 float particleMass(TDatabasePDG* pdg, int pid)
 {
diff --git a/.conflict-side-0/PWGUD/Core/DGPIDSelector.h b/.conflict-side-0/PWGUD/Core/DGPIDSelector.h
index c130c2094ce..191396b1074 100644
--- a/.conflict-side-0/PWGUD/Core/DGPIDSelector.h
+++ b/.conflict-side-0/PWGUD/Core/DGPIDSelector.h
@@ -12,12 +12,15 @@
 #ifndef PWGUD_CORE_DGPIDSELECTOR_H_
 #define PWGUD_CORE_DGPIDSELECTOR_H_
 
-#include <gandiva/projector.h>
-#include <vector>
-#include <TVector3.h>
+#include "Framework/Logger.h"
+
 #include "TDatabasePDG.h"
 #include "TLorentzVector.h"
-#include "Framework/Logger.h"
+#include <TVector3.h>
+
+#include <gandiva/projector.h>
+
+#include <vector>
 
 const int numDGPIDCutParameters = 9;
 float particleMass(TDatabasePDG* pdg, int pid);
diff --git a/.conflict-side-0/PWGUD/Core/DGSelector.h b/.conflict-side-0/PWGUD/Core/DGSelector.h
index c9349da9247..bcf29920c5a 100644
--- a/.conflict-side-0/PWGUD/Core/DGSelector.h
+++ b/.conflict-side-0/PWGUD/Core/DGSelector.h
@@ -12,14 +12,16 @@
 #ifndef PWGUD_CORE_DGSELECTOR_H_
 #define PWGUD_CORE_DGSELECTOR_H_
 
-#include <vector>
+#include "PWGUD/Core/DGCutparHolder.h"
+#include "PWGUD/Core/UDHelpers.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/Logger.h"
 
 #include "TDatabasePDG.h"
 #include "TLorentzVector.h"
-#include "Framework/Logger.h"
-#include "Framework/AnalysisTask.h"
-#include "PWGUD/Core/UDHelpers.h"
-#include "PWGUD/Core/DGCutparHolder.h"
+
+#include <vector>
 
 // -----------------------------------------------------------------------------
 // add here Selectors for different types of diffractive events
diff --git a/.conflict-side-0/PWGUD/Core/SGCutParHolder.h b/.conflict-side-0/PWGUD/Core/SGCutParHolder.h
index 753e9f0c96f..fcee2d79703 100644
--- a/.conflict-side-0/PWGUD/Core/SGCutParHolder.h
+++ b/.conflict-side-0/PWGUD/Core/SGCutParHolder.h
@@ -13,6 +13,7 @@
 #define PWGUD_CORE_SGCUTPARHOLDER_H_
 
 #include <Rtypes.h>
+
 #include <vector>
 
 // object to hold customizable cut values
diff --git a/.conflict-side-0/PWGUD/Core/SGTrackSelector.h b/.conflict-side-0/PWGUD/Core/SGTrackSelector.h
index 4288ef89e80..11517771eac 100644
--- a/.conflict-side-0/PWGUD/Core/SGTrackSelector.h
+++ b/.conflict-side-0/PWGUD/Core/SGTrackSelector.h
@@ -16,16 +16,19 @@
 #ifndef PWGUD_CORE_SGTRACKSELECTOR_H_
 #define PWGUD_CORE_SGTRACKSELECTOR_H_
 
-#include <vector>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
+#include "PWGUD/Core/SGSelector.h"
+#include "PWGUD/DataModel/UDTables.h"
+
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include <iostream>
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/SGSelector.h"
-#include <TString.h>
+#include "Framework/runDataProcessing.h"
+
 #include "TVector3.h"
+#include <TString.h>
+
+#include <iostream>
+#include <vector>
 using namespace std;
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-side-0/PWGUD/Core/UDFSParser.cxx b/.conflict-side-0/PWGUD/Core/UDFSParser.cxx
index 8759e404f69..c7206806307 100644
--- a/.conflict-side-0/PWGUD/Core/UDFSParser.cxx
+++ b/.conflict-side-0/PWGUD/Core/UDFSParser.cxx
@@ -9,10 +9,11 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/Logger.h"
+#include "UDFSParser.h"
+
 #include "CommonConstants/LHCConstants.h"
 #include "CommonDataFormat/BunchFilling.h"
-#include "UDFSParser.h"
+#include "Framework/Logger.h"
 
 // -----------------------------------------------------------------------------
 UDFSParser::UDFSParser(const char* filename)
diff --git a/.conflict-side-0/PWGUD/Core/UDGoodRunSelector.cxx b/.conflict-side-0/PWGUD/Core/UDGoodRunSelector.cxx
index ec51580cccf..06940cd3728 100644
--- a/.conflict-side-0/PWGUD/Core/UDGoodRunSelector.cxx
+++ b/.conflict-side-0/PWGUD/Core/UDGoodRunSelector.cxx
@@ -9,11 +9,14 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <algorithm>
+#include "PWGUD/Core/UDGoodRunSelector.h"
+
 #include "Framework/Logger.h"
+
 #include "rapidjson/document.h"
 #include "rapidjson/filereadstream.h"
-#include "PWGUD/Core/UDGoodRunSelector.h"
+
+#include <algorithm>
 
 class TFile;
 
diff --git a/.conflict-side-0/PWGUD/Core/UDGoodRunSelector.h b/.conflict-side-0/PWGUD/Core/UDGoodRunSelector.h
index 4cf49330698..1b73f2c3ac4 100644
--- a/.conflict-side-0/PWGUD/Core/UDGoodRunSelector.h
+++ b/.conflict-side-0/PWGUD/Core/UDGoodRunSelector.h
@@ -12,8 +12,8 @@
 #ifndef PWGUD_CORE_UDGOODRUNSELECTOR_H_
 #define PWGUD_CORE_UDGOODRUNSELECTOR_H_
 
-#include <string>
 #include <map>
+#include <string>
 #include <vector>
 
 // A class to select good runs
diff --git a/.conflict-side-0/PWGUD/Core/UDHelpers.h b/.conflict-side-0/PWGUD/Core/UDHelpers.h
index 4b692f7c5c1..ba7dc979a18 100644
--- a/.conflict-side-0/PWGUD/Core/UDHelpers.h
+++ b/.conflict-side-0/PWGUD/Core/UDHelpers.h
@@ -16,19 +16,22 @@
 #ifndef PWGUD_CORE_UDHELPERS_H_
 #define PWGUD_CORE_UDHELPERS_H_
 
-#include <vector>
-#include <bitset>
+#include "PWGUD/Core/DGCutparHolder.h"
+#include "PWGUD/Core/UPCHelpers.h"
 
-#include "TLorentzVector.h"
-#include "Framework/Logger.h"
-#include "DataFormatsFT0/Digit.h"
-#include "DataFormatsFIT/Triggers.h"
-#include "CommonConstants/LHCConstants.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/Core/UPCHelpers.h"
-#include "PWGUD/Core/DGCutparHolder.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonConstants/LHCConstants.h"
+#include "DataFormatsFIT/Triggers.h"
+#include "DataFormatsFT0/Digit.h"
+#include "Framework/Logger.h"
+
+#include "TLorentzVector.h"
+
+#include <bitset>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGUD/Core/UPCHelpers.h b/.conflict-side-0/PWGUD/Core/UPCHelpers.h
index 03ff2475c8c..b4d0dfa8899 100644
--- a/.conflict-side-0/PWGUD/Core/UPCHelpers.h
+++ b/.conflict-side-0/PWGUD/Core/UPCHelpers.h
@@ -12,13 +12,17 @@
 #ifndef PWGUD_CORE_UPCHELPERS_H_
 #define PWGUD_CORE_UPCHELPERS_H_
 
-#include "Framework/AnalysisDataModel.h"
-#include "Common/DataModel/EventSelection.h"
+#include "UPCCutparHolder.h"
+
+#include "PWGUD/DataModel/UDTables.h"
+
 #include "Common/CCDB/EventSelectionParams.h"
+#include "Common/DataModel/EventSelection.h"
+
 #include "CommonConstants/LHCConstants.h"
+#include "Framework/AnalysisDataModel.h"
+
 #include "TLorentzVector.h"
-#include "UPCCutparHolder.h"
-#include "PWGUD/DataModel/UDTables.h"
 
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-0/PWGUD/Core/UPCJpsiCentralBarrelCorrHelper.h b/.conflict-side-0/PWGUD/Core/UPCJpsiCentralBarrelCorrHelper.h
index 955601495e6..77d3781cbc0 100644
--- a/.conflict-side-0/PWGUD/Core/UPCJpsiCentralBarrelCorrHelper.h
+++ b/.conflict-side-0/PWGUD/Core/UPCJpsiCentralBarrelCorrHelper.h
@@ -16,10 +16,11 @@
 #ifndef PWGUD_CORE_UPCJPSICENTRALBARRELCORRHELPER_H_
 #define PWGUD_CORE_UPCJPSICENTRALBARRELCORRHELPER_H_
 
-#include <vector>
-#include <algorithm>
 #include "CommonConstants/MathConstants.h"
+
+#include <algorithm>
 #include <random>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGUD/Core/UPCPairCuts.h b/.conflict-side-0/PWGUD/Core/UPCPairCuts.h
index 6b0e37adca0..f0cdf532561 100644
--- a/.conflict-side-0/PWGUD/Core/UPCPairCuts.h
+++ b/.conflict-side-0/PWGUD/Core/UPCPairCuts.h
@@ -16,14 +16,14 @@
 #ifndef PWGUD_CORE_UPCPAIRCUTS_H_
 #define PWGUD_CORE_UPCPAIRCUTS_H_
 
-#include <cmath>
+#include "PWGUD/Core/UPCTauCentralBarrelHelperRL.h"
 
-#include "Framework/Logger.h"
-#include "Framework/HistogramRegistry.h"
 #include "CommonConstants/MathConstants.h"
 #include "CommonConstants/PhysicsConstants.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/Logger.h"
 
-#include "PWGUD/Core/UPCTauCentralBarrelHelperRL.h"
+#include <cmath>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGUD/Core/decayTree.cxx b/.conflict-side-0/PWGUD/Core/decayTree.cxx
index 026c77af706..f5691c42bcd 100644
--- a/.conflict-side-0/PWGUD/Core/decayTree.cxx
+++ b/.conflict-side-0/PWGUD/Core/decayTree.cxx
@@ -9,16 +9,17 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <utility>
+#include "decayTree.h"
+
+#include "rapidjson/document.h"
+#include "rapidjson/filereadstream.h"
+
 #include <cstdio>
 #include <map>
 #include <string>
+#include <utility>
 #include <vector>
 
-#include "rapidjson/document.h"
-#include "rapidjson/filereadstream.h"
-#include "decayTree.h"
-
 using namespace rapidjson;
 
 // -----------------------------------------------------------------------------
diff --git a/.conflict-side-0/PWGUD/Core/decayTree.h b/.conflict-side-0/PWGUD/Core/decayTree.h
index 3dd4f53578b..22680126420 100644
--- a/.conflict-side-0/PWGUD/Core/decayTree.h
+++ b/.conflict-side-0/PWGUD/Core/decayTree.h
@@ -12,17 +12,18 @@
 #ifndef PWGUD_CORE_DECAYTREE_H_
 #define PWGUD_CORE_DECAYTREE_H_
 
-#include <utility>
-#include <map>
-#include <vector>
-#include <string>
-
 #include "Framework/AnalysisTask.h"
-#include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/Logger.h"
-#include "TLorentzVector.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+
 #include "TDatabasePDG.h"
+#include "TLorentzVector.h"
+
+#include <map>
+#include <string>
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGUD/DataModel/SGTables.h b/.conflict-side-0/PWGUD/DataModel/SGTables.h
index bf9ef68da96..672d8f1763f 100644
--- a/.conflict-side-0/PWGUD/DataModel/SGTables.h
+++ b/.conflict-side-0/PWGUD/DataModel/SGTables.h
@@ -12,14 +12,16 @@
 #ifndef PWGUD_DATAMODEL_SGTABLES_H_
 #define PWGUD_DATAMODEL_SGTABLES_H_
 
-#include <vector>
-#include <cmath>
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoA.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/DataTypes.h"
 #include "MathUtils/Utils.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+
+#include <cmath>
+#include <vector>
 
 namespace o2::aod
 {
diff --git a/.conflict-side-0/PWGUD/TableProducer/Converters/UDCollisionSelExtrasConverter.cxx b/.conflict-side-0/PWGUD/TableProducer/Converters/UDCollisionSelExtrasConverter.cxx
index 1fa1882e7d5..d8585bc3377 100644
--- a/.conflict-side-0/PWGUD/TableProducer/Converters/UDCollisionSelExtrasConverter.cxx
+++ b/.conflict-side-0/PWGUD/TableProducer/Converters/UDCollisionSelExtrasConverter.cxx
@@ -20,11 +20,12 @@
 
 /// \author Sasha Bylinkin <alexandr.bylinkin@cern.ch>
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "PWGUD/DataModel/UDTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-side-0/PWGUD/TableProducer/Converters/UDCollisionSelExtrasV002Converter.cxx b/.conflict-side-0/PWGUD/TableProducer/Converters/UDCollisionSelExtrasV002Converter.cxx
index b10b467ec4d..967c94a2b18 100644
--- a/.conflict-side-0/PWGUD/TableProducer/Converters/UDCollisionSelExtrasV002Converter.cxx
+++ b/.conflict-side-0/PWGUD/TableProducer/Converters/UDCollisionSelExtrasV002Converter.cxx
@@ -13,11 +13,12 @@
 /// \brief Converts UDCollisionSelExtras table from version 000 to 002 and 001 to 002
 /// \author Roman Lavicka <roman.lavicka@cern.ch>
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "PWGUD/DataModel/UDTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-side-0/PWGUD/TableProducer/Converters/UDCollisionsConverter.cxx b/.conflict-side-0/PWGUD/TableProducer/Converters/UDCollisionsConverter.cxx
index 8be7bce717b..27883d2592d 100644
--- a/.conflict-side-0/PWGUD/TableProducer/Converters/UDCollisionsConverter.cxx
+++ b/.conflict-side-0/PWGUD/TableProducer/Converters/UDCollisionsConverter.cxx
@@ -20,11 +20,12 @@
 
 /// \author Sasha Bylinkin <alexandr.bylinkin@cern.ch>
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "PWGUD/DataModel/UDTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-side-0/PWGUD/TableProducer/Converters/UDFwdTracksExtraConverter.cxx b/.conflict-side-0/PWGUD/TableProducer/Converters/UDFwdTracksExtraConverter.cxx
index f9b1f2d0d22..bf2fd2cb4da 100644
--- a/.conflict-side-0/PWGUD/TableProducer/Converters/UDFwdTracksExtraConverter.cxx
+++ b/.conflict-side-0/PWGUD/TableProducer/Converters/UDFwdTracksExtraConverter.cxx
@@ -21,11 +21,12 @@
 
 /// \author Andrea Giovanni Riffero <andrea.giovanni.riffero@cern.ch>
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "PWGUD/DataModel/UDTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-side-0/PWGUD/TableProducer/DGBCCandProducer.cxx b/.conflict-side-0/PWGUD/TableProducer/DGBCCandProducer.cxx
index 97b60c42c9e..d5a3b64214c 100644
--- a/.conflict-side-0/PWGUD/TableProducer/DGBCCandProducer.cxx
+++ b/.conflict-side-0/PWGUD/TableProducer/DGBCCandProducer.cxx
@@ -14,15 +14,18 @@
 /// \author Paul Buehler, paul.buehler@oeaw.ac.at
 /// \since  30.09.2022
 
-#include <algorithm>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "ReconstructionDataFormats/Vertex.h"
-#include "PWGUD/DataModel/UDTables.h"
+#include "DGBCCandProducer.h"
+
+#include "PWGUD/Core/DGSelector.h"
 #include "PWGUD/Core/UDHelpers.h"
 #include "PWGUD/Core/UPCHelpers.h"
-#include "PWGUD/Core/DGSelector.h"
-#include "DGBCCandProducer.h"
+#include "PWGUD/DataModel/UDTables.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Vertex.h"
+
+#include <algorithm>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGUD/TableProducer/DGBCCandProducer.h b/.conflict-side-0/PWGUD/TableProducer/DGBCCandProducer.h
index 07717afbfde..66f67b32a50 100644
--- a/.conflict-side-0/PWGUD/TableProducer/DGBCCandProducer.h
+++ b/.conflict-side-0/PWGUD/TableProducer/DGBCCandProducer.h
@@ -16,12 +16,13 @@
 #ifndef PWGUD_TABLEPRODUCER_DGBCCANDPRODUCER_H_
 #define PWGUD_TABLEPRODUCER_DGBCCANDPRODUCER_H_
 
-#include <map>
-#include <vector>
 #include "Framework/ASoA.h"
 #include "Framework/AnalysisDataModel.h"
-#include "MathUtils/Utils.h"
 #include "Framework/DataTypes.h"
+#include "MathUtils/Utils.h"
+
+#include <map>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGUD/TableProducer/fwdTrackPropagation.cxx b/.conflict-side-0/PWGUD/TableProducer/fwdTrackPropagation.cxx
index cc6ba621690..523035ad0f6 100644
--- a/.conflict-side-0/PWGUD/TableProducer/fwdTrackPropagation.cxx
+++ b/.conflict-side-0/PWGUD/TableProducer/fwdTrackPropagation.cxx
@@ -12,22 +12,22 @@
 /// \author Diana Krupova, diana.krupova@cern.ch
 /// \since 04.06.2024
 
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
+#include "PWGUD/DataModel/UDTables.h"
 
 #include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include "TGeoGlobalMagField.h"
-#include "Field/MagneticField.h"
 #include "DetectorsBase/Propagator.h"
+#include "Field/MagneticField.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 #include "GlobalTracking/MatchGlobalFwd.h"
 #include "MCHTracking/TrackExtrap.h"
 #include "MCHTracking/TrackParam.h"
-#include "Math/SMatrix.h"
 #include "ReconstructionDataFormats/TrackFwd.h"
 
-#include "PWGUD/DataModel/UDTables.h"
+#include "Math/SMatrix.h"
+#include "TGeoGlobalMagField.h"
 
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-0/PWGUD/TableProducer/tauEventTableProducer.cxx b/.conflict-side-0/PWGUD/TableProducer/tauEventTableProducer.cxx
index 548d8701689..158dabadec0 100644
--- a/.conflict-side-0/PWGUD/TableProducer/tauEventTableProducer.cxx
+++ b/.conflict-side-0/PWGUD/TableProducer/tauEventTableProducer.cxx
@@ -17,20 +17,25 @@
 //
 
 // C++ headers
+#include <algorithm>
+#include <random>
 #include <set>
 #include <utility>
-#include <algorithm>
 #include <vector>
-#include <random>
 
 // O2 headers
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/runDataProcessing.h"
 
 // O2Physics headers
+#include "PWGUD/Core/SGSelector.h"
+#include "PWGUD/Core/UPCTauCentralBarrelHelperRL.h"
+#include "PWGUD/DataModel/TauEventTables.h"
+#include "PWGUD/DataModel/UDTables.h"
+
 #include "Common/CCDB/EventSelectionParams.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
@@ -38,10 +43,6 @@
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "PWGUD/Core/UPCTauCentralBarrelHelperRL.h"
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/DataModel/TauEventTables.h"
-#include "PWGUD/Core/SGSelector.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGUD/TableProducer/udMcCollisions2udCollisions.cxx b/.conflict-side-0/PWGUD/TableProducer/udMcCollisions2udCollisions.cxx
index cea35fb70ea..2522dd65896 100644
--- a/.conflict-side-0/PWGUD/TableProducer/udMcCollisions2udCollisions.cxx
+++ b/.conflict-side-0/PWGUD/TableProducer/udMcCollisions2udCollisions.cxx
@@ -16,13 +16,14 @@
 /// \brief  A task to create a reverse index from UDMcCollisions to UDCollisions
 ///
 
-#include <vector>
+#include "PWGUD/DataModel/UDIndex.h"
+#include "PWGUD/DataModel/UDTables.h"
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/DataModel/UDIndex.h"
+#include "Framework/runDataProcessing.h"
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGUD/TableProducer/udMcParticles2udTracks.cxx b/.conflict-side-0/PWGUD/TableProducer/udMcParticles2udTracks.cxx
index 4a876a72fb3..df797f9ea3a 100644
--- a/.conflict-side-0/PWGUD/TableProducer/udMcParticles2udTracks.cxx
+++ b/.conflict-side-0/PWGUD/TableProducer/udMcParticles2udTracks.cxx
@@ -16,13 +16,14 @@
 /// \brief  A task to create a reverse index from UDMcParticles to UDTracks
 ///
 
-#include <vector>
+#include "PWGUD/DataModel/UDIndex.h"
+#include "PWGUD/DataModel/UDTables.h"
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/DataModel/UDIndex.h"
+#include "Framework/runDataProcessing.h"
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGUD/Tasks/FwdMuonsUPC.cxx b/.conflict-side-0/PWGUD/Tasks/FwdMuonsUPC.cxx
index 0c4b3d81e3b..c821c4daa1d 100644
--- a/.conflict-side-0/PWGUD/Tasks/FwdMuonsUPC.cxx
+++ b/.conflict-side-0/PWGUD/Tasks/FwdMuonsUPC.cxx
@@ -16,22 +16,23 @@
 
 /// \author Andrea Giovanni Riffero <andrea.giovanni.riffero@cern.ch>
 
-#include <vector>
-#include <unordered_map>
+#include "PWGUD/DataModel/UDTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPLHCIFData.h"
 #include "DataFormatsParameters/GRPECSObject.h"
-#include "PWGUD/DataModel/UDTables.h"
+#include "DataFormatsParameters/GRPLHCIFData.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 
 #include "TLorentzVector.h"
-#include "TSystem.h"
 #include "TMath.h"
 #include "TRandom3.h"
+#include "TSystem.h"
+
+#include <unordered_map>
+#include <vector>
 
 // table for saving tree with info on data
 namespace dimu
diff --git a/.conflict-side-0/PWGUD/Tasks/analysisMCDPMJetSGv3.cxx b/.conflict-side-0/PWGUD/Tasks/analysisMCDPMJetSGv3.cxx
index 4347871377a..6c6bfdfb3ab 100644
--- a/.conflict-side-0/PWGUD/Tasks/analysisMCDPMJetSGv3.cxx
+++ b/.conflict-side-0/PWGUD/Tasks/analysisMCDPMJetSGv3.cxx
@@ -13,10 +13,11 @@
 ///
 /// \author Simone Ragoni
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 // #include "TDatabasePDG.h"
 #include "PWGUD/Core/UPCHelpers.h"
 #include "PWGUD/DataModel/UDTables.h"
diff --git a/.conflict-side-0/PWGUD/Tasks/decayTreeAnalyzer.cxx b/.conflict-side-0/PWGUD/Tasks/decayTreeAnalyzer.cxx
index c725a2ca72a..9a379877afa 100644
--- a/.conflict-side-0/PWGUD/Tasks/decayTreeAnalyzer.cxx
+++ b/.conflict-side-0/PWGUD/Tasks/decayTreeAnalyzer.cxx
@@ -13,18 +13,18 @@
 // \author Paul Buehler, paul.buehler@oeaw.ac.at
 // \since  01.03.2024
 
-#include <string>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
+#include "PWGUD/Core/UDGoodRunSelector.h"
+#include "PWGUD/Core/UDHelpers.h"
+#include "PWGUD/Core/decayTree.h"
+#include "PWGUD/DataModel/UDTables.h"
 
 #include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPLHCIFData.h"
 #include "CommonConstants/LHCConstants.h"
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/UDHelpers.h"
-#include "PWGUD/Core/UDGoodRunSelector.h"
-#include "PWGUD/Core/decayTree.h"
+#include "DataFormatsParameters/GRPLHCIFData.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include <string>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGUD/Tasks/dgCandAnalyzer.cxx b/.conflict-side-0/PWGUD/Tasks/dgCandAnalyzer.cxx
index 93c62c567d5..7697610eb8d 100644
--- a/.conflict-side-0/PWGUD/Tasks/dgCandAnalyzer.cxx
+++ b/.conflict-side-0/PWGUD/Tasks/dgCandAnalyzer.cxx
@@ -13,20 +13,21 @@
 // \author Paul Buehler, paul.buehler@oeaw.ac.at
 // \since  06.06.2022
 
-#include <set>
-#include <string>
+#include "PWGUD/Core/DGPIDSelector.h"
+#include "PWGUD/Core/UDGoodRunSelector.h"
+#include "PWGUD/Core/UDHelpers.h"
+#include "PWGUD/DataModel/UDTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
+#include "Common/DataModel/PIDResponse.h"
 
 #include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPLHCIFData.h"
 #include "CommonConstants/LHCConstants.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/UDHelpers.h"
-#include "PWGUD/Core/DGPIDSelector.h"
-#include "PWGUD/Core/UDGoodRunSelector.h"
+#include "DataFormatsParameters/GRPLHCIFData.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include <set>
+#include <string>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGUD/Tasks/diffMCDataScanner.cxx b/.conflict-side-0/PWGUD/Tasks/diffMCDataScanner.cxx
index 8ad8d7ae853..1ee06c28b61 100644
--- a/.conflict-side-0/PWGUD/Tasks/diffMCDataScanner.cxx
+++ b/.conflict-side-0/PWGUD/Tasks/diffMCDataScanner.cxx
@@ -13,9 +13,10 @@
 /// \author Paul Buehler, paul.buehler@oeaw.ac.at
 /// \since  01.10.2021
 
-#include "Framework/AnalysisTask.h"
-#include "PWGUD/DataModel/McPIDTable.h"
 #include "PWGUD/Core/UDHelpers.h"
+#include "PWGUD/DataModel/McPIDTable.h"
+
+#include "Framework/AnalysisTask.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGUD/Tasks/diffMCQA.cxx b/.conflict-side-0/PWGUD/Tasks/diffMCQA.cxx
index 19bf3016a97..f7a3fa16500 100644
--- a/.conflict-side-0/PWGUD/Tasks/diffMCQA.cxx
+++ b/.conflict-side-0/PWGUD/Tasks/diffMCQA.cxx
@@ -13,12 +13,14 @@
 /// \author Paul Buehler, paul.buehler@oeaw.ac.at
 /// \since  01.10.2021
 
-#include "Framework/runDataProcessing.h"
+#include "PWGUD/Core/UDHelpers.h"
+
+#include "CommonConstants/PhysicsConstants.h"
 #include "Framework/AnalysisTask.h"
-#include "TLorentzVector.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/BCRange.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "PWGUD/Core/UDHelpers.h"
+
+#include "TLorentzVector.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGUD/Tasks/diffQA.cxx b/.conflict-side-0/PWGUD/Tasks/diffQA.cxx
index a1e9ec34185..6c331ca7146 100644
--- a/.conflict-side-0/PWGUD/Tasks/diffQA.cxx
+++ b/.conflict-side-0/PWGUD/Tasks/diffQA.cxx
@@ -13,13 +13,15 @@
 /// \author Paul Buehler, paul.buehler@oeaw.ac.at
 /// \since  20.05.2022
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "TLorentzVector.h"
+#include "PWGUD/Core/UDHelpers.h"
+
 #include "CommonConstants/LHCConstants.h"
-#include "ReconstructionDataFormats/BCRange.h"
 #include "CommonConstants/PhysicsConstants.h"
-#include "PWGUD/Core/UDHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/BCRange.h"
+
+#include "TLorentzVector.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGUD/Tasks/eventByevent.cxx b/.conflict-side-0/PWGUD/Tasks/eventByevent.cxx
index 072ae2d961c..ba7a512a26e 100644
--- a/.conflict-side-0/PWGUD/Tasks/eventByevent.cxx
+++ b/.conflict-side-0/PWGUD/Tasks/eventByevent.cxx
@@ -10,16 +10,19 @@
 // or submit itself to any jurisdiction.
 //
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include <iostream>
+#include "PWGUD/Core/SGSelector.h"
+#include "PWGUD/Core/SGTrackSelector.h"
 #include "PWGUD/DataModel/UDTables.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TLorentzVector.h"
 #include <TString.h>
 #include <TTree.h>
-#include "TLorentzVector.h"
-#include "PWGUD/Core/SGSelector.h"
-#include "PWGUD/Core/SGTrackSelector.h"
+
+#include <iostream>
 
 using namespace std;
 using namespace o2;
diff --git a/.conflict-side-0/PWGUD/Tasks/exclusivePentaquark.cxx b/.conflict-side-0/PWGUD/Tasks/exclusivePentaquark.cxx
index c63dc7fce68..24c7cd2b674 100644
--- a/.conflict-side-0/PWGUD/Tasks/exclusivePentaquark.cxx
+++ b/.conflict-side-0/PWGUD/Tasks/exclusivePentaquark.cxx
@@ -8,15 +8,19 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include <iostream>
+#include "PWGUD/Core/SGSelector.h"
 #include "PWGUD/DataModel/UDTables.h"
-#include <TString.h>
-#include "TLorentzVector.h"
+
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/Core/SGSelector.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TLorentzVector.h"
+#include <TString.h>
+
+#include <iostream>
 using std::array;
 using namespace std;
 using namespace o2;
diff --git a/.conflict-side-0/PWGUD/Tasks/exclusivePhi.cxx b/.conflict-side-0/PWGUD/Tasks/exclusivePhi.cxx
index 634d17a5d8e..ba639348852 100644
--- a/.conflict-side-0/PWGUD/Tasks/exclusivePhi.cxx
+++ b/.conflict-side-0/PWGUD/Tasks/exclusivePhi.cxx
@@ -9,16 +9,20 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 //
-#include <vector>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include <iostream>
 #include "PWGUD/DataModel/UDTables.h"
-#include <TString.h>
-#include "TLorentzVector.h"
+
 #include "Common/DataModel/PIDResponse.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TLorentzVector.h"
+#include <TString.h>
+
+#include <iostream>
+#include <vector>
+
 using std::array;
 using namespace std;
 using namespace o2;
@@ -648,7 +652,7 @@ struct ExclusivePhi {
         }
       }
     } // Kaon Band
-  }   // end of process
+  } // end of process
 
 }; // end of struct
 
diff --git a/.conflict-side-0/PWGUD/Tasks/exclusivePhiLeptons.cxx b/.conflict-side-0/PWGUD/Tasks/exclusivePhiLeptons.cxx
index b212dd21723..45cdeb2d450 100644
--- a/.conflict-side-0/PWGUD/Tasks/exclusivePhiLeptons.cxx
+++ b/.conflict-side-0/PWGUD/Tasks/exclusivePhiLeptons.cxx
@@ -8,16 +8,20 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include <vector>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include <iostream>
+#include "PWGUD/Core/SGSelector.h"
 #include "PWGUD/DataModel/UDTables.h"
-#include <TString.h>
-#include "TLorentzVector.h"
+
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/Core/SGSelector.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TLorentzVector.h"
+#include <TString.h>
+
+#include <iostream>
+#include <vector>
 using std::array;
 using namespace std;
 using namespace o2;
diff --git a/.conflict-side-0/PWGUD/Tasks/exclusivePhiLeptonsTrees.cxx b/.conflict-side-0/PWGUD/Tasks/exclusivePhiLeptonsTrees.cxx
index 00abada06d4..48f00ab2524 100644
--- a/.conflict-side-0/PWGUD/Tasks/exclusivePhiLeptonsTrees.cxx
+++ b/.conflict-side-0/PWGUD/Tasks/exclusivePhiLeptonsTrees.cxx
@@ -8,16 +8,20 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include <vector>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include <iostream>
+#include "PWGUD/Core/SGSelector.h"
 #include "PWGUD/DataModel/UDTables.h"
-#include <TString.h>
-#include "TLorentzVector.h"
+
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/Core/SGSelector.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TLorentzVector.h"
+#include <TString.h>
+
+#include <iostream>
+#include <vector>
 using std::array;
 using namespace std;
 using namespace o2;
diff --git a/.conflict-side-0/PWGUD/Tasks/exclusiveTwoProtons.cxx b/.conflict-side-0/PWGUD/Tasks/exclusiveTwoProtons.cxx
index b7cf9b84004..966bd2c923a 100644
--- a/.conflict-side-0/PWGUD/Tasks/exclusiveTwoProtons.cxx
+++ b/.conflict-side-0/PWGUD/Tasks/exclusiveTwoProtons.cxx
@@ -8,15 +8,19 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include <iostream>
+#include "PWGUD/Core/SGSelector.h"
 #include "PWGUD/DataModel/UDTables.h"
-#include <TString.h>
-#include "TLorentzVector.h"
+
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/Core/SGSelector.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TLorentzVector.h"
+#include <TString.h>
+
+#include <iostream>
 using std::array;
 using namespace std;
 using namespace o2;
diff --git a/.conflict-side-0/PWGUD/Tasks/exclusiveTwoProtonsSG.cxx b/.conflict-side-0/PWGUD/Tasks/exclusiveTwoProtonsSG.cxx
index 0ac54805c69..539ed887676 100644
--- a/.conflict-side-0/PWGUD/Tasks/exclusiveTwoProtonsSG.cxx
+++ b/.conflict-side-0/PWGUD/Tasks/exclusiveTwoProtonsSG.cxx
@@ -8,15 +8,19 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include <iostream>
+#include "PWGUD/Core/SGSelector.h"
 #include "PWGUD/DataModel/UDTables.h"
-#include <TString.h>
-#include "TLorentzVector.h"
+
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/Core/SGSelector.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TLorentzVector.h"
+#include <TString.h>
+
+#include <iostream>
 using std::array;
 using namespace std;
 using namespace o2;
diff --git a/.conflict-side-0/PWGUD/Tasks/flowCumulantsUpc.cxx b/.conflict-side-0/PWGUD/Tasks/flowCumulantsUpc.cxx
index 155a398cd44..9300fb8d2dd 100644
--- a/.conflict-side-0/PWGUD/Tasks/flowCumulantsUpc.cxx
+++ b/.conflict-side-0/PWGUD/Tasks/flowCumulantsUpc.cxx
@@ -14,42 +14,44 @@
 /// \since  Mar/2025
 /// \brief  jira: , task to measure flow observables with cumulant method
 
-#include <CCDB/BasicCCDBManager.h>
-#include <cmath>
-#include <vector>
-#include <array>
-#include <unordered_map>
-#include <string>
-#include <memory>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/HistogramRegistry.h"
+#include "FlowContainer.h"
+#include "GFW.h"
+#include "GFWCumulant.h"
+#include "GFWPowerArray.h"
+#include "GFWWeights.h"
 
-#include "Common/DataModel/EventSelection.h"
+#include "PWGUD/Core/SGSelector.h"
+#include "PWGUD/DataModel/UDTables.h"
+
+#include "Common/CCDB/ctpRateFetcher.h"
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/CCDB/ctpRateFetcher.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/SGSelector.h"
-#include "TVector3.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include <CCDB/BasicCCDBManager.h>
 
-#include "GFWPowerArray.h"
-#include "GFW.h"
-#include "GFWCumulant.h"
-#include "GFWWeights.h"
-#include "FlowContainer.h"
 #include "TList.h"
+#include "TVector3.h"
+#include <TF1.h>
+#include <TObjArray.h>
 #include <TProfile.h>
 #include <TRandom3.h>
-#include <TObjArray.h>
-#include <TF1.h>
+
+#include <array>
+#include <cmath>
+#include <memory>
+#include <string>
+#include <unordered_map>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGUD/Tasks/polarisationRho.cxx b/.conflict-side-0/PWGUD/Tasks/polarisationRho.cxx
index c10e86baad6..3693acbfe2a 100644
--- a/.conflict-side-0/PWGUD/Tasks/polarisationRho.cxx
+++ b/.conflict-side-0/PWGUD/Tasks/polarisationRho.cxx
@@ -8,13 +8,16 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include <iostream>
 #include "PWGUD/DataModel/UDTables.h"
-#include <TString.h>
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TLorentzVector.h"
+#include <TString.h>
+
+#include <iostream>
 using namespace std;
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-side-0/PWGUD/Tasks/sgD0Analyzer.cxx b/.conflict-side-0/PWGUD/Tasks/sgD0Analyzer.cxx
index 58b01cbe281..229b6f09a4a 100644
--- a/.conflict-side-0/PWGUD/Tasks/sgD0Analyzer.cxx
+++ b/.conflict-side-0/PWGUD/Tasks/sgD0Analyzer.cxx
@@ -13,17 +13,21 @@
 // \author Sasha Bylinkin, alexander.bylinkin@gmail.com
 // \since  April 2023
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include <iostream>
-#include "PWGUD/DataModel/UDTables.h"
 #include "PWGUD/Core/SGSelector.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "PWGUD/Core/SGTrackSelector.h"
-#include <TString.h>
+#include "PWGUD/DataModel/UDTables.h"
+
+#include "Common/DataModel/PIDResponse.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TLorentzVector.h"
+#include <TString.h>
+
+#include <iostream>
 using namespace std;
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-side-0/PWGUD/Tasks/sgExcUniverse.cxx b/.conflict-side-0/PWGUD/Tasks/sgExcUniverse.cxx
index f7dd3691c25..47369db47cc 100644
--- a/.conflict-side-0/PWGUD/Tasks/sgExcUniverse.cxx
+++ b/.conflict-side-0/PWGUD/Tasks/sgExcUniverse.cxx
@@ -13,17 +13,19 @@
 // \author Sasha Bylinkin, alexander.bylinkin@gmail.com
 // \since  April 2023
 
-#include "Framework/runDataProcessing.h"
+#include "PWGUD/Core/SGSelector.h"
+#include "PWGUD/Core/SGTrackSelector.h"
+#include "PWGUD/Core/UDHelpers.h"
+#include "PWGUD/DataModel/UDTables.h"
+
+#include "Common/DataModel/PIDResponse.h"
+
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
-#include "TVector3.h"
-#include "TTree.h"
 #include "TFile.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/UDHelpers.h"
-#include "PWGUD/Core/SGSelector.h"
-#include "PWGUD/Core/SGTrackSelector.h"
+#include "TTree.h"
+#include "TVector3.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGUD/Tasks/sgExclOmega.cxx b/.conflict-side-0/PWGUD/Tasks/sgExclOmega.cxx
index 0a816e1dc0e..4a3cf48490f 100644
--- a/.conflict-side-0/PWGUD/Tasks/sgExclOmega.cxx
+++ b/.conflict-side-0/PWGUD/Tasks/sgExclOmega.cxx
@@ -13,17 +13,21 @@
 // \author Sasha Bylinkin, alexander.bylinkin@gmail.com
 // \since  April 2023
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include <iostream>
-#include "PWGUD/DataModel/UDTables.h"
 #include "PWGUD/Core/SGSelector.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "PWGUD/Core/SGTrackSelector.h"
-#include <TString.h>
+#include "PWGUD/DataModel/UDTables.h"
+
+#include "Common/DataModel/PIDResponse.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TLorentzVector.h"
+#include <TString.h>
+
+#include <iostream>
 using namespace std;
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-side-0/PWGUD/Tasks/sgExclusivePhi.cxx b/.conflict-side-0/PWGUD/Tasks/sgExclusivePhi.cxx
index df10373e571..9bea84b6ae4 100644
--- a/.conflict-side-0/PWGUD/Tasks/sgExclusivePhi.cxx
+++ b/.conflict-side-0/PWGUD/Tasks/sgExclusivePhi.cxx
@@ -9,16 +9,20 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 //
-#include <vector>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include <iostream>
+#include "PWGUD/Core/SGSelector.h"
 #include "PWGUD/DataModel/UDTables.h"
-#include <TString.h>
-#include "TLorentzVector.h"
+
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/Core/SGSelector.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TLorentzVector.h"
+#include <TString.h>
+
+#include <iostream>
+#include <vector>
 
 using std::array;
 using namespace std;
@@ -655,7 +659,7 @@ struct sgExclusivePhi {
             }
           }
         } // end of two tracks only loop
-      }   // vertex cut
+      } // vertex cut
 
       if (allTracksAreKaonsBandPID.size() == 2) {
 
@@ -731,8 +735,8 @@ struct sgExclusivePhi {
           }
         }
       } // Kaon Band
-    }   // double gap
-  }     // end of process
+    } // double gap
+  } // end of process
 
 }; // end of struct
 
diff --git a/.conflict-side-0/PWGUD/Tasks/sgExclusivePhiITSselections.cxx b/.conflict-side-0/PWGUD/Tasks/sgExclusivePhiITSselections.cxx
index 2d8bc72c0f6..6a70d8f3a1d 100644
--- a/.conflict-side-0/PWGUD/Tasks/sgExclusivePhiITSselections.cxx
+++ b/.conflict-side-0/PWGUD/Tasks/sgExclusivePhiITSselections.cxx
@@ -9,16 +9,20 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 //
-#include <vector>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include <iostream>
+#include "PWGUD/Core/SGSelector.h"
 #include "PWGUD/DataModel/UDTables.h"
-#include <TString.h>
-#include "TLorentzVector.h"
+
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/Core/SGSelector.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TLorentzVector.h"
+#include <TString.h>
+
+#include <iostream>
+#include <vector>
 
 using std::array;
 using namespace std;
@@ -298,7 +302,7 @@ struct sgExclusivePhiITSselections {
             }
           }
         } // Mass cut
-      }   // end of two tracks only loop
+      } // end of two tracks only loop
 
       if (allTracksAreKaonsBandPID.size() == 2) {
         registry.fill(HIST("hTracksKaons"), allTracksAreKaonsBandPID.size() + 10);
@@ -357,7 +361,7 @@ struct sgExclusivePhiITSselections {
       } // Kaon Band
 
     } // double gap
-  }   // end of process
+  } // end of process
 
   void processSG(UDCollisionsFull::iterator const& collision, udtracksfull const& tracks)
   // process function subscribing to SG data
diff --git a/.conflict-side-0/PWGUD/Tasks/sgFITAnalyzer.cxx b/.conflict-side-0/PWGUD/Tasks/sgFITAnalyzer.cxx
index 73d42421b87..58889965136 100644
--- a/.conflict-side-0/PWGUD/Tasks/sgFITAnalyzer.cxx
+++ b/.conflict-side-0/PWGUD/Tasks/sgFITAnalyzer.cxx
@@ -13,18 +13,20 @@
 // \author Sasha Bylinkin, alexander.bylinkin@gmail.com
 // \since  April 2023
 
-#include "Framework/runDataProcessing.h"
+#include "PWGUD/Core/SGSelector.h"
+#include "PWGUD/Core/SGTrackSelector.h"
+#include "PWGUD/Core/UDHelpers.h"
+#include "PWGUD/DataModel/UDTables.h"
+
+#include "Common/DataModel/PIDResponse.h"
+
 #include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 
-#include "TVector3.h"
-#include "TTree.h"
 #include "TFile.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/UDHelpers.h"
-#include "PWGUD/Core/SGSelector.h"
-#include "PWGUD/Core/SGTrackSelector.h"
+#include "TTree.h"
+#include "TVector3.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGUD/Tasks/sgFourPiAnalyzer.cxx b/.conflict-side-0/PWGUD/Tasks/sgFourPiAnalyzer.cxx
index 6a6abfc4628..49f9fd42c38 100644
--- a/.conflict-side-0/PWGUD/Tasks/sgFourPiAnalyzer.cxx
+++ b/.conflict-side-0/PWGUD/Tasks/sgFourPiAnalyzer.cxx
@@ -13,21 +13,25 @@
 // \author Sasha Bylinkin, alexander.bylinkin@gmail.com
 // \since  April 2023
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include <iostream>
-#include "PWGUD/DataModel/UDTables.h"
 #include "PWGUD/Core/SGSelector.h"
 #include "PWGUD/Core/SGTrackSelector.h"
+#include "PWGUD/DataModel/UDTables.h"
+
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/DataTypes.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 #include "MathUtils/Utils.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include <TString.h>
+
 #include "TLorentzVector.h"
+#include <TString.h>
+
+#include <iostream>
 using namespace std;
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-side-0/PWGUD/Tasks/sgInclJpsi.cxx b/.conflict-side-0/PWGUD/Tasks/sgInclJpsi.cxx
index f5001af7c10..013a97cc20f 100644
--- a/.conflict-side-0/PWGUD/Tasks/sgInclJpsi.cxx
+++ b/.conflict-side-0/PWGUD/Tasks/sgInclJpsi.cxx
@@ -13,17 +13,21 @@
 // \author Sasha Bylinkin, alexander.bylinkin@gmail.com
 // \since  April 2023
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include <iostream>
-#include "PWGUD/DataModel/UDTables.h"
 #include "PWGUD/Core/SGSelector.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "PWGUD/Core/SGTrackSelector.h"
-#include <TString.h>
+#include "PWGUD/DataModel/UDTables.h"
+
+#include "Common/DataModel/PIDResponse.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TLorentzVector.h"
+#include <TString.h>
+
+#include <iostream>
 using namespace std;
 using namespace o2;
 using namespace o2::aod;
@@ -297,7 +301,7 @@ struct SGInclJpsi {
             registry.fill(HIST("sss_Ntr_mm_invm_3"), tracks.size(), v01.M(), -1);
             registry.fill(HIST("sss_mm_pt_invm_3"), v01.Pt(), v01.M(), -1);
           }
-      }
+        }
       }
       if (selectionPIDElec(t0, use_tof, nsigmatpc_cut, nsigmatof_cut) && selectionPIDElec(t1, use_tof, nsigmatpc_cut, nsigmatof_cut)) {
         // Apply pion hypothesis and create pairs
diff --git a/.conflict-side-0/PWGUD/Tasks/sgPIDAnalyzer.cxx b/.conflict-side-0/PWGUD/Tasks/sgPIDAnalyzer.cxx
index e4015417971..5edef2f187d 100644
--- a/.conflict-side-0/PWGUD/Tasks/sgPIDAnalyzer.cxx
+++ b/.conflict-side-0/PWGUD/Tasks/sgPIDAnalyzer.cxx
@@ -13,19 +13,21 @@
 // \author Sasha Bylinkin, alexander.bylinkin@gmail.com
 // \since  April 2023
 
-#include "Framework/runDataProcessing.h"
+#include "PWGUD/Core/SGSelector.h"
+#include "PWGUD/Core/SGTrackSelector.h"
+#include "PWGUD/Core/UDHelpers.h"
+#include "PWGUD/DataModel/SGTables.h"
+
+#include "Common/DataModel/PIDResponse.h"
+
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
-#include "TVector3.h"
-#include "TTree.h"
 #include "TFile.h"
+#include "TTree.h"
+#include "TVector3.h"
 #include <TH1F.h>
 #include <TH2F.h>
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/DataModel/SGTables.h"
-#include "PWGUD/Core/UDHelpers.h"
-#include "PWGUD/Core/SGSelector.h"
-#include "PWGUD/Core/SGTrackSelector.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGUD/Tasks/sgPIDSpectra.cxx b/.conflict-side-0/PWGUD/Tasks/sgPIDSpectra.cxx
index 7ecea94c66d..b873d37198d 100644
--- a/.conflict-side-0/PWGUD/Tasks/sgPIDSpectra.cxx
+++ b/.conflict-side-0/PWGUD/Tasks/sgPIDSpectra.cxx
@@ -13,17 +13,19 @@
 // \author Sasha Bylinkin, alexander.bylinkin@gmail.com
 // \since  April 2023
 
-#include "Framework/runDataProcessing.h"
+#include "PWGUD/Core/SGSelector.h"
+#include "PWGUD/Core/SGTrackSelector.h"
+#include "PWGUD/Core/UDHelpers.h"
+#include "PWGUD/DataModel/UDTables.h"
+
+#include "Common/DataModel/PIDResponse.h"
+
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
-#include "TVector3.h"
-#include "TTree.h"
 #include "TFile.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/UDHelpers.h"
-#include "PWGUD/Core/SGSelector.h"
-#include "PWGUD/Core/SGTrackSelector.h"
+#include "TTree.h"
+#include "TVector3.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGUD/Tasks/sgPIDSpectraTable.cxx b/.conflict-side-0/PWGUD/Tasks/sgPIDSpectraTable.cxx
index 9a370403a6b..f6c608a1881 100644
--- a/.conflict-side-0/PWGUD/Tasks/sgPIDSpectraTable.cxx
+++ b/.conflict-side-0/PWGUD/Tasks/sgPIDSpectraTable.cxx
@@ -12,19 +12,22 @@
 // \Single Gap Event Analyzer
 // \author Sasha Bylinkin, alexander.bylinkin@gmail.com
 // \since  April 2023
-#include <vector>
-#include "Framework/runDataProcessing.h"
+#include "PWGUD/Core/SGSelector.h"
+#include "PWGUD/Core/SGTrackSelector.h"
+#include "PWGUD/Core/UDHelpers.h"
+#include "PWGUD/DataModel/SGTables.h"
+#include "PWGUD/DataModel/UDTables.h"
+
+#include "Common/DataModel/PIDResponse.h"
+
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
-#include "TVector3.h"
-#include "TTree.h"
 #include "TFile.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/DataModel/SGTables.h"
-#include "PWGUD/Core/UDHelpers.h"
-#include "PWGUD/Core/SGSelector.h"
-#include "PWGUD/Core/SGTrackSelector.h"
+#include "TTree.h"
+#include "TVector3.h"
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGUD/Tasks/sgSixPiAnalyzer.cxx b/.conflict-side-0/PWGUD/Tasks/sgSixPiAnalyzer.cxx
index c3561ad7026..888b4325a61 100644
--- a/.conflict-side-0/PWGUD/Tasks/sgSixPiAnalyzer.cxx
+++ b/.conflict-side-0/PWGUD/Tasks/sgSixPiAnalyzer.cxx
@@ -13,22 +13,25 @@
 // \author Sasha Bylinkin, alexander.bylinkin@gmail.com
 // \since  April 2023
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include <iostream>
-#include "PWGUD/DataModel/UDTables.h"
 #include "PWGUD/Core/SGSelector.h"
 #include "PWGUD/Core/SGTrackSelector.h"
+#include "PWGUD/DataModel/UDTables.h"
+
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/DataTypes.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 #include "MathUtils/Utils.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 
-#include <TString.h>
 #include "TLorentzVector.h"
+#include <TString.h>
+
+#include <iostream>
 using namespace std;
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-side-0/PWGUD/Tasks/sgSpectraAnalyzer.cxx b/.conflict-side-0/PWGUD/Tasks/sgSpectraAnalyzer.cxx
index afd766e0992..17bd0d6db03 100644
--- a/.conflict-side-0/PWGUD/Tasks/sgSpectraAnalyzer.cxx
+++ b/.conflict-side-0/PWGUD/Tasks/sgSpectraAnalyzer.cxx
@@ -13,18 +13,20 @@
 // \author Sasha Bylinkin, alexander.bylinkin@gmail.com
 // \since  April 2023
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
+#include "PWGUD/Core/SGSelector.h"
+#include "PWGUD/Core/SGTrackSelector.h"
+#include "PWGUD/DataModel/UDTables.h"
+
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
 #include <iostream>
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/SGSelector.h"
-#include "PWGUD/Core/SGTrackSelector.h"
-//#include "Common/DataModel/PIDResponse.h"
-//#include "PWGUD/Core/RLhelper.h"
-#include <TString.h>
+// #include "Common/DataModel/PIDResponse.h"
+// #include "PWGUD/Core/RLhelper.h"
 #include "TLorentzVector.h"
+#include <TString.h>
 using namespace std;
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-side-0/PWGUD/Tasks/sgTwoPiAnalyzer.cxx b/.conflict-side-0/PWGUD/Tasks/sgTwoPiAnalyzer.cxx
index e1568bb1838..a7763f614cc 100644
--- a/.conflict-side-0/PWGUD/Tasks/sgTwoPiAnalyzer.cxx
+++ b/.conflict-side-0/PWGUD/Tasks/sgTwoPiAnalyzer.cxx
@@ -13,22 +13,25 @@
 // \author Sasha Bylinkin, alexander.bylinkin@gmail.com
 // \since  April 2023
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include <iostream>
-#include "PWGUD/DataModel/UDTables.h"
 #include "PWGUD/Core/SGSelector.h"
 #include "PWGUD/Core/SGTrackSelector.h"
+#include "PWGUD/DataModel/UDTables.h"
+
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/DataTypes.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 #include "MathUtils/Utils.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 
-#include <TString.h>
 #include "TLorentzVector.h"
+#include <TString.h>
+
+#include <iostream>
 using namespace std;
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-side-0/PWGUD/Tasks/sginclusivePhiKstarSD.cxx b/.conflict-side-0/PWGUD/Tasks/sginclusivePhiKstarSD.cxx
index 628818bd553..c92293b2275 100644
--- a/.conflict-side-0/PWGUD/Tasks/sginclusivePhiKstarSD.cxx
+++ b/.conflict-side-0/PWGUD/Tasks/sginclusivePhiKstarSD.cxx
@@ -14,29 +14,30 @@
 /// \author Sandeep Dudi, sandeep.dudi3@gmail.com
 /// \since  May 2024
 
-#include <cstdlib>
-#include <vector>
-#include <TString.h>
-#include <TMath.h>
-#include "Math/Vector4D.h"
-#include "Math/Vector3D.h"
-#include "Math/GenVector/Boost.h"
-#include "TPDGCode.h"
+#include "PWGUD/Core/SGSelector.h"
+#include "PWGUD/Core/SGTrackSelector.h"
+#include "PWGUD/Core/UPCHelpers.h"
+#include "PWGUD/DataModel/UDTables.h"
+
+#include "Common/DataModel/PIDResponse.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoA.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Vertex.h"
 
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/SGSelector.h"
-#include "PWGUD/Core/SGTrackSelector.h"
-#include "PWGUD/Core/UPCHelpers.h"
+#include "Math/GenVector/Boost.h"
+#include "Math/Vector3D.h"
+#include "Math/Vector4D.h"
+#include "TPDGCode.h"
+#include <TMath.h>
+#include <TString.h>
 
-#include "Common/DataModel/PIDResponse.h"
+#include <cstdlib>
+#include <vector>
 
 using namespace std;
 using namespace o2;
diff --git a/.conflict-side-0/PWGUD/Tasks/upcAnalysis.cxx b/.conflict-side-0/PWGUD/Tasks/upcAnalysis.cxx
index 74a007314e0..533e9bbeb32 100644
--- a/.conflict-side-0/PWGUD/Tasks/upcAnalysis.cxx
+++ b/.conflict-side-0/PWGUD/Tasks/upcAnalysis.cxx
@@ -9,16 +9,16 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TLorentzVector.h"
 #include <TH1D.h>
 #include <TH2D.h>
-#include "TLorentzVector.h"
 
 using namespace o2;
 using namespace o2::aod::evsel;
diff --git a/.conflict-side-0/PWGUD/Tasks/upcCandidateAnalyzer.cxx b/.conflict-side-0/PWGUD/Tasks/upcCandidateAnalyzer.cxx
index 568ecacb872..d07f76c22ee 100644
--- a/.conflict-side-0/PWGUD/Tasks/upcCandidateAnalyzer.cxx
+++ b/.conflict-side-0/PWGUD/Tasks/upcCandidateAnalyzer.cxx
@@ -9,11 +9,12 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "PWGUD/DataModel/UDTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TLorentzVector.h"
 
 using namespace o2;
diff --git a/.conflict-side-0/PWGUD/Tasks/upcCandidateProducerQa.cpp b/.conflict-side-0/PWGUD/Tasks/upcCandidateProducerQa.cpp
index 29accce2fe4..e697941c115 100644
--- a/.conflict-side-0/PWGUD/Tasks/upcCandidateProducerQa.cpp
+++ b/.conflict-side-0/PWGUD/Tasks/upcCandidateProducerQa.cpp
@@ -9,16 +9,18 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Common/CCDB/EventSelectionParams.h"
-#include "Common/DataModel/EventSelection.h"
-#include "CommonConstants/LHCConstants.h"
 #include "PWGUD/Core/UPCCutparHolder.h"
 #include "PWGUD/Core/UPCHelpers.h"
 #include "PWGUD/DataModel/UDTables.h"
 
+#include "Common/CCDB/EventSelectionParams.h"
+#include "Common/DataModel/EventSelection.h"
+
+#include "CommonConstants/LHCConstants.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2::framework;
 using namespace o2::framework::expressions;
 
diff --git a/.conflict-side-0/PWGUD/Tasks/upcEventITSROFcounter.cxx b/.conflict-side-0/PWGUD/Tasks/upcEventITSROFcounter.cxx
index 51241be5d69..7156c8038e0 100644
--- a/.conflict-side-0/PWGUD/Tasks/upcEventITSROFcounter.cxx
+++ b/.conflict-side-0/PWGUD/Tasks/upcEventITSROFcounter.cxx
@@ -15,24 +15,24 @@
 /// \author Roman Lavicka <roman.lavicka@cern.ch>, Austrian Academy of Sciences & SMI
 /// \since  09.08.2024
 
-#include <utility>
-#include <vector>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "ITSMFTBase/DPLAlpideParam.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "ReconstructionDataFormats/Vertex.h"
+#include "PWGUD/Core/SGSelector.h"
+#include "PWGUD/DataModel/UDTables.h"
 
 #include "Common/CCDB/EventSelectionParams.h"
 #include "Common/DataModel/EventSelection.h"
 
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/SGSelector.h"
+#include "CCDB/BasicCCDBManager.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ITSMFTBase/DPLAlpideParam.h"
+#include "ReconstructionDataFormats/Vertex.h"
 
 #include <TH1D.h>
 
+#include <utility>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-0/PWGUD/Tasks/upcForward.cxx b/.conflict-side-0/PWGUD/Tasks/upcForward.cxx
index bebcf0b2be2..16571bc28ac 100644
--- a/.conflict-side-0/PWGUD/Tasks/upcForward.cxx
+++ b/.conflict-side-0/PWGUD/Tasks/upcForward.cxx
@@ -14,16 +14,19 @@ o2-analysis-timestamp| o2-analysis-upc-forward | o2-analysis-event-selection  --
 for now AO2D.root I am using is
 alien:///alice/data/2015/LHC15o/000246392/pass5_lowIR/PWGZZ/Run3_Conversion/148_20210304-0829_child_1/AOD/001/AO2D.root
 */
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "Common/CCDB/TriggerAliases.h"
 #include "Common/DataModel/EventSelection.h"
-#include <iostream>
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TLorentzVector.h"
 #include <TH1D.h>
 #include <TH2D.h>
 #include <TString.h>
-#include "TLorentzVector.h"
-#include "Common/CCDB/TriggerAliases.h"
+
+#include <iostream>
 
 using namespace std;
 using namespace o2;
diff --git a/.conflict-side-0/PWGUD/Tasks/upcJpsiCorr.cxx b/.conflict-side-0/PWGUD/Tasks/upcJpsiCorr.cxx
index 8db8746b99d..9ec14bdf12a 100644
--- a/.conflict-side-0/PWGUD/Tasks/upcJpsiCorr.cxx
+++ b/.conflict-side-0/PWGUD/Tasks/upcJpsiCorr.cxx
@@ -15,22 +15,23 @@
 /// \author Sara Haidlova, sara.haidlova@cern.ch
 /// \since March 2024
 
-#include <vector>
 #include <utility>
+#include <vector>
 
 // O2 headers
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "CommonConstants/MathConstants.h"
 #include "CommonConstants/PhysicsConstants.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 // O2Physics headers
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/RecoDecay.h"
-#include "PWGUD/DataModel/UDTables.h"
+#include "PWGUD/Core/SGSelector.h"
 #include "PWGUD/Core/UDHelpers.h"
 #include "PWGUD/Core/UPCJpsiCentralBarrelCorrHelper.h"
-#include "PWGUD/Core/SGSelector.h"
+#include "PWGUD/DataModel/UDTables.h"
+
+#include "Common/Core/RecoDecay.h"
+#include "Common/DataModel/PIDResponse.h"
 
 // ROOT headers
 #include "TLorentzVector.h"
diff --git a/.conflict-side-0/PWGUD/Tasks/upcMft.cxx b/.conflict-side-0/PWGUD/Tasks/upcMft.cxx
index a3ae2b03287..168f9c47f96 100644
--- a/.conflict-side-0/PWGUD/Tasks/upcMft.cxx
+++ b/.conflict-side-0/PWGUD/Tasks/upcMft.cxx
@@ -13,27 +13,28 @@
 #include <iostream>
 
 // root headers
+#include "TLorentzVector.h"
+#include "TMath.h"
 #include <TH1F.h>
 #include <TH2F.h>
-#include "TMath.h"
-#include "TLorentzVector.h"
 
 // framework headers
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 // for track propagation
-#include "ReconstructionDataFormats/TrackFwd.h"
-#include "Math/MatrixFunctions.h"
-#include "Math/SMatrix.h"
-#include "MathUtils/Utils.h"
 #include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsMFT/TrackMFT.h"
 #include "DataFormatsParameters/GRPMagField.h"
 #include "DetectorsBase/Propagator.h"
-#include "TGeoGlobalMagField.h"
 #include "Field/MagneticField.h"
-#include "DataFormatsMFT/TrackMFT.h"
+#include "MathUtils/Utils.h"
+#include "ReconstructionDataFormats/TrackFwd.h"
+
+#include "Math/MatrixFunctions.h"
+#include "Math/SMatrix.h"
+#include "TGeoGlobalMagField.h"
 
 // define namespaces
 using namespace o2;
diff --git a/.conflict-side-0/PWGUD/Tasks/upcPhotonuclearAnalysisJMG.cxx b/.conflict-side-0/PWGUD/Tasks/upcPhotonuclearAnalysisJMG.cxx
index d20a78429dd..7d474f26513 100644
--- a/.conflict-side-0/PWGUD/Tasks/upcPhotonuclearAnalysisJMG.cxx
+++ b/.conflict-side-0/PWGUD/Tasks/upcPhotonuclearAnalysisJMG.cxx
@@ -13,15 +13,10 @@
 /// \author Josué Martínez García, josuem@cern.ch
 /// \file   upcPhotonuclearAnalysisJMG.cxx
 
-#include <vector>
-
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "Framework/StepTHn.h"
-#include "CommonConstants/MathConstants.h"
-#include <TTree.h>
+#include "PWGCF/Core/CorrelationContainer.h"
+#include "PWGUD/Core/UPCPairCuts.h"
+#include "PWGUD/Core/UPCTauCentralBarrelHelperRL.h"
+#include "PWGUD/DataModel/UDTables.h"
 
 #include "Common/CCDB/EventSelectionParams.h"
 #include "Common/Core/TrackSelection.h"
@@ -29,12 +24,18 @@
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "PWGCF/Core/CorrelationContainer.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonConstants/MathConstants.h"
 #include "DataFormatsParameters/GRPObject.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
 
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/UPCPairCuts.h"
-#include "PWGUD/Core/UPCTauCentralBarrelHelperRL.h"
+#include <TTree.h>
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGUD/Tasks/upcPionAnalysis.cxx b/.conflict-side-0/PWGUD/Tasks/upcPionAnalysis.cxx
index fc215ea1822..4d581d5548c 100644
--- a/.conflict-side-0/PWGUD/Tasks/upcPionAnalysis.cxx
+++ b/.conflict-side-0/PWGUD/Tasks/upcPionAnalysis.cxx
@@ -9,18 +9,22 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 //
-#include <vector>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include <iostream>
-#include "PWGUD/DataModel/UDTables.h"
-#include <TString.h>
-#include <TTree.h>
-#include "TLorentzVector.h"
 #include "PWGUD/Core/SGSelector.h"
 #include "PWGUD/Core/SGTrackSelector.h"
+#include "PWGUD/DataModel/UDTables.h"
+
 #include "Common/Core/RecoDecay.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TLorentzVector.h"
+#include <TString.h>
+#include <TTree.h>
+
+#include <iostream>
+#include <vector>
 using namespace std;
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-side-0/PWGUD/Tasks/upcQuarkoniaCentralBarrel.cxx b/.conflict-side-0/PWGUD/Tasks/upcQuarkoniaCentralBarrel.cxx
index f195a750fa4..d029f336604 100644
--- a/.conflict-side-0/PWGUD/Tasks/upcQuarkoniaCentralBarrel.cxx
+++ b/.conflict-side-0/PWGUD/Tasks/upcQuarkoniaCentralBarrel.cxx
@@ -30,40 +30,41 @@
 //    david.dobrigkeit.chinellato@cern.ch
 //
 
-#include <Math/Vector4D.h>
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <map>
-#include <string>
-#include <vector>
-
-#include <TFile.h>
-#include <TH2F.h>
-#include <TProfile.h>
-#include <TLorentzVector.h>
-#include <TPDGCode.h>
+#include "PWGUD/Core/SGSelector.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/trackUtilities.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/Core/SGSelector.h"
-
+#include "Common/DataModel/TrackSelectionTables.h"
 #include "EventFiltering/Zorro.h"
 #include "EventFiltering/ZorroSummary.h"
 
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <Math/Vector4D.h>
+#include <TFile.h>
+#include <TH2F.h>
+#include <TLorentzVector.h>
+#include <TPDGCode.h>
+#include <TProfile.h>
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <map>
+#include <string>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-0/PWGUD/Tasks/upcRhoPrimeAnalysis.cxx b/.conflict-side-0/PWGUD/Tasks/upcRhoPrimeAnalysis.cxx
index d4048806854..6cb00abe79a 100644
--- a/.conflict-side-0/PWGUD/Tasks/upcRhoPrimeAnalysis.cxx
+++ b/.conflict-side-0/PWGUD/Tasks/upcRhoPrimeAnalysis.cxx
@@ -12,20 +12,20 @@
 /// \brief  Task for analysis of rho' in UPCs using UD tables (from SG producer).
 /// \author Cesar Ramirez, cesar.ramirez@cern.ch
 
-#include <string> // Para std::string
-#include <vector> // Para std::vector
+#include "PWGUD/Core/UPCTauCentralBarrelHelperRL.h"
+#include "PWGUD/DataModel/UDTables.h"
+
+#include "Common/DataModel/PIDResponse.h"
 
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
 
 #include "Math/Vector4D.h" // similiar to TLorentzVector (which is now legacy apparently)
-#include <random>
-
-#include "Common/DataModel/PIDResponse.h"
 
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/UPCTauCentralBarrelHelperRL.h"
+#include <random>
+#include <string> // Para std::string
+#include <vector> // Para std::vector
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/PWGUD/Tasks/upcTauRl.cxx b/.conflict-side-0/PWGUD/Tasks/upcTauRl.cxx
index c0684cec14b..8f723ac30e8 100644
--- a/.conflict-side-0/PWGUD/Tasks/upcTauRl.cxx
+++ b/.conflict-side-0/PWGUD/Tasks/upcTauRl.cxx
@@ -17,20 +17,24 @@
 //
 
 // C++ headers
+#include <algorithm>
+#include <random>
 #include <set>
 #include <utility>
-#include <algorithm>
 #include <vector>
-#include <random>
 
 // O2 headers
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/runDataProcessing.h"
 
 // O2Physics headers
+#include "PWGUD/Core/SGSelector.h"
+#include "PWGUD/Core/UPCTauCentralBarrelHelperRL.h"
+#include "PWGUD/DataModel/UDTables.h"
+
 #include "Common/CCDB/EventSelectionParams.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
@@ -38,9 +42,6 @@
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "PWGUD/Core/UPCTauCentralBarrelHelperRL.h"
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/SGSelector.h"
 
 // ROOT headers
 #include "Math/Vector4D.h"
diff --git a/.conflict-side-0/PWGUD/Tasks/upcTauTau13topo.cxx b/.conflict-side-0/PWGUD/Tasks/upcTauTau13topo.cxx
index 0d18b316b8b..e4e433ec883 100644
--- a/.conflict-side-0/PWGUD/Tasks/upcTauTau13topo.cxx
+++ b/.conflict-side-0/PWGUD/Tasks/upcTauTau13topo.cxx
@@ -17,9 +17,9 @@
 // copts="--configuration json://tautauConfig.json -b"
 // o2-analysis-ud-tautau13topo $copts > output.log
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 // #include "TDatabasePDG.h" // not recommended in o2
 #include "Framework/O2DatabasePDGPlugin.h"
@@ -28,13 +28,13 @@
 // #include "Common/DataModel/EventSelection.h"
 // #include "Common/DataModel/TrackSelectionTables.h"
 
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/UDHelpers.h"
 #include "PWGUD/Core/DGPIDSelector.h"
 #include "PWGUD/Core/SGSelector.h"
+#include "PWGUD/Core/UDHelpers.h"
+#include "PWGUD/DataModel/UDTables.h"
 
 #include "Common/Core/RecoDecay.h"
+#include "Common/DataModel/PIDResponse.h"
 // #include <CommonUtils/EnumFlags.h>
 #include "TPDGCode.h"
 
diff --git a/.conflict-side-0/PWGUD/Tasks/upcVetoAnalysis.cxx b/.conflict-side-0/PWGUD/Tasks/upcVetoAnalysis.cxx
index 45b3844ed51..84d73774439 100644
--- a/.conflict-side-0/PWGUD/Tasks/upcVetoAnalysis.cxx
+++ b/.conflict-side-0/PWGUD/Tasks/upcVetoAnalysis.cxx
@@ -8,21 +8,21 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include <map>
-#include <string>
-#include <unordered_set>
-#include <vector>
-#include <unordered_map>
-#include <memory>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-
 #include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/LHCConstants.h"
 #include "DataFormatsFIT/Triggers.h"
-#include "DataFormatsParameters/GRPLHCIFData.h"
 #include "DataFormatsParameters/GRPECSObject.h"
+#include "DataFormatsParameters/GRPLHCIFData.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include <map>
+#include <memory>
+#include <string>
+#include <unordered_map>
+#include <unordered_set>
+#include <vector>
 
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-0/Tools/KFparticle/qaKFEventTrack.cxx b/.conflict-side-0/Tools/KFparticle/qaKFEventTrack.cxx
index f3f026a8da7..ccadf3f60af 100644
--- a/.conflict-side-0/Tools/KFparticle/qaKFEventTrack.cxx
+++ b/.conflict-side-0/Tools/KFparticle/qaKFEventTrack.cxx
@@ -16,37 +16,40 @@
 ///
 
 #include "Tools/KFparticle/qaKFEventTrack.h"
-#include <CCDB/BasicCCDBManager.h>
-#include <string>
+
 #include "TableHelper.h"
+
+#include <CCDB/BasicCCDBManager.h>
+
 #include <iostream>
+#include <string>
 using namespace std;
 
 /// includes O2
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/DCA.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DetectorsBase/Propagator.h"
 
 /// includes O2Physics
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/Core/trackUtilities.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 #include "Tools/KFparticle/KFUtilities.h"
 
 /// includes KFParticle
-#include "KFParticle.h"
 #include "KFPTrack.h"
 #include "KFPVertex.h"
+#include "KFParticle.h"
 #include "KFParticleBase.h"
 #include "KFVertex.h"
 
diff --git a/.conflict-side-0/Tools/KFparticle/qaKFEventTrack.h b/.conflict-side-0/Tools/KFparticle/qaKFEventTrack.h
index 399a3139a91..3ded6f627ea 100644
--- a/.conflict-side-0/Tools/KFparticle/qaKFEventTrack.h
+++ b/.conflict-side-0/Tools/KFparticle/qaKFEventTrack.h
@@ -15,10 +15,11 @@
 #ifndef TOOLS_KFPARTICLE_QAKFEVENTTRACK_H_
 #define TOOLS_KFPARTICLE_QAKFEVENTTRACK_H_
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Common/Core/trackUtilities.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+
 enum FlagsTracks {
   kITS = BIT(0),
   kTPC = BIT(1),
diff --git a/.conflict-side-0/Tools/KFparticle/qaKFParticle.cxx b/.conflict-side-0/Tools/KFparticle/qaKFParticle.cxx
index f4ffdf58a85..a0886d647d9 100644
--- a/.conflict-side-0/Tools/KFparticle/qaKFParticle.cxx
+++ b/.conflict-side-0/Tools/KFparticle/qaKFParticle.cxx
@@ -16,38 +16,42 @@
 ///
 
 #include "Tools/KFparticle/qaKFParticle.h"
+
+#include "TableHelper.h"
+
 #include <CCDB/BasicCCDBManager.h>
-#include <string>
+
 #include <TDatabasePDG.h>
 #include <TPDGCode.h>
-#include "TableHelper.h"
+
+#include <string>
 
 /// includes O2
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/DCA.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DetectorsBase/Propagator.h"
 
 /// includes O2Physics
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/trackUtilities.h"
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/Core/RecoDecay.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 #include "Tools/KFparticle/KFUtilities.h"
 
 /// includes KFParticle
-#include "KFParticle.h"
 #include "KFPTrack.h"
 #include "KFPVertex.h"
+#include "KFParticle.h"
 #include "KFParticleBase.h"
 #include "KFVertex.h"
 
diff --git a/.conflict-side-0/Tools/KFparticle/qaKFParticle.h b/.conflict-side-0/Tools/KFparticle/qaKFParticle.h
index afb23851cb5..ddde56d6931 100644
--- a/.conflict-side-0/Tools/KFparticle/qaKFParticle.h
+++ b/.conflict-side-0/Tools/KFparticle/qaKFParticle.h
@@ -15,10 +15,11 @@
 #ifndef TOOLS_KFPARTICLE_QAKFPARTICLE_H_
 #define TOOLS_KFPARTICLE_QAKFPARTICLE_H_
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Common/Core/trackUtilities.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+
 enum Source {
   kPrompt = BIT(0),
   kNonPrompt = BIT(1),
diff --git a/.conflict-side-0/Tools/KFparticle/qaKFParticleLc.cxx b/.conflict-side-0/Tools/KFparticle/qaKFParticleLc.cxx
index 20da1eb6128..c8f0c6fe6b2 100644
--- a/.conflict-side-0/Tools/KFparticle/qaKFParticleLc.cxx
+++ b/.conflict-side-0/Tools/KFparticle/qaKFParticleLc.cxx
@@ -16,38 +16,42 @@
 ///
 
 #include "Tools/KFparticle/qaKFParticleLc.h"
+
+#include "TableHelper.h"
+
 #include <CCDB/BasicCCDBManager.h>
-#include <string>
+
 #include <TDatabasePDG.h>
 #include <TPDGCode.h>
-#include "TableHelper.h"
+
+#include <string>
 
 /// includes O2
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/DCA.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DetectorsBase/Propagator.h"
 
 /// includes O2Physics
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/trackUtilities.h"
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/Core/RecoDecay.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 #include "Tools/KFparticle/KFUtilities.h"
 
 /// includes KFParticle
-#include "KFParticle.h"
 #include "KFPTrack.h"
 #include "KFPVertex.h"
+#include "KFParticle.h"
 #include "KFParticleBase.h"
 #include "KFVertex.h"
 
diff --git a/.conflict-side-0/Tools/KFparticle/qaKFParticleLc.h b/.conflict-side-0/Tools/KFparticle/qaKFParticleLc.h
index 8c57232f99a..444b45bb5eb 100644
--- a/.conflict-side-0/Tools/KFparticle/qaKFParticleLc.h
+++ b/.conflict-side-0/Tools/KFparticle/qaKFParticleLc.h
@@ -15,10 +15,11 @@
 #ifndef TOOLS_KFPARTICLE_QAKFPARTICLELC_H_
 #define TOOLS_KFPARTICLE_QAKFPARTICLELC_H_
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Common/Core/trackUtilities.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+
 enum Source {
   kPrompt = BIT(0),
   kNonPrompt = BIT(1),
diff --git a/.conflict-side-0/Tutorials/ML/applyMlSelection.cxx b/.conflict-side-0/Tutorials/ML/applyMlSelection.cxx
index 4ca579acc44..0212c53d913 100644
--- a/.conflict-side-0/Tutorials/ML/applyMlSelection.cxx
+++ b/.conflict-side-0/Tutorials/ML/applyMlSelection.cxx
@@ -15,14 +15,15 @@
 ///
 /// \author Fabio Catalano <fabio.catalano@cern.ch>, CERN
 
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+
+#include "Tools/ML/MlResponse.h"
+
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
 
-#include "Tools/ML/MlResponse.h"
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-
 using namespace o2;
 using namespace o2::analysis;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Tutorials/ML/applyOnnxModel.cxx b/.conflict-side-0/Tutorials/ML/applyOnnxModel.cxx
index 6bf5d6ecb59..f49a315494f 100644
--- a/.conflict-side-0/Tutorials/ML/applyOnnxModel.cxx
+++ b/.conflict-side-0/Tutorials/ML/applyOnnxModel.cxx
@@ -14,10 +14,11 @@
 ///
 /// \author Christian Sonnabend <christian.sonnabend@cern.ch>, GSI
 
-#include "Framework/runDataProcessing.h"
+#include "Tools/ML/model.h"
+
 #include "Framework/AnalysisTask.h"
 #include "Framework/Logger.h"
-#include "Tools/ML/model.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Tutorials/OpenData/flowAnalysis.cxx b/.conflict-side-0/Tutorials/OpenData/flowAnalysis.cxx
index dc5e180b300..75fe73001f4 100644
--- a/.conflict-side-0/Tutorials/OpenData/flowAnalysis.cxx
+++ b/.conflict-side-0/Tutorials/OpenData/flowAnalysis.cxx
@@ -15,20 +15,22 @@
 /// \author
 /// \since
 
-#include <TF1.h>
-#include <TH3.h>
-#include <Framework/runDataProcessing.h>
-#include <Framework/AnalysisTask.h>
-#include <Framework/HistogramRegistry.h>
-#include <Framework/AnalysisDataModel.h>
-#include <Common/DataModel/EventSelection.h>
 #include <Common/CCDB/TriggerAliases.h>
 #include <Common/DataModel/Centrality.h>
+#include <Common/DataModel/EventSelection.h>
 #include <Common/DataModel/Multiplicity.h>
-#include <Common/DataModel/TrackSelectionTables.h>
 #include <Common/DataModel/PIDResponse.h>
+#include <Common/DataModel/TrackSelectionTables.h>
+
 #include <CCDB/BasicCCDBManager.h>
 #include <DataFormatsParameters/GRPObject.h>
+#include <Framework/AnalysisDataModel.h>
+#include <Framework/AnalysisTask.h>
+#include <Framework/HistogramRegistry.h>
+#include <Framework/runDataProcessing.h>
+
+#include <TF1.h>
+#include <TH3.h>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Tutorials/PWGCF/EventPlane/src/qVectorstutorial.cxx b/.conflict-side-0/Tutorials/PWGCF/EventPlane/src/qVectorstutorial.cxx
index b5b01185a49..eb02ea865ec 100644
--- a/.conflict-side-0/Tutorials/PWGCF/EventPlane/src/qVectorstutorial.cxx
+++ b/.conflict-side-0/Tutorials/PWGCF/EventPlane/src/qVectorstutorial.cxx
@@ -10,32 +10,32 @@
 // or submit itself to any jurisdiction.
 
 // C++/ROOT includes.
-#include <chrono>
-#include <string>
-#include <vector>
 #include <TComplex.h>
 #include <TH1F.h>
 #include <TH2D.h>
 #include <TMath.h>
 #include <TVector2.h>
 
+#include <chrono>
+#include <string>
+#include <vector>
+
 // o2Physics includes.
+#include "Common/Core/EventPlaneHelper.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Qvectors.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StaticFor.h"
-
-#include "Common/DataModel/Qvectors.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/Core/EventPlaneHelper.h"
-#include "Common/Core/TrackSelection.h"
-
-#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/runDataProcessing.h"
 
 // o2 includes.
 
diff --git a/.conflict-side-0/Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask1.cxx b/.conflict-side-0/Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask1.cxx
index 369e63cbdf6..246fba0e183 100644
--- a/.conflict-side-0/Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask1.cxx
+++ b/.conflict-side-0/Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask1.cxx
@@ -16,9 +16,9 @@
 #include "Framework/runDataProcessing.h"
 
 /// FemtoDream includes
+#include "PWGCF/DataModel/FemtoDerived.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamMath.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
-#include "PWGCF/DataModel/FemtoDerived.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask2.cxx b/.conflict-side-0/Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask2.cxx
index ff5fa93aa5b..303d3d8e3ef 100644
--- a/.conflict-side-0/Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask2.cxx
+++ b/.conflict-side-0/Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask2.cxx
@@ -16,9 +16,9 @@
 #include "Framework/runDataProcessing.h"
 
 /// FemtoDream includes
+#include "PWGCF/DataModel/FemtoDerived.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamMath.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
-#include "PWGCF/DataModel/FemtoDerived.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask3.cxx b/.conflict-side-0/Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask3.cxx
index ca200fd3937..69aa8baf37c 100644
--- a/.conflict-side-0/Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask3.cxx
+++ b/.conflict-side-0/Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask3.cxx
@@ -16,9 +16,9 @@
 #include "Framework/runDataProcessing.h"
 
 /// FemtoDream includes
+#include "PWGCF/DataModel/FemtoDerived.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamMath.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
-#include "PWGCF/DataModel/FemtoDerived.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask4.cxx b/.conflict-side-0/Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask4.cxx
index 90ae5168a78..a6b61304a53 100644
--- a/.conflict-side-0/Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask4.cxx
+++ b/.conflict-side-0/Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask4.cxx
@@ -16,9 +16,9 @@
 #include "Framework/runDataProcessing.h"
 
 /// FemtoDream includes
+#include "PWGCF/DataModel/FemtoDerived.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamMath.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
-#include "PWGCF/DataModel/FemtoDerived.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask5.cxx b/.conflict-side-0/Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask5.cxx
index d9159c2e3cc..3332d4ce43d 100644
--- a/.conflict-side-0/Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask5.cxx
+++ b/.conflict-side-0/Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask5.cxx
@@ -14,12 +14,13 @@
 /// O2 includes
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
+
 #include "TDatabasePDG.h"
 
 /// FemtoDream includes
+#include "PWGCF/DataModel/FemtoDerived.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamMath.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
-#include "PWGCF/DataModel/FemtoDerived.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Tutorials/PWGCF/FlowGenericFramework/src/flowGFWTutorial.cxx b/.conflict-side-0/Tutorials/PWGCF/FlowGenericFramework/src/flowGFWTutorial.cxx
index cfd0eca696b..8e5f096c8ac 100644
--- a/.conflict-side-0/Tutorials/PWGCF/FlowGenericFramework/src/flowGFWTutorial.cxx
+++ b/.conflict-side-0/Tutorials/PWGCF/FlowGenericFramework/src/flowGFWTutorial.cxx
@@ -9,26 +9,28 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <CCDB/BasicCCDBManager.h>
-#include <cmath>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/HistogramRegistry.h"
+#include "GFW.h"
+#include "GFWCumulant.h"
+#include "GFWPowerArray.h"
 
-#include "Common/DataModel/EventSelection.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include <CCDB/BasicCCDBManager.h>
 
-#include "GFWPowerArray.h"
-#include "GFW.h"
-#include "GFWCumulant.h"
 #include "TList.h"
 #include <TProfile.h>
 #include <TRandom3.h>
 
+#include <cmath>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-0/Tutorials/PWGCF/TwoParticleCorrelations/src/firstcfcorrelations.cxx b/.conflict-side-0/Tutorials/PWGCF/TwoParticleCorrelations/src/firstcfcorrelations.cxx
index cdec4f3ca95..ef8f6f78b32 100644
--- a/.conflict-side-0/Tutorials/PWGCF/TwoParticleCorrelations/src/firstcfcorrelations.cxx
+++ b/.conflict-side-0/Tutorials/PWGCF/TwoParticleCorrelations/src/firstcfcorrelations.cxx
@@ -13,18 +13,20 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "PWGCF/Core/CorrelationContainer.h"
+#include "PWGCF/Core/PairCuts.h"
+
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonConstants/MathConstants.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/RunningWorkflowInfo.h"
-#include "CommonConstants/MathConstants.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Centrality.h"
-#include "PWGCF/Core/CorrelationContainer.h"
-#include "PWGCF/Core/PairCuts.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Tutorials/PWGCF/TwoParticleCorrelations/src/firstcfo2physics.cxx b/.conflict-side-0/Tutorials/PWGCF/TwoParticleCorrelations/src/firstcfo2physics.cxx
index d5d1a6777d3..d6b459e43b3 100644
--- a/.conflict-side-0/Tutorials/PWGCF/TwoParticleCorrelations/src/firstcfo2physics.cxx
+++ b/.conflict-side-0/Tutorials/PWGCF/TwoParticleCorrelations/src/firstcfo2physics.cxx
@@ -13,11 +13,11 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-
 #include "Common/DataModel/Centrality.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-side-0/Tutorials/PWGEM/Cocktail/configs/ana_config.json b/.conflict-side-0/Tutorials/PWGEM/Cocktail/configs/ana_config.json
index 1b61ab3c3a8..dda7d3d0127 100644
--- a/.conflict-side-0/Tutorials/PWGEM/Cocktail/configs/ana_config.json
+++ b/.conflict-side-0/Tutorials/PWGEM/Cocktail/configs/ana_config.json
@@ -15,4 +15,4 @@
         "cfgPhotonPtFileName": "",
         "cfgPhotonPtDirName": ""
     }
-}
\ No newline at end of file
+}
diff --git a/.conflict-side-0/Tutorials/PWGEM/Cocktail/files/parametrizations/PbPb_5TeV.json b/.conflict-side-0/Tutorials/PWGEM/Cocktail/files/parametrizations/PbPb_5TeV.json
index 85e0fec1703..dee9dacae8d 100644
--- a/.conflict-side-0/Tutorials/PWGEM/Cocktail/files/parametrizations/PbPb_5TeV.json
+++ b/.conflict-side-0/Tutorials/PWGEM/Cocktail/files/parametrizations/PbPb_5TeV.json
@@ -399,4 +399,4 @@
         "221_pt": "(TMath::TwoPi()*x*(219.382*exp(-(sqrt(x*x+0.139571*0.139571)-0.139571)/0.384303)+2471.6*pow(exp(-1.12373*x-0.752507*x*x)+x/0.438343,-5.45943)))*((((x<9.445400)*(TMath::Max(TMath::Max(1.68883e-09*TMath::Power((exp(- -1.16032*sqrt(x*x+0.547*0.547-0.139*0.139)-0.435153*(x*x+0.547*0.547-0.139*0.139))+TMath::Power(0.480215/1.68883e-09,-1./16.7077)*sqrt(x*x+0.547*0.547-0.139*0.139)/0.0356546),-16.7077)/TMath::Power((exp(- -1.16032*x-0.435153*x*x)+x/0.0356546),-16.7077)+1.75797*TMath::Landau(x,2.41484,1.01421),0.00469052*TMath::Power((exp(- -0.124633*sqrt(x*x+0.547*0.547-0.139*0.139)-0.310906*(x*x+0.547*0.547-0.139*0.139))+TMath::Power(0.479677/0.00469052,-1./0.657178)*sqrt(x*x+0.547*0.547-0.139*0.139)/0.0210313),-0.657178)/TMath::Power((exp(- -0.124633*x-0.310906*x*x)+x/0.0210313),-0.657178)+1.42452*TMath::Landau(x,2.46537,0.969902)),TMath::Max(4.88363e-10*TMath::Power((exp(- -2.82354*sqrt(x*x+0.547*0.547-0.139*0.139)-0.728315*(x*x+0.547*0.547-0.139*0.139))+TMath::Power(0.483053/4.88363e-10,-1./16.2073)*sqrt(x*x+0.547*0.547-0.139*0.139)/0.0021492),-16.2073)/TMath::Power((exp(- -2.82354*x-0.728315*x*x)+x/0.0021492),-16.2073)+1.57731*TMath::Landau(x,2.40466,1.00957),0.00469052*TMath::Power((exp(- -0.124633*sqrt(x*x+0.547*0.547-0.139*0.139)-0.310906*(x*x+0.547*0.547-0.139*0.139))+TMath::Power(0.479677/0.00469052,-1./0.657178)*sqrt(x*x+0.547*0.547-0.139*0.139)/0.0210313),-0.657178)/TMath::Power((exp(- -0.124633*x-0.310906*x*x)+x/0.0210313),-0.657178)+1.42452*TMath::Landau(x,2.46537,0.969902))))+(x>=9.445400)*1.06*(((0.52091*1.)+(159.301*(-0.00307058*TMath::Power(1.+((x/1.03888)*(x/1.03888)),-(0.567478)))))/(1.+(-0.00307058*TMath::Power(1.+((x/1.03888)*(x/1.03888)),-(0.567478))))))))",
         "333_pt": "(TMath::TwoPi()*x*(219.382*exp(-(sqrt(x*x+0.139571*0.139571)-0.139571)/0.384303)+2471.6*pow(exp(-1.12373*x-0.752507*x*x)+x/0.438343,-5.45943)))*(0.1191/(1+exp(-(x- -0.316437)/0.554431))+-0.507618*TMath::Gaus(x,1.69654,1.62649)+0.494136*TMath::Gaus(x,2.56805,1.6193)+0.0789659)"
     }
-}
\ No newline at end of file
+}
diff --git a/.conflict-side-0/Tutorials/PWGEM/Cocktail/files/parametrizations/pp_13TeV.json b/.conflict-side-0/Tutorials/PWGEM/Cocktail/files/parametrizations/pp_13TeV.json
index 1f999879643..d4d5a77bf8f 100644
--- a/.conflict-side-0/Tutorials/PWGEM/Cocktail/files/parametrizations/pp_13TeV.json
+++ b/.conflict-side-0/Tutorials/PWGEM/Cocktail/files/parametrizations/pp_13TeV.json
@@ -43,4 +43,4 @@
         "113_pt": "(x*(123.313*(pow((exp((0.171351*x)-(abs(0.00418378)*(x*x)))+(x/0.919801)),-(6.29677)))))*((((0.37788/(1+exp(-((x-0.265203)/0.274547))))+(-(0.393597*TMath::Gaus(x,0.324349,0.819888))))+(-(0.230459*TMath::Gaus(x,1.23251,1.24114))))+0.412584)",
         "223_pt": "(x*(123.313*(pow((exp((0.171351*x)-(abs(0.00418378)*(x*x)))+(x/0.919801)),-(6.29677)))))*((((0.435069/(1+exp(-((x-0.302485)/0.27614))))+(-(0.258853*TMath::Gaus(x,0.42493,0.693856))))+(-(0.202117*TMath::Gaus(x,1.07795,1.09857))))+0.242026)"
     }
-}
\ No newline at end of file
+}
diff --git a/.conflict-side-0/Tutorials/PWGEM/Cocktail/plotLFCocktail.C b/.conflict-side-0/Tutorials/PWGEM/Cocktail/plotLFCocktail.C
index 8740544d66f..db095ad62f7 100644
--- a/.conflict-side-0/Tutorials/PWGEM/Cocktail/plotLFCocktail.C
+++ b/.conflict-side-0/Tutorials/PWGEM/Cocktail/plotLFCocktail.C
@@ -72,4 +72,5 @@ void plotLFCocktail(TString filename = "AnalysisResults.root", int rebin = 1)
   }
   gPad->BuildLegend(0.62, 0.9, 0.9, 0.6);
   mee[0]->SetTitle("after resolution and acceptance");
-}
\ No newline at end of file
+}
+ 
\ No newline at end of file
diff --git a/.conflict-side-0/Tutorials/PWGEM/emcclustertutorial.cxx b/.conflict-side-0/Tutorials/PWGEM/emcclustertutorial.cxx
index a047206e70d..222346a9114 100644
--- a/.conflict-side-0/Tutorials/PWGEM/emcclustertutorial.cxx
+++ b/.conflict-side-0/Tutorials/PWGEM/emcclustertutorial.cxx
@@ -9,32 +9,31 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <climits>
-#include <cstdlib>
-#include <map>
-#include <memory>
-#include <sstream>
-#include <string>
-#include <vector>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoA.h"
-#include "Framework/HistogramRegistry.h"
+#include "PWGJE/DataModel/EMCALClusters.h"
 
-#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
 
-#include "EMCALBase/Geometry.h"
-#include "EMCALCalib/BadChannelMap.h"
-#include "PWGJE/DataModel/EMCALClusters.h"
+#include "CommonDataFormat/InteractionRecord.h"
+#include "DataFormatsEMCAL/AnalysisCluster.h"
 #include "DataFormatsEMCAL/Cell.h"
 #include "DataFormatsEMCAL/Constants.h"
-#include "DataFormatsEMCAL/AnalysisCluster.h"
+#include "EMCALBase/Geometry.h"
+#include "EMCALCalib/BadChannelMap.h"
+#include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 
-#include "CommonDataFormat/InteractionRecord.h"
+#include <climits>
+#include <cstdlib>
+#include <map>
+#include <memory>
+#include <sstream>
+#include <string>
+#include <vector>
 
 // \struct ClusterTutorial
 /// \brief Skeleton task for EMCal cluster tutorial
diff --git a/.conflict-side-0/Tutorials/PWGEM/pcm/pcmtutorial.cxx b/.conflict-side-0/Tutorials/PWGEM/pcm/pcmtutorial.cxx
index c10b4251991..d31ffa85177 100644
--- a/.conflict-side-0/Tutorials/PWGEM/pcm/pcmtutorial.cxx
+++ b/.conflict-side-0/Tutorials/PWGEM/pcm/pcmtutorial.cxx
@@ -12,16 +12,18 @@
 /// \brief tutorial for pcm analysis.
 /// \author daiki.sekihata@cern.ch
 
-#include <TMath.h>
-#include <Math/Vector4D.h>
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+#include "PWGEM/PhotonMeson/Utils/PCMUtilities.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Common/Core/trackUtilities.h"
+
 #include "CommonConstants/PhysicsConstants.h"
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/PhotonMeson/Utils/PCMUtilities.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include <Math/Vector4D.h>
+#include <TMath.h>
 
 using namespace o2;
 using namespace o2::soa;
diff --git a/.conflict-side-0/Tutorials/PWGLF/Resonance/resonancesCombine.cxx b/.conflict-side-0/Tutorials/PWGLF/Resonance/resonancesCombine.cxx
index 26a28661c6c..8ff1a07b1e0 100644
--- a/.conflict-side-0/Tutorials/PWGLF/Resonance/resonancesCombine.cxx
+++ b/.conflict-side-0/Tutorials/PWGLF/Resonance/resonancesCombine.cxx
@@ -14,16 +14,18 @@
 /// \author Bong-Hwi Lim <bong-hwi.lim@cern.ch>
 /// \since 13/12/2024
 
-#include <TLorentzVector.h>
-#include <TPDGCode.h>
+#include "PWGLF/DataModel/LFResonanceTables.h"
 
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/DataModel/Qvectors.h"
 #include "Common/Core/EventPlaneHelper.h"
-#include "Framework/AnalysisTask.h"
+#include "Common/DataModel/Qvectors.h"
+
+#include "CommonConstants/PhysicsConstants.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
+
+#include <TLorentzVector.h>
+#include <TPDGCode.h>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Tutorials/PWGLF/Resonance/resonancesMicrotrack.cxx b/.conflict-side-0/Tutorials/PWGLF/Resonance/resonancesMicrotrack.cxx
index 5022d4b602d..0e0073f6e3e 100644
--- a/.conflict-side-0/Tutorials/PWGLF/Resonance/resonancesMicrotrack.cxx
+++ b/.conflict-side-0/Tutorials/PWGLF/Resonance/resonancesMicrotrack.cxx
@@ -14,15 +14,16 @@
 /// \author Bong-Hwi Lim <bong-hwi.lim@cern.ch>
 /// \since 07/03/2025
 
-#include <TLorentzVector.h>
-#include <TPDGCode.h>
+#include "PWGLF/DataModel/LFResonanceTables.h"
 
 #include "CommonConstants/MathConstants.h"
 #include "CommonConstants/PhysicsConstants.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
+
+#include <TLorentzVector.h>
+#include <TPDGCode.h>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Tutorials/PWGLF/Resonance/resonances_step0.cxx b/.conflict-side-0/Tutorials/PWGLF/Resonance/resonances_step0.cxx
index 706abc72cd2..33d64cbc34b 100644
--- a/.conflict-side-0/Tutorials/PWGLF/Resonance/resonances_step0.cxx
+++ b/.conflict-side-0/Tutorials/PWGLF/Resonance/resonances_step0.cxx
@@ -13,12 +13,13 @@
 /// \author
 /// \since 08/11/2023
 
-#include <TLorentzVector.h>
+#include "PWGLF/DataModel/LFResonanceTables.h"
 
-#include "Framework/AnalysisTask.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
+
+#include <TLorentzVector.h>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Tutorials/PWGLF/Resonance/resonances_step1.cxx b/.conflict-side-0/Tutorials/PWGLF/Resonance/resonances_step1.cxx
index 2f566ace97c..7db2098ae2f 100644
--- a/.conflict-side-0/Tutorials/PWGLF/Resonance/resonances_step1.cxx
+++ b/.conflict-side-0/Tutorials/PWGLF/Resonance/resonances_step1.cxx
@@ -13,14 +13,15 @@
 /// \author
 /// \since 08/11/2023
 
-#include <TLorentzVector.h>
-#include <TPDGCode.h>
+#include "PWGLF/DataModel/LFResonanceTables.h"
 
 #include "CommonConstants/PhysicsConstants.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
+
+#include <TLorentzVector.h>
+#include <TPDGCode.h>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Tutorials/PWGLF/Resonance/resonances_step2.cxx b/.conflict-side-0/Tutorials/PWGLF/Resonance/resonances_step2.cxx
index 000bbf1e501..ff905f82582 100644
--- a/.conflict-side-0/Tutorials/PWGLF/Resonance/resonances_step2.cxx
+++ b/.conflict-side-0/Tutorials/PWGLF/Resonance/resonances_step2.cxx
@@ -13,13 +13,14 @@
 /// \author
 /// \since 08/11/2023
 
-#include <TLorentzVector.h>
+#include "PWGLF/DataModel/LFResonanceTables.h"
 
 #include "CommonConstants/PhysicsConstants.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
+
+#include <TLorentzVector.h>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Tutorials/PWGLF/Resonance/resonances_step3.cxx b/.conflict-side-0/Tutorials/PWGLF/Resonance/resonances_step3.cxx
index f2ef8dbbe67..80d24b43b17 100644
--- a/.conflict-side-0/Tutorials/PWGLF/Resonance/resonances_step3.cxx
+++ b/.conflict-side-0/Tutorials/PWGLF/Resonance/resonances_step3.cxx
@@ -13,11 +13,12 @@
 /// \author Hirak Kumar Koley <hirak.koley@cern.ch>
 /// \since 11/10/2024
 
+#include "PWGLF/DataModel/LFResonanceTables.h"
+
 #include "CommonConstants/PhysicsConstants.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Tutorials/PWGLF/Resonance/resonances_step4.cxx b/.conflict-side-0/Tutorials/PWGLF/Resonance/resonances_step4.cxx
index 05f7b35f7cf..6c54f87a713 100644
--- a/.conflict-side-0/Tutorials/PWGLF/Resonance/resonances_step4.cxx
+++ b/.conflict-side-0/Tutorials/PWGLF/Resonance/resonances_step4.cxx
@@ -13,11 +13,12 @@
 /// \author Hirak Kumar Koley <hirak.koley@cern.ch>
 /// \since 11/10/2024
 
+#include "PWGLF/DataModel/LFResonanceTables.h"
+
 #include "CommonConstants/PhysicsConstants.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Tutorials/PWGLF/Resonance/resonances_step5.cxx b/.conflict-side-0/Tutorials/PWGLF/Resonance/resonances_step5.cxx
index 7d8463b9236..3fc33f45f81 100644
--- a/.conflict-side-0/Tutorials/PWGLF/Resonance/resonances_step5.cxx
+++ b/.conflict-side-0/Tutorials/PWGLF/Resonance/resonances_step5.cxx
@@ -13,11 +13,12 @@
 /// \author Hirak Kumar Koley
 /// \since 11/10/2024
 
+#include "PWGLF/DataModel/LFResonanceTables.h"
+
 #include "CommonConstants/PhysicsConstants.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Tutorials/PWGLF/Resonance/resonances_step6.cxx b/.conflict-side-0/Tutorials/PWGLF/Resonance/resonances_step6.cxx
index 23ccac6dfd2..723d5a64712 100644
--- a/.conflict-side-0/Tutorials/PWGLF/Resonance/resonances_step6.cxx
+++ b/.conflict-side-0/Tutorials/PWGLF/Resonance/resonances_step6.cxx
@@ -13,13 +13,14 @@
 /// \author Hirak Kumar Koley
 /// \since 11/10/2024
 
-#include <TLorentzVector.h>
+#include "PWGLF/DataModel/LFResonanceTables.h"
 
 #include "CommonConstants/PhysicsConstants.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
+
+#include <TLorentzVector.h>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_skeleton.cxx b/.conflict-side-0/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_skeleton.cxx
index 788aaead7ae..9c7265a5051 100644
--- a/.conflict-side-0/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_skeleton.cxx
+++ b/.conflict-side-0/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_skeleton.cxx
@@ -15,11 +15,13 @@
 /// \author Nepeivoda Roman (roman.nepeivoda@cern.ch)
 /// \author Chiara De Martin (chiara.de.martin@cern.ch)
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/EventSelection.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/DataModel/EventSelection.h"
+
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_step0.cxx b/.conflict-side-0/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_step0.cxx
index b0e595246d7..96c7877e130 100644
--- a/.conflict-side-0/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_step0.cxx
+++ b/.conflict-side-0/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_step0.cxx
@@ -15,11 +15,13 @@
 /// \author Nepeivoda Roman (roman.nepeivoda@cern.ch)
 /// \author Chiara De Martin (chiara.de.martin@cern.ch)
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/EventSelection.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/DataModel/EventSelection.h"
+
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_step1.cxx b/.conflict-side-0/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_step1.cxx
index 836be98b240..92da4bfb428 100644
--- a/.conflict-side-0/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_step1.cxx
+++ b/.conflict-side-0/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_step1.cxx
@@ -15,11 +15,13 @@
 /// \author Nepeivoda Roman (roman.nepeivoda@cern.ch)
 /// \author Chiara De Martin (chiara.de.martin@cern.ch)
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/EventSelection.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/DataModel/EventSelection.h"
+
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_step2.cxx b/.conflict-side-0/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_step2.cxx
index 1558bb78052..c182142fd0a 100644
--- a/.conflict-side-0/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_step2.cxx
+++ b/.conflict-side-0/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_step2.cxx
@@ -15,12 +15,14 @@
 /// \author Nepeivoda Roman (roman.nepeivoda@cern.ch)
 /// \author Chiara De Martin (chiara.de.martin@cern.ch)
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/EventSelection.h"
 #include "PWGLF/DataModel/LFStrangenessPIDTables.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/DataModel/EventSelection.h"
+
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_step3.cxx b/.conflict-side-0/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_step3.cxx
index f12a4f02560..f6491959c37 100644
--- a/.conflict-side-0/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_step3.cxx
+++ b/.conflict-side-0/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_step3.cxx
@@ -15,12 +15,14 @@
 /// \author Nepeivoda Roman (roman.nepeivoda@cern.ch)
 /// \author Chiara De Martin (chiara.de.martin@cern.ch)
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/EventSelection.h"
 #include "PWGLF/DataModel/LFStrangenessPIDTables.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/DataModel/EventSelection.h"
+
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_step4.cxx b/.conflict-side-0/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_step4.cxx
index d45ef3c26a1..706e580bcb2 100644
--- a/.conflict-side-0/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_step4.cxx
+++ b/.conflict-side-0/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_step4.cxx
@@ -15,12 +15,14 @@
 /// \author Nepeivoda Roman (roman.nepeivoda@cern.ch)
 /// \author Chiara De Martin (chiara.de.martin@cern.ch)
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/EventSelection.h"
 #include "PWGLF/DataModel/LFStrangenessPIDTables.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/DataModel/EventSelection.h"
+
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Tutorials/PWGLF/Strangeness/pp/strangeness_step0.cxx b/.conflict-side-0/Tutorials/PWGLF/Strangeness/pp/strangeness_step0.cxx
index a14b0a5aa3f..4c2b6569e09 100644
--- a/.conflict-side-0/Tutorials/PWGLF/Strangeness/pp/strangeness_step0.cxx
+++ b/.conflict-side-0/Tutorials/PWGLF/Strangeness/pp/strangeness_step0.cxx
@@ -13,11 +13,13 @@
 /// \author Nepeivoda Roman (roman.nepeivoda@cern.ch)
 /// \author Chiara De Martin (chiara.de.martin@cern.ch)
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/EventSelection.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Common/DataModel/EventSelection.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-0/Tutorials/PWGLF/Strangeness/pp/strangeness_step1.cxx b/.conflict-side-0/Tutorials/PWGLF/Strangeness/pp/strangeness_step1.cxx
index 70748658778..ca57646dc97 100644
--- a/.conflict-side-0/Tutorials/PWGLF/Strangeness/pp/strangeness_step1.cxx
+++ b/.conflict-side-0/Tutorials/PWGLF/Strangeness/pp/strangeness_step1.cxx
@@ -13,11 +13,13 @@
 /// \author Nepeivoda Roman (roman.nepeivoda@cern.ch)
 /// \author Chiara De Martin (chiara.de.martin@cern.ch)
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/EventSelection.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Common/DataModel/EventSelection.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-0/Tutorials/PWGLF/Strangeness/pp/strangeness_step2.cxx b/.conflict-side-0/Tutorials/PWGLF/Strangeness/pp/strangeness_step2.cxx
index 9701410db1b..fd863f5090a 100644
--- a/.conflict-side-0/Tutorials/PWGLF/Strangeness/pp/strangeness_step2.cxx
+++ b/.conflict-side-0/Tutorials/PWGLF/Strangeness/pp/strangeness_step2.cxx
@@ -13,12 +13,14 @@
 /// \author Nepeivoda Roman (roman.nepeivoda@cern.ch)
 /// \author Chiara De Martin (chiara.de.martin@cern.ch)
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/EventSelection.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-0/Tutorials/PWGLF/Strangeness/pp/strangeness_step3.cxx b/.conflict-side-0/Tutorials/PWGLF/Strangeness/pp/strangeness_step3.cxx
index 6121831fadb..ef06ffaded7 100644
--- a/.conflict-side-0/Tutorials/PWGLF/Strangeness/pp/strangeness_step3.cxx
+++ b/.conflict-side-0/Tutorials/PWGLF/Strangeness/pp/strangeness_step3.cxx
@@ -13,12 +13,14 @@
 /// \author Nepeivoda Roman (roman.nepeivoda@cern.ch)
 /// \author Chiara De Martin (chiara.de.martin@cern.ch)
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/EventSelection.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-0/Tutorials/PWGLF/Strangeness/pp/strangeness_step4.cxx b/.conflict-side-0/Tutorials/PWGLF/Strangeness/pp/strangeness_step4.cxx
index 544d4283932..b96601c16f8 100644
--- a/.conflict-side-0/Tutorials/PWGLF/Strangeness/pp/strangeness_step4.cxx
+++ b/.conflict-side-0/Tutorials/PWGLF/Strangeness/pp/strangeness_step4.cxx
@@ -13,12 +13,14 @@
 /// \author Nepeivoda Roman (roman.nepeivoda@cern.ch)
 /// \author Chiara De Martin (chiara.de.martin@cern.ch)
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/EventSelection.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Tutorials/PWGMM/myExampleTask.cxx b/.conflict-side-0/Tutorials/PWGMM/myExampleTask.cxx
index f7035781b6e..2de9b8c1114 100644
--- a/.conflict-side-0/Tutorials/PWGMM/myExampleTask.cxx
+++ b/.conflict-side-0/Tutorials/PWGMM/myExampleTask.cxx
@@ -13,8 +13,8 @@
 ///        it is meant to be a blank page for further developments.
 /// \author everyone
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Tutorials/PWGUD/UDTutorial_01.cxx b/.conflict-side-0/Tutorials/PWGUD/UDTutorial_01.cxx
index c2cbf7b4f13..70161203257 100644
--- a/.conflict-side-0/Tutorials/PWGUD/UDTutorial_01.cxx
+++ b/.conflict-side-0/Tutorials/PWGUD/UDTutorial_01.cxx
@@ -13,13 +13,15 @@
 // \author Paul Buehler, paul.buehler@oeaw.ac.at
 // \since  April 2023
 
-#include "Framework/runDataProcessing.h"
+#include "PWGUD/Core/UDHelpers.h"
+#include "PWGUD/DataModel/UDTables.h"
+
+#include "Common/DataModel/PIDResponse.h"
+
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 #include "TVector3.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/UDHelpers.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Tutorials/PWGUD/UDTutorial_02a.cxx b/.conflict-side-0/Tutorials/PWGUD/UDTutorial_02a.cxx
index 75aa83c87a7..f10174d8d5b 100644
--- a/.conflict-side-0/Tutorials/PWGUD/UDTutorial_02a.cxx
+++ b/.conflict-side-0/Tutorials/PWGUD/UDTutorial_02a.cxx
@@ -13,14 +13,16 @@
 // \author Paul Buehler, paul.buehler@oeaw.ac.at
 // \since  April 2023
 
-#include "Framework/runDataProcessing.h"
+#include "PWGUD/Core/UDHelpers.h"
+#include "PWGUD/DataModel/UDTables.h"
+
+#include "Common/DataModel/PIDResponse.h"
+
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 #include "TDatabasePDG.h"
 #include "TLorentzVector.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/UDHelpers.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Tutorials/PWGUD/UDTutorial_02b.cxx b/.conflict-side-0/Tutorials/PWGUD/UDTutorial_02b.cxx
index 26a76a98186..315ae0dd45a 100644
--- a/.conflict-side-0/Tutorials/PWGUD/UDTutorial_02b.cxx
+++ b/.conflict-side-0/Tutorials/PWGUD/UDTutorial_02b.cxx
@@ -13,13 +13,14 @@
 // \author Paul Buehler, paul.buehler@oeaw.ac.at
 // \since  April 2023
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
+#include "PWGUD/Core/DGPIDSelector.h"
+#include "PWGUD/Core/UDHelpers.h"
+#include "PWGUD/DataModel/UDTables.h"
 
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/UDHelpers.h"
-#include "PWGUD/Core/DGPIDSelector.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Tutorials/PWGUD/UDTutorial_03a.cxx b/.conflict-side-0/Tutorials/PWGUD/UDTutorial_03a.cxx
index 9840123236b..a466ddfc1ff 100644
--- a/.conflict-side-0/Tutorials/PWGUD/UDTutorial_03a.cxx
+++ b/.conflict-side-0/Tutorials/PWGUD/UDTutorial_03a.cxx
@@ -13,15 +13,17 @@
 // \author Paul Buehler, paul.buehler@oeaw.ac.at
 // \since  October 2023
 
-#include "Framework/runDataProcessing.h"
+#include "PWGUD/Core/UDHelpers.h"
+
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 #include "TDatabasePDG.h"
 #include "TLorentzVector.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/Core/UDHelpers.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Tutorials/PWGUD/UDTutorial_03b.cxx b/.conflict-side-0/Tutorials/PWGUD/UDTutorial_03b.cxx
index 71a144f1d1e..562836e0dce 100644
--- a/.conflict-side-0/Tutorials/PWGUD/UDTutorial_03b.cxx
+++ b/.conflict-side-0/Tutorials/PWGUD/UDTutorial_03b.cxx
@@ -13,15 +13,17 @@
 // \author Paul Buehler, paul.buehler@oeaw.ac.at
 // \since  October 2023
 
-#include "Framework/runDataProcessing.h"
+#include "PWGUD/Core/UDHelpers.h"
+
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 #include "TDatabasePDG.h"
 #include "TLorentzVector.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/Core/UDHelpers.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Tutorials/PWGUD/UDTutorial_04.cxx b/.conflict-side-0/Tutorials/PWGUD/UDTutorial_04.cxx
index 94a93cb0ef4..8b16a7fde51 100644
--- a/.conflict-side-0/Tutorials/PWGUD/UDTutorial_04.cxx
+++ b/.conflict-side-0/Tutorials/PWGUD/UDTutorial_04.cxx
@@ -13,13 +13,14 @@
 // \author Paul Buehler, paul.buehler@oeaw.ac.at
 // \since  October 2023
 
-#include "Framework/runDataProcessing.h"
+#include "PWGUD/Core/UDHelpers.h"
+#include "PWGUD/DataModel/UDTables.h"
+
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 #include "TDatabasePDG.h"
 #include "TLorentzVector.h"
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/UDHelpers.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Tutorials/PWGUD/UDTutorial_05.cxx b/.conflict-side-0/Tutorials/PWGUD/UDTutorial_05.cxx
index 40375c48614..9ca8ddf62d5 100644
--- a/.conflict-side-0/Tutorials/PWGUD/UDTutorial_05.cxx
+++ b/.conflict-side-0/Tutorials/PWGUD/UDTutorial_05.cxx
@@ -10,16 +10,18 @@
 // or submit itself to any jurisdiction.
 //
 
-#include <iostream>
-#include "TLorentzVector.h"
-#include "TDatabasePDG.h"
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "PWGUD/DataModel/UDTables.h"
 #include "PWGUD/Core/SGSelector.h"
 #include "PWGUD/Core/SGTrackSelector.h"
+#include "PWGUD/DataModel/UDTables.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TDatabasePDG.h"
+#include "TLorentzVector.h"
+
+#include <iostream>
 
 // using namespace std;
 using namespace o2;
diff --git a/.conflict-side-0/Tutorials/PWGUD/UDTutorial_06.cxx b/.conflict-side-0/Tutorials/PWGUD/UDTutorial_06.cxx
index 9b1d1f55895..d7ef0273e7f 100644
--- a/.conflict-side-0/Tutorials/PWGUD/UDTutorial_06.cxx
+++ b/.conflict-side-0/Tutorials/PWGUD/UDTutorial_06.cxx
@@ -14,23 +14,23 @@
 /// \date 10.10.2024
 
 // O2 headers
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 // O2Physics headers
-#include "PWGUD/DataModel/UDTables.h"
 #include "PWGUD/Core/UDHelpers.h"
+#include "PWGUD/DataModel/UDTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPLHCIFData.h"
 #include "DataFormatsParameters/GRPECSObject.h"
+#include "DataFormatsParameters/GRPLHCIFData.h"
 
 // ROOT headers
-#include "TSystem.h"
 #include "TDatabasePDG.h"
 #include "TLorentzVector.h"
-#include "TLorentzVector.h"
 #include "TMath.h"
+#include "TSystem.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Tutorials/PWGUD/UDTutorial_07.cxx b/.conflict-side-0/Tutorials/PWGUD/UDTutorial_07.cxx
index 0060b68293e..cfa5dc6d27c 100644
--- a/.conflict-side-0/Tutorials/PWGUD/UDTutorial_07.cxx
+++ b/.conflict-side-0/Tutorials/PWGUD/UDTutorial_07.cxx
@@ -9,16 +9,19 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 //
-#include <iostream>
-#include <TString.h>
-#include <TTree.h>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "PWGUD/DataModel/UDTables.h"
-#include "TLorentzVector.h"
 #include "PWGUD/Core/SGSelector.h"
 #include "PWGUD/Core/SGTrackSelector.h"
+#include "PWGUD/DataModel/UDTables.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TLorentzVector.h"
+#include <TString.h>
+#include <TTree.h>
+
+#include <iostream>
 
 using namespace std;
 using namespace o2;
diff --git a/.conflict-side-0/Tutorials/Skimming/DataModel/JEDerived.h b/.conflict-side-0/Tutorials/Skimming/DataModel/JEDerived.h
index 20a8b3d076e..b0b79c2060a 100644
--- a/.conflict-side-0/Tutorials/Skimming/DataModel/JEDerived.h
+++ b/.conflict-side-0/Tutorials/Skimming/DataModel/JEDerived.h
@@ -29,7 +29,7 @@ DECLARE_SOA_COLUMN(Area, area, float);
 DECLARE_SOA_DYNAMIC_COLUMN(Px, px, [](float pt, float phi) { return pt * TMath::Cos(phi); });
 DECLARE_SOA_DYNAMIC_COLUMN(Py, py, [](float pt, float phi) { return pt * TMath::Sin(phi); });
 DECLARE_SOA_DYNAMIC_COLUMN(Pz, pz, [](float pt, float eta) { return pt * TMath::SinH(eta); });
-DECLARE_SOA_DYNAMIC_COLUMN(P, p, [](float pt, float eta) { return pt * TMath::CosH(eta); }); //absolute p
+DECLARE_SOA_DYNAMIC_COLUMN(P, p, [](float pt, float eta) { return pt * TMath::CosH(eta); }); // absolute p
 } // namespace jejet
 
 DECLARE_SOA_TABLE(JEJets, "AOD", "JEJET",
@@ -56,7 +56,7 @@ DECLARE_SOA_COLUMN(Phi, phi, float);
 DECLARE_SOA_DYNAMIC_COLUMN(Px, px, [](float pt, float phi) { return pt * TMath::Cos(phi); });
 DECLARE_SOA_DYNAMIC_COLUMN(Py, py, [](float pt, float phi) { return pt * TMath::Sin(phi); });
 DECLARE_SOA_DYNAMIC_COLUMN(Pz, pz, [](float pt, float eta) { return pt * TMath::SinH(eta); });
-DECLARE_SOA_DYNAMIC_COLUMN(P, p, [](float pt, float eta) { return pt * TMath::CosH(eta); }); //absolute p
+DECLARE_SOA_DYNAMIC_COLUMN(P, p, [](float pt, float eta) { return pt * TMath::CosH(eta); }); // absolute p
 } // namespace jeconstituent
 
 DECLARE_SOA_TABLE(JEConstituents, "AOD", "JECONSTITUENT", o2::soa::Index<>,
diff --git a/.conflict-side-0/Tutorials/Skimming/derivedBasicConsumer.cxx b/.conflict-side-0/Tutorials/Skimming/derivedBasicConsumer.cxx
index c96eeb156e7..21b06c2f9a6 100644
--- a/.conflict-side-0/Tutorials/Skimming/derivedBasicConsumer.cxx
+++ b/.conflict-side-0/Tutorials/Skimming/derivedBasicConsumer.cxx
@@ -11,13 +11,15 @@
 /// \author Nima Zardoshti <nima.zardoshti@cern.ch>, CERN
 
 // O2 includes
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "DataModel/DerivedExampleTable.h"
 
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "ReconstructionDataFormats/Track.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-0/Tutorials/Skimming/derivedBasicProvider.cxx b/.conflict-side-0/Tutorials/Skimming/derivedBasicProvider.cxx
index 93e567ecc9b..b0613b74cfd 100644
--- a/.conflict-side-0/Tutorials/Skimming/derivedBasicProvider.cxx
+++ b/.conflict-side-0/Tutorials/Skimming/derivedBasicProvider.cxx
@@ -10,13 +10,15 @@
 // or submit itself to any jurisdiction.
 
 // O2 includes
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "DataModel/DerivedExampleTable.h"
 
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "ReconstructionDataFormats/Track.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-0/Tutorials/Skimming/jetProvider.cxx b/.conflict-side-0/Tutorials/Skimming/jetProvider.cxx
index 36b985bc18d..ace25583de3 100644
--- a/.conflict-side-0/Tutorials/Skimming/jetProvider.cxx
+++ b/.conflict-side-0/Tutorials/Skimming/jetProvider.cxx
@@ -11,14 +11,17 @@
 /// \author Nima Zardoshti <nima.zardoshti@cern.ch>, CERN
 
 // O2 includes
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "DataModel/JEDerived.h"
-#include "PWGJE/DataModel/Jet.h"
+
 #include "PWGJE/Core/JetFinder.h"
+#include "PWGJE/DataModel/Jet.h"
+
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "ReconstructionDataFormats/Track.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Tutorials/Skimming/jetSpectraAnalyser.cxx b/.conflict-side-0/Tutorials/Skimming/jetSpectraAnalyser.cxx
index 6e635cd659e..2257e40086a 100644
--- a/.conflict-side-0/Tutorials/Skimming/jetSpectraAnalyser.cxx
+++ b/.conflict-side-0/Tutorials/Skimming/jetSpectraAnalyser.cxx
@@ -14,18 +14,19 @@
 // Author: Nima Zardoshti
 //
 
-#include "TH1F.h"
-#include "TTree.h"
+#include "DataModel/JEDerived.h"
+
+#include "PWGJE/Core/JetFinder.h"
+#include "PWGJE/DataModel/Jet.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 
-#include "PWGJE/DataModel/Jet.h"
-#include "PWGJE/Core/JetFinder.h"
-#include "DataModel/JEDerived.h"
+#include "TH1F.h"
+#include "TTree.h"
 
 using namespace o2;
 using namespace o2::framework;
@@ -39,7 +40,7 @@ struct JetSpectraAnalyser {
      {"hNJetConstituents", "Number of constituents;N;entries", {HistType::kTH1F, {{100, -0.5, 99.5}}}},
      {"hConstituentPt", "Constituent pT; Constituent #it{p}_{T} (GeV/#it{c});entries", {HistType::kTH1F, {{100, 0., 100.}}}}}};
 
-  //Filter jetCuts = aod::jet::pt > f_jetPtMin;
+  // Filter jetCuts = aod::jet::pt > f_jetPtMin;
 
   void process(aod::JEJet const& jet,
                aod::JEConstituents const& constituents)
@@ -55,4 +56,5 @@ WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
   return WorkflowSpec{
     adaptAnalysisTask<JetSpectraAnalyser>(cfgc, TaskName{"jetspectra-task-skim-analyser"})};
-}
\ No newline at end of file
+}
+ 
\ No newline at end of file
diff --git a/.conflict-side-0/Tutorials/Skimming/jetSpectraReference.cxx b/.conflict-side-0/Tutorials/Skimming/jetSpectraReference.cxx
index 74fb82dfc83..e73f5526dc4 100644
--- a/.conflict-side-0/Tutorials/Skimming/jetSpectraReference.cxx
+++ b/.conflict-side-0/Tutorials/Skimming/jetSpectraReference.cxx
@@ -14,17 +14,17 @@
 // Author: Nima Zardoshti
 //
 
-#include "TH1F.h"
-#include "TTree.h"
+#include "PWGJE/Core/JetFinder.h"
+#include "PWGJE/DataModel/Jet.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 
-#include "PWGJE/DataModel/Jet.h"
-#include "PWGJE/Core/JetFinder.h"
+#include "TH1F.h"
+#include "TTree.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Tutorials/Skimming/spectraNucleiAnalyser.cxx b/.conflict-side-0/Tutorials/Skimming/spectraNucleiAnalyser.cxx
index f0647db20a9..cdad3b82434 100644
--- a/.conflict-side-0/Tutorials/Skimming/spectraNucleiAnalyser.cxx
+++ b/.conflict-side-0/Tutorials/Skimming/spectraNucleiAnalyser.cxx
@@ -10,16 +10,17 @@
 // or submit itself to any jurisdiction.
 // O2 includes
 
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
+#include "DataModel/LFDerived.h"
+
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "DataModel/LFDerived.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
 #include <TLorentzVector.h>
 
diff --git a/.conflict-side-0/Tutorials/Skimming/spectraNucleiProvider.cxx b/.conflict-side-0/Tutorials/Skimming/spectraNucleiProvider.cxx
index 7a76882fd7a..66fe7b5de4d 100644
--- a/.conflict-side-0/Tutorials/Skimming/spectraNucleiProvider.cxx
+++ b/.conflict-side-0/Tutorials/Skimming/spectraNucleiProvider.cxx
@@ -11,16 +11,17 @@
 /// \author Nima Zardoshti <nima.zardoshti@cern.ch>, CERN
 
 // O2 includes
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "MathUtils/Utils.h"
 #include "DataModel/LFDerived.h"
 
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "MathUtils/Utils.h"
+#include "ReconstructionDataFormats/Track.h"
 
 #include <TLorentzVector.h>
 
diff --git a/.conflict-side-0/Tutorials/Skimming/spectraNucleiReference.cxx b/.conflict-side-0/Tutorials/Skimming/spectraNucleiReference.cxx
index 40535297fef..2af935c4339 100644
--- a/.conflict-side-0/Tutorials/Skimming/spectraNucleiReference.cxx
+++ b/.conflict-side-0/Tutorials/Skimming/spectraNucleiReference.cxx
@@ -10,18 +10,16 @@
 // or submit itself to any jurisdiction.
 // O2 includes
 
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
 #include <TLorentzVector.h>
 
diff --git a/.conflict-side-0/Tutorials/Skimming/spectraTPCAnalyser.cxx b/.conflict-side-0/Tutorials/Skimming/spectraTPCAnalyser.cxx
index 769ad0b885a..b5e42893f15 100644
--- a/.conflict-side-0/Tutorials/Skimming/spectraTPCAnalyser.cxx
+++ b/.conflict-side-0/Tutorials/Skimming/spectraTPCAnalyser.cxx
@@ -10,13 +10,15 @@
 // or submit itself to any jurisdiction.
 
 // O2 includes
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
+#include "DataModel/LFDerived.h"
+
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "DataModel/LFDerived.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "ReconstructionDataFormats/Track.h"
 
 using namespace o2;
 using namespace o2::framework;
@@ -63,7 +65,7 @@ struct TPCSpectraAnalyserTask {
     histos.fill(HIST(hpt[i]), track.pt());
   }
 
-  Filter collisionFilter = nabs(aod::collision::posZ) < cfgCutVertex; //collision filters not doing anything now?
+  Filter collisionFilter = nabs(aod::collision::posZ) < cfgCutVertex; // collision filters not doing anything now?
   Filter trackFilter = nabs(aod::lftrack::eta) < cfgCutEta;
 
   void process(soa::Filtered<aod::LFTracks>::iterator const& track)
diff --git a/.conflict-side-0/Tutorials/Skimming/spectraTPCProvider.cxx b/.conflict-side-0/Tutorials/Skimming/spectraTPCProvider.cxx
index c0bbf087fd3..12ca5c9a1ba 100644
--- a/.conflict-side-0/Tutorials/Skimming/spectraTPCProvider.cxx
+++ b/.conflict-side-0/Tutorials/Skimming/spectraTPCProvider.cxx
@@ -11,15 +11,17 @@
 /// \author Nima Zardoshti <nima.zardoshti@cern.ch>, CERN
 
 // O2 includes
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
+#include "DataModel/LFDerived.h"
+
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "MathUtils/Utils.h"
-#include "DataModel/LFDerived.h"
+#include "ReconstructionDataFormats/Track.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Tutorials/Skimming/spectraTPCReference.cxx b/.conflict-side-0/Tutorials/Skimming/spectraTPCReference.cxx
index 5d23fd202dc..7fbca871870 100644
--- a/.conflict-side-0/Tutorials/Skimming/spectraTPCReference.cxx
+++ b/.conflict-side-0/Tutorials/Skimming/spectraTPCReference.cxx
@@ -10,13 +10,14 @@
 // or submit itself to any jurisdiction.
 
 // O2 includes
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "ReconstructionDataFormats/Track.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
@@ -47,7 +48,7 @@ struct TPCSpectraReferenceTask {
     }
   }
 
-  //Defining filters and input
+  // Defining filters and input
   Configurable<float> cfgCutVertex{"cfgCutVertex", 10.0f, "Accepted z-vertex range"};
   Configurable<float> cfgCutEta{"cfgCutEta", 0.8f, "Eta range for tracks"};
   Configurable<float> cfgCutPt{"cfgCutPt", 0.0f, "Pt range for tracks"};
diff --git a/.conflict-side-0/Tutorials/Skimming/spectraUPCAnalyser.cxx b/.conflict-side-0/Tutorials/Skimming/spectraUPCAnalyser.cxx
index cdc6c9a0c4b..2c831ddc591 100644
--- a/.conflict-side-0/Tutorials/Skimming/spectraUPCAnalyser.cxx
+++ b/.conflict-side-0/Tutorials/Skimming/spectraUPCAnalyser.cxx
@@ -10,16 +10,18 @@
 // or submit itself to any jurisdiction.
 
 // O2 includes
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
+#include "DataModel/UDDerived.h"
+
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "DataModel/UDDerived.h"
-#include "TLorentzVector.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include "TLorentzVector.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Tutorials/Skimming/spectraUPCProvider.cxx b/.conflict-side-0/Tutorials/Skimming/spectraUPCProvider.cxx
index 053b7437080..3d6909f88d0 100644
--- a/.conflict-side-0/Tutorials/Skimming/spectraUPCProvider.cxx
+++ b/.conflict-side-0/Tutorials/Skimming/spectraUPCProvider.cxx
@@ -10,18 +10,19 @@
 // or submit itself to any jurisdiction.
 /// \author Nima Zardoshti <nima.zardoshti@cern.ch>, CERN
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "ReconstructionDataFormats/Track.h"
+#include "DataModel/UDDerived.h"
 
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
 #include <TH1D.h>
-#include "DataModel/UDDerived.h"
 
 using namespace o2;
 using namespace o2::aod::evsel;
diff --git a/.conflict-side-0/Tutorials/Skimming/spectraUPCReference.cxx b/.conflict-side-0/Tutorials/Skimming/spectraUPCReference.cxx
index f0a26f248f8..59ba6c24ab1 100644
--- a/.conflict-side-0/Tutorials/Skimming/spectraUPCReference.cxx
+++ b/.conflict-side-0/Tutorials/Skimming/spectraUPCReference.cxx
@@ -9,17 +9,16 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 
-#include <TH1D.h>
 #include "TLorentzVector.h"
+#include <TH1D.h>
 
 using namespace o2;
 using namespace o2::aod::evsel;
diff --git a/.conflict-side-0/Tutorials/include/configurableCut.h b/.conflict-side-0/Tutorials/include/configurableCut.h
index b690058abf1..2bbb47486fc 100644
--- a/.conflict-side-0/Tutorials/include/configurableCut.h
+++ b/.conflict-side-0/Tutorials/include/configurableCut.h
@@ -13,10 +13,13 @@
 #define CONFIGURABLECUT_H
 
 #include "Framework/Array2D.h"
-#include <iosfwd>
-#include <Rtypes.h>
+
 #include <TMath.h>
 
+#include <Rtypes.h>
+
+#include <iosfwd>
+
 static constexpr double default_matrix[3][3] = {{1.1, 1.2, 1.3}, {2.1, 2.2, 2.3}, {3.1, 3.2, 3.3}};
 
 class configurableCut
diff --git a/.conflict-side-0/Tutorials/src/ZDCVZeroIteration.cxx b/.conflict-side-0/Tutorials/src/ZDCVZeroIteration.cxx
index 10b45687213..1804fe5690f 100644
--- a/.conflict-side-0/Tutorials/src/ZDCVZeroIteration.cxx
+++ b/.conflict-side-0/Tutorials/src/ZDCVZeroIteration.cxx
@@ -17,8 +17,8 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Tutorials/src/associatedExample.cxx b/.conflict-side-0/Tutorials/src/associatedExample.cxx
index 6538104d3f5..f7abeeb604e 100644
--- a/.conflict-side-0/Tutorials/src/associatedExample.cxx
+++ b/.conflict-side-0/Tutorials/src/associatedExample.cxx
@@ -13,8 +13,8 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 namespace o2::aod
 {
@@ -140,7 +140,7 @@ struct PartitionColExtra {
 struct BuildHmpidIndex {
   // build the index table HMPIDTracksIndex
   Builds<aod::HMPIDTracksIndex> idx;
-  void init(InitContext const&){};
+  void init(InitContext const&) {};
 };
 
 struct ConsumeHmpidIndex {
diff --git a/.conflict-side-0/Tutorials/src/ccdbaccess.cxx b/.conflict-side-0/Tutorials/src/ccdbaccess.cxx
index afa5c9d4d52..69f804195d1 100644
--- a/.conflict-side-0/Tutorials/src/ccdbaccess.cxx
+++ b/.conflict-side-0/Tutorials/src/ccdbaccess.cxx
@@ -18,10 +18,10 @@
 /// \author Nicolo' Jacazio
 /// \since 2020-06-22
 
-#include "Framework/runDataProcessing.h"
+#include "CommonDataFormat/InteractionRecord.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 #include <CCDB/BasicCCDBManager.h>
-#include "CommonDataFormat/InteractionRecord.h"
 
 #include <chrono>
 
diff --git a/.conflict-side-0/Tutorials/src/collisionTracksIteration.cxx b/.conflict-side-0/Tutorials/src/collisionTracksIteration.cxx
index a2261504d3b..e7999a01455 100644
--- a/.conflict-side-0/Tutorials/src/collisionTracksIteration.cxx
+++ b/.conflict-side-0/Tutorials/src/collisionTracksIteration.cxx
@@ -15,8 +15,8 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Tutorials/src/compatibleBCs.cxx b/.conflict-side-0/Tutorials/src/compatibleBCs.cxx
index 20d38d032db..22c8b2c49be 100644
--- a/.conflict-side-0/Tutorials/src/compatibleBCs.cxx
+++ b/.conflict-side-0/Tutorials/src/compatibleBCs.cxx
@@ -15,9 +15,9 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "CommonConstants/LHCConstants.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Tutorials/src/conditionalExpressions.cxx b/.conflict-side-0/Tutorials/src/conditionalExpressions.cxx
index 07b9dbac403..5843f2b5a33 100644
--- a/.conflict-side-0/Tutorials/src/conditionalExpressions.cxx
+++ b/.conflict-side-0/Tutorials/src/conditionalExpressions.cxx
@@ -11,8 +11,8 @@
 ///
 /// \brief Demonstration of conditions in filter expressions
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Tutorials/src/configurableCut.cxx b/.conflict-side-0/Tutorials/src/configurableCut.cxx
index 62b1d1adc66..22ef7341b84 100644
--- a/.conflict-side-0/Tutorials/src/configurableCut.cxx
+++ b/.conflict-side-0/Tutorials/src/configurableCut.cxx
@@ -10,6 +10,7 @@
 // or submit itself to any jurisdiction.
 
 #include "configurableCut.h"
+
 #include <iostream>
 
 std::ostream& operator<<(std::ostream& os, configurableCut const& c)
diff --git a/.conflict-side-0/Tutorials/src/configurableCut.json b/.conflict-side-0/Tutorials/src/configurableCut.json
index 33d4294b132..be9ab281ad8 100644
--- a/.conflict-side-0/Tutorials/src/configurableCut.json
+++ b/.conflict-side-0/Tutorials/src/configurableCut.json
@@ -10,12 +10,12 @@
     "internal-dpl-aod-spawner": "",
     "configurable-demo": {
         "cut": {
-		"cut": "0.1",
-		"state": "1"
-	},
+            "cut": "0.1",
+            "state": "1"
+        },
         "mutable_cut": {
-		"cut": "0.2",
-		"state": "-1"
-	}
+            "cut": "0.2",
+            "state": "-1"
+        }
     }
 }
diff --git a/.conflict-side-0/Tutorials/src/configurableObjects.cxx b/.conflict-side-0/Tutorials/src/configurableObjects.cxx
index 210d93c0dac..0d34f8f1913 100644
--- a/.conflict-side-0/Tutorials/src/configurableObjects.cxx
+++ b/.conflict-side-0/Tutorials/src/configurableObjects.cxx
@@ -14,11 +14,12 @@
 /// \author
 /// \since
 
-#include <sstream>
-
 #include "configurableCut.h"
-#include "Framework/runDataProcessing.h"
+
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include <sstream>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Tutorials/src/consume.cxx b/.conflict-side-0/Tutorials/src/consume.cxx
index f97e65bda87..95e8a8e9a4b 100644
--- a/.conflict-side-0/Tutorials/src/consume.cxx
+++ b/.conflict-side-0/Tutorials/src/consume.cxx
@@ -14,8 +14,9 @@
 /// \since
 
 #include "IntermediateTables.h"
-#include "Framework/runDataProcessing.h"
+
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Tutorials/src/dynamicColumns.cxx b/.conflict-side-0/Tutorials/src/dynamicColumns.cxx
index 48de150b042..2e6dbcc0a15 100644
--- a/.conflict-side-0/Tutorials/src/dynamicColumns.cxx
+++ b/.conflict-side-0/Tutorials/src/dynamicColumns.cxx
@@ -13,8 +13,8 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 namespace o2::aod
 {
diff --git a/.conflict-side-0/Tutorials/src/efficiencyGlobal.cxx b/.conflict-side-0/Tutorials/src/efficiencyGlobal.cxx
index ef509cb0bac..e405c479697 100644
--- a/.conflict-side-0/Tutorials/src/efficiencyGlobal.cxx
+++ b/.conflict-side-0/Tutorials/src/efficiencyGlobal.cxx
@@ -17,9 +17,10 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 #include <CCDB/BasicCCDBManager.h>
+
 #include <chrono>
 
 using namespace o2::framework;
@@ -56,7 +57,7 @@ struct EfficiencyGlobal {
   {
     for (auto& track : tracks) {
       pt->Fill(track.pt(), efficiency->GetBinContent(efficiency->FindBin(track.pt())));
-      //LOGF(info, "Efficiency %f for pt %f", efficiency->GetBinContent(efficiency->FindBin(track.pt())), track.pt());
+      // LOGF(info, "Efficiency %f for pt %f", efficiency->GetBinContent(efficiency->FindBin(track.pt())), track.pt());
     }
   }
 };
diff --git a/.conflict-side-0/Tutorials/src/efficiencyPerRun.cxx b/.conflict-side-0/Tutorials/src/efficiencyPerRun.cxx
index c2fa7a887ca..57f28054d37 100644
--- a/.conflict-side-0/Tutorials/src/efficiencyPerRun.cxx
+++ b/.conflict-side-0/Tutorials/src/efficiencyPerRun.cxx
@@ -20,9 +20,10 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 #include <CCDB/BasicCCDBManager.h>
+
 #include <chrono>
 
 using namespace o2::framework;
@@ -58,7 +59,7 @@ struct EfficiencyPerRun {
 
     for (auto& track : tracks) {
       pt->Fill(track.pt(), efficiency->GetBinContent(efficiency->FindBin(track.pt())));
-      //LOGF(info, "Efficiency %f for pt %f", efficiency->GetBinContent(efficiency->FindBin(track.pt())), track.pt());
+      // LOGF(info, "Efficiency %f for pt %f", efficiency->GetBinContent(efficiency->FindBin(track.pt())), track.pt());
     }
   }
 };
diff --git a/.conflict-side-0/Tutorials/src/eventMixing.cxx b/.conflict-side-0/Tutorials/src/eventMixing.cxx
index a1526740886..759dfeb2ff2 100644
--- a/.conflict-side-0/Tutorials/src/eventMixing.cxx
+++ b/.conflict-side-0/Tutorials/src/eventMixing.cxx
@@ -14,15 +14,17 @@
 /// \author Karwowska Maja
 /// \since
 
-#include <vector>
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-0/Tutorials/src/eventMixingValidation.cxx b/.conflict-side-0/Tutorials/src/eventMixingValidation.cxx
index cc1933b0a25..1bfc9891ac5 100644
--- a/.conflict-side-0/Tutorials/src/eventMixingValidation.cxx
+++ b/.conflict-side-0/Tutorials/src/eventMixingValidation.cxx
@@ -14,15 +14,17 @@
 /// \author Karwowska Maja
 /// \since
 
-#include <vector>
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/SliceCache.h"
 #include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Multiplicity.h"
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
@@ -39,7 +41,7 @@ struct MixedEventsEmptyTables {
   std::vector<double> xBins{VARIABLE_WIDTH, -0.064, -0.062, -0.060, 0.066, 0.068, 0.070, 0.072};
   std::vector<double> yBins{VARIABLE_WIDTH, -0.320, -0.301, -0.300, 0.330, 0.340, 0.350, 0.360};
   using BinningType = ColumnBinningPolicy<aod::collision::PosX, aod::collision::PosY>;
-  BinningType binningOnPositions{{xBins, yBins}, true};                                 // true is for 'ignore overflows' (true by default)
+  BinningType binningOnPositions{{xBins, yBins}, true};                                         // true is for 'ignore overflows' (true by default)
   SameKindPair<aod::Collisions, MyTracks, BinningType> pair{binningOnPositions, 5, -1, &cache}; // indicates that 5 events should be mixed and under/overflow (-1) to be ignored
 
   void process(aod::Collisions const& collisions, MyTracks const& tracks)
@@ -71,7 +73,7 @@ struct MixedEventsJoinedTracks {
   std::vector<double> xBins{VARIABLE_WIDTH, -0.064, -0.062, -0.060, 0.066, 0.068, 0.070, 0.072};
   std::vector<double> yBins{VARIABLE_WIDTH, -0.320, -0.301, -0.300, 0.330, 0.340, 0.350, 0.360};
   using BinningType = ColumnBinningPolicy<aod::collision::PosX, aod::collision::PosY>;
-  BinningType binningOnPositions{{xBins, yBins}, true};                                        // true is for 'ignore overflows' (true by default)
+  BinningType binningOnPositions{{xBins, yBins}, true};                                                // true is for 'ignore overflows' (true by default)
   SameKindPair<aod::Collisions, aod::FullTracks, BinningType> pair{binningOnPositions, 5, -1, &cache}; // indicates that 5 events should be mixed and under/overflow (-1) to be ignored
 
   void process(aod::Collisions const& collisions, aod::FullTracks const& tracks)
diff --git a/.conflict-side-0/Tutorials/src/extendedColumns.cxx b/.conflict-side-0/Tutorials/src/extendedColumns.cxx
index 72bb2bb55b4..43ec8f77a7d 100644
--- a/.conflict-side-0/Tutorials/src/extendedColumns.cxx
+++ b/.conflict-side-0/Tutorials/src/extendedColumns.cxx
@@ -13,8 +13,8 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 namespace o2::aod
 {
diff --git a/.conflict-side-0/Tutorials/src/extendedTables.cxx b/.conflict-side-0/Tutorials/src/extendedTables.cxx
index 643a81e1504..4b50c4d85b0 100644
--- a/.conflict-side-0/Tutorials/src/extendedTables.cxx
+++ b/.conflict-side-0/Tutorials/src/extendedTables.cxx
@@ -13,8 +13,8 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 namespace o2::aod
 {
diff --git a/.conflict-side-0/Tutorials/src/filters.cxx b/.conflict-side-0/Tutorials/src/filters.cxx
index a3c590b8bfd..6b2d4a1aba4 100644
--- a/.conflict-side-0/Tutorials/src/filters.cxx
+++ b/.conflict-side-0/Tutorials/src/filters.cxx
@@ -13,8 +13,8 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 namespace o2::aod
 {
diff --git a/.conflict-side-0/Tutorials/src/fullTrackIteration.cxx b/.conflict-side-0/Tutorials/src/fullTrackIteration.cxx
index c88ba5b1a78..0bfa4532d55 100644
--- a/.conflict-side-0/Tutorials/src/fullTrackIteration.cxx
+++ b/.conflict-side-0/Tutorials/src/fullTrackIteration.cxx
@@ -13,8 +13,8 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Tutorials/src/hepMC.cxx b/.conflict-side-0/Tutorials/src/hepMC.cxx
index d05941eff06..10d73141b78 100644
--- a/.conflict-side-0/Tutorials/src/hepMC.cxx
+++ b/.conflict-side-0/Tutorials/src/hepMC.cxx
@@ -13,8 +13,8 @@
 /// \author jgrosseo
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Tutorials/src/histogramRegistry.cxx b/.conflict-side-0/Tutorials/src/histogramRegistry.cxx
index ddbcdd18c56..24d5899361c 100644
--- a/.conflict-side-0/Tutorials/src/histogramRegistry.cxx
+++ b/.conflict-side-0/Tutorials/src/histogramRegistry.cxx
@@ -13,12 +13,13 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include <TParameter.h>
 
+#include "Framework/AnalysisTask.h"
 #include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
+
+#include <TParameter.h>
 
 using namespace o2;
 using namespace o2::framework;
@@ -30,7 +31,7 @@ struct EtaPhiHistograms {
     {
       {"eta", "#eta", {HistType::kTH1F, {{102, -2.01, 2.01}}}},     //
       {"phi", "#varphi", {HistType::kTH1F, {{100, 0., 2. * M_PI}}}} //
-    }                                                               //
+    } //
   };
 
   void process(aod::Tracks const& tracks)
@@ -49,7 +50,7 @@ struct FilteredHistograms {
     {
       {"eta", "#eta", {HistType::kTH1F, {{102, -2.01, 2.01}}}},                            //
       {"ptToPt", "#ptToPt", {HistType::kTH2F, {{100, -0.01, 10.01}, {100, -0.01, 10.01}}}} //
-    }                                                                                      //
+    } //
   };
 
   void process(aod::Tracks const& tracks)
@@ -259,7 +260,7 @@ struct TListTest {
     {
       {"eta", "#eta", {HistType::kTH1F, {{102, -2.01, 2.01}}}},     //
       {"phi", "#varphi", {HistType::kTH1F, {{100, 0., 2. * M_PI}}}} //
-    }                                                               //
+    } //
   };
 
   void init(InitContext const&)
diff --git a/.conflict-side-0/Tutorials/src/histogramTrackSelection.cxx b/.conflict-side-0/Tutorials/src/histogramTrackSelection.cxx
index df164396b66..599aa0e0ee9 100644
--- a/.conflict-side-0/Tutorials/src/histogramTrackSelection.cxx
+++ b/.conflict-side-0/Tutorials/src/histogramTrackSelection.cxx
@@ -17,12 +17,12 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-
 #include "Common/Core/TrackSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-0/Tutorials/src/histograms.cxx b/.conflict-side-0/Tutorials/src/histograms.cxx
index 613b27d05d6..13c44fbc713 100644
--- a/.conflict-side-0/Tutorials/src/histograms.cxx
+++ b/.conflict-side-0/Tutorials/src/histograms.cxx
@@ -19,8 +19,8 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Tutorials/src/histogramsFullTracks.cxx b/.conflict-side-0/Tutorials/src/histogramsFullTracks.cxx
index 8c45e5a3927..a68e3e5a873 100644
--- a/.conflict-side-0/Tutorials/src/histogramsFullTracks.cxx
+++ b/.conflict-side-0/Tutorials/src/histogramsFullTracks.cxx
@@ -13,9 +13,11 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 #include <TH2F.h>
+
 #include <cmath>
 
 using namespace o2;
diff --git a/.conflict-side-0/Tutorials/src/jetAnalysis.cxx b/.conflict-side-0/Tutorials/src/jetAnalysis.cxx
index 8313e69f2bb..e684f645b90 100644
--- a/.conflict-side-0/Tutorials/src/jetAnalysis.cxx
+++ b/.conflict-side-0/Tutorials/src/jetAnalysis.cxx
@@ -14,10 +14,11 @@
 /// \author Jochen Klein
 /// \since
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "PWGJE/DataModel/Jet.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-side-0/Tutorials/src/mcHistograms.cxx b/.conflict-side-0/Tutorials/src/mcHistograms.cxx
index 75c28c6c3c4..08bcb24119d 100644
--- a/.conflict-side-0/Tutorials/src/mcHistograms.cxx
+++ b/.conflict-side-0/Tutorials/src/mcHistograms.cxx
@@ -13,10 +13,11 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "CommonConstants/MathConstants.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TDatabasePDG.h"
 
 using namespace o2;
diff --git a/.conflict-side-0/Tutorials/src/mcOnly.cxx b/.conflict-side-0/Tutorials/src/mcOnly.cxx
index e72295ecb3a..293bd0a1904 100644
--- a/.conflict-side-0/Tutorials/src/mcOnly.cxx
+++ b/.conflict-side-0/Tutorials/src/mcOnly.cxx
@@ -13,10 +13,11 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "CommonConstants/MathConstants.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TDatabasePDG.h"
 
 using namespace o2;
diff --git a/.conflict-side-0/Tutorials/src/multiplicityEventTrackSelection.cxx b/.conflict-side-0/Tutorials/src/multiplicityEventTrackSelection.cxx
index c1e3714f2f3..2c0b4cce38a 100644
--- a/.conflict-side-0/Tutorials/src/multiplicityEventTrackSelection.cxx
+++ b/.conflict-side-0/Tutorials/src/multiplicityEventTrackSelection.cxx
@@ -17,12 +17,12 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-0/Tutorials/src/muonIteration.cxx b/.conflict-side-0/Tutorials/src/muonIteration.cxx
index 4b94fe77ae3..497a07cd881 100644
--- a/.conflict-side-0/Tutorials/src/muonIteration.cxx
+++ b/.conflict-side-0/Tutorials/src/muonIteration.cxx
@@ -16,8 +16,8 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
@@ -65,7 +65,7 @@ struct IterateMuonsSparse {
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
   return WorkflowSpec{
-    //adaptAnalysisTask<IterateMuonsExclusives>(cfgc), // currently does not work
+    // adaptAnalysisTask<IterateMuonsExclusives>(cfgc), // currently does not work
     adaptAnalysisTask<IterateMuons>(cfgc),
     adaptAnalysisTask<IterateMuonsSparse>(cfgc),
   };
diff --git a/.conflict-side-0/Tutorials/src/newCollections.cxx b/.conflict-side-0/Tutorials/src/newCollections.cxx
index 490782347f3..689d442314f 100644
--- a/.conflict-side-0/Tutorials/src/newCollections.cxx
+++ b/.conflict-side-0/Tutorials/src/newCollections.cxx
@@ -13,8 +13,8 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 // define columns in a sub-namespace of o2::aod
 // and tables in namespace o2::aod
diff --git a/.conflict-side-0/Tutorials/src/partitions.cxx b/.conflict-side-0/Tutorials/src/partitions.cxx
index f5b58529a80..aee5605da20 100644
--- a/.conflict-side-0/Tutorials/src/partitions.cxx
+++ b/.conflict-side-0/Tutorials/src/partitions.cxx
@@ -13,8 +13,8 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Tutorials/src/pidTpcTof.cxx b/.conflict-side-0/Tutorials/src/pidTpcTof.cxx
index 777c09c1920..b5d755cf1c0 100644
--- a/.conflict-side-0/Tutorials/src/pidTpcTof.cxx
+++ b/.conflict-side-0/Tutorials/src/pidTpcTof.cxx
@@ -17,8 +17,8 @@
 
 // O2 includes
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
 
 // O2Physics includes
 #include "Common/DataModel/PIDResponse.h"
diff --git a/.conflict-side-0/Tutorials/src/preprocess.cxx b/.conflict-side-0/Tutorials/src/preprocess.cxx
index 417bafbf744..290c040db39 100644
--- a/.conflict-side-0/Tutorials/src/preprocess.cxx
+++ b/.conflict-side-0/Tutorials/src/preprocess.cxx
@@ -16,10 +16,11 @@
 /// \since
 
 #include "IntermediateTables.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
+
 #include "Framework/AnalysisTask.h"
 #include "Framework/ConfigParamSpec.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Tutorials/src/propagatedTracks.cxx b/.conflict-side-0/Tutorials/src/propagatedTracks.cxx
index 651738de71e..097adc3ecf3 100644
--- a/.conflict-side-0/Tutorials/src/propagatedTracks.cxx
+++ b/.conflict-side-0/Tutorials/src/propagatedTracks.cxx
@@ -14,18 +14,18 @@
 // Needs o2-analysis-track-propagation
 //
 
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/Core/trackUtilities.h"
-#include "ReconstructionDataFormats/DCA.h"
-#include "DetectorsBase/Propagator.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CommonUtils/NameConf.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
 #include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/DCA.h"
 
 using namespace o2;
 using namespace o2::constants::math;
@@ -105,4 +105,5 @@ WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
     adaptAnalysisTask<PropagatedTracksQa>(cfgc),
     adaptAnalysisTask<PropagatedTracksExtra>(cfgc),
   };
-}
\ No newline at end of file
+}
+ 
\ No newline at end of file
diff --git a/.conflict-side-0/Tutorials/src/reweighting.cxx b/.conflict-side-0/Tutorials/src/reweighting.cxx
index 17a4ad4bf33..b1f0c43a22f 100644
--- a/.conflict-side-0/Tutorials/src/reweighting.cxx
+++ b/.conflict-side-0/Tutorials/src/reweighting.cxx
@@ -28,11 +28,15 @@
 // This workflow is used to create a flat tree for model training
 // Use o2-aod-merger to combine dataframes in output AnalysisResults_trees.root
 
-#include <onnxruntime_cxx_api.h>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/Multiplicity.h"
 #include "TrainingTree.h"
+
+#include "Common/DataModel/Multiplicity.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include <onnxruntime_cxx_api.h>
+
 #include <cmath>
 
 using namespace o2;
diff --git a/.conflict-side-0/Tutorials/src/schemaEvolution.cxx b/.conflict-side-0/Tutorials/src/schemaEvolution.cxx
index a15fcba6dda..04033257753 100644
--- a/.conflict-side-0/Tutorials/src/schemaEvolution.cxx
+++ b/.conflict-side-0/Tutorials/src/schemaEvolution.cxx
@@ -16,8 +16,8 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 namespace o2::aod
 {
diff --git a/.conflict-side-0/Tutorials/src/tableIOout.cxx b/.conflict-side-0/Tutorials/src/tableIOout.cxx
index 403740755d9..75678bca3b6 100644
--- a/.conflict-side-0/Tutorials/src/tableIOout.cxx
+++ b/.conflict-side-0/Tutorials/src/tableIOout.cxx
@@ -14,8 +14,8 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 namespace o2::aod
 {
diff --git a/.conflict-side-0/Tutorials/src/trackIteration.cxx b/.conflict-side-0/Tutorials/src/trackIteration.cxx
index ff3271d90c0..53b85c39ec9 100644
--- a/.conflict-side-0/Tutorials/src/trackIteration.cxx
+++ b/.conflict-side-0/Tutorials/src/trackIteration.cxx
@@ -13,8 +13,8 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-0/Tutorials/src/tracksCombinations.cxx b/.conflict-side-0/Tutorials/src/tracksCombinations.cxx
index 413e8399e9b..ca5db69f0f4 100644
--- a/.conflict-side-0/Tutorials/src/tracksCombinations.cxx
+++ b/.conflict-side-0/Tutorials/src/tracksCombinations.cxx
@@ -15,11 +15,12 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
 #include "Common/DataModel/Multiplicity.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::soa;
diff --git a/.conflict-side-0/Tutorials/src/treeCreator.cxx b/.conflict-side-0/Tutorials/src/treeCreator.cxx
index 27d1f1eda21..70879497ecd 100644
--- a/.conflict-side-0/Tutorials/src/treeCreator.cxx
+++ b/.conflict-side-0/Tutorials/src/treeCreator.cxx
@@ -30,11 +30,13 @@
 // This workflow is used to create a flat tree for model training
 // Use o2-aod-merger to combine dataframes in output AnalysisResults_trees.root
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/Multiplicity.h"
 #include "TrainingTree.h"
 
+#include "Common/DataModel/Multiplicity.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-0/Tutorials/src/weakDecayIteration.cxx b/.conflict-side-0/Tutorials/src/weakDecayIteration.cxx
index 0c4bc01f877..0735f5537e0 100644
--- a/.conflict-side-0/Tutorials/src/weakDecayIteration.cxx
+++ b/.conflict-side-0/Tutorials/src/weakDecayIteration.cxx
@@ -17,8 +17,8 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/ALICE3/Core/DelphesO2TrackSmearer.h b/.conflict-side-1/ALICE3/Core/DelphesO2TrackSmearer.h
index 1e0fd873e2c..7714e53f65f 100644
--- a/.conflict-side-1/ALICE3/Core/DelphesO2TrackSmearer.h
+++ b/.conflict-side-1/ALICE3/Core/DelphesO2TrackSmearer.h
@@ -24,12 +24,13 @@
 #ifndef ALICE3_CORE_DELPHESO2TRACKSMEARER_H_
 #define ALICE3_CORE_DELPHESO2TRACKSMEARER_H_
 
-#include <map>
-#include <iostream>
-#include <fstream>
+#include "ReconstructionDataFormats/Track.h"
 
 #include "TRandom.h"
-#include "ReconstructionDataFormats/Track.h"
+
+#include <fstream>
+#include <iostream>
+#include <map>
 
 ///////////////////////////////
 /// DelphesO2/src/lutCovm.hh //
@@ -85,7 +86,7 @@ struct map_t {
     if (bin > nbins - 1)
       return nbins - 1;
     return bin;
-  }                                                                                                            //;
+  } //;
   void print() { printf("nbins = %d, min = %f, max = %f, log = %s \n", nbins, min, max, log ? "on" : "off"); } //;
 };
 
@@ -214,8 +215,8 @@ class TrackSmearer
         return 7; // Helium3
       default:
         return 2; // Default: pion
-    }             //;
-  }               //;
+    } //;
+  } //;
 
   void setdNdEta(float val) { mdNdEta = val; } //;
 
diff --git a/.conflict-side-1/ALICE3/Core/DetLayer.cxx b/.conflict-side-1/ALICE3/Core/DetLayer.cxx
index 25e61e6e6d5..fa49e4d811e 100644
--- a/.conflict-side-1/ALICE3/Core/DetLayer.cxx
+++ b/.conflict-side-1/ALICE3/Core/DetLayer.cxx
@@ -16,11 +16,11 @@
 /// \brief  Basic struct to hold information regarding a detector layer to be used in fast simulation
 ///
 
-#include <vector>
-#include <string>
-
 #include "DetLayer.h"
 
+#include <string>
+#include <vector>
+
 namespace o2::fastsim
 {
 
diff --git a/.conflict-side-1/ALICE3/Core/DetLayer.h b/.conflict-side-1/ALICE3/Core/DetLayer.h
index 2577c73e42d..e70d719a6e4 100644
--- a/.conflict-side-1/ALICE3/Core/DetLayer.h
+++ b/.conflict-side-1/ALICE3/Core/DetLayer.h
@@ -19,10 +19,10 @@
 #ifndef ALICE3_CORE_DETLAYER_H_
 #define ALICE3_CORE_DETLAYER_H_
 
-#include <string>
-
 #include "TString.h"
 
+#include <string>
+
 namespace o2::fastsim
 {
 
diff --git a/.conflict-side-1/ALICE3/Core/TOFResoALICE3.h b/.conflict-side-1/ALICE3/Core/TOFResoALICE3.h
index b102091f756..9179c550e8e 100644
--- a/.conflict-side-1/ALICE3/Core/TOFResoALICE3.h
+++ b/.conflict-side-1/ALICE3/Core/TOFResoALICE3.h
@@ -20,9 +20,9 @@
 #define O2_ANALYSIS_PID_TOFRESOALICE3_H_
 
 // O2 includes
-#include "PID/ParamBase.h"
 #include "PID/DetectorResponse.h"
 #include "PID/PIDTOF.h"
+#include "PID/ParamBase.h"
 #include "ReconstructionDataFormats/PID.h"
 
 namespace o2::pid::tof
diff --git a/.conflict-side-1/ALICE3/DataModel/A3DecayFinderTables.h b/.conflict-side-1/ALICE3/DataModel/A3DecayFinderTables.h
index 55229bbb5d4..ed5bccfbb56 100644
--- a/.conflict-side-1/ALICE3/DataModel/A3DecayFinderTables.h
+++ b/.conflict-side-1/ALICE3/DataModel/A3DecayFinderTables.h
@@ -19,9 +19,10 @@
 #define ALICE3_DATAMODEL_A3DECAYFINDERTABLES_H_
 
 // O2 includes
-#include "Framework/AnalysisDataModel.h"
 #include "Common/Core/RecoDecay.h"
 
+#include "Framework/AnalysisDataModel.h"
+
 enum a3selectionBit : uint32_t { kDCAxy = 0,
                                  kInnerTOFPion,
                                  kInnerTOFKaon,
diff --git a/.conflict-side-1/ALICE3/TableProducer/OTF/onTheFlyTrackerPid.cxx b/.conflict-side-1/ALICE3/TableProducer/OTF/onTheFlyTrackerPid.cxx
index 42d2bcc5252..54de20c87b7 100644
--- a/.conflict-side-1/ALICE3/TableProducer/OTF/onTheFlyTrackerPid.cxx
+++ b/.conflict-side-1/ALICE3/TableProducer/OTF/onTheFlyTrackerPid.cxx
@@ -20,42 +20,45 @@
 /// \since  May 22, 2025
 ///
 
-#include <utility>
-#include <map>
-#include <string>
-#include <algorithm>
-#include <vector>
+#include "TableHelper.h"
 
+#include "ALICE3/Core/DelphesO2TrackSmearer.h"
+#include "ALICE3/Core/TrackUtilities.h"
+#include "ALICE3/DataModel/OTFPIDTrk.h"
+#include "ALICE3/DataModel/OTFRICH.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
+#include "CommonConstants/GeomConstants.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "CommonUtils/NameConf.h"
+#include "DataFormatsCalibration/MeanVertexObject.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "DetectorsVertexing/HelixHelper.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/Core/trackUtilities.h"
-#include "ALICE3/Core/TrackUtilities.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/DCA.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "CommonUtils/NameConf.h"
-#include "CCDB/CcdbApi.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "DataFormatsCalibration/MeanVertexObject.h"
-#include "CommonConstants/GeomConstants.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "TRandom3.h"
+
 #include "TF1.h"
 #include "TH2F.h"
-#include "TVector3.h"
+#include "TRandom3.h"
 #include "TString.h"
-#include "ALICE3/DataModel/OTFRICH.h"
-#include "DetectorsVertexing/HelixHelper.h"
-#include "TableHelper.h"
-#include "ALICE3/Core/DelphesO2TrackSmearer.h"
-#include "ALICE3/DataModel/OTFPIDTrk.h"
+#include "TVector3.h"
+
+#include <algorithm>
+#include <map>
+#include <string>
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/ALICE3/TableProducer/alice3-centrality.cxx b/.conflict-side-1/ALICE3/TableProducer/alice3-centrality.cxx
index 48c7ae617bf..bd6b8ac09d1 100644
--- a/.conflict-side-1/ALICE3/TableProducer/alice3-centrality.cxx
+++ b/.conflict-side-1/ALICE3/TableProducer/alice3-centrality.cxx
@@ -12,12 +12,13 @@
 /// \author David Dobrigkeit Chinellato <david.dobrigkeit.chinellato@cern.ch>, UNICAMP/CERN
 
 // O2 includes
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 #include <CCDB/BasicCCDBManager.h>
-#include "Common/DataModel/Centrality.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/ALICE3/TableProducer/alice3-correlatorDDbar.cxx b/.conflict-side-1/ALICE3/TableProducer/alice3-correlatorDDbar.cxx
index 6c270dc1cd5..63679b81b76 100644
--- a/.conflict-side-1/ALICE3/TableProducer/alice3-correlatorDDbar.cxx
+++ b/.conflict-side-1/ALICE3/TableProducer/alice3-correlatorDDbar.cxx
@@ -14,21 +14,20 @@
 ///
 /// \author Fabio Colamaria <fabio.colamaria@ba.infn.it>, INFN Bari
 
-#include <vector>
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/Core/SelectorCuts.h"
+#include "PWGHF/HFC/DataModel/CorrelationTables.h"
+
+#include "ALICE3/DataModel/A3DecayFinderTables.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
 #include "CommonConstants/PhysicsConstants.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
 
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-
-#include "ALICE3/DataModel/A3DecayFinderTables.h"
-
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/Core/SelectorCuts.h"
-#include "PWGHF/HFC/DataModel/CorrelationTables.h"
+#include <vector>
 // #include "PWGHF/DataModel/CandidateReconstructionTables.h"
 // #include "PWGHF/DataModel/CandidateSelectionTables.h"
 
diff --git a/.conflict-side-1/ALICE3/TableProducer/alice3-decayfinder.cxx b/.conflict-side-1/ALICE3/TableProducer/alice3-decayfinder.cxx
index 2d12ea9ed14..76ee4cc5027 100644
--- a/.conflict-side-1/ALICE3/TableProducer/alice3-decayfinder.cxx
+++ b/.conflict-side-1/ALICE3/TableProducer/alice3-decayfinder.cxx
@@ -17,35 +17,37 @@
 //    HF decays. Work in progress: use at your own risk!
 //
 
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <map>
-#include <iterator>
-#include <utility>
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "ReconstructionDataFormats/Track.h"
+#include "ALICE3/DataModel/A3DecayFinderTables.h"
+#include "ALICE3/DataModel/OTFTOF.h"
+#include "ALICE3/DataModel/RICH.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
 #include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "DCAFitter/DCAFitterN.h"
 #include "DataFormatsCalibration/MeanVertexObject.h"
-#include "ALICE3/DataModel/OTFTOF.h"
-#include "ALICE3/DataModel/RICH.h"
-#include "ALICE3/DataModel/A3DecayFinderTables.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <iterator>
+#include <map>
+#include <utility>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/ALICE3/TableProducer/alice3-decaypreselector.cxx b/.conflict-side-1/ALICE3/TableProducer/alice3-decaypreselector.cxx
index 527d1c1d197..b613d893292 100644
--- a/.conflict-side-1/ALICE3/TableProducer/alice3-decaypreselector.cxx
+++ b/.conflict-side-1/ALICE3/TableProducer/alice3-decaypreselector.cxx
@@ -17,36 +17,38 @@
 //    HF decays. Work in progress: use at your own risk!
 //
 
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <map>
-#include <iterator>
-#include <vector>
-#include <utility>
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "ReconstructionDataFormats/Track.h"
+#include "ALICE3/DataModel/A3DecayFinderTables.h"
+#include "ALICE3/DataModel/OTFRICH.h"
+#include "ALICE3/DataModel/OTFTOF.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
 #include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "DCAFitter/DCAFitterN.h"
 #include "DataFormatsCalibration/MeanVertexObject.h"
-#include "ALICE3/DataModel/OTFTOF.h"
-#include "ALICE3/DataModel/OTFRICH.h"
-#include "ALICE3/DataModel/A3DecayFinderTables.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <iterator>
+#include <map>
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/ALICE3/TableProducer/alice3-multicharmTable.cxx b/.conflict-side-1/ALICE3/TableProducer/alice3-multicharmTable.cxx
index 16b16c666d8..62713161343 100644
--- a/.conflict-side-1/ALICE3/TableProducer/alice3-multicharmTable.cxx
+++ b/.conflict-side-1/ALICE3/TableProducer/alice3-multicharmTable.cxx
@@ -17,41 +17,43 @@
 //    HF decays. Work in progress: use at your own risk!
 //
 
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <map>
-#include <iterator>
-#include <utility>
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "ReconstructionDataFormats/Track.h"
+#include "ALICE3/DataModel/A3DecayFinderTables.h"
+#include "ALICE3/DataModel/OTFMulticharm.h"
+#include "ALICE3/DataModel/OTFStrangeness.h"
+#include "ALICE3/DataModel/OTFTOF.h"
+#include "ALICE3/DataModel/RICH.h"
+#include "ALICE3/DataModel/tracksAlice3.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
 #include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "DCAFitter/DCAFitterN.h"
 #include "DataFormatsCalibration/MeanVertexObject.h"
-#include "ALICE3/DataModel/OTFTOF.h"
-#include "ALICE3/DataModel/RICH.h"
-#include "ALICE3/DataModel/A3DecayFinderTables.h"
-#include "ALICE3/DataModel/OTFStrangeness.h"
-#include "ALICE3/DataModel/OTFMulticharm.h"
-#include "ALICE3/DataModel/tracksAlice3.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
 #include "DetectorsVertexing/PVertexer.h"
 #include "DetectorsVertexing/PVertexerHelpers.h"
-#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <iterator>
+#include <map>
+#include <utility>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/ALICE3/TableProducer/alice3-pidTOF.cxx b/.conflict-side-1/ALICE3/TableProducer/alice3-pidTOF.cxx
index 3e54b1f46dc..cd5fe0dfff0 100644
--- a/.conflict-side-1/ALICE3/TableProducer/alice3-pidTOF.cxx
+++ b/.conflict-side-1/ALICE3/TableProducer/alice3-pidTOF.cxx
@@ -17,15 +17,16 @@
 ///
 
 // O2 includes
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "ALICE3/Core/TOFResoALICE3.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StaticFor.h"
+#include "ReconstructionDataFormats/Track.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/ALICE3/TableProducer/alice3-trackextension.cxx b/.conflict-side-1/ALICE3/TableProducer/alice3-trackextension.cxx
index 578d1979310..8709b5e7b7e 100644
--- a/.conflict-side-1/ALICE3/TableProducer/alice3-trackextension.cxx
+++ b/.conflict-side-1/ALICE3/TableProducer/alice3-trackextension.cxx
@@ -13,11 +13,12 @@
 // Task performing basic track selection for the ALICE3.
 //
 
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/Core/trackUtilities.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/ALICE3/TableProducer/alice3-trackselection.cxx b/.conflict-side-1/ALICE3/TableProducer/alice3-trackselection.cxx
index 58f3a4f33ce..b45910da01d 100644
--- a/.conflict-side-1/ALICE3/TableProducer/alice3-trackselection.cxx
+++ b/.conflict-side-1/ALICE3/TableProducer/alice3-trackselection.cxx
@@ -14,11 +14,12 @@
 /// \brief  Track selection for the ALICE3 studies
 ///
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/ALICE3/Tasks/ECALqa.cxx b/.conflict-side-1/ALICE3/Tasks/ECALqa.cxx
index b3d1b200f71..8903a101b56 100644
--- a/.conflict-side-1/ALICE3/Tasks/ECALqa.cxx
+++ b/.conflict-side-1/ALICE3/Tasks/ECALqa.cxx
@@ -17,12 +17,13 @@
 ///
 
 // O2 includes
-#include "Framework/AnalysisTask.h"
 #include "ALICE3/DataModel/ECAL.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "ReconstructionDataFormats/PID.h"
+
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/PID.h"
 
 using namespace o2;
 using namespace o2::track;
diff --git a/.conflict-side-1/ALICE3/Tasks/alice3-cdeuteron.cxx b/.conflict-side-1/ALICE3/Tasks/alice3-cdeuteron.cxx
index de6b6738d02..c8357dc9a30 100644
--- a/.conflict-side-1/ALICE3/Tasks/alice3-cdeuteron.cxx
+++ b/.conflict-side-1/ALICE3/Tasks/alice3-cdeuteron.cxx
@@ -13,15 +13,17 @@
 /// \author Alexander Kalweit <alexander.kalweit@cern.ch>, CERN
 
 // O2 includes
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/PIDResponse.h"
+
+#include "DCAFitter/DCAFitterN.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "TLorentzVector.h"
 #include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/PID.h"
-#include "Common/Core/RecoDecay.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/trackUtilities.h"
+
+#include "TLorentzVector.h"
 
 using namespace o2;
 using namespace o2::framework;
@@ -468,7 +470,7 @@ struct Alice3CDeuteron {
 
           // fitterCasc.getTrack(1).getPxPyPzGlo(pvecbach);
         } // End loop on pions
-      }   // End loop on kaons
+      } // End loop on kaons
       histos.fill(HIST("event/candperdeuteron"), ncand);
     } // End loop on deuterons
   }
diff --git a/.conflict-side-1/ALICE3/Tasks/alice3-dilepton.cxx b/.conflict-side-1/ALICE3/Tasks/alice3-dilepton.cxx
index e3632fc5a02..6f20f518d27 100644
--- a/.conflict-side-1/ALICE3/Tasks/alice3-dilepton.cxx
+++ b/.conflict-side-1/ALICE3/Tasks/alice3-dilepton.cxx
@@ -16,16 +16,17 @@
 
 #include "Math/Vector4D.h"
 // O2 includes
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/HistogramRegistry.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Framework/AnalysisDataModel.h"
-#include "ALICE3/DataModel/OTFTOF.h"
 #include "ALICE3/DataModel/OTFRICH.h"
+#include "ALICE3/DataModel/OTFTOF.h"
 #include "ALICE3/DataModel/tracksAlice3.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-side-1/ALICE3/Tasks/alice3-multicharm.cxx b/.conflict-side-1/ALICE3/Tasks/alice3-multicharm.cxx
index 2b6ad804ddf..16332ead7e0 100644
--- a/.conflict-side-1/ALICE3/Tasks/alice3-multicharm.cxx
+++ b/.conflict-side-1/ALICE3/Tasks/alice3-multicharm.cxx
@@ -17,41 +17,43 @@
 //    HF decays. Work in progress: use at your own risk!
 //
 
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <map>
-#include <iterator>
-#include <utility>
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "ReconstructionDataFormats/Track.h"
+#include "ALICE3/DataModel/A3DecayFinderTables.h"
+#include "ALICE3/DataModel/OTFMulticharm.h"
+#include "ALICE3/DataModel/OTFStrangeness.h"
+#include "ALICE3/DataModel/OTFTOF.h"
+#include "ALICE3/DataModel/RICH.h"
+#include "ALICE3/DataModel/tracksAlice3.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
 #include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "DCAFitter/DCAFitterN.h"
 #include "DataFormatsCalibration/MeanVertexObject.h"
-#include "ALICE3/DataModel/OTFTOF.h"
-#include "ALICE3/DataModel/RICH.h"
-#include "ALICE3/DataModel/A3DecayFinderTables.h"
-#include "ALICE3/DataModel/OTFStrangeness.h"
-#include "ALICE3/DataModel/OTFMulticharm.h"
-#include "ALICE3/DataModel/tracksAlice3.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
 #include "DetectorsVertexing/PVertexer.h"
 #include "DetectorsVertexing/PVertexerHelpers.h"
-#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <iterator>
+#include <map>
+#include <utility>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/ALICE3/Tasks/alice3-qa-multiplicity.cxx b/.conflict-side-1/ALICE3/Tasks/alice3-qa-multiplicity.cxx
index b798209dfde..8d15316eb05 100644
--- a/.conflict-side-1/ALICE3/Tasks/alice3-qa-multiplicity.cxx
+++ b/.conflict-side-1/ALICE3/Tasks/alice3-qa-multiplicity.cxx
@@ -11,11 +11,12 @@
 /// \author Nicolo' Jacazio <nicolo.jacazio@cern.ch>, CERN
 
 // O2 includes
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-1/ALICE3/Tasks/alice3-qa-singleparticle.cxx b/.conflict-side-1/ALICE3/Tasks/alice3-qa-singleparticle.cxx
index 1c8f0f19330..32925a2708b 100644
--- a/.conflict-side-1/ALICE3/Tasks/alice3-qa-singleparticle.cxx
+++ b/.conflict-side-1/ALICE3/Tasks/alice3-qa-singleparticle.cxx
@@ -17,9 +17,10 @@
 
 // O2 includes
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TDatabasePDG.h"
 #include "TMCProcess.h"
 
diff --git a/.conflict-side-1/ALICE3/Tasks/alice3-taskcorrelationDDbar.cxx b/.conflict-side-1/ALICE3/Tasks/alice3-taskcorrelationDDbar.cxx
index b6c8058f747..914cc3ba95c 100644
--- a/.conflict-side-1/ALICE3/Tasks/alice3-taskcorrelationDDbar.cxx
+++ b/.conflict-side-1/ALICE3/Tasks/alice3-taskcorrelationDDbar.cxx
@@ -14,15 +14,15 @@
 ///
 /// \author Fabio Colamaria <fabio.colamaria@ba.infn.it>, INFN Bari
 
-#include <vector>
+#include "PWGHF/Core/SelectorCuts.h"
+#include "PWGHF/HFC/DataModel/CorrelationTables.h"
+#include "PWGHF/Utils/utilsAnalysis.h"
 
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
 
-#include "PWGHF/Core/SelectorCuts.h"
-#include "PWGHF/Utils/utilsAnalysis.h"
-#include "PWGHF/HFC/DataModel/CorrelationTables.h"
+#include <vector>
 // #include "PWGHF/DataModel/CandidateReconstructionTables.h"
 // #include "PWGHF/DataModel/CandidateSelectionTables.h"
 
diff --git a/.conflict-side-1/ALICE3/Tasks/alice3Efficiency.cxx b/.conflict-side-1/ALICE3/Tasks/alice3Efficiency.cxx
index 7741ea24696..0f247305d00 100644
--- a/.conflict-side-1/ALICE3/Tasks/alice3Efficiency.cxx
+++ b/.conflict-side-1/ALICE3/Tasks/alice3Efficiency.cxx
@@ -17,16 +17,17 @@
 /// \since  May 27, 2025
 ///
 
-#include <map>
-#include <vector>
-
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/HistogramRegistry.h"
 #include "Framework/ConfigParamRegistry.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TEfficiency.h"
 #include "THashList.h"
 
+#include <map>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 std::map<int, TEfficiency*> effVsPt;
diff --git a/.conflict-side-1/ALICE3/Tasks/alice3SeparationPower.cxx b/.conflict-side-1/ALICE3/Tasks/alice3SeparationPower.cxx
index ae5b52d0692..c01cbdaf767 100644
--- a/.conflict-side-1/ALICE3/Tasks/alice3SeparationPower.cxx
+++ b/.conflict-side-1/ALICE3/Tasks/alice3SeparationPower.cxx
@@ -17,20 +17,22 @@
 /// \since  May 13, 2025
 ///
 
-#include <utility>
-#include <map>
-#include <string>
-#include <vector>
+#include "ALICE3/DataModel/OTFRICH.h"
+#include "ALICE3/DataModel/OTFTOF.h"
 
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
 #include "Framework/HistogramRegistry.h"
-#include "TProfile2D.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+
 #include "THashList.h"
-#include "ALICE3/DataModel/OTFTOF.h"
-#include "ALICE3/DataModel/OTFRICH.h"
+#include "TProfile2D.h"
+
+#include <map>
+#include <string>
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/ALICE3/Tasks/pidFTOFqa.cxx b/.conflict-side-1/ALICE3/Tasks/pidFTOFqa.cxx
index 52dbaf8dcfa..03fa51e58cc 100644
--- a/.conflict-side-1/ALICE3/Tasks/pidFTOFqa.cxx
+++ b/.conflict-side-1/ALICE3/Tasks/pidFTOFqa.cxx
@@ -10,14 +10,15 @@
 // or submit itself to any jurisdiction.
 
 // O2 includes
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
 #include "ALICE3/DataModel/FTOF.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-1/ALICE3/Tasks/pidRICHqa.cxx b/.conflict-side-1/ALICE3/Tasks/pidRICHqa.cxx
index ab2a71e3ad9..392d4d99b8d 100644
--- a/.conflict-side-1/ALICE3/Tasks/pidRICHqa.cxx
+++ b/.conflict-side-1/ALICE3/Tasks/pidRICHqa.cxx
@@ -16,9 +16,10 @@
 ///
 
 // O2 includes
-#include "Framework/AnalysisTask.h"
 #include "ALICE3/DataModel/RICH.h"
 #include "Common/DataModel/PIDResponse.h"
+
+#include "Framework/AnalysisTask.h"
 #include "ReconstructionDataFormats/PID.h"
 
 using namespace o2;
diff --git a/.conflict-side-1/Common/CCDB/EventSelectionParams.h b/.conflict-side-1/Common/CCDB/EventSelectionParams.h
index 4633ff7aa73..cc4c397dd1b 100644
--- a/.conflict-side-1/Common/CCDB/EventSelectionParams.h
+++ b/.conflict-side-1/Common/CCDB/EventSelectionParams.h
@@ -17,9 +17,10 @@
 #ifndef COMMON_CCDB_EVENTSELECTIONPARAMS_H_
 #define COMMON_CCDB_EVENTSELECTIONPARAMS_H_
 
-#include <Rtypes.h>
 #include <TMath.h>
 
+#include <Rtypes.h>
+
 namespace o2::aod::evsel
 {
 // Event selection criteria
diff --git a/.conflict-side-1/Common/CCDB/RCTSelectionFlags.h b/.conflict-side-1/Common/CCDB/RCTSelectionFlags.h
index 1f396751c25..f80a1a7aa1b 100644
--- a/.conflict-side-1/Common/CCDB/RCTSelectionFlags.h
+++ b/.conflict-side-1/Common/CCDB/RCTSelectionFlags.h
@@ -18,11 +18,13 @@
 #define COMMON_CCDB_RCTSELECTIONFLAGS_H_
 
 #include <CommonUtils/EnumFlags.h>
-#include <Rtypes.h>
+
 #include <TMath.h>
 
-#include <stdexcept>
+#include <Rtypes.h>
+
 #include <algorithm>
+#include <stdexcept>
 #include <string>
 #include <vector>
 
diff --git a/.conflict-side-1/Common/CCDB/TriggerAliases.cxx b/.conflict-side-1/Common/CCDB/TriggerAliases.cxx
index 789d293c1d0..1c013e58ad3 100644
--- a/.conflict-side-1/Common/CCDB/TriggerAliases.cxx
+++ b/.conflict-side-1/Common/CCDB/TriggerAliases.cxx
@@ -10,6 +10,7 @@
 // or submit itself to any jurisdiction.
 
 #include "Common/CCDB/TriggerAliases.h"
+
 #include "Framework/Logger.h"
 
 std::string aliasLabels[kNaliases] = {
diff --git a/.conflict-side-1/Common/CCDB/TriggerAliases.h b/.conflict-side-1/Common/CCDB/TriggerAliases.h
index f1baf04fdcc..fff86e67e1f 100644
--- a/.conflict-side-1/Common/CCDB/TriggerAliases.h
+++ b/.conflict-side-1/Common/CCDB/TriggerAliases.h
@@ -12,10 +12,11 @@
 #ifndef COMMON_CCDB_TRIGGERALIASES_H_
 #define COMMON_CCDB_TRIGGERALIASES_H_
 
+#include <Rtypes.h>
+
 #include <cstdint>
 #include <map>
 #include <string>
-#include <Rtypes.h>
 
 enum triggerAliases {
   kINT7 = 0,
diff --git a/.conflict-side-1/Common/CCDB/ctpRateFetcher.cxx b/.conflict-side-1/Common/CCDB/ctpRateFetcher.cxx
index e20fc41616c..5a3b1e48132 100644
--- a/.conflict-side-1/Common/CCDB/ctpRateFetcher.cxx
+++ b/.conflict-side-1/Common/CCDB/ctpRateFetcher.cxx
@@ -11,14 +11,14 @@
 
 #include "ctpRateFetcher.h"
 
-#include <map>
-#include <vector>
-
+#include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/LHCConstants.h"
 #include "DataFormatsCTP/Configuration.h"
 #include "DataFormatsCTP/Scalers.h"
 #include "DataFormatsParameters/GRPLHCIFData.h"
-#include "CCDB/BasicCCDBManager.h"
+
+#include <map>
+#include <vector>
 
 namespace o2
 {
diff --git a/.conflict-side-1/Common/CCDB/ctpRateFetcher.h b/.conflict-side-1/Common/CCDB/ctpRateFetcher.h
index 6aaf5e3ebaa..beb8cd28b8e 100644
--- a/.conflict-side-1/Common/CCDB/ctpRateFetcher.h
+++ b/.conflict-side-1/Common/CCDB/ctpRateFetcher.h
@@ -12,10 +12,10 @@
 #ifndef COMMON_CCDB_CTPRATEFETCHER_H_
 #define COMMON_CCDB_CTPRATEFETCHER_H_
 
-#include <string>
-
 #include "CCDB/BasicCCDBManager.h"
 
+#include <string>
+
 namespace o2
 {
 
diff --git a/.conflict-side-1/Common/CCDB/macros/ctpRateF.C b/.conflict-side-1/Common/CCDB/macros/ctpRateF.C
index 32b93e4aa6b..efce284c159 100644
--- a/.conflict-side-1/Common/CCDB/macros/ctpRateF.C
+++ b/.conflict-side-1/Common/CCDB/macros/ctpRateF.C
@@ -9,15 +9,16 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <map>
-#include <vector>
+#include "Common/CCDB/ctpRateFetcher.h"
 
+#include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/LHCConstants.h"
 #include "DataFormatsCTP/Configuration.h"
 #include "DataFormatsCTP/Scalers.h"
 #include "DataFormatsParameters/GRPLHCIFData.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "Common/CCDB/ctpRateFetcher.h"
+
+#include <map>
+#include <vector>
 
 struct ctpRateFetcher {
   ctpRateFetcher() = default;
diff --git a/.conflict-side-1/Common/CCDB/macros/upload_event_selection_params.C b/.conflict-side-1/Common/CCDB/macros/upload_event_selection_params.C
index cafc863ab03..8296dc0f78a 100644
--- a/.conflict-side-1/Common/CCDB/macros/upload_event_selection_params.C
+++ b/.conflict-side-1/Common/CCDB/macros/upload_event_selection_params.C
@@ -9,12 +9,15 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "CCDB/CcdbApi.h"
+#include "EventSelectionParams.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
+
 #include "TString.h"
+
 #include <map>
 #include <string>
-#include "EventSelectionParams.h"
 using std::map;
 using std::string;
 
diff --git a/.conflict-side-1/Common/CCDB/macros/upload_event_selection_params_run3.C b/.conflict-side-1/Common/CCDB/macros/upload_event_selection_params_run3.C
index f81491949c6..f7887aa1df5 100644
--- a/.conflict-side-1/Common/CCDB/macros/upload_event_selection_params_run3.C
+++ b/.conflict-side-1/Common/CCDB/macros/upload_event_selection_params_run3.C
@@ -9,11 +9,14 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
+#include "EventSelectionParams.h"
+
 #include "CCDB/CcdbApi.h"
+
 #include "TString.h"
+
 #include <map>
 #include <string>
-#include "EventSelectionParams.h"
 using std::map;
 using std::string;
 
@@ -140,4 +143,5 @@ void fillMapOfCustomOrbitShifts(std::map<int, int>& mapOrbitShift)
   mapOrbitShift[523797] = 41;
   mapOrbitShift[523821] = 36;
   mapOrbitShift[523897] = 38;
-}
\ No newline at end of file
+}
+ 
\ No newline at end of file
diff --git a/.conflict-side-1/Common/CCDB/macros/upload_trigger_aliases.C b/.conflict-side-1/Common/CCDB/macros/upload_trigger_aliases.C
index 9fa91cd9b13..a6bf004edb5 100644
--- a/.conflict-side-1/Common/CCDB/macros/upload_trigger_aliases.C
+++ b/.conflict-side-1/Common/CCDB/macros/upload_trigger_aliases.C
@@ -9,12 +9,15 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "CCDB/CcdbApi.h"
+#include "TriggerAliases.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
+
 #include "TObjArray.h"
-#include "TriggerAliases.h"
-#include "TTree.h"
 #include "TString.h"
+#include "TTree.h"
+
 #include <fstream>
 #include <map>
 #include <string>
diff --git a/.conflict-side-1/Common/CCDB/macros/upload_trigger_aliases_run3.C b/.conflict-side-1/Common/CCDB/macros/upload_trigger_aliases_run3.C
index e946d9117d4..75e813b6dd3 100644
--- a/.conflict-side-1/Common/CCDB/macros/upload_trigger_aliases_run3.C
+++ b/.conflict-side-1/Common/CCDB/macros/upload_trigger_aliases_run3.C
@@ -9,13 +9,16 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "DataFormatsCTP/Configuration.h"
-#include "CCDB/CcdbApi.h"
+#include "TriggerAliases.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
+#include "DataFormatsCTP/Configuration.h"
+
 #include "TObjArray.h"
-#include "TriggerAliases.h"
-#include "TTree.h"
 #include "TString.h"
+#include "TTree.h"
+
 #include <fstream>
 #include <map>
 #include <string>
diff --git a/.conflict-side-1/Common/Core/CollisionAssociation.h b/.conflict-side-1/Common/Core/CollisionAssociation.h
index 69ec38a24db..c505f0c6dbb 100644
--- a/.conflict-side-1/Common/Core/CollisionAssociation.h
+++ b/.conflict-side-1/Common/Core/CollisionAssociation.h
@@ -20,13 +20,13 @@
 #ifndef COMMON_CORE_COLLISIONASSOCIATION_H_
 #define COMMON_CORE_COLLISIONASSOCIATION_H_
 
-#include <vector>
-#include <memory>
-#include <utility>
-
 #include "CommonConstants/LHCConstants.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+
+#include <memory>
+#include <utility>
+#include <vector>
 
 namespace o2::aod
 {
diff --git a/.conflict-side-1/Common/Core/EventPlaneHelper.cxx b/.conflict-side-1/Common/Core/EventPlaneHelper.cxx
index 75424d900d9..b1e63af16fa 100644
--- a/.conflict-side-1/Common/Core/EventPlaneHelper.cxx
+++ b/.conflict-side-1/Common/Core/EventPlaneHelper.cxx
@@ -20,13 +20,13 @@
 
 #include "Common/Core/EventPlaneHelper.h"
 
+#include "TMath.h"
+#include "TVector3.h"
+
 #include <algorithm>
 #include <iterator>
-#include <vector>
 #include <memory>
-
-#include "TMath.h"
-#include "TVector3.h"
+#include <vector>
 
 double EventPlaneHelper::GetPhiFV0(int chno, o2::fv0::Geometry* fv0geom)
 {
diff --git a/.conflict-side-1/Common/Core/EventPlaneHelper.h b/.conflict-side-1/Common/Core/EventPlaneHelper.h
index d6a2f3cba11..c85c04fe092 100644
--- a/.conflict-side-1/Common/Core/EventPlaneHelper.h
+++ b/.conflict-side-1/Common/Core/EventPlaneHelper.h
@@ -21,17 +21,16 @@
 #ifndef COMMON_CORE_EVENTPLANEHELPER_H_
 #define COMMON_CORE_EVENTPLANEHELPER_H_
 
-#include <vector>
-#include <memory>
+#include "FT0Base/Geometry.h"
+#include "FV0Base/Geometry.h"
 
 #include "TNamed.h"
-
 #include <TComplex.h>
 #include <TH2D.h>
 #include <TProfile.h>
 
-#include "FV0Base/Geometry.h"
-#include "FT0Base/Geometry.h"
+#include <memory>
+#include <vector>
 
 class EventPlaneHelper
 {
diff --git a/.conflict-side-1/Common/Core/FFitWeights.cxx b/.conflict-side-1/Common/Core/FFitWeights.cxx
index 3a92114f48c..3cb9216ba85 100644
--- a/.conflict-side-1/Common/Core/FFitWeights.cxx
+++ b/.conflict-side-1/Common/Core/FFitWeights.cxx
@@ -16,12 +16,12 @@
 
 #include "FFitWeights.h"
 
-#include <string>
+#include <TSpline.h>
+
 #include <cstdio>
+#include <string>
 #include <vector>
 
-#include <TSpline.h>
-
 ClassImp(FFitWeights)
 
   FFitWeights::FFitWeights() : TNamed("", ""),
diff --git a/.conflict-side-1/Common/Core/FFitWeights.h b/.conflict-side-1/Common/Core/FFitWeights.h
index c80165730f7..5227eefa359 100644
--- a/.conflict-side-1/Common/Core/FFitWeights.h
+++ b/.conflict-side-1/Common/Core/FFitWeights.h
@@ -17,22 +17,22 @@
 #ifndef COMMON_CORE_FFITWEIGHTS_H_
 #define COMMON_CORE_FFITWEIGHTS_H_
 
-#include <vector>
-#include <string>
-#include <utility>
-#include <algorithm>
-#include <complex>
-#include <memory>
-
+#include "TCollection.h"
+#include "TFile.h"
+#include "TH1D.h"
+#include "TH2D.h"
+#include "TH3D.h"
+#include "TMath.h"
 #include "TNamed.h"
 #include "TObjArray.h"
-#include "TH3D.h"
-#include "TH2D.h"
-#include "TH1D.h"
-#include "TFile.h"
-#include "TCollection.h"
 #include "TString.h"
-#include "TMath.h"
+
+#include <algorithm>
+#include <complex>
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
 
 class FFitWeights : public TNamed
 {
diff --git a/.conflict-side-1/Common/Core/OrbitRange.cxx b/.conflict-side-1/Common/Core/OrbitRange.cxx
index 51a3ec5fe78..b57654079bc 100644
--- a/.conflict-side-1/Common/Core/OrbitRange.cxx
+++ b/.conflict-side-1/Common/Core/OrbitRange.cxx
@@ -14,6 +14,7 @@
 //
 
 #include "Common/Core/OrbitRange.h"
+
 #include "TCollection.h"
 #include "TMath.h"
 
diff --git a/.conflict-side-1/Common/Core/PID/DetectorResponse.h b/.conflict-side-1/Common/Core/PID/DetectorResponse.h
index 1f687a4605c..e78251935ee 100644
--- a/.conflict-side-1/Common/Core/PID/DetectorResponse.h
+++ b/.conflict-side-1/Common/Core/PID/DetectorResponse.h
@@ -20,18 +20,21 @@
 #ifndef O2_ANALYSIS_PID_DETECTORRESPONSE_H_
 #define O2_ANALYSIS_PID_DETECTORRESPONSE_H_
 
+#include "Framework/Logger.h"
+
 #include <array>
 #include <vector>
-#include "Framework/Logger.h"
 // ROOT includes
 #include "Rtypes.h"
-#include "TMath.h"
+
 #include "TFile.h"
+#include "TMath.h"
 
 // O2 includes
-#include "ReconstructionDataFormats/PID.h"
 #include "Common/Core/PID/ParamBase.h"
 
+#include "ReconstructionDataFormats/PID.h"
+
 namespace o2::pid
 {
 /// \brief Class to handle the general detector response
diff --git a/.conflict-side-1/Common/Core/PID/PIDTOF.cxx b/.conflict-side-1/Common/Core/PID/PIDTOF.cxx
index bec41fafc43..10a3588730c 100644
--- a/.conflict-side-1/Common/Core/PID/PIDTOF.cxx
+++ b/.conflict-side-1/Common/Core/PID/PIDTOF.cxx
@@ -17,6 +17,7 @@
 ///
 
 #include "PIDTOF.h"
+
 #include <string>
 
 namespace o2::pid::tof
diff --git a/.conflict-side-1/Common/Core/PID/PIDTOF.h b/.conflict-side-1/Common/Core/PID/PIDTOF.h
index ad16716916c..fb02804745a 100644
--- a/.conflict-side-1/Common/Core/PID/PIDTOF.h
+++ b/.conflict-side-1/Common/Core/PID/PIDTOF.h
@@ -25,17 +25,18 @@
 
 // ROOT includes
 #include "Rtypes.h"
-#include "TMath.h"
-#include "TGraph.h"
-#include "TFile.h"
+
 #include "TF2.h"
+#include "TFile.h"
+#include "TGraph.h"
+#include "TMath.h"
 
 // O2 includes
+#include "CommonConstants/PhysicsConstants.h"
 #include "DataFormatsTOF/ParameterContainers.h"
+#include "Framework/DataTypes.h"
 #include "Framework/Logger.h"
 #include "ReconstructionDataFormats/PID.h"
-#include "Framework/DataTypes.h"
-#include "CommonConstants/PhysicsConstants.h"
 
 namespace o2::pid::tof
 {
diff --git a/.conflict-side-1/Common/Core/PID/ParamBase.cxx b/.conflict-side-1/Common/Core/PID/ParamBase.cxx
index 74824781d07..ab5a0d0f4dd 100644
--- a/.conflict-side-1/Common/Core/PID/ParamBase.cxx
+++ b/.conflict-side-1/Common/Core/PID/ParamBase.cxx
@@ -18,7 +18,9 @@
 ///
 
 #include "PID/ParamBase.h"
+
 #include "Framework/Logger.h"
+
 #include "TFile.h"
 
 namespace o2::pid
diff --git a/.conflict-side-1/Common/Core/PID/ParamBase.h b/.conflict-side-1/Common/Core/PID/ParamBase.h
index ec4b17083f4..28bbc6b732b 100644
--- a/.conflict-side-1/Common/Core/PID/ParamBase.h
+++ b/.conflict-side-1/Common/Core/PID/ParamBase.h
@@ -26,11 +26,11 @@
 #include <vector>    // std::vector
 
 // ROOT includes
-#include "TNamed.h"
-#include "TFile.h"
-
 #include "Framework/Logger.h"
 
+#include "TFile.h"
+#include "TNamed.h"
+
 namespace o2::pid
 {
 /// Variable to use for the pid input/output i.e. float, double et cetera
diff --git a/.conflict-side-1/Common/Core/PID/TPCPIDResponse.h b/.conflict-side-1/Common/Core/PID/TPCPIDResponse.h
index f25e1acd69e..03ec6c2302f 100644
--- a/.conflict-side-1/Common/Core/PID/TPCPIDResponse.h
+++ b/.conflict-side-1/Common/Core/PID/TPCPIDResponse.h
@@ -17,14 +17,15 @@
 #ifndef COMMON_CORE_PID_TPCPIDRESPONSE_H_
 #define COMMON_CORE_PID_TPCPIDRESPONSE_H_
 
+#include "Framework/Logger.h"
+
 #include <array>
-#include <vector>
 #include <cmath>
-#include "Framework/Logger.h"
+#include <vector>
 // O2 includes
-#include "ReconstructionDataFormats/PID.h"
-#include "Framework/DataTypes.h"
 #include "DataFormatsTPC/BetheBlochAleph.h"
+#include "Framework/DataTypes.h"
+#include "ReconstructionDataFormats/PID.h"
 
 namespace o2::pid::tpc
 {
diff --git a/.conflict-side-1/Common/Core/TPCVDriftManager.h b/.conflict-side-1/Common/Core/TPCVDriftManager.h
index 5d35db5ea99..54f0f26a9f6 100644
--- a/.conflict-side-1/Common/Core/TPCVDriftManager.h
+++ b/.conflict-side-1/Common/Core/TPCVDriftManager.h
@@ -12,17 +12,17 @@
 #ifndef COMMON_CORE_TPCVDRIFTMANAGER_H_
 #define COMMON_CORE_TPCVDRIFTMANAGER_H_
 
-#include <string>
-
 #include "CCDB/BasicCCDBManager.h"
-#include "Framework/Logger.h"
-#include "Framework/DataTypes.h"
-#include "DataFormatsTPC/VDriftCorrFact.h"
 #include "CommonConstants/LHCConstants.h"
-#include "DataFormatsParameters/GRPLHCIFData.h"
 #include "DataFormatsParameters/GRPECSObject.h"
+#include "DataFormatsParameters/GRPLHCIFData.h"
+#include "DataFormatsTPC/VDriftCorrFact.h"
+#include "Framework/DataTypes.h"
+#include "Framework/Logger.h"
 #include "ReconstructionDataFormats/Track.h"
 
+#include <string>
+
 namespace o2::aod::common
 {
 
diff --git a/.conflict-side-1/Common/Core/TrackSelection.cxx b/.conflict-side-1/Common/Core/TrackSelection.cxx
index 717d7db77f5..1103b678024 100644
--- a/.conflict-side-1/Common/Core/TrackSelection.cxx
+++ b/.conflict-side-1/Common/Core/TrackSelection.cxx
@@ -13,9 +13,10 @@
 // Class for track selection
 //
 
-#include "Framework/Logger.h"
 #include "Common/Core/TrackSelection.h"
 
+#include "Framework/Logger.h"
+
 bool TrackSelection::FulfillsITSHitRequirements(uint8_t itsClusterMap) const
 {
   constexpr uint8_t bit = 1;
diff --git a/.conflict-side-1/Common/Core/TrackSelection.h b/.conflict-side-1/Common/Core/TrackSelection.h
index 19d77a198e1..94285fbdda8 100644
--- a/.conflict-side-1/Common/Core/TrackSelection.h
+++ b/.conflict-side-1/Common/Core/TrackSelection.h
@@ -16,13 +16,15 @@
 #ifndef COMMON_CORE_TRACKSELECTION_H_
 #define COMMON_CORE_TRACKSELECTION_H_
 
+#include "Rtypes.h"
+
+#include "Framework/DataTypes.h"
+#include "Framework/Logger.h"
+
 #include <set>
-#include <vector>
-#include <utility>
 #include <string>
-#include "Framework/Logger.h"
-#include "Framework/DataTypes.h"
-#include "Rtypes.h"
+#include <utility>
+#include <vector>
 
 class TrackSelection
 {
diff --git a/.conflict-side-1/Common/Core/TrackSelectionDefaults.cxx b/.conflict-side-1/Common/Core/TrackSelectionDefaults.cxx
index 2958718feba..3e659db0502 100644
--- a/.conflict-side-1/Common/Core/TrackSelectionDefaults.cxx
+++ b/.conflict-side-1/Common/Core/TrackSelectionDefaults.cxx
@@ -15,10 +15,12 @@
 /// \since 20-10-2020
 ///
 
-#include "Framework/DataTypes.h"
-#include "Common/Core/TrackSelection.h"
 #include "TrackSelectionDefaults.h"
 
+#include "Common/Core/TrackSelection.h"
+
+#include "Framework/DataTypes.h"
+
 // Default track selection requiring one hit in the SPD
 TrackSelection getGlobalTrackSelection()
 {
diff --git a/.conflict-side-1/Common/Core/TrackSelectionDefaults.h b/.conflict-side-1/Common/Core/TrackSelectionDefaults.h
index 72c666456ae..9dc2f1aa661 100644
--- a/.conflict-side-1/Common/Core/TrackSelectionDefaults.h
+++ b/.conflict-side-1/Common/Core/TrackSelectionDefaults.h
@@ -18,9 +18,10 @@
 #ifndef COMMON_CORE_TRACKSELECTIONDEFAULTS_H_
 #define COMMON_CORE_TRACKSELECTIONDEFAULTS_H_
 
-#include "Framework/DataTypes.h"
 #include "Common/Core/TrackSelection.h"
 
+#include "Framework/DataTypes.h"
+
 // Default track selection requiring one hit in the SPD
 TrackSelection getGlobalTrackSelection();
 
diff --git a/.conflict-side-1/Common/Core/TrackSelectorPID.h b/.conflict-side-1/Common/Core/TrackSelectorPID.h
index 214627a2d72..afda01c5a44 100644
--- a/.conflict-side-1/Common/Core/TrackSelectorPID.h
+++ b/.conflict-side-1/Common/Core/TrackSelectorPID.h
@@ -17,11 +17,11 @@
 #ifndef COMMON_CORE_TRACKSELECTORPID_H_
 #define COMMON_CORE_TRACKSELECTORPID_H_
 
-#include <TPDGCode.h>
-
 #include "Framework/Logger.h"
 #include "ReconstructionDataFormats/PID.h"
 
+#include <TPDGCode.h>
+
 /// Class for track selection using PID detectors
 
 struct TrackSelectorPID {
diff --git a/.conflict-side-1/Common/Core/trackUtilities.h b/.conflict-side-1/Common/Core/trackUtilities.h
index e67e0f82d6f..744647915f8 100644
--- a/.conflict-side-1/Common/Core/trackUtilities.h
+++ b/.conflict-side-1/Common/Core/trackUtilities.h
@@ -17,11 +17,13 @@
 #ifndef COMMON_CORE_TRACKUTILITIES_H_
 #define COMMON_CORE_TRACKUTILITIES_H_
 
-#include <utility> // std::move
+#include "Common/Core/RecoDecay.h"
+
 #include "CommonConstants/MathConstants.h"
 #include "ReconstructionDataFormats/Track.h"
 #include "ReconstructionDataFormats/Vertex.h"
-#include "Common/Core/RecoDecay.h"
+
+#include <utility> // std::move
 
 /// Extracts track parameters from a track.
 template <typename TrackPrecision = float, typename T>
diff --git a/.conflict-side-1/Common/DataModel/CaloClusters.h b/.conflict-side-1/Common/DataModel/CaloClusters.h
index 23a44371d80..9a83a92ccec 100644
--- a/.conflict-side-1/Common/DataModel/CaloClusters.h
+++ b/.conflict-side-1/Common/DataModel/CaloClusters.h
@@ -12,9 +12,10 @@
 #ifndef COMMON_DATAMODEL_CALOCLUSTERS_H_
 #define COMMON_DATAMODEL_CALOCLUSTERS_H_
 
-#include <vector>
 #include "Framework/AnalysisDataModel.h"
 
+#include <vector>
+
 namespace o2::aod
 {
 namespace calocluster
diff --git a/.conflict-side-1/Common/DataModel/EseTable.h b/.conflict-side-1/Common/DataModel/EseTable.h
index 68ffdff450a..defc3c750a5 100644
--- a/.conflict-side-1/Common/DataModel/EseTable.h
+++ b/.conflict-side-1/Common/DataModel/EseTable.h
@@ -17,10 +17,10 @@
 #ifndef COMMON_DATAMODEL_ESETABLE_H_
 #define COMMON_DATAMODEL_ESETABLE_H_
 
-#include <vector>
-
-#include "Framework/AnalysisTask.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+
+#include <vector>
 
 namespace o2::aod
 {
diff --git a/.conflict-side-1/Common/DataModel/EventSelection.h b/.conflict-side-1/Common/DataModel/EventSelection.h
index 77849d0d7cf..093ae4303c3 100644
--- a/.conflict-side-1/Common/DataModel/EventSelection.h
+++ b/.conflict-side-1/Common/DataModel/EventSelection.h
@@ -17,10 +17,11 @@
 #ifndef COMMON_DATAMODEL_EVENTSELECTION_H_
 #define COMMON_DATAMODEL_EVENTSELECTION_H_
 
-#include "Framework/AnalysisDataModel.h"
-#include "Common/CCDB/TriggerAliases.h"
 #include "Common/CCDB/EventSelectionParams.h"
 #include "Common/CCDB/RCTSelectionFlags.h"
+#include "Common/CCDB/TriggerAliases.h"
+
+#include "Framework/AnalysisDataModel.h"
 
 namespace o2::aod
 {
diff --git a/.conflict-side-1/Common/DataModel/McCollisionExtra.h b/.conflict-side-1/Common/DataModel/McCollisionExtra.h
index 14b11b9a4e8..4b0f20c92fa 100644
--- a/.conflict-side-1/Common/DataModel/McCollisionExtra.h
+++ b/.conflict-side-1/Common/DataModel/McCollisionExtra.h
@@ -14,15 +14,16 @@
 #ifndef COMMON_DATAMODEL_MCCOLLISIONEXTRA_H_
 #define COMMON_DATAMODEL_MCCOLLISIONEXTRA_H_
 
-#include <cmath>
 #include "Framework/AnalysisDataModel.h"
 
+#include <cmath>
+
 namespace o2::aod
 {
 namespace mccollisionprop
 {
-DECLARE_SOA_COLUMN(NumRecoCollision, numRecoCollision, int);     //! stores N times this PV was recoed
-DECLARE_SOA_COLUMN(BestCollisionIndex, bestCollisionIndex, int); //! stores N times this PV was recoed
+DECLARE_SOA_COLUMN(NumRecoCollision, numRecoCollision, int);             //! stores N times this PV was recoed
+DECLARE_SOA_COLUMN(BestCollisionIndex, bestCollisionIndex, int);         //! stores N times this PV was recoed
 DECLARE_SOA_COLUMN(BestCollisionCentFT0C, bestCollisionCentFT0C, float); //! stores best FT0C centrality
 
 // collision MC context (neighbours contain PoI?)
@@ -35,4 +36,4 @@ DECLARE_SOA_TABLE(McCollContexts, "AOD", "MCCOLLCONTEXT",
                   mccollisionprop::ForwardCollisionMap, mccollisionprop::BackwardCollisionMap);
 } // namespace o2::aod
 
-#endif // COMMON_DATAMODEL_MCCOLLISIONEXTRA_H_
\ No newline at end of file
+#endif // COMMON_DATAMODEL_MCCOLLISIONEXTRA_H_
diff --git a/.conflict-side-1/Common/DataModel/MftmchMatchingML.h b/.conflict-side-1/Common/DataModel/MftmchMatchingML.h
index f243411f3b7..56171cb052e 100644
--- a/.conflict-side-1/Common/DataModel/MftmchMatchingML.h
+++ b/.conflict-side-1/Common/DataModel/MftmchMatchingML.h
@@ -12,9 +12,10 @@
 #ifndef COMMON_DATAMODEL_MFTMCHMATCHINGML_H_
 #define COMMON_DATAMODEL_MFTMCHMATCHINGML_H_
 
-#include "Framework/AnalysisDataModel.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+
 namespace o2::aod
 {
 DECLARE_SOA_TABLE(FwdTracksML, "AOD", "FWDTRACKML",
diff --git a/.conflict-side-1/Common/DataModel/Multiplicity.h b/.conflict-side-1/Common/DataModel/Multiplicity.h
index 0ac2a0074c6..8b0bcc2f051 100644
--- a/.conflict-side-1/Common/DataModel/Multiplicity.h
+++ b/.conflict-side-1/Common/DataModel/Multiplicity.h
@@ -16,9 +16,10 @@
 #ifndef COMMON_DATAMODEL_MULTIPLICITY_H_
 #define COMMON_DATAMODEL_MULTIPLICITY_H_
 
-#include "Framework/AnalysisDataModel.h"
 #include "Common/DataModel/EventSelection.h"
 
+#include "Framework/AnalysisDataModel.h"
+
 namespace o2::aod
 {
 namespace mult
diff --git a/.conflict-side-1/Common/DataModel/OccupancyTables.h b/.conflict-side-1/Common/DataModel/OccupancyTables.h
index 9e14fd8f4f2..70db5b31793 100644
--- a/.conflict-side-1/Common/DataModel/OccupancyTables.h
+++ b/.conflict-side-1/Common/DataModel/OccupancyTables.h
@@ -14,11 +14,11 @@
 ///
 /// \author Rahul Verma (rahul.verma@iitb.ac.in) :: Marian I Ivanov (marian.ivanov@cern.ch)
 
-#include <vector>
-
 #include "Framework/ASoA.h"
 #include "Framework/AnalysisDataModel.h"
 
+#include <vector>
+
 #ifndef COMMON_DATAMODEL_OCCUPANCYTABLES_H_
 #define COMMON_DATAMODEL_OCCUPANCYTABLES_H_
 
diff --git a/.conflict-side-1/Common/DataModel/PIDResponse.h b/.conflict-side-1/Common/DataModel/PIDResponse.h
index eee2e4df2e3..f113f3a4c1f 100644
--- a/.conflict-side-1/Common/DataModel/PIDResponse.h
+++ b/.conflict-side-1/Common/DataModel/PIDResponse.h
@@ -19,9 +19,9 @@
 #ifndef COMMON_DATAMODEL_PIDRESPONSE_H_
 #define COMMON_DATAMODEL_PIDRESPONSE_H_
 
+#include "PIDResponseCombined.h"
 #include "PIDResponseTOF.h"
 #include "PIDResponseTPC.h"
-#include "PIDResponseCombined.h"
 
 namespace o2::aod
 {
diff --git a/.conflict-side-1/Common/DataModel/PIDResponseCombined.h b/.conflict-side-1/Common/DataModel/PIDResponseCombined.h
index 4b54d214838..e6f859ab692 100644
--- a/.conflict-side-1/Common/DataModel/PIDResponseCombined.h
+++ b/.conflict-side-1/Common/DataModel/PIDResponseCombined.h
@@ -24,8 +24,8 @@
 // O2 includes
 #include "Framework/ASoA.h"
 #include "Framework/AnalysisDataModel.h"
-#include "ReconstructionDataFormats/PID.h"
 #include "Framework/Logger.h"
+#include "ReconstructionDataFormats/PID.h"
 
 namespace o2::aod
 {
diff --git a/.conflict-side-1/Common/DataModel/PIDResponseTOF.h b/.conflict-side-1/Common/DataModel/PIDResponseTOF.h
index 5edfe931ad8..85beb113851 100644
--- a/.conflict-side-1/Common/DataModel/PIDResponseTOF.h
+++ b/.conflict-side-1/Common/DataModel/PIDResponseTOF.h
@@ -23,11 +23,12 @@
 #include <experimental/type_traits>
 
 // O2 includes
+#include "Common/Core/PID/PIDTOF.h"
+
 #include "Framework/ASoA.h"
 #include "Framework/AnalysisDataModel.h"
-#include "ReconstructionDataFormats/PID.h"
 #include "Framework/Logger.h"
-#include "Common/Core/PID/PIDTOF.h"
+#include "ReconstructionDataFormats/PID.h"
 
 namespace o2::aod
 {
diff --git a/.conflict-side-1/Common/DataModel/PIDResponseTPC.h b/.conflict-side-1/Common/DataModel/PIDResponseTPC.h
index a22d5c9c008..e5247b90432 100644
--- a/.conflict-side-1/Common/DataModel/PIDResponseTPC.h
+++ b/.conflict-side-1/Common/DataModel/PIDResponseTPC.h
@@ -25,8 +25,8 @@
 // O2 includes
 #include "Framework/ASoA.h"
 #include "Framework/AnalysisDataModel.h"
-#include "ReconstructionDataFormats/PID.h"
 #include "Framework/Logger.h"
+#include "ReconstructionDataFormats/PID.h"
 
 namespace o2::aod
 {
diff --git a/.conflict-side-1/Common/DataModel/Qvectors.h b/.conflict-side-1/Common/DataModel/Qvectors.h
index 423c2648e89..1ff0ceebabd 100644
--- a/.conflict-side-1/Common/DataModel/Qvectors.h
+++ b/.conflict-side-1/Common/DataModel/Qvectors.h
@@ -21,9 +21,10 @@
 #ifndef COMMON_DATAMODEL_QVECTORS_H_
 #define COMMON_DATAMODEL_QVECTORS_H_
 
-#include <vector>
 #include "Framework/AnalysisDataModel.h"
 
+#include <vector>
+
 namespace o2::aod
 {
 namespace qvec
diff --git a/.conflict-side-1/Common/LegacyDataQA/centqa.cxx b/.conflict-side-1/Common/LegacyDataQA/centqa.cxx
index 0d69be10754..00bb1fee419 100644
--- a/.conflict-side-1/Common/LegacyDataQA/centqa.cxx
+++ b/.conflict-side-1/Common/LegacyDataQA/centqa.cxx
@@ -22,13 +22,15 @@
 // - david.dobrigkeit.chinellato@cern.ch
 //
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Common/DataModel/McCollisionExtra.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/McCollisionExtra.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TH1F.h"
 #include "TH2F.h"
 
diff --git a/.conflict-side-1/Common/LegacyDataQA/otfv0qa.cxx b/.conflict-side-1/Common/LegacyDataQA/otfv0qa.cxx
index 8dc446d9a01..13ee2809bcd 100644
--- a/.conflict-side-1/Common/LegacyDataQA/otfv0qa.cxx
+++ b/.conflict-side-1/Common/LegacyDataQA/otfv0qa.cxx
@@ -9,13 +9,15 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/McCollisionExtra.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TH1F.h"
 #include "TH2F.h"
 
diff --git a/.conflict-side-1/Common/LegacyDataQA/pmdQa.cxx b/.conflict-side-1/Common/LegacyDataQA/pmdQa.cxx
index 9958fd26761..3d355f33f0b 100644
--- a/.conflict-side-1/Common/LegacyDataQA/pmdQa.cxx
+++ b/.conflict-side-1/Common/LegacyDataQA/pmdQa.cxx
@@ -15,21 +15,23 @@
 /// \author Abhi Modak (abhi.modak@cern.ch)
 /// \since May 17, 2025
 
-#include <cstdlib>
-#include <cmath>
-#include <vector>
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PmdTable.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
+#include "CCDB/BasicCCDBManager.h"
 #include "Framework/ASoA.h"
 #include "Framework/AnalysisDataModel.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/PmdTable.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "CCDB/BasicCCDBManager.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TH1F.h"
 #include "TH2F.h"
 
+#include <cmath>
+#include <cstdlib>
+#include <vector>
+
 using namespace o2;
 using namespace o2::aod::run2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Common/LegacyDataQA/tpcpidqa.cxx b/.conflict-side-1/Common/LegacyDataQA/tpcpidqa.cxx
index a67043fd342..fd9988f7251 100644
--- a/.conflict-side-1/Common/LegacyDataQA/tpcpidqa.cxx
+++ b/.conflict-side-1/Common/LegacyDataQA/tpcpidqa.cxx
@@ -18,12 +18,14 @@
 //
 // Warning: expected resolution is NOT provided.
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "TableHelper.h"
 
+#include "Common/DataModel/PIDResponse.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-side-1/Common/TableProducer/Converters/bcConverter.cxx b/.conflict-side-1/Common/TableProducer/Converters/bcConverter.cxx
index 54f9a90aa8b..a023c530236 100644
--- a/.conflict-side-1/Common/TableProducer/Converters/bcConverter.cxx
+++ b/.conflict-side-1/Common/TableProducer/Converters/bcConverter.cxx
@@ -8,9 +8,9 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Common/TableProducer/Converters/bcFlagsCreator.cxx b/.conflict-side-1/Common/TableProducer/Converters/bcFlagsCreator.cxx
index 972832716b5..6300998830c 100644
--- a/.conflict-side-1/Common/TableProducer/Converters/bcFlagsCreator.cxx
+++ b/.conflict-side-1/Common/TableProducer/Converters/bcFlagsCreator.cxx
@@ -8,9 +8,9 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Common/TableProducer/Converters/caloLabelConverter.cxx b/.conflict-side-1/Common/TableProducer/Converters/caloLabelConverter.cxx
index 0186e34f628..2200df1e1a6 100644
--- a/.conflict-side-1/Common/TableProducer/Converters/caloLabelConverter.cxx
+++ b/.conflict-side-1/Common/TableProducer/Converters/caloLabelConverter.cxx
@@ -8,9 +8,9 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Common/TableProducer/Converters/collisionConverter.cxx b/.conflict-side-1/Common/TableProducer/Converters/collisionConverter.cxx
index d3186ea462f..9f6da391425 100644
--- a/.conflict-side-1/Common/TableProducer/Converters/collisionConverter.cxx
+++ b/.conflict-side-1/Common/TableProducer/Converters/collisionConverter.cxx
@@ -8,9 +8,9 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Common/TableProducer/Converters/fddConverter.cxx b/.conflict-side-1/Common/TableProducer/Converters/fddConverter.cxx
index 50d47ade048..a5aaaffecf3 100644
--- a/.conflict-side-1/Common/TableProducer/Converters/fddConverter.cxx
+++ b/.conflict-side-1/Common/TableProducer/Converters/fddConverter.cxx
@@ -8,9 +8,9 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Common/TableProducer/Converters/hmpConverter.cxx b/.conflict-side-1/Common/TableProducer/Converters/hmpConverter.cxx
index da4eeeb7bca..2c8b5815868 100644
--- a/.conflict-side-1/Common/TableProducer/Converters/hmpConverter.cxx
+++ b/.conflict-side-1/Common/TableProducer/Converters/hmpConverter.cxx
@@ -12,9 +12,9 @@
 // HMPID converter to new format
 // to be used with Run 2 converted data and older AO2Ds
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Common/TableProducer/Converters/mcCollisionConverter.cxx b/.conflict-side-1/Common/TableProducer/Converters/mcCollisionConverter.cxx
index b965a092117..eb837e9cf22 100644
--- a/.conflict-side-1/Common/TableProducer/Converters/mcCollisionConverter.cxx
+++ b/.conflict-side-1/Common/TableProducer/Converters/mcCollisionConverter.cxx
@@ -8,9 +8,9 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Common/TableProducer/Converters/mcConverter.cxx b/.conflict-side-1/Common/TableProducer/Converters/mcConverter.cxx
index a78ac3158ea..8680bcb65dc 100644
--- a/.conflict-side-1/Common/TableProducer/Converters/mcConverter.cxx
+++ b/.conflict-side-1/Common/TableProducer/Converters/mcConverter.cxx
@@ -8,9 +8,9 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Common/TableProducer/Converters/mftTracksConverter.cxx b/.conflict-side-1/Common/TableProducer/Converters/mftTracksConverter.cxx
index 425bb0c6392..006e9bbe742 100644
--- a/.conflict-side-1/Common/TableProducer/Converters/mftTracksConverter.cxx
+++ b/.conflict-side-1/Common/TableProducer/Converters/mftTracksConverter.cxx
@@ -19,9 +19,9 @@
 
 /// \author L.Micheletti <luca.micheletti@cern.ch>
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Common/TableProducer/Converters/multMCExtrasConverter.cxx b/.conflict-side-1/Common/TableProducer/Converters/multMCExtrasConverter.cxx
index ac2c074ba1b..27eeaf78bcb 100644
--- a/.conflict-side-1/Common/TableProducer/Converters/multMCExtrasConverter.cxx
+++ b/.conflict-side-1/Common/TableProducer/Converters/multMCExtrasConverter.cxx
@@ -9,11 +9,12 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Common/DataModel/Multiplicity.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-side-1/Common/TableProducer/Converters/multsExtraConverter.cxx b/.conflict-side-1/Common/TableProducer/Converters/multsExtraConverter.cxx
index d62b34508b8..2e30ed2a266 100644
--- a/.conflict-side-1/Common/TableProducer/Converters/multsExtraConverter.cxx
+++ b/.conflict-side-1/Common/TableProducer/Converters/multsExtraConverter.cxx
@@ -9,11 +9,12 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Common/DataModel/Multiplicity.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-side-1/Common/TableProducer/Converters/run2TinyToFullPID.cxx b/.conflict-side-1/Common/TableProducer/Converters/run2TinyToFullPID.cxx
index 23b6c5a8cbf..098318e3c3a 100644
--- a/.conflict-side-1/Common/TableProducer/Converters/run2TinyToFullPID.cxx
+++ b/.conflict-side-1/Common/TableProducer/Converters/run2TinyToFullPID.cxx
@@ -18,12 +18,14 @@
 //
 // Warning: expected resolution is NOT provided.
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "TableHelper.h"
 
+#include "Common/DataModel/PIDResponse.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-side-1/Common/TableProducer/Converters/run2bcinfosConverter.cxx b/.conflict-side-1/Common/TableProducer/Converters/run2bcinfosConverter.cxx
index 6257d371824..06d5282a9ee 100644
--- a/.conflict-side-1/Common/TableProducer/Converters/run2bcinfosConverter.cxx
+++ b/.conflict-side-1/Common/TableProducer/Converters/run2bcinfosConverter.cxx
@@ -9,9 +9,9 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Common/TableProducer/Converters/run2tracksExtraConverter.cxx b/.conflict-side-1/Common/TableProducer/Converters/run2tracksExtraConverter.cxx
index 28ae54c4367..ffb9b9cf24e 100644
--- a/.conflict-side-1/Common/TableProducer/Converters/run2tracksExtraConverter.cxx
+++ b/.conflict-side-1/Common/TableProducer/Converters/run2tracksExtraConverter.cxx
@@ -9,9 +9,9 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Common/TableProducer/Converters/trackQA002Converter.cxx b/.conflict-side-1/Common/TableProducer/Converters/trackQA002Converter.cxx
index 566c998e1bc..2e74c50d8e9 100644
--- a/.conflict-side-1/Common/TableProducer/Converters/trackQA002Converter.cxx
+++ b/.conflict-side-1/Common/TableProducer/Converters/trackQA002Converter.cxx
@@ -8,11 +8,11 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include <limits>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include <limits>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Common/TableProducer/Converters/trackQA003Converter.cxx b/.conflict-side-1/Common/TableProducer/Converters/trackQA003Converter.cxx
index 56a6d3551e9..2447283f468 100644
--- a/.conflict-side-1/Common/TableProducer/Converters/trackQA003Converter.cxx
+++ b/.conflict-side-1/Common/TableProducer/Converters/trackQA003Converter.cxx
@@ -8,11 +8,11 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include <limits>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include <limits>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Common/TableProducer/Converters/trackQAConverter.cxx b/.conflict-side-1/Common/TableProducer/Converters/trackQAConverter.cxx
index bdfecbca8d0..fd8657ebcdd 100644
--- a/.conflict-side-1/Common/TableProducer/Converters/trackQAConverter.cxx
+++ b/.conflict-side-1/Common/TableProducer/Converters/trackQAConverter.cxx
@@ -8,11 +8,11 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include <limits>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include <limits>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Common/TableProducer/Converters/tracksExtraConverter.cxx b/.conflict-side-1/Common/TableProducer/Converters/tracksExtraConverter.cxx
index b097cb7c4a3..ed8b6c21db8 100644
--- a/.conflict-side-1/Common/TableProducer/Converters/tracksExtraConverter.cxx
+++ b/.conflict-side-1/Common/TableProducer/Converters/tracksExtraConverter.cxx
@@ -19,9 +19,9 @@
 
 /// \author F.Mazzaschi <fmazzasc@cern.ch>
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Common/TableProducer/Converters/tracksExtraV002Converter.cxx b/.conflict-side-1/Common/TableProducer/Converters/tracksExtraV002Converter.cxx
index a70ac8ea8a8..8c4c8a22d4a 100644
--- a/.conflict-side-1/Common/TableProducer/Converters/tracksExtraV002Converter.cxx
+++ b/.conflict-side-1/Common/TableProducer/Converters/tracksExtraV002Converter.cxx
@@ -9,9 +9,9 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Common/TableProducer/Converters/v0converter.cxx b/.conflict-side-1/Common/TableProducer/Converters/v0converter.cxx
index 849e35591e1..3131a4a5ad2 100644
--- a/.conflict-side-1/Common/TableProducer/Converters/v0converter.cxx
+++ b/.conflict-side-1/Common/TableProducer/Converters/v0converter.cxx
@@ -8,9 +8,9 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Common/TableProducer/Converters/zdcConverter.cxx b/.conflict-side-1/Common/TableProducer/Converters/zdcConverter.cxx
index 2c94d5ca46f..2b97f8ff102 100644
--- a/.conflict-side-1/Common/TableProducer/Converters/zdcConverter.cxx
+++ b/.conflict-side-1/Common/TableProducer/Converters/zdcConverter.cxx
@@ -12,9 +12,9 @@
 // ZDC converter to new format
 // to be used with Run 2 converted data and older AO2Ds
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 #include "ZDCBase/Constants.h"
 
 using namespace o2;
diff --git a/.conflict-side-1/Common/TableProducer/PID/pidBayes.cxx b/.conflict-side-1/Common/TableProducer/PID/pidBayes.cxx
index abedb281668..4654caf1580 100644
--- a/.conflict-side-1/Common/TableProducer/PID/pidBayes.cxx
+++ b/.conflict-side-1/Common/TableProducer/PID/pidBayes.cxx
@@ -16,29 +16,30 @@
 ///         Only the tables for the mass hypotheses requested are filled, the others are sent empty.
 ///
 
-#include <utility>
 #include <algorithm>
-#include <vector>
 #include <memory>
 #include <string>
+#include <utility>
+#include <vector>
 
 // O2 includes
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/Array2D.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "Common/Core/PID/TPCPIDResponse.h"
+#include "pidTOFBase.h"
+
 #include "Common/Core/PID/DetectorResponse.h"
-#include "Common/Core/PID/ParamBase.h"
 #include "Common/Core/PID/PIDTOF.h"
+#include "Common/Core/PID/ParamBase.h"
+#include "Common/Core/PID/TPCPIDResponse.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/PIDResponseCombined.h"
-#include "Common/DataModel/PIDResponseTPC.h"
 #include "Common/DataModel/PIDResponseTOF.h"
+#include "Common/DataModel/PIDResponseTPC.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "pidTOFBase.h"
+#include "CCDB/BasicCCDBManager.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/Array2D.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Common/TableProducer/PID/pidITS.cxx b/.conflict-side-1/Common/TableProducer/PID/pidITS.cxx
index 1a6cdbc5491..64c05ea41c9 100644
--- a/.conflict-side-1/Common/TableProducer/PID/pidITS.cxx
+++ b/.conflict-side-1/Common/TableProducer/PID/pidITS.cxx
@@ -19,22 +19,23 @@
 ///         Only the tables for the mass hypotheses requested are filled, the others are sent empty.
 ///
 
+#include <string>
 #include <utility>
 #include <vector>
-#include <string>
 
 // O2 includes
-#include "Framework/runDataProcessing.h"
+#include "CCDB/BasicCCDBManager.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "CCDB/BasicCCDBManager.h"
 #include "TOFBase/EventTimeMaker.h"
 
 // O2Physics includes
-#include "Common/DataModel/PIDResponseITS.h"
 #include "MetadataHelper.h"
 
+#include "Common/DataModel/PIDResponseITS.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-1/Common/TableProducer/PID/pidTOF.cxx b/.conflict-side-1/Common/TableProducer/PID/pidTOF.cxx
index 076cc0c26de..ab4b9c6ce02 100644
--- a/.conflict-side-1/Common/TableProducer/PID/pidTOF.cxx
+++ b/.conflict-side-1/Common/TableProducer/PID/pidTOF.cxx
@@ -17,10 +17,10 @@
 ///
 
 // O2 includes
-#include <CCDB/BasicCCDBManager.h>
-#include "TOFBase/EventTimeMaker.h"
 #include "Framework/AnalysisTask.h"
 #include "ReconstructionDataFormats/Track.h"
+#include "TOFBase/EventTimeMaker.h"
+#include <CCDB/BasicCCDBManager.h>
 
 // O2Physics includes
 #include "TableHelper.h"
diff --git a/.conflict-side-1/Common/TableProducer/PID/pidTOFBase.cxx b/.conflict-side-1/Common/TableProducer/PID/pidTOFBase.cxx
index f0f9722fc6b..2300535c274 100644
--- a/.conflict-side-1/Common/TableProducer/PID/pidTOFBase.cxx
+++ b/.conflict-side-1/Common/TableProducer/PID/pidTOFBase.cxx
@@ -15,25 +15,27 @@
 /// \brief  Base to build tasks for TOF PID tasks.
 ///
 
+#include <string>
 #include <utility>
 #include <vector>
-#include <string>
 
 // O2 includes
 #include "CCDB/BasicCCDBManager.h"
-#include "TOFBase/EventTimeMaker.h"
 #include "Framework/AnalysisTask.h"
 #include "ReconstructionDataFormats/Track.h"
+#include "TOFBase/EventTimeMaker.h"
 
 // O2Physics includes
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "TableHelper.h"
+#include "pidTOFBase.h"
+
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/FT0Corrected.h"
 #include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
-#include "TableHelper.h"
-#include "pidTOFBase.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Common/TableProducer/PID/pidTOFBase.h b/.conflict-side-1/Common/TableProducer/PID/pidTOFBase.h
index 44367eacb75..98189aa03b1 100644
--- a/.conflict-side-1/Common/TableProducer/PID/pidTOFBase.h
+++ b/.conflict-side-1/Common/TableProducer/PID/pidTOFBase.h
@@ -22,10 +22,11 @@
 #include <vector>
 
 // O2Physics
-#include "PID/ParamBase.h"
-#include "PID/PIDTOF.h"
-#include "Common/DataModel/PIDResponseTOF.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/PIDResponseTOF.h"
+
+#include "PID/PIDTOF.h"
+#include "PID/ParamBase.h"
 
 static constexpr int nSpecies = 9;
 static constexpr int nParameters = 1;
diff --git a/.conflict-side-1/Common/TableProducer/PID/pidTOFFull.cxx b/.conflict-side-1/Common/TableProducer/PID/pidTOFFull.cxx
index 6fec03a10ff..98bd612a166 100644
--- a/.conflict-side-1/Common/TableProducer/PID/pidTOFFull.cxx
+++ b/.conflict-side-1/Common/TableProducer/PID/pidTOFFull.cxx
@@ -17,10 +17,10 @@
 ///
 
 // O2 includes
-#include <CCDB/BasicCCDBManager.h>
-#include "TOFBase/EventTimeMaker.h"
 #include "Framework/AnalysisTask.h"
 #include "ReconstructionDataFormats/Track.h"
+#include "TOFBase/EventTimeMaker.h"
+#include <CCDB/BasicCCDBManager.h>
 
 // O2Physics includes
 #include "TableHelper.h"
diff --git a/.conflict-side-1/Common/TableProducer/PID/pidTOFbeta.cxx b/.conflict-side-1/Common/TableProducer/PID/pidTOFbeta.cxx
index d76d631bc4d..c8c6a65c22c 100644
--- a/.conflict-side-1/Common/TableProducer/PID/pidTOFbeta.cxx
+++ b/.conflict-side-1/Common/TableProducer/PID/pidTOFbeta.cxx
@@ -16,11 +16,13 @@
 ///
 
 // O2 includes
+#include "TableHelper.h"
+#include "pidTOFBase.h"
+
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
 #include "Framework/AnalysisTask.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "pidTOFBase.h"
-#include "TableHelper.h"
 
 // O2Physics includes
 #include "PID/PIDTOF.h"
diff --git a/.conflict-side-1/Common/TableProducer/caloClusterProducer.cxx b/.conflict-side-1/Common/TableProducer/caloClusterProducer.cxx
index 086885beb4c..d0336adcef4 100644
--- a/.conflict-side-1/Common/TableProducer/caloClusterProducer.cxx
+++ b/.conflict-side-1/Common/TableProducer/caloClusterProducer.cxx
@@ -14,35 +14,34 @@
 ///
 /// \author Dmitri Peresunko <Dmitri.Peresunko@cern.ch>
 
-#include <algorithm>
-#include <map>
-#include <memory>
-#include <string>
-#include <vector>
-
-#include "Framework/ConfigParamSpec.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/CaloClusters.h"
 #include "Common/Core/trackUtilities.h"
-#include "ReconstructionDataFormats/TrackParametrization.h"
-#include "DetectorsBase/Propagator.h"
+#include "Common/DataModel/CaloClusters.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "CommonUtils/NameConf.h"
 #include "CCDB/BasicCCDBManager.h"
-#include "SimulationDataFormat/MCTruthContainer.h"
-
-#include "DataFormatsParameters/GRPMagField.h"
+#include "CommonUtils/NameConf.h"
+#include "DataFormatsPHOS/BadChannelsMap.h"
+#include "DataFormatsPHOS/CalibParams.h"
 #include "DataFormatsPHOS/Cell.h"
 #include "DataFormatsPHOS/Cluster.h"
-#include "DataFormatsPHOS/TriggerRecord.h"
 #include "DataFormatsPHOS/MCLabel.h"
-#include "DataFormatsPHOS/BadChannelsMap.h"
-#include "DataFormatsPHOS/CalibParams.h"
+#include "DataFormatsPHOS/TriggerRecord.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/ConfigParamSpec.h"
+#include "Framework/runDataProcessing.h"
 #include "PHOSBase/Geometry.h"
 #include "PHOSReconstruction/Clusterer.h"
+#include "ReconstructionDataFormats/TrackParametrization.h"
+#include "SimulationDataFormat/MCTruthContainer.h"
+
+#include <algorithm>
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
 
 using namespace o2::framework;
 using namespace o2;
diff --git a/.conflict-side-1/Common/TableProducer/centralityTable.cxx b/.conflict-side-1/Common/TableProducer/centralityTable.cxx
index 9198f79499e..701d26f9ebb 100644
--- a/.conflict-side-1/Common/TableProducer/centralityTable.cxx
+++ b/.conflict-side-1/Common/TableProducer/centralityTable.cxx
@@ -15,25 +15,28 @@
 /// \author ALICE
 //
 
-#include <string>
-#include <vector>
-#include <algorithm>
-#include <map>
+#include "MetadataHelper.h"
+#include "TableHelper.h"
 
-#include <CCDB/BasicCCDBManager.h>
-#include <TH1F.h>
-#include <TFormula.h>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/HistogramRegistry.h"
-#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "MetadataHelper.h"
-#include "TableHelper.h"
+#include "Common/DataModel/Multiplicity.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include <CCDB/BasicCCDBManager.h>
+
 #include "TList.h"
+#include <TFormula.h>
+#include <TH1F.h>
+
+#include <algorithm>
+#include <map>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Common/TableProducer/eseTableProducer.cxx b/.conflict-side-1/Common/TableProducer/eseTableProducer.cxx
index 098bfbe400f..9f6619060fe 100644
--- a/.conflict-side-1/Common/TableProducer/eseTableProducer.cxx
+++ b/.conflict-side-1/Common/TableProducer/eseTableProducer.cxx
@@ -14,30 +14,29 @@
 ///
 /// \author Joachim C. K. B. Hansen
 
-#include <CCDB/BasicCCDBManager.h>
+#include "FFitWeights.h"
 
-#include <chrono>
-#include <string>
-#include <algorithm>
-#include <numeric>
-#include <vector>
-#include <tuple>
-#include <unordered_map>
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EseTable.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/Qvectors.h"
 
 #include "Framework/ASoA.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
 #include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include <CCDB/BasicCCDBManager.h>
 
-#include "Common/DataModel/EventSelection.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-
-#include "Common/DataModel/EseTable.h"
-#include "Common/DataModel/Qvectors.h"
-#include "FFitWeights.h"
+#include <algorithm>
+#include <chrono>
+#include <numeric>
+#include <string>
+#include <tuple>
+#include <unordered_map>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Common/TableProducer/eventSelection.cxx b/.conflict-side-1/Common/TableProducer/eventSelection.cxx
index 5ead8e80493..52bf23cda7b 100644
--- a/.conflict-side-1/Common/TableProducer/eventSelection.cxx
+++ b/.conflict-side-1/Common/TableProducer/eventSelection.cxx
@@ -14,35 +14,38 @@
 ///
 /// \author Evgeny Kryshen <evgeny.kryshen@cern.ch> and Igor Altsybeev <Igor.Altsybeev@cern.ch>
 
-#include <vector>
-#include <map>
-#include <string>
-#include <limits>
-
-#include "Framework/ConfigParamSpec.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Common/DataModel/EventSelection.h"
+
+#include "MetadataHelper.h"
+
 #include "Common/CCDB/EventSelectionParams.h"
 #include "Common/CCDB/TriggerAliases.h"
+
 #include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/LHCConstants.h"
-#include "Framework/HistogramRegistry.h"
+#include "DataFormatsCTP/Configuration.h"
+#include "DataFormatsCTP/Scalers.h"
 #include "DataFormatsFT0/Digit.h"
-#include "DataFormatsParameters/GRPLHCIFData.h"
-#include "DataFormatsParameters/GRPECSObject.h"
-#include "ITSMFTBase/DPLAlpideParam.h"
-#include "MetadataHelper.h"
-#include "DataFormatsParameters/AggregatedRunInfo.h"
 #include "DataFormatsITSMFT/NoiseMap.h" // missing include in TimeDeadMap.h
 #include "DataFormatsITSMFT/TimeDeadMap.h"
+#include "DataFormatsParameters/AggregatedRunInfo.h"
+#include "DataFormatsParameters/GRPECSObject.h"
+#include "DataFormatsParameters/GRPLHCIFData.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/ConfigParamSpec.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include "ITSMFTBase/DPLAlpideParam.h"
 #include "ITSMFTReconstruction/ChipMappingITS.h"
-#include "DataFormatsCTP/Configuration.h"
-#include "DataFormatsCTP/Scalers.h"
 
 #include "TH1D.h"
 
+#include <limits>
+#include <map>
+#include <string>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::aod::evsel;
diff --git a/.conflict-side-1/Common/TableProducer/ft0CorrectedTable.cxx b/.conflict-side-1/Common/TableProducer/ft0CorrectedTable.cxx
index a8a2787aa5a..694fed73c4c 100644
--- a/.conflict-side-1/Common/TableProducer/ft0CorrectedTable.cxx
+++ b/.conflict-side-1/Common/TableProducer/ft0CorrectedTable.cxx
@@ -9,22 +9,26 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <bitset>
-#include <string>
-#include "Framework/ConfigParamSpec.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Common/DataModel/FT0Corrected.h"
+#include "CollisionTypeHelper.h"
+
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/FT0Corrected.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/LHCConstants.h"
 #include "CommonConstants/PhysicsConstants.h"
 #include "DataFormatsFT0/Digit.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "CollisionTypeHelper.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/ConfigParamSpec.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TRandom3.h"
 
+#include <bitset>
+#include <string>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::aod;
diff --git a/.conflict-side-1/Common/TableProducer/fwdtrackToCollisionAssociator.cxx b/.conflict-side-1/Common/TableProducer/fwdtrackToCollisionAssociator.cxx
index 20d6e4c6a60..a8b6fa22baa 100644
--- a/.conflict-side-1/Common/TableProducer/fwdtrackToCollisionAssociator.cxx
+++ b/.conflict-side-1/Common/TableProducer/fwdtrackToCollisionAssociator.cxx
@@ -17,6 +17,7 @@
 #include "Common/Core/CollisionAssociation.h"
 #include "Common/DataModel/CollisionAssociationTables.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CommonConstants/LHCConstants.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
diff --git a/.conflict-side-1/Common/TableProducer/fwdtrackextension.cxx b/.conflict-side-1/Common/TableProducer/fwdtrackextension.cxx
index 4a78bf8de5f..965fca008f1 100644
--- a/.conflict-side-1/Common/TableProducer/fwdtrackextension.cxx
+++ b/.conflict-side-1/Common/TableProducer/fwdtrackextension.cxx
@@ -13,19 +13,20 @@
 // Task performing forward track DCA computation
 //
 
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonUtils/NameConf.h"
+#include "DetectorsBase/Propagator.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/Core/trackUtilities.h"
 #include "ReconstructionDataFormats/DCA.h"
-#include "DetectorsBase/Propagator.h"
-#include "CommonUtils/NameConf.h"
+#include "ReconstructionDataFormats/TrackFwd.h"
 
 #include "Math/SMatrix.h"
-#include "ReconstructionDataFormats/TrackFwd.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Common/TableProducer/match-mft-ft0.cxx b/.conflict-side-1/Common/TableProducer/match-mft-ft0.cxx
index a4b208a03c9..bc5e0feec12 100644
--- a/.conflict-side-1/Common/TableProducer/match-mft-ft0.cxx
+++ b/.conflict-side-1/Common/TableProducer/match-mft-ft0.cxx
@@ -18,31 +18,27 @@
 //        called aod::BCofMFT
 // \date 03/09/24
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
+#include "Common/Core/trackUtilities.h" //for getTrackPar()
 
-#include "MathUtils/Utils.h"
 #include "CommonConstants/LHCConstants.h"
-#include "Common/Core/trackUtilities.h"         //for getTrackPar()
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "MathUtils/Utils.h"
 #include "ReconstructionDataFormats/TrackFwd.h" //for propagate
 // https://github.com/AliceO2Group/AliceO2/blob/dev/DataFormats/Reconstruction/include/ReconstructionDataFormats/TrackFwd.h
-#include "CommonConstants/LHCConstants.h"
-#include "Math/MatrixFunctions.h"
-#include "Math/SMatrix.h"
+#include "Common/DataModel/MatchMFTFT0.h"
 
 #include "CCDB/BasicCCDBManager.h"
 #include "CCDB/CcdbApi.h"
-
-#include "DataFormatsParameters/GRPMagField.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "Field/MagneticField.h"
-#include "TGeoGlobalMagField.h"
-
+#include "CommonConstants/LHCConstants.h"
 #include "DataFormatsParameters/GRPMagField.h"
 #include "DetectorsBase/GeometryManager.h"
 #include "DetectorsBase/Propagator.h"
+#include "Field/MagneticField.h"
 
-#include "Common/DataModel/MatchMFTFT0.h"
+#include "Math/MatrixFunctions.h"
+#include "Math/SMatrix.h"
+#include "TGeoGlobalMagField.h"
 
 using SMatrix55 = ROOT::Math::SMatrix<double, 5, 5, ROOT::Math::MatRepSym<double, 5>>;
 using SMatrix5 = ROOT::Math::SVector<Double_t, 5>;
diff --git a/.conflict-side-1/Common/TableProducer/match-mft-mch-data-mc.cxx b/.conflict-side-1/Common/TableProducer/match-mft-mch-data-mc.cxx
index 11d59611772..1f330b45422 100644
--- a/.conflict-side-1/Common/TableProducer/match-mft-mch-data-mc.cxx
+++ b/.conflict-side-1/Common/TableProducer/match-mft-mch-data-mc.cxx
@@ -8,29 +8,31 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include <map>
-#include <string>
-#include <unordered_set>
-#include <unordered_map>
-#include <vector>
-
-#include "CCDB/BasicCCDBManager.h"
+#include "Common/DataModel/CollisionAssociationTables.h"
 #include "Common/DataModel/MatchMFTFT0.h"
 #include "Common/DataModel/MatchMFTMuonData.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsGlobalTracking/RecoContainer.h"
-#include "Common/DataModel/CollisionAssociationTables.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include "Field/MagneticField.h"
-#include "TGeoGlobalMagField.h"
-#include "DetectorsBase/Propagator.h"
 #include "DetectorsBase/GeometryManager.h"
-#include "MCHTracking/TrackExtrap.h"
+#include "DetectorsBase/Propagator.h"
+#include "Field/MagneticField.h"
 #include "GlobalTracking/MatchGlobalFwd.h"
+#include "MCHTracking/TrackExtrap.h"
+
 #include "Math/SMatrix.h"
 #include "Math/SVector.h"
+#include "TDatabasePDG.h"
+#include "TGeoGlobalMagField.h"
 #include "TLorentzVector.h"
 #include "TVector2.h"
-#include "TDatabasePDG.h"
+
+#include <map>
+#include <string>
+#include <unordered_map>
+#include <unordered_set>
+#include <vector>
 
 using namespace std;
 
@@ -40,9 +42,9 @@ using namespace o2::aod;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/DataTypes.h"
 #include "Framework/runDataProcessing.h"
 
diff --git a/.conflict-side-1/Common/TableProducer/match-mft-mch-data.cxx b/.conflict-side-1/Common/TableProducer/match-mft-mch-data.cxx
index 96471ddefab..eafcd54c51c 100644
--- a/.conflict-side-1/Common/TableProducer/match-mft-mch-data.cxx
+++ b/.conflict-side-1/Common/TableProducer/match-mft-mch-data.cxx
@@ -8,29 +8,31 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include <map>
-#include <string>
-#include <unordered_set>
-#include <unordered_map>
-#include <vector>
-
-#include "CCDB/BasicCCDBManager.h"
+#include "Common/DataModel/CollisionAssociationTables.h"
 #include "Common/DataModel/MatchMFTFT0.h"
 #include "Common/DataModel/MatchMFTMuonData.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsGlobalTracking/RecoContainer.h"
-#include "Common/DataModel/CollisionAssociationTables.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include "Field/MagneticField.h"
-#include "TGeoGlobalMagField.h"
-#include "DetectorsBase/Propagator.h"
 #include "DetectorsBase/GeometryManager.h"
-#include "MCHTracking/TrackExtrap.h"
+#include "DetectorsBase/Propagator.h"
+#include "Field/MagneticField.h"
 #include "GlobalTracking/MatchGlobalFwd.h"
+#include "MCHTracking/TrackExtrap.h"
+
 #include "Math/SMatrix.h"
 #include "Math/SVector.h"
+#include "TDatabasePDG.h"
+#include "TGeoGlobalMagField.h"
 #include "TLorentzVector.h"
 #include "TVector2.h"
-#include "TDatabasePDG.h"
+
+#include <map>
+#include <string>
+#include <unordered_map>
+#include <unordered_set>
+#include <vector>
 
 using namespace std;
 
@@ -40,9 +42,9 @@ using namespace o2::aod;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/DataTypes.h"
 #include "Framework/runDataProcessing.h"
 
diff --git a/.conflict-side-1/Common/TableProducer/mcCollsExtra.cxx b/.conflict-side-1/Common/TableProducer/mcCollsExtra.cxx
index 452930494ba..83523cf45d0 100644
--- a/.conflict-side-1/Common/TableProducer/mcCollsExtra.cxx
+++ b/.conflict-side-1/Common/TableProducer/mcCollsExtra.cxx
@@ -12,38 +12,40 @@
 // Quick and dirty task to correlate MC <-> data
 //
 
-#include <array>
-#include <cmath>
-#include <cstdlib>
-#include <vector>
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/McCollisionExtra.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
 #include "Math/Vector4D.h"
+#include <TDatabasePDG.h>
 #include <TFile.h>
 #include <TH2F.h>
-#include <TProfile.h>
 #include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
+#include <TProfile.h>
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/DataModel/McCollisionExtra.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Common/TableProducer/mftmchMatchingML.cxx b/.conflict-side-1/Common/TableProducer/mftmchMatchingML.cxx
index 4df90bbfdd1..78e1902d6b4 100644
--- a/.conflict-side-1/Common/TableProducer/mftmchMatchingML.cxx
+++ b/.conflict-side-1/Common/TableProducer/mftmchMatchingML.cxx
@@ -9,30 +9,36 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <math.h>
-#include <onnxruntime_cxx_api.h>
-#include <string>
-#include <regex>
-#include <TLorentzVector.h>
 #include "Common/DataModel/MftmchMatchingML.h"
+
+#include "Common/CCDB/EventSelectionParams.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+#include "Tools/ML/model.h"
+
+#include "CCDB/CcdbApi.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/CCDB/EventSelectionParams.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/Core/trackUtilities.h"
-#include "Common/Core/TrackSelection.h"
+#include "GlobalTracking/MatchGlobalFwd.h"
+#include "MCHTracking/TrackExtrap.h"
+#include "MCHTracking/TrackParam.h"
+#include "MFTTracking/Tracker.h"
 #include "ReconstructionDataFormats/TrackFwd.h"
+
 #include "Math/SMatrix.h"
-#include "DetectorsBase/Propagator.h"
-#include "MFTTracking/Tracker.h"
-#include "MCHTracking/TrackParam.h"
-#include "MCHTracking/TrackExtrap.h"
-#include "GlobalTracking/MatchGlobalFwd.h"
-#include "CCDB/CcdbApi.h"
-#include "Tools/ML/model.h"
+#include <TLorentzVector.h>
+
+#include <onnxruntime_cxx_api.h>
+
+#include <regex>
+#include <string>
+
+#include <math.h>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Common/TableProducer/multCentTable.cxx b/.conflict-side-1/Common/TableProducer/multCentTable.cxx
index 612125715cf..daed806ebb3 100644
--- a/.conflict-side-1/Common/TableProducer/multCentTable.cxx
+++ b/.conflict-side-1/Common/TableProducer/multCentTable.cxx
@@ -20,27 +20,29 @@
 //
 //===============================================================
 
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "MetadataHelper.h"
+
 #include "Common/Core/trackUtilities.h"
-#include "ReconstructionDataFormats/DCA.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "CommonUtils/NameConf.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/Tools/MultModule.h"
+#include "Common/Tools/StandardCCDBLoader.h"
+#include "Common/Tools/TrackPropagationModule.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "CCDB/CcdbApi.h"
+#include "CommonConstants/GeomConstants.h"
+#include "CommonUtils/NameConf.h"
+#include "DataFormatsCalibration/MeanVertexObject.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "DataFormatsCalibration/MeanVertexObject.h"
-#include "CommonConstants/GeomConstants.h"
-#include "Common/Tools/TrackPropagationModule.h"
-#include "Common/Tools/StandardCCDBLoader.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "MetadataHelper.h"
-#include "Common/Tools/MultModule.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/DCA.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Common/TableProducer/multiplicityExtraTable.cxx b/.conflict-side-1/Common/TableProducer/multiplicityExtraTable.cxx
index 001e75e6adb..13d9a43f3e7 100644
--- a/.conflict-side-1/Common/TableProducer/multiplicityExtraTable.cxx
+++ b/.conflict-side-1/Common/TableProducer/multiplicityExtraTable.cxx
@@ -8,20 +8,23 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include <CCDB/BasicCCDBManager.h> // megalinter thinks this is a C header...
-#include <bitset>
-#include "Framework/ConfigParamSpec.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "TableHelper.h"
+
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "DataFormatsFIT/Triggers.h"
-#include "TableHelper.h"
+
 #include "CCDB/CcdbApi.h"
 #include "CommonDataFormat/BunchFilling.h"
-#include "DataFormatsParameters/GRPObject.h"
+#include "DataFormatsFIT/Triggers.h"
 #include "DataFormatsParameters/GRPLHCIFData.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/ConfigParamSpec.h"
+#include "Framework/runDataProcessing.h"
+#include <CCDB/BasicCCDBManager.h> // megalinter thinks this is a C header...
+
+#include <bitset>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Common/TableProducer/multiplicityTable.cxx b/.conflict-side-1/Common/TableProducer/multiplicityTable.cxx
index 12cde8a9869..45a712e5803 100644
--- a/.conflict-side-1/Common/TableProducer/multiplicityTable.cxx
+++ b/.conflict-side-1/Common/TableProducer/multiplicityTable.cxx
@@ -15,26 +15,30 @@
 /// \author ALICE
 ///
 
-#include <vector>
-#include <algorithm>
-#include <map>
-#include <string>
+#include "MetadataHelper.h"
+#include "TableHelper.h"
 
-#include "Framework/ConfigParamSpec.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
+#include "PWGMM/Mult/DataModel/bestCollisionTable.h"
+
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/ConfigParamSpec.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "TableHelper.h"
-#include "MetadataHelper.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TList.h"
-#include "PWGMM/Mult/DataModel/bestCollisionTable.h"
+
+#include <algorithm>
+#include <map>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
@@ -100,9 +104,9 @@ struct MultiplicityTable {
   Produces<aod::PVMultZeqs> tablePVZeqs;        // 12
   Produces<aod::MultMCExtras> tableExtraMc;     // 13
   Produces<aod::Mult2MCExtras> tableExtraMult2MCExtras;
-  Produces<aod::MultHepMCHIs> multHepMCHIs;     // Not accounted for, produced using custom process function to avoid dependencies
-  Produces<aod::MFTMults> mftMults;             // Not accounted for, produced using custom process function to avoid dependencies
-  Produces<aod::MultsGlobal> multsGlobal;       // Not accounted for, produced based on process function processGlobalTrackingCounters
+  Produces<aod::MultHepMCHIs> multHepMCHIs; // Not accounted for, produced using custom process function to avoid dependencies
+  Produces<aod::MFTMults> mftMults;         // Not accounted for, produced using custom process function to avoid dependencies
+  Produces<aod::MultsGlobal> multsGlobal;   // Not accounted for, produced based on process function processGlobalTrackingCounters
 
   // For vertex-Z corrections in calibration
   Service<o2::ccdb::BasicCCDBManager> ccdb;
diff --git a/.conflict-side-1/Common/TableProducer/muonRealignment.cxx b/.conflict-side-1/Common/TableProducer/muonRealignment.cxx
index 58745af69a6..3d1516dd5fc 100644
--- a/.conflict-side-1/Common/TableProducer/muonRealignment.cxx
+++ b/.conflict-side-1/Common/TableProducer/muonRealignment.cxx
@@ -13,33 +13,34 @@
 /// \brief Task for muon re-alignment at analysis level
 /// \author Chi Zhang <chi.zhang@cern.ch>, CEA-Saclay
 
-#include <string>
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/ASoAHelpers.h"
+#include "Common/DataModel/CollisionAssociationTables.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/FwdTrackReAlignTables.h"
 
 #include "CCDB/BasicCCDBManager.h"
 #include "CCDB/CCDBTimeStampUtils.h"
-#include "CommonUtils/NameConf.h"
 #include "CommonUtils/ConfigurableParam.h"
+#include "CommonUtils/NameConf.h"
 #include "DataFormatsMCH/Cluster.h"
 #include "DataFormatsParameters/GRPObject.h"
-#include "DetectorsBase/GeometryManager.h"
 #include "DetectorsBase/GRPGeomHelper.h"
+#include "DetectorsBase/GeometryManager.h"
 #include "DetectorsBase/Propagator.h"
-#include "MathUtils/Cartesian.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "GlobalTracking/MatchGlobalFwd.h"
+#include "MCHBase/TrackerParam.h"
 #include "MCHGeometryTransformer/Transformations.h"
 #include "MCHTracking/Track.h"
 #include "MCHTracking/TrackExtrap.h"
-#include "MCHTracking/TrackParam.h"
 #include "MCHTracking/TrackFitter.h"
-#include "MCHBase/TrackerParam.h"
-#include "GlobalTracking/MatchGlobalFwd.h"
+#include "MCHTracking/TrackParam.h"
+#include "MathUtils/Cartesian.h"
 #include "ReconstructionDataFormats/TrackFwd.h"
-#include "Common/DataModel/FwdTrackReAlignTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/CollisionAssociationTables.h"
+
+#include <string>
 
 using namespace std;
 using namespace o2;
diff --git a/.conflict-side-1/Common/TableProducer/occupancyTableProducer.cxx b/.conflict-side-1/Common/TableProducer/occupancyTableProducer.cxx
index a700b394772..8f9c36bad2b 100644
--- a/.conflict-side-1/Common/TableProducer/occupancyTableProducer.cxx
+++ b/.conflict-side-1/Common/TableProducer/occupancyTableProducer.cxx
@@ -15,31 +15,29 @@
 ///         Ambg tracks were not used
 /// \author Rahul Verma (rahul.verma@iitb.ac.in) :: Marian I Ivanov (marian.ivanov@cern.ch)
 
-#include <vector>
-#include <unordered_map>
-#include <algorithm>
-#include <cmath>
-#include <string>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/O2DatabasePDGPlugin.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-
 #include "Common/DataModel/OccupancyTables.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
 #include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsFT0/Digit.h"
 #include "DataFormatsParameters/GRPLHCIFData.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
+#include <algorithm>
+#include <cmath>
+#include <string>
+#include <unordered_map>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Common/TableProducer/qVectorsTable.cxx b/.conflict-side-1/Common/TableProducer/qVectorsTable.cxx
index 9de8faf028f..b6d1e98d803 100644
--- a/.conflict-side-1/Common/TableProducer/qVectorsTable.cxx
+++ b/.conflict-side-1/Common/TableProducer/qVectorsTable.cxx
@@ -19,28 +19,27 @@
 ///
 
 // C++/ROOT includes.
+#include <TComplex.h>
+#include <TH3F.h>
+
 #include <chrono>
 #include <string>
 #include <vector>
-#include <TComplex.h>
-#include <TH3F.h>
 
 // o2Physics includes.
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-
 #include "Common/Core/EventPlaneHelper.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/FT0Corrected.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-
 #include "Common/DataModel/Qvectors.h"
-
-#include "Common/Core/TrackSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
 // o2 includes.
 #include "CCDB/BasicCCDBManager.h"
 #include "DetectorsCommonDataFormats/AlignParam.h"
diff --git a/.conflict-side-1/Common/TableProducer/timestamp.cxx b/.conflict-side-1/Common/TableProducer/timestamp.cxx
index 40ab7000772..a3d071cf305 100644
--- a/.conflict-side-1/Common/TableProducer/timestamp.cxx
+++ b/.conflict-side-1/Common/TableProducer/timestamp.cxx
@@ -16,14 +16,16 @@
 /// \brief  A task to fill the timestamp table from run number.
 ///         Uses headers from CCDB
 ///
-#include <vector>
-#include <map>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
+#include "MetadataHelper.h"
+
 #include "CCDB/BasicCCDBManager.h"
 #include "CommonDataFormat/InteractionRecord.h"
 #include "DetectorsRaw/HBFUtils.h"
-#include "MetadataHelper.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include <map>
+#include <vector>
 
 using namespace o2::framework;
 using namespace o2::header;
@@ -32,15 +34,15 @@ using namespace o2;
 o2::common::core::MetadataHelper metadataInfo; // Metadata helper
 
 struct TimestampTask {
-  Produces<aod::Timestamps> timestampTable;  /// Table with SOR timestamps produced by the task
-  Service<o2::ccdb::BasicCCDBManager> ccdb;  /// CCDB manager to access orbit-reset timestamp
-  o2::ccdb::CcdbApi ccdb_api;                /// API to access CCDB headers
+  Produces<aod::Timestamps> timestampTable; /// Table with SOR timestamps produced by the task
+  Service<o2::ccdb::BasicCCDBManager> ccdb; /// CCDB manager to access orbit-reset timestamp
+  o2::ccdb::CcdbApi ccdb_api;               /// API to access CCDB headers
   Configurable<bool> fatalOnInvalidTimestamp{"fatalOnInvalidTimestamp", false, "Generate fatal error for invalid timestamps"};
-  std::map<int, int64_t> mapRunToOrbitReset; /// Cache of orbit reset timestamps
+  std::map<int, int64_t> mapRunToOrbitReset;                      /// Cache of orbit reset timestamps
   std::map<int, std::pair<int64_t, int64_t>> mapRunToRunDuration; /// Cache of run duration timestamps
-  int lastRunNumber = 0;                     /// Last run number processed
-  int64_t orbitResetTimestamp = 0;           /// Orbit-reset timestamp in us
-  std::pair<int64_t, int64_t> runDuration;   /// Pair of SOR and EOR timestamps
+  int lastRunNumber = 0;                                          /// Last run number processed
+  int64_t orbitResetTimestamp = 0;                                /// Orbit-reset timestamp in us
+  std::pair<int64_t, int64_t> runDuration;                        /// Pair of SOR and EOR timestamps
 
   // Configurables
   Configurable<bool> verbose{"verbose", false, "verbose mode"};
diff --git a/.conflict-side-1/Common/TableProducer/trackDcaCovFillerRun2.cxx b/.conflict-side-1/Common/TableProducer/trackDcaCovFillerRun2.cxx
index d07833ae9e0..ca56615dfee 100644
--- a/.conflict-side-1/Common/TableProducer/trackDcaCovFillerRun2.cxx
+++ b/.conflict-side-1/Common/TableProducer/trackDcaCovFillerRun2.cxx
@@ -15,12 +15,14 @@
 // Run 2 AO2Ds cannot have their dcacov filled by the current track-propagation workflow as the workflow isn't designed for them, given Run 2 tracks are already propagated to the PV.
 // This task fills the DCA Cov (and DCA) tables for Run 2 tracks by "propagating" the tracks (though given they are already at the PV it doesn't actually do the propagation) and retrieving the DCA and DCA cov given by the propagateToDCABxByBz function
 
-#include <string>
-
 #include "TableHelper.h"
+
 #include "Common/Tools/TrackTuner.h"
+
 #include "DataFormatsParameters/GRPObject.h"
 
+#include <string>
+
 using namespace o2;
 using namespace o2::framework;
 // using namespace o2::framework::expressions;
diff --git a/.conflict-side-1/Common/TableProducer/trackPropagation.cxx b/.conflict-side-1/Common/TableProducer/trackPropagation.cxx
index e1b6528ce53..dbe1c93a56c 100644
--- a/.conflict-side-1/Common/TableProducer/trackPropagation.cxx
+++ b/.conflict-side-1/Common/TableProducer/trackPropagation.cxx
@@ -14,6 +14,7 @@
 //
 
 #include "TableHelper.h"
+
 #include "Common/Tools/TrackTuner.h"
 
 // The Run 3 AO2D stores the tracks at the point of innermost update. For a track with ITS this is the innermost (or second innermost)
diff --git a/.conflict-side-1/Common/TableProducer/trackPropagationTester.cxx b/.conflict-side-1/Common/TableProducer/trackPropagationTester.cxx
index 694ff77d3c0..7b851aa1ce0 100644
--- a/.conflict-side-1/Common/TableProducer/trackPropagationTester.cxx
+++ b/.conflict-side-1/Common/TableProducer/trackPropagationTester.cxx
@@ -23,24 +23,25 @@
 //
 //===============================================================
 
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/Core/trackUtilities.h"
-#include "ReconstructionDataFormats/DCA.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "CommonUtils/NameConf.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/Tools/StandardCCDBLoader.h"
+#include "Common/Tools/TrackPropagationModule.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "CCDB/CcdbApi.h"
+#include "CommonConstants/GeomConstants.h"
+#include "CommonUtils/NameConf.h"
+#include "DataFormatsCalibration/MeanVertexObject.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "DataFormatsCalibration/MeanVertexObject.h"
-#include "CommonConstants/GeomConstants.h"
-#include "Common/Tools/TrackPropagationModule.h"
-#include "Common/Tools/StandardCCDBLoader.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/DCA.h"
 
 // The Run 3 AO2D stores the tracks at the point of innermost update. For a track with ITS this is the innermost (or second innermost)
 // ITS layer. For a track without ITS, this is the TPC inner wall or for loopers in the TPC even a radius beyond that.
diff --git a/.conflict-side-1/Common/TableProducer/trackToCollisionAssociator.cxx b/.conflict-side-1/Common/TableProducer/trackToCollisionAssociator.cxx
index 62d90edaa9f..7c0e4fe147c 100644
--- a/.conflict-side-1/Common/TableProducer/trackToCollisionAssociator.cxx
+++ b/.conflict-side-1/Common/TableProducer/trackToCollisionAssociator.cxx
@@ -18,6 +18,7 @@
 #include "Common/Core/CollisionAssociation.h"
 #include "Common/DataModel/CollisionAssociationTables.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
diff --git a/.conflict-side-1/Common/TableProducer/trackextension.cxx b/.conflict-side-1/Common/TableProducer/trackextension.cxx
index 210f9adc122..1bfd9f700bb 100644
--- a/.conflict-side-1/Common/TableProducer/trackextension.cxx
+++ b/.conflict-side-1/Common/TableProducer/trackextension.cxx
@@ -13,17 +13,18 @@
 // Task performing basic track selection.
 //
 
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Multiplicity.h"
 #include "Common/Core/trackUtilities.h"
-#include "ReconstructionDataFormats/DCA.h"
-#include "DetectorsBase/Propagator.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CommonUtils/NameConf.h"
 #include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/DCA.h"
 #include <CCDB/BasicCCDBManager.h>
 
 using namespace o2;
diff --git a/.conflict-side-1/Common/TableProducer/trackselection.cxx b/.conflict-side-1/Common/TableProducer/trackselection.cxx
index 8ce5a88e0bd..505a24af68b 100644
--- a/.conflict-side-1/Common/TableProducer/trackselection.cxx
+++ b/.conflict-side-1/Common/TableProducer/trackselection.cxx
@@ -17,14 +17,17 @@
 /// \brief Task performing basic track selection.
 ///
 
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Common/Core/TrackSelection.h"
+
+#include "TableHelper.h"
+
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/Core/trackUtilities.h"
-#include "TableHelper.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Common/TableProducer/weakDecayIndices.cxx b/.conflict-side-1/Common/TableProducer/weakDecayIndices.cxx
index b2937e1c8a5..50358f9f82a 100644
--- a/.conflict-side-1/Common/TableProducer/weakDecayIndices.cxx
+++ b/.conflict-side-1/Common/TableProducer/weakDecayIndices.cxx
@@ -8,9 +8,9 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Common/TableProducer/zdcTaskInterCalib.cxx b/.conflict-side-1/Common/TableProducer/zdcTaskInterCalib.cxx
index 78054580b81..c4ed223b67e 100644
--- a/.conflict-side-1/Common/TableProducer/zdcTaskInterCalib.cxx
+++ b/.conflict-side-1/Common/TableProducer/zdcTaskInterCalib.cxx
@@ -13,17 +13,18 @@
 /// \brief Task for ZDC tower inter-calibration
 /// \author chiara.oppedisano@cern.ch
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/CCDB/EventSelectionParams.h"
 #include "Common/CCDB/TriggerAliases.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/ZDCInterCalib.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TH1F.h"
 #include "TH2F.h"
 
diff --git a/.conflict-side-1/Common/Tasks/centralityQa.cxx b/.conflict-side-1/Common/Tasks/centralityQa.cxx
index 9e39194415c..8fa08f047cb 100644
--- a/.conflict-side-1/Common/Tasks/centralityQa.cxx
+++ b/.conflict-side-1/Common/Tasks/centralityQa.cxx
@@ -8,12 +8,14 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TH1F.h"
 
 using namespace o2;
diff --git a/.conflict-side-1/Common/Tasks/checkDataModel.cxx b/.conflict-side-1/Common/Tasks/checkDataModel.cxx
index 33b059e870b..17fad881f68 100644
--- a/.conflict-side-1/Common/Tasks/checkDataModel.cxx
+++ b/.conflict-side-1/Common/Tasks/checkDataModel.cxx
@@ -25,8 +25,8 @@ void customize(std::vector<ConfigParamSpec>& workflowOptions)
   // workflowOptions.push_back(ConfigParamSpec{"isMC", VariantType::Bool, false, {"Check also MC tables if set"}});
 }
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 using namespace o2::framework::expressions;
 
 template <typename Table>
diff --git a/.conflict-side-1/Common/Tasks/checkDataModelMC.cxx b/.conflict-side-1/Common/Tasks/checkDataModelMC.cxx
index fb2762a02b7..14cf55589d7 100644
--- a/.conflict-side-1/Common/Tasks/checkDataModelMC.cxx
+++ b/.conflict-side-1/Common/Tasks/checkDataModelMC.cxx
@@ -13,8 +13,8 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Common/Tasks/cpvQa.cxx b/.conflict-side-1/Common/Tasks/cpvQa.cxx
index e549d89e33d..badf7e7adbd 100644
--- a/.conflict-side-1/Common/Tasks/cpvQa.cxx
+++ b/.conflict-side-1/Common/Tasks/cpvQa.cxx
@@ -13,9 +13,9 @@
 /// \author Sergey Evdokimov
 /// \since 25.10.2022
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Common/Tasks/evtPlanesResolution.cxx b/.conflict-side-1/Common/Tasks/evtPlanesResolution.cxx
index e493ff3f00e..741194a2c64 100644
--- a/.conflict-side-1/Common/Tasks/evtPlanesResolution.cxx
+++ b/.conflict-side-1/Common/Tasks/evtPlanesResolution.cxx
@@ -18,25 +18,26 @@
 ///
 
 // C++/ROOT includes.
+#include <TComplex.h>
+#include <TH1F.h>
+#include <TMath.h>
+#include <TProfile.h>
+
 #include <chrono>
 #include <string>
 #include <vector>
-#include <TComplex.h>
-#include <TProfile.h>
-#include <TMath.h>
-#include <TH1F.h>
 
 // o2Physics includes.
+#include "Common/Core/EventPlaneHelper.h"
+#include "Common/DataModel/EvtPlanes.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StaticFor.h"
-
-#include "Common/DataModel/EvtPlanes.h"
-#include "Common/Core/EventPlaneHelper.h"
+#include "Framework/runDataProcessing.h"
 
 // o2 includes.
 
@@ -146,7 +147,7 @@ struct evtPlanesResolution {
         fillHistosEvtPl<7>(evPl);
         break;
     } // End switch(centBin)
-  }   // End void process(...)
+  } // End void process(...)
 };
 
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
diff --git a/.conflict-side-1/Common/Tasks/flowTest.cxx b/.conflict-side-1/Common/Tasks/flowTest.cxx
index bb27c0cc504..f70831d5c9a 100644
--- a/.conflict-side-1/Common/Tasks/flowTest.cxx
+++ b/.conflict-side-1/Common/Tasks/flowTest.cxx
@@ -13,20 +13,21 @@
 // cross-PWG effort in tracking studies
 // includes basic tracking, V0s and Cascades
 
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGMM/Mult/DataModel/Index.h" // for Particles2Tracks table
+
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPObject.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-
-#include "PWGMM/Mult/DataModel/Index.h" // for Particles2Tracks table
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "ReconstructionDataFormats/Track.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Common/Tasks/ft0Qa.cxx b/.conflict-side-1/Common/Tasks/ft0Qa.cxx
index f7dcb8d75c4..6b200c6092f 100644
--- a/.conflict-side-1/Common/Tasks/ft0Qa.cxx
+++ b/.conflict-side-1/Common/Tasks/ft0Qa.cxx
@@ -9,17 +9,20 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <bitset>
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/FT0Corrected.h"
 #include "Common/DataModel/Multiplicity.h"
+
 #include "DataFormatsFT0/Digit.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
+
 #include "TH1F.h"
 #include "TH2F.h"
 
+#include <bitset>
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-side-1/Common/Tasks/integrationTest.cxx b/.conflict-side-1/Common/Tasks/integrationTest.cxx
index 04e0ad4778e..4768814154a 100644
--- a/.conflict-side-1/Common/Tasks/integrationTest.cxx
+++ b/.conflict-side-1/Common/Tasks/integrationTest.cxx
@@ -15,17 +15,18 @@
 //
 // Includes further QA if option enabled
 
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPObject.h"
 #include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "ReconstructionDataFormats/Track.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Common/Tasks/integrationTestCCDB.cxx b/.conflict-side-1/Common/Tasks/integrationTestCCDB.cxx
index 33dbc6dd3e4..1966ca70126 100644
--- a/.conflict-side-1/Common/Tasks/integrationTestCCDB.cxx
+++ b/.conflict-side-1/Common/Tasks/integrationTestCCDB.cxx
@@ -22,19 +22,20 @@
 //
 // +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPObject.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include "DetectorsBase/Propagator.h"
+#include "DataFormatsParameters/GRPObject.h"
 #include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "ReconstructionDataFormats/Track.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Common/Tasks/multiplicityDerivedQa.cxx b/.conflict-side-1/Common/Tasks/multiplicityDerivedQa.cxx
index 78f229fa2d6..64fe84840d3 100644
--- a/.conflict-side-1/Common/Tasks/multiplicityDerivedQa.cxx
+++ b/.conflict-side-1/Common/Tasks/multiplicityDerivedQa.cxx
@@ -12,13 +12,15 @@
 // This code does QA based on a saved derived dataset using the
 // tables provided by multiplicityTable.
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/McCollisionExtra.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TH1F.h"
 #include "TH2F.h"
 
diff --git a/.conflict-side-1/Common/Tasks/multiplicityQa.cxx b/.conflict-side-1/Common/Tasks/multiplicityQa.cxx
index 3fc2374c2cc..6b8a10d6f5f 100644
--- a/.conflict-side-1/Common/Tasks/multiplicityQa.cxx
+++ b/.conflict-side-1/Common/Tasks/multiplicityQa.cxx
@@ -22,13 +22,15 @@
 // - david.dobrigkeit.chinellato@cern.ch
 //
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/McCollisionExtra.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TH1F.h"
 #include "TH2F.h"
 
diff --git a/.conflict-side-1/Common/Tasks/orbitRangeTask.cxx b/.conflict-side-1/Common/Tasks/orbitRangeTask.cxx
index 250751c25ba..5cfb8c44f13 100644
--- a/.conflict-side-1/Common/Tasks/orbitRangeTask.cxx
+++ b/.conflict-side-1/Common/Tasks/orbitRangeTask.cxx
@@ -11,11 +11,13 @@
 
 // This task finds minimum and maximum orbit among all processed bcs
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "CommonConstants/LHCConstants.h"
 #include "OrbitRange.h"
+
+#include "CommonConstants/LHCConstants.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TMath.h"
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Common/Tasks/propagatorQa.cxx b/.conflict-side-1/Common/Tasks/propagatorQa.cxx
index f978f8bc564..47280cbd44e 100644
--- a/.conflict-side-1/Common/Tasks/propagatorQa.cxx
+++ b/.conflict-side-1/Common/Tasks/propagatorQa.cxx
@@ -14,20 +14,22 @@
 // Work in progress! More to follow, use at your own peril
 //
 
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "trackSelectionRequest.h"
+
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
 #include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
 #include "DetectorsBase/Propagator.h"
-#include "trackSelectionRequest.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "ReconstructionDataFormats/Track.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Common/Tasks/qVectorsCorrection.cxx b/.conflict-side-1/Common/Tasks/qVectorsCorrection.cxx
index 10e37a4c210..9400fa185c5 100644
--- a/.conflict-side-1/Common/Tasks/qVectorsCorrection.cxx
+++ b/.conflict-side-1/Common/Tasks/qVectorsCorrection.cxx
@@ -18,31 +18,31 @@
 ///
 
 // C++/ROOT includes.
-#include <chrono>
-#include <string>
-#include <vector>
 #include <TComplex.h>
 #include <TH1F.h>
 #include <TH2D.h>
 #include <TMath.h>
 #include <TVector2.h>
 
+#include <chrono>
+#include <string>
+#include <vector>
+
 // o2Physics includes.
+#include "Common/Core/EventPlaneHelper.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Qvectors.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StaticFor.h"
-
-#include "Common/DataModel/Qvectors.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/Core/EventPlaneHelper.h"
-#include "Common/Core/TrackSelection.h"
-
-#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/runDataProcessing.h"
 
 // o2 includes.
 
diff --git a/.conflict-side-1/Common/Tasks/trackqa.cxx b/.conflict-side-1/Common/Tasks/trackqa.cxx
index d10d42af8da..53f73517c83 100644
--- a/.conflict-side-1/Common/Tasks/trackqa.cxx
+++ b/.conflict-side-1/Common/Tasks/trackqa.cxx
@@ -13,15 +13,16 @@
 // Task producing basic tracking qa histograms
 //
 
-#include <utility> // std::swap
-#include <vector>
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/Core/TrackSelectionDefaults.h"
+
+#include <utility> // std::swap
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Common/Tasks/validation.cxx b/.conflict-side-1/Common/Tasks/validation.cxx
index 5c464aebb30..f3b79197d16 100644
--- a/.conflict-side-1/Common/Tasks/validation.cxx
+++ b/.conflict-side-1/Common/Tasks/validation.cxx
@@ -8,15 +8,16 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
 
 #include <TFile.h>
 #include <TH1F.h>
-#include <cmath>
+
 #include <array>
+#include <cmath>
 namespace o2::aod
 {
 } // namespace o2::aod
diff --git a/.conflict-side-1/Common/Tools/MultModule.h b/.conflict-side-1/Common/Tools/MultModule.h
index 1a445cb186a..3a372670e04 100644
--- a/.conflict-side-1/Common/Tools/MultModule.h
+++ b/.conflict-side-1/Common/Tools/MultModule.h
@@ -16,23 +16,28 @@
 #ifndef COMMON_TOOLS_MULTMODULE_H_
 #define COMMON_TOOLS_MULTMODULE_H_
 
-#include <vector>
-#include <memory>
-#include <cstdlib>
-#include <cmath>
-#include <array>
-#include <string>
-#include <map>
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/Configurable.h"
-#include "Framework/HistogramSpec.h"
 #include "TableHelper.h"
+
+#include "PWGMM/Mult/DataModel/bestCollisionTable.h"
+
 #include "Common/Core/TPCVDriftManager.h"
-#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/Centrality.h"
-#include "PWGMM/Mult/DataModel/bestCollisionTable.h"
+#include "Common/DataModel/Multiplicity.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/Configurable.h"
+#include "Framework/HistogramSpec.h"
+
 #include "TFormula.h"
 
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
+
 //__________________________________________
 // MultModule
 
diff --git a/.conflict-side-1/Common/Tools/Multiplicity/multCalibrator.cxx b/.conflict-side-1/Common/Tools/Multiplicity/multCalibrator.cxx
index e9931c0389f..38959bef8c9 100644
--- a/.conflict-side-1/Common/Tools/Multiplicity/multCalibrator.cxx
+++ b/.conflict-side-1/Common/Tools/Multiplicity/multCalibrator.cxx
@@ -16,16 +16,17 @@
 // - victor.gonzalez@cern.ch
 // - david.dobrigkeit.chinellato@cern.ch
 //
-#include "TList.h"
+#include "multCalibrator.h"
+
+#include "TArrayF.h"
+#include "TArrayL64.h"
 #include "TDirectory.h"
 #include "TFile.h"
-#include "TH1F.h"
 #include "TH1D.h"
+#include "TH1F.h"
+#include "TList.h"
 #include "TProfile.h"
 #include "TStopwatch.h"
-#include "TArrayL64.h"
-#include "TArrayF.h"
-#include "multCalibrator.h"
 
 using namespace std;
 
@@ -100,7 +101,7 @@ Bool_t multCalibrator::Calibrate()
     return kFALSE;
   }
 
-  //Step 1: verify if input file contains desired histograms
+  // Step 1: verify if input file contains desired histograms
   TH1D* hRaw[kNCentEstim];
   for (Int_t iv = 0; iv < kNCentEstim; iv++) {
     hRaw[iv] = (TH1D*)fileInput->Get(Form("multiplicity-qa/multiplicityQa/h%s", fCentEstimName[iv].Data()));
@@ -112,7 +113,7 @@ Bool_t multCalibrator::Calibrate()
 
   cout << "Histograms loaded! Will now calibrate..." << endl;
 
-  //Create output file
+  // Create output file
   TFile* fOut = new TFile(fOutputFileName.Data(), "RECREATE");
   TH1F* hCalib[kNCentEstim];
   for (Int_t iv = 0; iv < kNCentEstim; iv++) {
@@ -129,7 +130,7 @@ Bool_t multCalibrator::Calibrate()
 
 Double_t multCalibrator::GetRawMax(TH1* histo)
 {
-  //This function gets the max X value (right edge) which is filled.
+  // This function gets the max X value (right edge) which is filled.
   for (Int_t ii = histo->GetNbinsX(); ii > 0; ii--) {
     if (histo->GetBinContent(ii) < 1e-10)
       return histo->GetBinLowEdge(ii + 1);
@@ -139,24 +140,24 @@ Double_t multCalibrator::GetRawMax(TH1* histo)
 
 Double_t multCalibrator::GetBoundaryForPercentile(TH1* histo, Double_t lPercentileRequested, Double_t& lPrecisionEstimate)
 {
-  //This function returns the boundary for a specific percentile.
-  //It uses a linear interpolation in an attempt to get more precision
-  //than the binning of the histogram used for quantiling.
+  // This function returns the boundary for a specific percentile.
+  // It uses a linear interpolation in an attempt to get more precision
+  // than the binning of the histogram used for quantiling.
   //
-  //It also estimates a certain level of precision of the procedure
-  //by explicitly comparing the bin content of the bins around the boundary
-  //with the entire cross section, effectively reporting back a percentage
-  //that corresponds to those bins. If this percentage is O(percentile bin
-  //width requested), then the user should worry and we print out a warning.
+  // It also estimates a certain level of precision of the procedure
+  // by explicitly comparing the bin content of the bins around the boundary
+  // with the entire cross section, effectively reporting back a percentage
+  // that corresponds to those bins. If this percentage is O(percentile bin
+  // width requested), then the user should worry and we print out a warning.
 
   const Double_t lPrecisionConstant = 2.0;
 
   Double_t lRawMax = GetRawMax(histo);
 
   if (lPercentileRequested < 1e-7)
-    return lRawMax; //safeguard
+    return lRawMax; // safeguard
   if (lPercentileRequested > 100 - 1e-7)
-    return 0.0; //safeguard
+    return 0.0; // safeguard
 
   Double_t lReturnValue = 0.0;
   Double_t lPercentile = 100.0 - lPercentileRequested;
@@ -182,7 +183,7 @@ Double_t multCalibrator::GetBoundaryForPercentile(TH1* histo, Double_t lPercenti
   for (Long_t ibin = lFirstBin; ibin < lNBins; ibin++) {
     lCount += histo->GetBinContent(ibin);
     if (lCount >= lCountDesired) {
-      //Found bin I am looking for!
+      // Found bin I am looking for!
       Double_t lWidth = histo->GetBinWidth(ibin);
       Double_t lLeftPercentile = 100. * (lCount - histo->GetBinContent(ibin)) / lHadronicTotal;
       Double_t lRightPercentile = 100. * lCount / lHadronicTotal;
@@ -200,12 +201,12 @@ Double_t multCalibrator::GetBoundaryForPercentile(TH1* histo, Double_t lPercenti
 //________________________________________________________________
 void multCalibrator::SetStandardAdaptiveBoundaries()
 {
-  //Function to set standard adaptive boundaries
-  //Typically used in pp, goes to 0.001% binning for highest multiplicity
+  // Function to set standard adaptive boundaries
+  // Typically used in pp, goes to 0.001% binning for highest multiplicity
   lNDesiredBoundaries = 0;
   lDesiredBoundaries = new Double_t[1100];
   lDesiredBoundaries[0] = 100;
-  //From Low To High Multiplicity
+  // From Low To High Multiplicity
   for (Int_t ib = 1; ib < 91; ib++) {
     lNDesiredBoundaries++;
     lDesiredBoundaries[lNDesiredBoundaries] = lDesiredBoundaries[lNDesiredBoundaries - 1] - 1.0;
@@ -229,12 +230,12 @@ void multCalibrator::SetStandardAdaptiveBoundaries()
 //________________________________________________________________
 void multCalibrator::SetStandardOnePercentBoundaries()
 {
-  //Function to set standard adaptive boundaries
-  //Typically used in pp, goes to 0.001% binning for highest multiplicity
+  // Function to set standard adaptive boundaries
+  // Typically used in pp, goes to 0.001% binning for highest multiplicity
   lNDesiredBoundaries = 101;
   lDesiredBoundaries = new Double_t[101];
   lDesiredBoundaries[0] = 100;
-  //From Low To High Multiplicity
+  // From Low To High Multiplicity
   for (Int_t ib = 1; ib < 101; ib++)
     lDesiredBoundaries[ib] = lDesiredBoundaries[ib - 1] - 1.0;
   cout << "Set standard 1%-wide percentile boundaries! Nboundaries: " << lNDesiredBoundaries << endl;
@@ -243,10 +244,10 @@ void multCalibrator::SetStandardOnePercentBoundaries()
 //________________________________________________________________
 TH1F* multCalibrator::GetCalibrationHistogram(TH1* histoRaw, TString lHistoName)
 {
-  //This function returns a calibration histogram
+  // This function returns a calibration histogram
   //(pp or p-Pb like, no anchor point considered)
 
-  //Reset + recreate precision histogram
+  // Reset + recreate precision histogram
   ResetPrecisionHistogram();
 
   // Consistency check
@@ -256,10 +257,10 @@ TH1F* multCalibrator::GetCalibrationHistogram(TH1* histoRaw, TString lHistoName)
     cout << "Last boundary: " << lDesiredBoundaries[0] << endl;
   }
 
-  //Aux vars
+  // Aux vars
   Double_t lMiddleOfBins[1000];
   for (Long_t lB = 1; lB < lNDesiredBoundaries; lB++) {
-    //place squarely at the middle to ensure it's all fine
+    // place squarely at the middle to ensure it's all fine
     lMiddleOfBins[lB - 1] = 0.5 * (lDesiredBoundaries[lB] + lDesiredBoundaries[lB - 1]);
   }
   Double_t lBounds[lNDesiredBoundaries + 1];
@@ -276,7 +277,7 @@ TH1F* multCalibrator::GetCalibrationHistogram(TH1* histoRaw, TString lHistoName)
     lBounds[lDisplacedii] = GetBoundaryForPercentile(histoRaw, lDesiredBoundaries[ii], lPrecision[ii]);
     TString lPrecisionString = "(Precision OK)";
     if (ii != 0 && ii != lNDesiredBoundaries - 1) {
-      //check precision, please
+      // check precision, please
       if (lPrecision[ii] / TMath::Abs(lDesiredBoundaries[ii + 1] - lDesiredBoundaries[ii]) > fkPrecisionWarningThreshold)
         lPrecisionString = "(WARNING: BINNING MAY LEAD TO IMPRECISION!)";
       if (lPrecision[ii] / TMath::Abs(lDesiredBoundaries[ii - 1] - lDesiredBoundaries[ii]) > fkPrecisionWarningThreshold)
@@ -302,8 +303,8 @@ void multCalibrator::ResetPrecisionHistogram()
     delete fPrecisionHistogram;
     fPrecisionHistogram = 0x0;
   }
-  if (lNDesiredBoundaries > 0) { //only if initialized
-    //invert boundaries, please
+  if (lNDesiredBoundaries > 0) { // only if initialized
+    // invert boundaries, please
     Double_t lInverseDesiredBoundaries[1100];
     for (Int_t ii = 0; ii < lNDesiredBoundaries; ii++) {
       lInverseDesiredBoundaries[ii] = lDesiredBoundaries[lNDesiredBoundaries - (ii + 1)];
diff --git a/.conflict-side-1/Common/Tools/Multiplicity/multCalibrator.h b/.conflict-side-1/Common/Tools/Multiplicity/multCalibrator.h
index b5c618bdc3d..27e530983df 100644
--- a/.conflict-side-1/Common/Tools/Multiplicity/multCalibrator.h
+++ b/.conflict-side-1/Common/Tools/Multiplicity/multCalibrator.h
@@ -19,30 +19,30 @@
 #ifndef MULTCALIBRATOR_H
 #define MULTCALIBRATOR_H
 
+#include "TH1D.h"
+#include "TNamed.h"
+
 #include <iostream>
 #include <map>
 
-#include "TNamed.h"
-#include "TH1D.h"
-
 class multCalibrator : public TNamed
 {
 
  public:
-  //Constructors/Destructor
+  // Constructors/Destructor
   multCalibrator();
   multCalibrator(const char* name, const char* title = "Multiplicity Calibration Class");
   ~multCalibrator();
 
-  //void    Print(Option_t *option="") const;
+  // void    Print(Option_t *option="") const;
 
   //_________________________________________________________________________
-  //Interface: steering functions to be used in calibration macro
+  // Interface: steering functions to be used in calibration macro
 
-  //Set Filenames
+  // Set Filenames
   void SetInputFile(TString lFile) { fInputFileName = lFile.Data(); }
   void SetOutputFile(TString lFile) { fOutputFileName = lFile.Data(); }
-  //Set Boundaries to find
+  // Set Boundaries to find
   void SetBoundaries(Long_t lNB, Double_t* lB)
   {
     if (lNB < 2 || lNB > 1e+6) {
@@ -56,24 +56,24 @@ class multCalibrator : public TNamed
   void SetAnchorPointRaw(Float_t lRaw) { fAnchorPointValue = lRaw; }
   void SetAnchorPointPercentage(Float_t lPer) { fAnchorPointPercentage = lPer; }
 
-  void SetStandardAdaptiveBoundaries();   //standard adaptive (pp-like)
-  void SetStandardOnePercentBoundaries(); //standard 1% (Pb-Pb like)
+  void SetStandardAdaptiveBoundaries();   // standard adaptive (pp-like)
+  void SetStandardOnePercentBoundaries(); // standard 1% (Pb-Pb like)
 
-  //Master Function in this Class: To be called once filenames are set
+  // Master Function in this Class: To be called once filenames are set
   Bool_t Calibrate();
 
-  //Aux function. Keep public, accessible outside as rather useful utility
+  // Aux function. Keep public, accessible outside as rather useful utility
   TH1F* GetCalibrationHistogram(TH1* histoRaw, TString lHistoName = "hCalib");
 
-  //Auxiliary functions
+  // Auxiliary functions
   Double_t GetRawMax(TH1* histo);
   Double_t GetBoundaryForPercentile(TH1* histo, Double_t lPercentileRequested, Double_t& lPrecisionEstimate);
 
-  //Precision bookkeeping
-  TH1D* GetPrecisionHistogram() { return fPrecisionHistogram; }; //gets precision histogram from current object
-  void ResetPrecisionHistogram();                                //Reset precision histogram, if it exists
+  // Precision bookkeeping
+  TH1D* GetPrecisionHistogram() { return fPrecisionHistogram; }; // gets precision histogram from current object
+  void ResetPrecisionHistogram();                                // Reset precision histogram, if it exists
 
-  //Aliases for centrality estimators
+  // Aliases for centrality estimators
   enum fCentEstim {
     kCentRawV0M = 0,
     kCentRawT0M,
@@ -89,7 +89,7 @@ class multCalibrator : public TNamed
   static const TString fCentEstimName[kNCentEstim]; //! name (internal)
 
  private:
-  //Calibration Boundaries to locate
+  // Calibration Boundaries to locate
   Double_t* lDesiredBoundaries;
   Long_t lNDesiredBoundaries;
   Double_t fkPrecisionWarningThreshold;
@@ -105,7 +105,7 @@ class multCalibrator : public TNamed
   // TList object for storing histograms
   TList* fCalibHists;
 
-  TH1D* fPrecisionHistogram; //for bookkeeping of precision report
+  TH1D* fPrecisionHistogram; // for bookkeeping of precision report
 
   ClassDef(multCalibrator, 1);
   //(this classdef is only for bookkeeping, class will not usually
diff --git a/.conflict-side-1/Common/Tools/Multiplicity/multGlauberNBDFitter.cxx b/.conflict-side-1/Common/Tools/Multiplicity/multGlauberNBDFitter.cxx
index a765db72448..91a71b78eaf 100644
--- a/.conflict-side-1/Common/Tools/Multiplicity/multGlauberNBDFitter.cxx
+++ b/.conflict-side-1/Common/Tools/Multiplicity/multGlauberNBDFitter.cxx
@@ -26,13 +26,14 @@
  **********************************************/
 
 #include "multGlauberNBDFitter.h"
-#include "TList.h"
-#include "TFile.h"
+
 #include "TF1.h"
+#include "TFile.h"
+#include "TFitResult.h"
+#include "TList.h"
+#include "TProfile.h"
 #include "TStopwatch.h"
 #include "TVirtualFitter.h"
-#include "TProfile.h"
-#include "TFitResult.h"
 
 using namespace std;
 
@@ -63,14 +64,14 @@ multGlauberNBDFitter::multGlauberNBDFitter() : TNamed(),
   fNcoll = new Double_t[fMaxNpNcPairs];
   fContent = new Long_t[fMaxNpNcPairs];
 
-  //Ancestor histo
+  // Ancestor histo
   fhNanc = new TH1D("fhNanc", "", 1000, -0.5, 999.5);
 
-  //NBD
+  // NBD
   fNBD = new TF1("fNBD", "ROOT::Math::negative_binomial_pdf(x,[0],[1])", 0, 45000);
   fNBD->SetNpx(45000);
 
-  //master function
+  // master function
   fGlauberNBD = new TF1("fGlauberNBD", this, &multGlauberNBDFitter::ProbDistrib,
                         0, 50000, 4, "multGlauberNBDFitter", "ProbDistrib");
   fGlauberNBD->SetParameter(0, fMu);
@@ -105,19 +106,19 @@ multGlauberNBDFitter::multGlauberNBDFitter(const char* name, const char* title)
                                                                                   fFitOptions("R0"),
                                                                                   fFitNpx(5000)
 {
-  //Named constructor
+  // Named constructor
   fNpart = new Double_t[fMaxNpNcPairs];
   fNcoll = new Double_t[fMaxNpNcPairs];
   fContent = new Long_t[fMaxNpNcPairs];
 
-  //Ancestor histo
-  //fhNanc = new TH1D("fhNanc", "", fAncestorMode==2?10000:1000, -0.5, 999.5);
+  // Ancestor histo
+  // fhNanc = new TH1D("fhNanc", "", fAncestorMode==2?10000:1000, -0.5, 999.5);
 
-  //NBD
+  // NBD
   fNBD = new TF1("fNBD", "ROOT::Math::negative_binomial_pdf(x,[0],[1])", 0, 45000);
   fNBD->SetNpx(45000);
 
-  //master function
+  // master function
   fGlauberNBD = new TF1("fGlauberNBD", this, &multGlauberNBDFitter::ProbDistrib,
                         0, 50000, 5, "multGlauberNBDFitter", "ProbDistrib");
   fGlauberNBD->SetParameter(0, fMu);
@@ -157,18 +158,18 @@ multGlauberNBDFitter::~multGlauberNBDFitter()
 
 //______________________________________________________
 Double_t multGlauberNBDFitter::ProbDistrib(Double_t* x, Double_t* par)
-//Master fitter function
+// Master fitter function
 {
   Double_t lMultValue = x[0];
   Double_t lProbability = 0.0;
   ffChanged = kTRUE;
   const Double_t lAlmost0 = 1.e-13;
-  //Comment this line in order to make the code evaluate Nancestor all the time
+  // Comment this line in order to make the code evaluate Nancestor all the time
   if (TMath::Abs(fCurrentf - par[2]) < lAlmost0)
     ffChanged = kFALSE;
 
   //______________________________________________________
-  //Recalculate the ancestor distribution in case f changed
+  // Recalculate the ancestor distribution in case f changed
   if (ffChanged) {
     fCurrentf = par[2];
     fhNanc->Reset();
@@ -192,12 +193,12 @@ Double_t multGlauberNBDFitter::ProbDistrib(Double_t* x, Double_t* par)
     fhNanc->Scale(1. / fhNanc->Integral());
   }
   //______________________________________________________
-  //Actually evaluate function
+  // Actually evaluate function
   Int_t lStartBin = fhNanc->FindBin(0.0) + 1;
   for (Long_t iNanc = lStartBin; iNanc < fhNanc->GetNbinsX() + 1; iNanc++) {
     Double_t lNancestors = fhNanc->GetBinCenter(iNanc);
     Double_t lNancestorCount = fhNanc->GetBinContent(iNanc);
-    //if(lNancestorCount<1e-12&&lNancestors>10) break;
+    // if(lNancestorCount<1e-12&&lNancestors>10) break;
 
     // allow for variable mu in case requested
     Double_t lThisMu = (((Double_t)lNancestors)) * (par[0] + par[4] * lNancestors);
@@ -279,7 +280,7 @@ void multGlauberNBDFitter::InitAncestor()
 Bool_t multGlauberNBDFitter::DoFit()
 {
   InitAncestor();
-  //Try very hard, please
+  // Try very hard, please
   TVirtualFitter::SetMaxIterations(5000000);
   if (!InitializeNpNc()) {
     cout << "---> Initialization of Npart x Ncoll correlation info failed!" << endl;
@@ -317,12 +318,12 @@ Bool_t multGlauberNBDFitter::DoFit()
 //________________________________________________________________
 Bool_t multGlauberNBDFitter::InitializeNpNc()
 {
-  //This function initializes fhNpNc
-  //Warning: X == Npart, Y == Ncoll
+  // This function initializes fhNpNc
+  // Warning: X == Npart, Y == Ncoll
   Bool_t lReturnValue = kFALSE;
   if (fhNpNc) {
     fNNpNcPairs = 0;
-    //Sweep all allowed values of Npart, Ncoll; find counters
+    // Sweep all allowed values of Npart, Ncoll; find counters
     for (int xbin = 1; xbin < 500; xbin++) {
       for (int ybin = 1; ybin < 3000; ybin++) {
         if (fhNpNc->GetBinContent(fhNpNc->FindBin(xbin, ybin)) != 0) {
@@ -345,12 +346,12 @@ Bool_t multGlauberNBDFitter::InitializeNpNc()
 //________________________________________________________________
 Double_t multGlauberNBDFitter::ContinuousNBD(Double_t n, Double_t mu, Double_t k)
 {
-  //Adaptation of the negative binomial distribution
-  //for non-integer arguments: analytical continuation
+  // Adaptation of the negative binomial distribution
+  // for non-integer arguments: analytical continuation
   //
-  //This function would actually also be fine with integers;
-  //in fact it is equivalent to that if 'n' is typecast as
-  //an integer prior to use
+  // This function would actually also be fine with integers;
+  // in fact it is equivalent to that if 'n' is typecast as
+  // an integer prior to use
 
   Double_t F;
   Double_t f;
@@ -390,10 +391,10 @@ void multGlauberNBDFitter::CalculateAvNpNc(TProfile* lNPartProf, TProfile* lNCol
   cout << "Glauber NBD norm ..........: " << fnorm << endl;
   cout << "Glauber NBD dmu/dNanc .....: " << fdMu << endl;
 
-  //2-fold nested loop:
-  // + looping over all Nancestor combinations
-  // + looping over all possible final multiplicities
-  // ^---> final product already multiplicity-binned
+  // 2-fold nested loop:
+  //  + looping over all Nancestor combinations
+  //  + looping over all possible final multiplicities
+  //  ^---> final product already multiplicity-binned
 
   //______________________________________________________
   if (lLoRange < -1 && lHiRange < -1) {
diff --git a/.conflict-side-1/Common/Tools/Multiplicity/multGlauberNBDFitter.h b/.conflict-side-1/Common/Tools/Multiplicity/multGlauberNBDFitter.h
index 42d5cab046f..effd18e843f 100644
--- a/.conflict-side-1/Common/Tools/Multiplicity/multGlauberNBDFitter.h
+++ b/.conflict-side-1/Common/Tools/Multiplicity/multGlauberNBDFitter.h
@@ -12,56 +12,57 @@
 #ifndef MULTGLAUBERNBDFITTER_H
 #define MULTGLAUBERNBDFITTER_H
 
-#include <iostream>
-#include "TNamed.h"
 #include "TF1.h"
 #include "TH1.h"
 #include "TH1D.h"
 #include "TH2.h"
+#include "TNamed.h"
 #include "TProfile.h"
 
+#include <iostream>
+
 class multGlauberNBDFitter : public TNamed
 {
 
  public:
-  //basic functionality
+  // basic functionality
   multGlauberNBDFitter();
   multGlauberNBDFitter(const char* name, const char* title = "Glauber+NBD fitter");
   ~multGlauberNBDFitter();
 
-  //Master fitter function
+  // Master fitter function
   Double_t ProbDistrib(Double_t* x, Double_t* par);
 
   void InitAncestor();
 
-  //Do Fit: where everything happens
+  // Do Fit: where everything happens
   Bool_t DoFit();
 
-  //Set input characteristics: the 2D plot with Npart, Nanc
+  // Set input characteristics: the 2D plot with Npart, Nanc
   Bool_t SetNpartNcollCorrelation(TH2* hNpNc);
 
-  //Set main input to be fitted (the V0M distribution)
+  // Set main input to be fitted (the V0M distribution)
   Bool_t SetInputV0M(TH1* hV0M);
 
-  //Interface to get funtions if asked to
+  // Interface to get funtions if asked to
   TF1* GetNBD();
   TF1* GetGlauberNBD();
 
-  //Helper
+  // Helper
   Bool_t InitializeNpNc();
 
-  //Interface for debug
+  // Interface for debug
   void SetAncestorMode(Int_t lAncMode = 0) { fAncestorMode = lAncMode; }
   Int_t GetAncestorMode() { return fAncestorMode; }
   TH1D* GetAncestorHistogram() { return fhNanc; }
 
-  //Interface to set vals
+  // Interface to set vals
   void SetMu(Double_t lVal) { fMu = lVal; }
   void Setk(Double_t lVal) { fk = lVal; }
   void Setf(Double_t lVal) { ff = lVal; }
   void SetNorm(Double_t lVal) { fnorm = lVal; }
 
-  //Interface to get vals
+  // Interface to get vals
   Double_t GetMu() { return fMu; }
   Double_t Getk() { return fk; }
   Double_t Getf() { return ff; }
@@ -71,41 +72,41 @@ class multGlauberNBDFitter : public TNamed
   void SetFitOptions(TString lOpt);
   void SetFitNpx(Long_t lNpx);
 
-  //For ancestor mode 2
+  // For ancestor mode 2
   Double_t ContinuousNBD(Double_t n, Double_t mu, Double_t k);
 
-  //For estimating Npart, Ncoll in multiplicity bins
+  // For estimating Npart, Ncoll in multiplicity bins
   void CalculateAvNpNc(TProfile* lNPartProf, TProfile* lNCollProf, TH2F* lNPart2DPlot, TH2F* lNColl2DPlot, TH1F* hPercentileMap, Double_t lLoRange = -1, Double_t lHiRange = -1);
 
-  //void    Print(Option_t *option="") const;
+  // void    Print(Option_t *option="") const;
 
  private:
-  //This function serves as the (analytical) NBD
+  // This function serves as the (analytical) NBD
   TF1* fNBD;
 
-  //This function is the key fitting function
+  // This function is the key fitting function
   TF1* fGlauberNBD;
 
-  //Reference histo
-  TH1D* fhNanc; //basic ancestor distribution
-  TH2* fhNpNc;  //correlation between Npart and Ncoll
-  TH1* fhV0M;   //basic ancestor distribution
+  // Reference histo
+  TH1D* fhNanc; // basic ancestor distribution
+  TH2* fhNpNc;  // correlation between Npart and Ncoll
+  TH1* fhV0M;   // basic ancestor distribution
 
-  //Fitting utilities
+  // Fitting utilities
   Bool_t ffChanged;
   Double_t fCurrentf;
 
-  //0: truncation, 1: rounding, 2: analytical continuation
+  // 0: truncation, 1: rounding, 2: analytical continuation
   Int_t fAncestorMode;
 
-  //Buffer for (Npart, Ncoll) pairs in memory
+  // Buffer for (Npart, Ncoll) pairs in memory
   Double_t* fNpart;
   Double_t* fNcoll;
   Long_t* fContent;
-  Long_t fNNpNcPairs; //number of pairs to use
+  Long_t fNNpNcPairs; // number of pairs to use
   Long_t fMaxNpNcPairs;
 
-  //The actual output: mu, k, f, norm
+  // The actual output: mu, k, f, norm
   Double_t fMu;
   Double_t fdMu; // variable mu option
   Double_t fk;
diff --git a/.conflict-side-1/Common/Tools/Multiplicity/multMCCalibrator.cxx b/.conflict-side-1/Common/Tools/Multiplicity/multMCCalibrator.cxx
index 5b490daf77d..f0960da4b07 100644
--- a/.conflict-side-1/Common/Tools/Multiplicity/multMCCalibrator.cxx
+++ b/.conflict-side-1/Common/Tools/Multiplicity/multMCCalibrator.cxx
@@ -16,18 +16,20 @@
 // - victor.gonzalez@cern.ch
 // - david.dobrigkeit.chinellato@cern.ch
 //
-#include "TList.h"
+#include "multMCCalibrator.h"
+
+#include "multCalibrator.h"
+
+#include "TArrayF.h"
+#include "TArrayL64.h"
 #include "TDirectory.h"
-#include "TFile.h"
 #include "TF1.h"
-#include "TH1F.h"
+#include "TFile.h"
 #include "TH1D.h"
+#include "TH1F.h"
+#include "TList.h"
 #include "TProfile.h"
 #include "TStopwatch.h"
-#include "TArrayL64.h"
-#include "TArrayF.h"
-#include "multCalibrator.h"
-#include "multMCCalibrator.h"
 
 using namespace std;
 
@@ -79,11 +81,11 @@ Bool_t multMCCalibrator::Calibrate()
   cout << " * Output File............: " << fOutputFileName.Data() << endl;
   cout << endl;
 
-  //Opening data and simulation file...
+  // Opening data and simulation file...
   TFile* fileData = new TFile(fDataInputFileName.Data(), "READ");
   TFile* fileSim = new TFile(fSimInputFileName.Data(), "READ");
 
-  //Step 1: verify if input file contains desired histograms
+  // Step 1: verify if input file contains desired histograms
   TProfile* hProfData[multCalibrator::kNCentEstim];
   TProfile* hProfSim[multCalibrator::kNCentEstim];
   cout << " * acquiring input profiles..." << endl;
@@ -135,14 +137,14 @@ Bool_t multMCCalibrator::Calibrate()
 //________________________________________________________________
 TF1* multMCCalibrator::GetFit(TProfile* fProf, Bool_t lQuadratic)
 {
-  TString fFormula = "[0]*x"; //old/deprecated (avoid if possible, please)
+  TString fFormula = "[0]*x"; // old/deprecated (avoid if possible, please)
   if (lQuadratic)
     fFormula = "[0]+[1]*TMath::Power(x,[2])";
 
   // Function to return fit function to profile for posterior inversion
   TF1* fit = new TF1(Form("%s_fit", fProf->GetName()), fFormula.Data(), fProf->GetBinLowEdge(1), fProf->GetBinLowEdge(fProf->GetNbinsX()));
 
-  //Guesstimate inclination from data points in profile
+  // Guesstimate inclination from data points in profile
   Double_t lMeanInclination = 0;
   Long_t lInclinationCount = 0;
   for (Int_t ii = 2; ii < fProf->GetNbinsX(); ii++) {
@@ -158,7 +160,7 @@ TF1* multMCCalibrator::GetFit(TProfile* fProf, Bool_t lQuadratic)
   if (lInclinationCount >= 5)
     lMeanInclination /= lInclinationCount;
 
-  //Give it a little nudge, cause life's hard
+  // Give it a little nudge, cause life's hard
   fit->SetParameter(0, 0.0);
   fit->SetParameter(1, lMeanInclination);
   fit->SetParameter(2, 1.0);
diff --git a/.conflict-side-1/Common/Tools/Multiplicity/multMCCalibrator.h b/.conflict-side-1/Common/Tools/Multiplicity/multMCCalibrator.h
index f88bddf98c3..4e19d38acd1 100644
--- a/.conflict-side-1/Common/Tools/Multiplicity/multMCCalibrator.h
+++ b/.conflict-side-1/Common/Tools/Multiplicity/multMCCalibrator.h
@@ -19,31 +19,32 @@
 #ifndef MULTMCCALIBRATOR_H
 #define MULTMCCALIBRATOR_H
 
-#include <iostream>
-#include "TNamed.h"
 #include "TF1.h"
 #include "TH1D.h"
+#include "TNamed.h"
 #include "TProfile.h"
+
+#include <iostream>
 #include <map>
 
 class multMCCalibrator : public TNamed
 {
 
  public:
-  //Constructors/Destructor
+  // Constructors/Destructor
   multMCCalibrator();
   multMCCalibrator(const char* name, const char* title = "MC Multiplicity Calibration Class");
   ~multMCCalibrator();
 
   //_________________________________________________________________________
-  //Interface: steering functions to be used in calibration macro
+  // Interface: steering functions to be used in calibration macro
 
-  //Set Filenames
+  // Set Filenames
   void SetDataInputFile(TString lFile) { fDataInputFileName = lFile.Data(); }
   void SetSimInputFile(TString lFile) { fSimInputFileName = lFile.Data(); }
   void SetOutputFile(TString lFile) { fOutputFileName = lFile.Data(); }
 
-  //Master Function in this Class: To be called once filenames are set
+  // Master Function in this Class: To be called once filenames are set
   Bool_t Calibrate();
 
   TF1* GetFit(TProfile* fProf, Bool_t lQuadratic = kTRUE);
diff --git a/.conflict-side-1/Common/Tools/PID/checkPidPacking.cxx b/.conflict-side-1/Common/Tools/PID/checkPidPacking.cxx
index 84f72c4f48c..6416ab50669 100644
--- a/.conflict-side-1/Common/Tools/PID/checkPidPacking.cxx
+++ b/.conflict-side-1/Common/Tools/PID/checkPidPacking.cxx
@@ -16,14 +16,15 @@
 /// \since  03/05/2024
 ///
 
-#include <string>
-
 #include "Common/DataModel/PIDResponseTOF.h"
 #include "Common/DataModel/PIDResponseTPC.h"
-#include "TH1F.h"
+
 #include "TCanvas.h"
+#include "TH1F.h"
 #include "TRandom.h"
 
+#include <string>
+
 using namespace o2;
 
 template <typename T>
diff --git a/.conflict-side-1/Common/Tools/PID/handleParamBase.h b/.conflict-side-1/Common/Tools/PID/handleParamBase.h
index 01c2a66ab8b..263f05a1f0b 100644
--- a/.conflict-side-1/Common/Tools/PID/handleParamBase.h
+++ b/.conflict-side-1/Common/Tools/PID/handleParamBase.h
@@ -19,13 +19,16 @@
 #ifndef COMMON_TOOLS_PID_HANDLEPARAMBASE_H_
 #define COMMON_TOOLS_PID_HANDLEPARAMBASE_H_
 
-#include <map>
-#include <string>
 #include "CCDB/CcdbApi.h"
-#include <boost/program_options.hpp>
 #include "Framework/Logger.h"
+
 #include "TFile.h"
 
+#include <boost/program_options.hpp>
+
+#include <map>
+#include <string>
+
 // Global executable arguments
 namespace bpo = boost::program_options;
 bpo::variables_map arguments;             // Command line arguments
diff --git a/.conflict-side-1/Common/Tools/PID/handleParamTPCResponse.cxx b/.conflict-side-1/Common/Tools/PID/handleParamTPCResponse.cxx
index 64741503fae..abe70d1e1ba 100644
--- a/.conflict-side-1/Common/Tools/PID/handleParamTPCResponse.cxx
+++ b/.conflict-side-1/Common/Tools/PID/handleParamTPCResponse.cxx
@@ -14,14 +14,19 @@
 /// \author Jeremy Wilkinson
 /// \brief exec for writing and reading TPC PID Response object
 
+#include "handleParamBase.h"
+
+#include "Common/Core/PID/TPCPIDResponse.h"
+
+#include "Algorithm/RangeTokenizer.h"
+
+#include "TFile.h"
+
+#include <boost/algorithm/string.hpp>
+
 #include <array>
 #include <fstream>
 #include <sstream>
-#include <boost/algorithm/string.hpp>
-#include "TFile.h"
-#include "Common/Core/PID/TPCPIDResponse.h"
-#include "handleParamBase.h"
-#include "Algorithm/RangeTokenizer.h"
 using namespace o2::pid::tpc;
 
 bool initOptionsAndParse(bpo::options_description& options, int argc, char* argv[])
diff --git a/.conflict-side-1/Common/Tools/StandardCCDBLoader.h b/.conflict-side-1/Common/Tools/StandardCCDBLoader.h
index 6ba4c9be9a1..ac9bc97a950 100644
--- a/.conflict-side-1/Common/Tools/StandardCCDBLoader.h
+++ b/.conflict-side-1/Common/Tools/StandardCCDBLoader.h
@@ -16,12 +16,13 @@
 #ifndef COMMON_TOOLS_STANDARDCCDBLOADER_H_
 #define COMMON_TOOLS_STANDARDCCDBLOADER_H_
 
-#include <string>
-#include <cstdlib>
-#include <cmath>
-#include <array>
 #include "Framework/AnalysisDataModel.h"
 
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <string>
+
 //__________________________________________
 // Standard class to load stuff
 // such as matLUT, B and mean Vertex
diff --git a/.conflict-side-1/Common/Tools/TrackPropagationModule.h b/.conflict-side-1/Common/Tools/TrackPropagationModule.h
index fb957a87b9d..edaf8130b3d 100644
--- a/.conflict-side-1/Common/Tools/TrackPropagationModule.h
+++ b/.conflict-side-1/Common/Tools/TrackPropagationModule.h
@@ -16,16 +16,19 @@
 #ifndef COMMON_TOOLS_TRACKPROPAGATIONMODULE_H_
 #define COMMON_TOOLS_TRACKPROPAGATIONMODULE_H_
 
-#include <memory>
-#include <cstdlib>
-#include <cmath>
-#include <array>
-#include <string>
+#include "TableHelper.h"
+
+#include "Common/Tools/TrackTuner.h"
+
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/Configurable.h"
 #include "Framework/HistogramSpec.h"
-#include "Common/Tools/TrackTuner.h"
-#include "TableHelper.h"
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <memory>
+#include <string>
 
 //__________________________________________
 // track propagation module
diff --git a/.conflict-side-1/Common/Tools/TrackTuner.h b/.conflict-side-1/Common/Tools/TrackTuner.h
index 26937eb9131..aa951a4802f 100644
--- a/.conflict-side-1/Common/Tools/TrackTuner.h
+++ b/.conflict-side-1/Common/Tools/TrackTuner.h
@@ -18,35 +18,38 @@
 #ifndef COMMON_TOOLS_TRACKTUNER_H_
 #define COMMON_TOOLS_TRACKTUNER_H_
 
-#include <map>
-#include <memory>
-#include <string>
-#include <utility>
-#include <vector>
-#include <algorithm>
-#include <numbers>
-#include <fmt/core.h>
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
 #include "CCDB/BasicCCDBManager.h"
 #include "CCDB/CcdbApi.h"
 #include "CommonConstants/GeomConstants.h"
-#include "Common/Core/trackUtilities.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "CommonUtils/NameConf.h"
 #include "DataFormatsCalibration/MeanVertexObject.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include "DetectorsBase/Propagator.h"
 #include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/Configurable.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/DCA.h"
 #include "ReconstructionDataFormats/Track.h"
+
 #include <TGraphErrors.h>
 
+#include <fmt/core.h>
+
+#include <algorithm>
+#include <map>
+#include <memory>
+#include <numbers>
+#include <string>
+#include <utility>
+#include <vector>
+
 namespace o2::aod
 {
 namespace track_tuner
diff --git a/.conflict-side-1/Common/Tools/aodDataModelGraph.cxx b/.conflict-side-1/Common/Tools/aodDataModelGraph.cxx
index da854a700f5..c051a5dccc3 100644
--- a/.conflict-side-1/Common/Tools/aodDataModelGraph.cxx
+++ b/.conflict-side-1/Common/Tools/aodDataModelGraph.cxx
@@ -9,19 +9,23 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <fmt/printf.h>
-#include <utility>
-#include <string>
-#include <cstdio>
-#include "Framework/AnalysisDataModel.h"
 #include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGJE/DataModel/Jet.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponseTOF.h"
 #include "Common/DataModel/PIDResponseTPC.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "PWGJE/DataModel/Jet.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Framework/AnalysisDataModel.h"
+
+#include <fmt/printf.h>
+
+#include <cstdio>
+#include <string>
+#include <utility>
 
 using namespace o2::framework;
 using namespace o2::aod;
diff --git a/.conflict-side-1/Common/Tools/trackSelectionRequest.cxx b/.conflict-side-1/Common/Tools/trackSelectionRequest.cxx
index ed82f1ff7bf..e9d2ebbeca7 100644
--- a/.conflict-side-1/Common/Tools/trackSelectionRequest.cxx
+++ b/.conflict-side-1/Common/Tools/trackSelectionRequest.cxx
@@ -12,7 +12,9 @@
 // see header for a more detailed description.
 
 #include "trackSelectionRequest.h"
+
 #include "Framework/Logger.h"
+
 #include <iostream>
 
 std::ostream& operator<<(std::ostream& os, trackSelectionRequest const& c)
diff --git a/.conflict-side-1/Common/Tools/trackSelectionRequest.h b/.conflict-side-1/Common/Tools/trackSelectionRequest.h
index 123392611f0..38f4026c1b3 100644
--- a/.conflict-side-1/Common/Tools/trackSelectionRequest.h
+++ b/.conflict-side-1/Common/Tools/trackSelectionRequest.h
@@ -24,10 +24,12 @@
 #ifndef TRACKSELECTIONREQUEST_H
 #define TRACKSELECTIONREQUEST_H
 
-#include <iosfwd>
-#include <Rtypes.h>
 #include <TMath.h>
 
+#include <Rtypes.h>
+
+#include <iosfwd>
+
 class trackSelectionRequest
 {
  public:
diff --git a/.conflict-side-1/DPG/Tasks/AOTEvent/dEdxVsOccupancyWithTrackQAinfo.cxx b/.conflict-side-1/DPG/Tasks/AOTEvent/dEdxVsOccupancyWithTrackQAinfo.cxx
index c87fd48bc99..a9e90a1b33a 100644
--- a/.conflict-side-1/DPG/Tasks/AOTEvent/dEdxVsOccupancyWithTrackQAinfo.cxx
+++ b/.conflict-side-1/DPG/Tasks/AOTEvent/dEdxVsOccupancyWithTrackQAinfo.cxx
@@ -14,31 +14,32 @@
 ///
 /// \author Igor Altsybeev <Igor.Altsybeev@cern.ch>
 
-#include <vector>
-#include <map>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/CCDB/EventSelectionParams.h"
 #include "Common/CCDB/ctpRateFetcher.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "Framework/HistogramRegistry.h"
-#include "CommonDataFormat/BunchFilling.h"
-#include "DataFormatsParameters/GRPLHCIFData.h"
-#include "DataFormatsParameters/GRPECSObject.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonDataFormat/BunchFilling.h"
 #include "DataFormatsParameters/AggregatedRunInfo.h"
+#include "DataFormatsParameters/GRPECSObject.h"
+#include "DataFormatsParameters/GRPLHCIFData.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 
 #include "TH1F.h"
 #include "TH2F.h"
 #include "TH3.h"
 
+#include <map>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::aod::evsel;
diff --git a/.conflict-side-1/DPG/Tasks/AOTEvent/detectorOccupancyQa.cxx b/.conflict-side-1/DPG/Tasks/AOTEvent/detectorOccupancyQa.cxx
index 123cbd0e442..ec133b1bcea 100644
--- a/.conflict-side-1/DPG/Tasks/AOTEvent/detectorOccupancyQa.cxx
+++ b/.conflict-side-1/DPG/Tasks/AOTEvent/detectorOccupancyQa.cxx
@@ -14,30 +14,31 @@
 ///
 /// \author Igor Altsybeev <Igor.Altsybeev@cern.ch>
 
-#include <vector>
-#include <map>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/CCDB/EventSelectionParams.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "Framework/HistogramRegistry.h"
-#include "CommonDataFormat/BunchFilling.h"
-#include "DataFormatsParameters/GRPLHCIFData.h"
-#include "DataFormatsParameters/GRPECSObject.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonDataFormat/BunchFilling.h"
 #include "DataFormatsParameters/AggregatedRunInfo.h"
+#include "DataFormatsParameters/GRPECSObject.h"
+#include "DataFormatsParameters/GRPLHCIFData.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 
 #include "TH1F.h"
 #include "TH2F.h"
 #include "TH3.h"
 
+#include <map>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::aod::evsel;
diff --git a/.conflict-side-1/DPG/Tasks/AOTEvent/eventSelectionQa.cxx b/.conflict-side-1/DPG/Tasks/AOTEvent/eventSelectionQa.cxx
index 52ec04b0f2e..216522f528c 100644
--- a/.conflict-side-1/DPG/Tasks/AOTEvent/eventSelectionQa.cxx
+++ b/.conflict-side-1/DPG/Tasks/AOTEvent/eventSelectionQa.cxx
@@ -14,31 +14,33 @@
 ///
 /// \author Evgeny Kryshen <evgeny.kryshen@cern.ch>
 
-#include <map>
-#include <vector>
-#include <string>
-#include <unordered_map>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/CCDB/EventSelectionParams.h"
+#include "Common/DataModel/EventSelection.h"
+
 #include "CCDB/BasicCCDBManager.h"
-#include "Framework/HistogramRegistry.h"
 #include "CommonDataFormat/BunchFilling.h"
-#include "DataFormatsParameters/GRPLHCIFData.h"
-#include "DataFormatsParameters/GRPECSObject.h"
-#include "DataFormatsParameters/AggregatedRunInfo.h"
 #include "DataFormatsITSMFT/NoiseMap.h" // missing include in TimeDeadMap.h
-#include "DataFormatsITSMFT/TimeDeadMap.h"
 #include "DataFormatsITSMFT/ROFRecord.h"
-#include "ReconstructionDataFormats/Vertex.h"
+#include "DataFormatsITSMFT/TimeDeadMap.h"
+#include "DataFormatsParameters/AggregatedRunInfo.h"
+#include "DataFormatsParameters/GRPECSObject.h"
+#include "DataFormatsParameters/GRPLHCIFData.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 #include "ITSMFTBase/DPLAlpideParam.h"
 #include "ITSMFTReconstruction/ChipMappingITS.h"
+#include "ReconstructionDataFormats/Vertex.h"
+
 #include "TH1F.h"
 #include "TH2F.h"
 
+#include <map>
+#include <string>
+#include <unordered_map>
+#include <vector>
+
 using namespace o2::framework;
 using namespace o2;
 using namespace o2::aod::evsel;
diff --git a/.conflict-side-1/DPG/Tasks/AOTEvent/lumiQa.cxx b/.conflict-side-1/DPG/Tasks/AOTEvent/lumiQa.cxx
index 254e58f0b67..6f27ce2cb31 100644
--- a/.conflict-side-1/DPG/Tasks/AOTEvent/lumiQa.cxx
+++ b/.conflict-side-1/DPG/Tasks/AOTEvent/lumiQa.cxx
@@ -9,15 +9,16 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "CCDB/BasicCCDBManager.h"
-#include "Framework/HistogramRegistry.h"
-#include "DataFormatsParameters/GRPLHCIFData.h"
 #include "DataFormatsFT0/Digit.h"
-#include "TList.h"
+#include "DataFormatsParameters/GRPLHCIFData.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TH1.h"
+#include "TList.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/DPG/Tasks/AOTEvent/matchingQa.cxx b/.conflict-side-1/DPG/Tasks/AOTEvent/matchingQa.cxx
index 3b266f047e9..944db040d8c 100644
--- a/.conflict-side-1/DPG/Tasks/AOTEvent/matchingQa.cxx
+++ b/.conflict-side-1/DPG/Tasks/AOTEvent/matchingQa.cxx
@@ -9,14 +9,15 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
+#include "MetadataHelper.h"
+
 #include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsFT0/Digit.h"
 #include "DataFormatsParameters/GRPLHCIFData.h"
-#include "MetadataHelper.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/DPG/Tasks/AOTEvent/rofBorderQa.cxx b/.conflict-side-1/DPG/Tasks/AOTEvent/rofBorderQa.cxx
index 83f704960b6..a2a071e9e0d 100644
--- a/.conflict-side-1/DPG/Tasks/AOTEvent/rofBorderQa.cxx
+++ b/.conflict-side-1/DPG/Tasks/AOTEvent/rofBorderQa.cxx
@@ -12,27 +12,26 @@
 /// \brief QA task to study ROF border effect for different event, track and particle selection parameters
 /// \author Igor Altsybeev, Igor.Altsybeev@cern.ch
 
-#include <iostream>
-#include <string>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
+#include "Common/CCDB/EventSelectionParams.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/FT0Corrected.h"
 #include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/CCDB/EventSelectionParams.h"
 
 #include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPObject.h"
+#include "DataFormatsFT0/Digit.h"
 #include "DataFormatsParameters/GRPECSObject.h"
 #include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
-#include "Common/DataModel/FT0Corrected.h"
-#include "DataFormatsFT0/Digit.h"
+#include <iostream>
+#include <string>
 
 using namespace std;
 using namespace o2;
diff --git a/.conflict-side-1/DPG/Tasks/AOTEvent/rofOccupancyQa.cxx b/.conflict-side-1/DPG/Tasks/AOTEvent/rofOccupancyQa.cxx
index cbc8d7d56d1..c2040ac3e6e 100644
--- a/.conflict-side-1/DPG/Tasks/AOTEvent/rofOccupancyQa.cxx
+++ b/.conflict-side-1/DPG/Tasks/AOTEvent/rofOccupancyQa.cxx
@@ -14,20 +14,21 @@
 ///
 /// \author Igor Altsybeev <Igor.Altsybeev@cern.ch>
 
-#include <vector>
-
-#include "Framework/ConfigParamSpec.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/CCDB/EventSelectionParams.h"
+#include "Common/DataModel/EventSelection.h"
+
 #include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/LHCConstants.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/ConfigParamSpec.h"
 #include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+
+#include <vector>
 // #include "DataFormatsParameters/GRPLHCIFData.h"
-#include "ITSMFTBase/DPLAlpideParam.h"
 #include "DataFormatsParameters/AggregatedRunInfo.h"
+#include "ITSMFTBase/DPLAlpideParam.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/DPG/Tasks/AOTEvent/timeDependentQa.cxx b/.conflict-side-1/DPG/Tasks/AOTEvent/timeDependentQa.cxx
index 61fbb690e6c..497a2a4d986 100644
--- a/.conflict-side-1/DPG/Tasks/AOTEvent/timeDependentQa.cxx
+++ b/.conflict-side-1/DPG/Tasks/AOTEvent/timeDependentQa.cxx
@@ -14,27 +14,28 @@
 ///
 /// \author Evgeny Kryshen <evgeny.kryshen@cern.ch> and Igor Altsybeev <Igor.Altsybeev@cern.ch>
 
-#include <map>
-#include <vector>
-#include <string>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/CCDB/EventSelectionParams.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/CCDB/ctpRateFetcher.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "TPCCalibration/TPCMShapeCorrection.h"
-#include "DataFormatsParameters/AggregatedRunInfo.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsITSMFT/ROFRecord.h"
+#include "DataFormatsParameters/AggregatedRunInfo.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Vertex.h"
+#include "TPCCalibration/TPCMShapeCorrection.h"
 
 #include "TTree.h"
 
+#include <map>
+#include <string>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::aod::evsel;
diff --git a/.conflict-side-1/DPG/Tasks/AOTTrack/MonitorFilterBit.cxx b/.conflict-side-1/DPG/Tasks/AOTTrack/MonitorFilterBit.cxx
index b8fb6679b1c..5eed1a42ce0 100644
--- a/.conflict-side-1/DPG/Tasks/AOTTrack/MonitorFilterBit.cxx
+++ b/.conflict-side-1/DPG/Tasks/AOTTrack/MonitorFilterBit.cxx
@@ -15,12 +15,13 @@
 /// \brief Task performing basic checks on filter-bit selections.
 ///
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/Core/RecoDecay.h"
-#include "Framework/ASoAHelpers.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/DPG/Tasks/AOTTrack/PID/Combined/qaPIDWithV0s.cxx b/.conflict-side-1/DPG/Tasks/AOTTrack/PID/Combined/qaPIDWithV0s.cxx
index 3f1ed2a8640..3bc6803d041 100644
--- a/.conflict-side-1/DPG/Tasks/AOTTrack/PID/Combined/qaPIDWithV0s.cxx
+++ b/.conflict-side-1/DPG/Tasks/AOTTrack/PID/Combined/qaPIDWithV0s.cxx
@@ -16,18 +16,20 @@
 /// \brief  Task to monitor the PID performance making use of V0s
 ///
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/DPG/Tasks/AOTTrack/PID/HMPID/analysisHMPID.cxx b/.conflict-side-1/DPG/Tasks/AOTTrack/PID/HMPID/analysisHMPID.cxx
index c5a6b9d0597..6501fa74ed4 100644
--- a/.conflict-side-1/DPG/Tasks/AOTTrack/PID/HMPID/analysisHMPID.cxx
+++ b/.conflict-side-1/DPG/Tasks/AOTTrack/PID/HMPID/analysisHMPID.cxx
@@ -10,23 +10,24 @@
 // or submit itself to any jurisdiction.
 
 // O2 includes
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "ReconstructionDataFormats/TrackParametrization.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/Core/PID/PIDTOF.h"
-#include "Common/TableProducer/PID/pidTOFBase.h"
-#include "ReconstructionDataFormats/PID.h"
 #include "Common/Core/trackUtilities.h"
-#include "ReconstructionDataFormats/DCA.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/ASoA.h"
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/TableProducer/PID/pidTOFBase.h"
+
+#include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/DCA.h"
+#include "ReconstructionDataFormats/PID.h"
+#include "ReconstructionDataFormats/Track.h"
+#include "ReconstructionDataFormats/TrackParametrization.h"
 
 #include <TTree.h>
 
diff --git a/.conflict-side-1/DPG/Tasks/AOTTrack/PID/HMPID/qaHMPID.cxx b/.conflict-side-1/DPG/Tasks/AOTTrack/PID/HMPID/qaHMPID.cxx
index a4e01d6a980..b7e3da0df41 100644
--- a/.conflict-side-1/DPG/Tasks/AOTTrack/PID/HMPID/qaHMPID.cxx
+++ b/.conflict-side-1/DPG/Tasks/AOTTrack/PID/HMPID/qaHMPID.cxx
@@ -10,23 +10,24 @@
 // or submit itself to any jurisdiction.
 
 // O2 includes
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "ReconstructionDataFormats/TrackParametrization.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/Core/PID/PIDTOF.h"
-#include "Common/TableProducer/PID/pidTOFBase.h"
-#include "ReconstructionDataFormats/PID.h"
 #include "Common/Core/trackUtilities.h"
-#include "ReconstructionDataFormats/DCA.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/ASoA.h"
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/TableProducer/PID/pidTOFBase.h"
+
+#include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/DCA.h"
+#include "ReconstructionDataFormats/PID.h"
+#include "ReconstructionDataFormats/Track.h"
+#include "ReconstructionDataFormats/TrackParametrization.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFBeta.cxx b/.conflict-side-1/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFBeta.cxx
index 60ad0a9ab38..7661990a12b 100644
--- a/.conflict-side-1/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFBeta.cxx
+++ b/.conflict-side-1/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFBeta.cxx
@@ -15,16 +15,17 @@
 /// \brief  Task to produce the TOF QA plots for Beta
 ///
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/StaticFor.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/FT0Corrected.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/TableProducer/PID/pidTOFBase.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-1/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFBetaImp.cxx b/.conflict-side-1/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFBetaImp.cxx
index f503ab1d92d..ad445323605 100644
--- a/.conflict-side-1/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFBetaImp.cxx
+++ b/.conflict-side-1/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFBetaImp.cxx
@@ -15,16 +15,17 @@
 /// \brief  Task to produce the TOF QA plots for Beta. Version using dynamic columns. Interim solution for test and benchmarking
 ///
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/StaticFor.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/FT0Corrected.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/TableProducer/PID/pidTOFBase.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-1/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFEvTime.cxx b/.conflict-side-1/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFEvTime.cxx
index 204bff837fb..2e57d875f3e 100644
--- a/.conflict-side-1/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFEvTime.cxx
+++ b/.conflict-side-1/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFEvTime.cxx
@@ -15,20 +15,21 @@
 /// \brief  Tasks of the TOF PID quantities for the event times
 ///
 
-#include "TEfficiency.h"
-#include "THashList.h"
-
-#include "Framework/HistogramRegistry.h"
-#include "Framework/StaticFor.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/FT0Corrected.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/TableProducer/PID/pidTOFBase.h"
-#include "Framework/runDataProcessing.h"
+
 #include "CommonConstants/LHCConstants.h"
 #include "DataFormatsFT0/Digit.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TEfficiency.h"
+#include "THashList.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFMC.cxx b/.conflict-side-1/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFMC.cxx
index 73d1c72ad1e..8f35b228191 100644
--- a/.conflict-side-1/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFMC.cxx
+++ b/.conflict-side-1/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFMC.cxx
@@ -16,11 +16,12 @@
 ///
 
 // O2 includes
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/StaticFor.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Framework/runDataProcessing.h"
 
 using namespace o2;
diff --git a/.conflict-side-1/DPG/Tasks/AOTTrack/PID/TPC/qaPIDTPC.cxx b/.conflict-side-1/DPG/Tasks/AOTTrack/PID/TPC/qaPIDTPC.cxx
index 2794070498d..819b26a74c0 100644
--- a/.conflict-side-1/DPG/Tasks/AOTTrack/PID/TPC/qaPIDTPC.cxx
+++ b/.conflict-side-1/DPG/Tasks/AOTTrack/PID/TPC/qaPIDTPC.cxx
@@ -15,13 +15,14 @@
 /// \brief  Implementation for QA tasks of the TPC PID quantities
 ///
 
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/StaticFor.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/PIDResponse.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/DPG/Tasks/AOTTrack/PID/TPC/qaPIDTPCMC.cxx b/.conflict-side-1/DPG/Tasks/AOTTrack/PID/TPC/qaPIDTPCMC.cxx
index 993c2f7b24c..a84e874af6f 100644
--- a/.conflict-side-1/DPG/Tasks/AOTTrack/PID/TPC/qaPIDTPCMC.cxx
+++ b/.conflict-side-1/DPG/Tasks/AOTTrack/PID/TPC/qaPIDTPCMC.cxx
@@ -16,10 +16,11 @@
 ///
 
 // O2 includes
+#include "Common/DataModel/PIDResponse.h"
+
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/StaticFor.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Framework/runDataProcessing.h"
 
 using namespace o2;
diff --git a/.conflict-side-1/DPG/Tasks/AOTTrack/PID/TPC/qaPIDTPCSignal.cxx b/.conflict-side-1/DPG/Tasks/AOTTrack/PID/TPC/qaPIDTPCSignal.cxx
index bf8492b8036..44e12f36e3a 100644
--- a/.conflict-side-1/DPG/Tasks/AOTTrack/PID/TPC/qaPIDTPCSignal.cxx
+++ b/.conflict-side-1/DPG/Tasks/AOTTrack/PID/TPC/qaPIDTPCSignal.cxx
@@ -16,12 +16,13 @@
 /// \brief  Implementation for QA tasks of the TPC signal (lite task, refer to qaPIDTPC.cxx for full TPC QA for PID)
 ///
 
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/StaticFor.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/DPG/Tasks/AOTTrack/V0Cascades/perfK0sResolution.cxx b/.conflict-side-1/DPG/Tasks/AOTTrack/V0Cascades/perfK0sResolution.cxx
index 91effcc47b4..5a2a7aa0a21 100644
--- a/.conflict-side-1/DPG/Tasks/AOTTrack/V0Cascades/perfK0sResolution.cxx
+++ b/.conflict-side-1/DPG/Tasks/AOTTrack/V0Cascades/perfK0sResolution.cxx
@@ -9,22 +9,24 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <string>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "ReconstructionDataFormats/PID.h"
-#include "Common/Core/trackUtilities.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/Tools/TrackTuner.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/PID.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <string>
+
 using namespace o2;
 using namespace o2::track;
 using namespace o2::framework;
diff --git a/.conflict-side-1/DPG/Tasks/AOTTrack/V0Cascades/qaCascades.cxx b/.conflict-side-1/DPG/Tasks/AOTTrack/V0Cascades/qaCascades.cxx
index 4e42b50da2a..eed88c54dc2 100644
--- a/.conflict-side-1/DPG/Tasks/AOTTrack/V0Cascades/qaCascades.cxx
+++ b/.conflict-side-1/DPG/Tasks/AOTTrack/V0Cascades/qaCascades.cxx
@@ -16,20 +16,22 @@
 /// \brief  QA task for basic quantities on cascades
 ///
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/DPG/Tasks/AOTTrack/V0Cascades/qaEfficiencyV0s.cxx b/.conflict-side-1/DPG/Tasks/AOTTrack/V0Cascades/qaEfficiencyV0s.cxx
index a728b252007..bf09dd8f6b0 100644
--- a/.conflict-side-1/DPG/Tasks/AOTTrack/V0Cascades/qaEfficiencyV0s.cxx
+++ b/.conflict-side-1/DPG/Tasks/AOTTrack/V0Cascades/qaEfficiencyV0s.cxx
@@ -18,22 +18,24 @@
 ///
 
 // O2 includes
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/DCA.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 
 // ROOT includes
-#include "TPDGCode.h"
 #include "TEfficiency.h"
 #include "THashList.h"
+#include "TPDGCode.h"
 
 using namespace o2::framework;
 static constexpr int nSpecies = 2; // One per PDG
diff --git a/.conflict-side-1/DPG/Tasks/AOTTrack/V0Cascades/qaK0sTrackingEfficiency.cxx b/.conflict-side-1/DPG/Tasks/AOTTrack/V0Cascades/qaK0sTrackingEfficiency.cxx
index 6ee7c4e7a5c..75189988459 100644
--- a/.conflict-side-1/DPG/Tasks/AOTTrack/V0Cascades/qaK0sTrackingEfficiency.cxx
+++ b/.conflict-side-1/DPG/Tasks/AOTTrack/V0Cascades/qaK0sTrackingEfficiency.cxx
@@ -9,18 +9,20 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/DPG/Tasks/AOTTrack/V0Cascades/qaLamMomResolution.cxx b/.conflict-side-1/DPG/Tasks/AOTTrack/V0Cascades/qaLamMomResolution.cxx
index 9ee92d0a509..778ac59f79d 100644
--- a/.conflict-side-1/DPG/Tasks/AOTTrack/V0Cascades/qaLamMomResolution.cxx
+++ b/.conflict-side-1/DPG/Tasks/AOTTrack/V0Cascades/qaLamMomResolution.cxx
@@ -14,23 +14,26 @@
 /// \author Carolina Reetz c.reetz@cern.ch
 /// \brief  QA task to study momentum resolution of Lambda daughter tracks
 
-#include <string>
+#include "DPG/Tasks/AOTTrack/V0Cascades/qaLamMomResolution.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "ReconstructionDataFormats/PID.h"
-#include "Common/Core/trackUtilities.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "DPG/Tasks/AOTTrack/V0Cascades/qaLamMomResolution.h"
+
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/Tools/TrackTuner.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/PID.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <string>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
@@ -540,8 +543,8 @@ struct qaLamMomResolution {
             }
           }
         } // end Anti-Lambda
-      }   // end MC
-    }     // end V0 loop
+      } // end MC
+    } // end V0 loop
   }
   PROCESS_SWITCH(qaLamMomResolution, processMC, "Process MC", true);
 };
diff --git a/.conflict-side-1/DPG/Tasks/AOTTrack/V0Cascades/qaLamMomResolution.h b/.conflict-side-1/DPG/Tasks/AOTTrack/V0Cascades/qaLamMomResolution.h
index 603195404d4..67b8620ab6b 100644
--- a/.conflict-side-1/DPG/Tasks/AOTTrack/V0Cascades/qaLamMomResolution.h
+++ b/.conflict-side-1/DPG/Tasks/AOTTrack/V0Cascades/qaLamMomResolution.h
@@ -14,10 +14,11 @@
 #ifndef DPG_TASKS_AOTTRACK_V0CASCADES_QALAMMOMRESOLUTION_H_
 #define DPG_TASKS_AOTTRACK_V0CASCADES_QALAMMOMRESOLUTION_H_
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Common/Core/trackUtilities.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+
 namespace o2::aod
 {
 namespace qaLamMomResolution
diff --git a/.conflict-side-1/DPG/Tasks/AOTTrack/qaDcaMC.cxx b/.conflict-side-1/DPG/Tasks/AOTTrack/qaDcaMC.cxx
index 4054c59b33a..7e76026fed6 100644
--- a/.conflict-side-1/DPG/Tasks/AOTTrack/qaDcaMC.cxx
+++ b/.conflict-side-1/DPG/Tasks/AOTTrack/qaDcaMC.cxx
@@ -16,22 +16,24 @@
 ///
 
 // O2 includes
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/DCA.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
 
 // ROOT includes
-#include "TPDGCode.h"
 #include "TEfficiency.h"
 #include "THashList.h"
+#include "TPDGCode.h"
 
 using namespace o2::framework;
 
diff --git a/.conflict-side-1/DPG/Tasks/AOTTrack/qaEfficiency.cxx b/.conflict-side-1/DPG/Tasks/AOTTrack/qaEfficiency.cxx
index a55d205ed57..13703e3d92d 100644
--- a/.conflict-side-1/DPG/Tasks/AOTTrack/qaEfficiency.cxx
+++ b/.conflict-side-1/DPG/Tasks/AOTTrack/qaEfficiency.cxx
@@ -17,27 +17,29 @@
 ///
 
 // O2 includes
-#include <memory>
-#include <vector>
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/DCA.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
-#include "Common/Core/RecoDecay.h"
+
+#include <memory>
+#include <vector>
 
 // ROOT includes
-#include "TPDGCode.h"
 #include "TEfficiency.h"
 #include "THashList.h"
+#include "TPDGCode.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/DPG/Tasks/AOTTrack/qaEventTrack.cxx b/.conflict-side-1/DPG/Tasks/AOTTrack/qaEventTrack.cxx
index 09590267ed8..8bc884208cb 100644
--- a/.conflict-side-1/DPG/Tasks/AOTTrack/qaEventTrack.cxx
+++ b/.conflict-side-1/DPG/Tasks/AOTTrack/qaEventTrack.cxx
@@ -23,19 +23,20 @@
 
 #include "qaEventTrack.h"
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "ReconstructionDataFormats/DCA.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/Core/TrackSelectionDefaults.h"
 #include "Common/TableProducer/PID/pidTOFBase.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/DCA.h"
+
 #include <string>
 #include <vector>
 
diff --git a/.conflict-side-1/DPG/Tasks/AOTTrack/qaEventTrack.h b/.conflict-side-1/DPG/Tasks/AOTTrack/qaEventTrack.h
index e2230e37c87..274ec3d1d31 100644
--- a/.conflict-side-1/DPG/Tasks/AOTTrack/qaEventTrack.h
+++ b/.conflict-side-1/DPG/Tasks/AOTTrack/qaEventTrack.h
@@ -17,10 +17,11 @@
 /// \brief  Header file for QA tasks for the track and the event properties.
 ///
 
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
 
 // Output table declaration
 namespace o2::aod
diff --git a/.conflict-side-1/DPG/Tasks/AOTTrack/qaEventTrackLite.cxx b/.conflict-side-1/DPG/Tasks/AOTTrack/qaEventTrackLite.cxx
index eecb5d7c240..a5d381960b9 100644
--- a/.conflict-side-1/DPG/Tasks/AOTTrack/qaEventTrackLite.cxx
+++ b/.conflict-side-1/DPG/Tasks/AOTTrack/qaEventTrackLite.cxx
@@ -20,17 +20,18 @@
 
 #include "qaEventTrack.h"
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisDataModel.h"
-#include "ReconstructionDataFormats/DCA.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/Core/TrackSelectionDefaults.h"
+
 #include "DataFormatsTPC/BetheBlochAleph.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/DCA.h"
 #include "ReconstructionDataFormats/PID.h"
 
 #include "TF1.h"
diff --git a/.conflict-side-1/DPG/Tasks/AOTTrack/qaEventTrackLiteProducer.cxx b/.conflict-side-1/DPG/Tasks/AOTTrack/qaEventTrackLiteProducer.cxx
index 0184d5b39f0..945f6ec08f1 100644
--- a/.conflict-side-1/DPG/Tasks/AOTTrack/qaEventTrackLiteProducer.cxx
+++ b/.conflict-side-1/DPG/Tasks/AOTTrack/qaEventTrackLiteProducer.cxx
@@ -19,22 +19,24 @@
 
 #include "qaEventTrack.h"
 
-#include <vector>
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/McCollisionExtra.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/TableProducer/PID/pidTOFBase.h"
 
-#include "TRandom.h"
+#include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisDataModel.h"
 #include "ReconstructionDataFormats/DCA.h"
-#include "Common/Core/trackUtilities.h"
-#include "Common/DataModel/McCollisionExtra.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/TableProducer/PID/pidTOFBase.h"
+
+#include "TRandom.h"
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/DPG/Tasks/AOTTrack/qaFakeHits.cxx b/.conflict-side-1/DPG/Tasks/AOTTrack/qaFakeHits.cxx
index 1da3a6a6674..88a794770cc 100644
--- a/.conflict-side-1/DPG/Tasks/AOTTrack/qaFakeHits.cxx
+++ b/.conflict-side-1/DPG/Tasks/AOTTrack/qaFakeHits.cxx
@@ -17,17 +17,19 @@
 ///
 
 // O2 includes
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/DCA.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
 
 using namespace o2::framework;
 // Particle information
diff --git a/.conflict-side-1/DPG/Tasks/AOTTrack/qaMatchEff.cxx b/.conflict-side-1/DPG/Tasks/AOTTrack/qaMatchEff.cxx
index 704d3fa89ad..7b289d68de3 100644
--- a/.conflict-side-1/DPG/Tasks/AOTTrack/qaMatchEff.cxx
+++ b/.conflict-side-1/DPG/Tasks/AOTTrack/qaMatchEff.cxx
@@ -21,20 +21,21 @@
 //
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "CommonConstants/MathConstants.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "CommonConstants/MathConstants.h"
 //
 #include "Framework/AnalysisTask.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/runDataProcessing.h"
 //
+#include <set>
 #include <string>
 #include <vector>
-#include <set>
 //
 namespace extConfPar
 {
diff --git a/.conflict-side-1/DPG/Tasks/AOTTrack/qaPrimVtxVsTime.cxx b/.conflict-side-1/DPG/Tasks/AOTTrack/qaPrimVtxVsTime.cxx
index dd66692a4e2..1ac1b97b5c1 100644
--- a/.conflict-side-1/DPG/Tasks/AOTTrack/qaPrimVtxVsTime.cxx
+++ b/.conflict-side-1/DPG/Tasks/AOTTrack/qaPrimVtxVsTime.cxx
@@ -10,16 +10,18 @@
 // or submit itself to any jurisdiction.
 /// \author Mattia Faggin <mattia.faggin@cern.ch>, Padova University and INFN
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/CCDB/EventSelectionParams.h"
+#include "Common/DataModel/EventSelection.h"
+
 #include "CCDB/BasicCCDBManager.h"
-#include "Framework/HistogramRegistry.h"
 #include "CommonDataFormat/BunchFilling.h"
-#include "DataFormatsParameters/GRPLHCIFData.h"
 #include "DataFormatsParameters/GRPECSObject.h"
+#include "DataFormatsParameters/GRPLHCIFData.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TH1F.h"
 #include "TH2F.h"
 
diff --git a/.conflict-side-1/DPG/Tasks/AOTTrack/qaSignChargeMC.cxx b/.conflict-side-1/DPG/Tasks/AOTTrack/qaSignChargeMC.cxx
index e40dd0e76e9..d8ad1bf21bc 100644
--- a/.conflict-side-1/DPG/Tasks/AOTTrack/qaSignChargeMC.cxx
+++ b/.conflict-side-1/DPG/Tasks/AOTTrack/qaSignChargeMC.cxx
@@ -18,9 +18,9 @@
 
 // O2 includes
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2::framework;
 
diff --git a/.conflict-side-1/DPG/Tasks/AOTTrack/qaTrackSelection.cxx b/.conflict-side-1/DPG/Tasks/AOTTrack/qaTrackSelection.cxx
index f7ea3dd2f53..bf9f732d5c1 100644
--- a/.conflict-side-1/DPG/Tasks/AOTTrack/qaTrackSelection.cxx
+++ b/.conflict-side-1/DPG/Tasks/AOTTrack/qaTrackSelection.cxx
@@ -17,14 +17,15 @@
 ///
 
 // O2 includes
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/HistogramRegistry.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2::framework;
 
 struct QaTrackCuts {
diff --git a/.conflict-side-1/DPG/Tasks/AOTTrack/qaTrackSplitting.cxx b/.conflict-side-1/DPG/Tasks/AOTTrack/qaTrackSplitting.cxx
index 3125f1e7c03..c8abc81ae7e 100644
--- a/.conflict-side-1/DPG/Tasks/AOTTrack/qaTrackSplitting.cxx
+++ b/.conflict-side-1/DPG/Tasks/AOTTrack/qaTrackSplitting.cxx
@@ -15,13 +15,14 @@
 /// \brief  Task to analyse the numbers of particles reconstructed more than once
 ///
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/HistogramRegistry.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-1/DPG/Tasks/FDD/qaFDD.cxx b/.conflict-side-1/DPG/Tasks/FDD/qaFDD.cxx
index c985d7dbb9d..37914166c8e 100644
--- a/.conflict-side-1/DPG/Tasks/FDD/qaFDD.cxx
+++ b/.conflict-side-1/DPG/Tasks/FDD/qaFDD.cxx
@@ -9,19 +9,20 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Common/DataModel/EventSelection.h"
-#include "DataFormatsFDD/Digit.h"
-#include "DataFormatsFIT/Triggers.h"
 #include "Common/DataModel/FT0Corrected.h"
 
+#include "CCDB/BasicCCDBManager.h"
 #include "CCDB/CcdbApi.h"
 #include "CommonDataFormat/BunchFilling.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPObject.h"
+#include "DataFormatsFDD/Digit.h"
+#include "DataFormatsFIT/Triggers.h"
 #include "DataFormatsParameters/GRPLHCIFData.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TH1F.h"
 #include "TH2F.h"
 
diff --git a/.conflict-side-1/DPG/Tasks/FT0/ft0AnalysisTask.cxx b/.conflict-side-1/DPG/Tasks/FT0/ft0AnalysisTask.cxx
index a7d487fbdff..498847b65cd 100644
--- a/.conflict-side-1/DPG/Tasks/FT0/ft0AnalysisTask.cxx
+++ b/.conflict-side-1/DPG/Tasks/FT0/ft0AnalysisTask.cxx
@@ -9,19 +9,20 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <bitset>
-#include <map>
-#include <string>
-#include <numeric>
-
-#include "TH1.h"
-
 #include "Common/DataModel/EventSelection.h"
+
 #include "DataFormatsFT0/Digit.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
 
+#include "TH1.h"
+
+#include <bitset>
+#include <map>
+#include <numeric>
+#include <string>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::aod::evsel;
diff --git a/.conflict-side-1/DPG/Tasks/FT0/qaFT0TrgBased.cxx b/.conflict-side-1/DPG/Tasks/FT0/qaFT0TrgBased.cxx
index 35a2c2cc884..89bfed1dfe5 100644
--- a/.conflict-side-1/DPG/Tasks/FT0/qaFT0TrgBased.cxx
+++ b/.conflict-side-1/DPG/Tasks/FT0/qaFT0TrgBased.cxx
@@ -13,20 +13,13 @@
 /// \author Uliana Dmitrieva uliana.dmitrieva@cern.ch
 /// \brief  FT0 QA
 
-#include <bitset>
-#include <cstddef>
-#include <cstdint>
-#include <map>
-#include <string>
-#include <vector>
-
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/FT0Corrected.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "DataFormatsFT0/Digit.h"
 
 #include "CommonConstants/LHCConstants.h"
 #include "DataFormatsFIT/Triggers.h"
+#include "DataFormatsFT0/Digit.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
@@ -34,6 +27,13 @@
 #include "Framework/InitContext.h"
 #include "Framework/runDataProcessing.h"
 
+#include <bitset>
+#include <cstddef>
+#include <cstdint>
+#include <map>
+#include <string>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-side-1/DPG/Tasks/FV0/qaFV0.cxx b/.conflict-side-1/DPG/Tasks/FV0/qaFV0.cxx
index 295f981b0b7..fda2bc3b9c4 100644
--- a/.conflict-side-1/DPG/Tasks/FV0/qaFV0.cxx
+++ b/.conflict-side-1/DPG/Tasks/FV0/qaFV0.cxx
@@ -13,13 +13,6 @@
 /// \author Andreas Molander andreas.molander@cern.ch
 /// \brief  FV0 QA
 
-#include <bitset>
-#include <cstddef>
-#include <cstdint>
-#include <string>
-#include <map>
-#include <vector>
-
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
 
@@ -27,14 +20,21 @@
 #include "DataFormatsFIT/Triggers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/InitContext.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/HistogramSpec.h"
+#include "Framework/InitContext.h"
 #include "Framework/runDataProcessing.h"
 
 #include "TH1F.h"
 #include "TH2F.h"
 
+#include <bitset>
+#include <cstddef>
+#include <cstdint>
+#include <map>
+#include <string>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-side-1/DPG/Tasks/ITS/itsImpParStudies.cxx b/.conflict-side-1/DPG/Tasks/ITS/itsImpParStudies.cxx
index 67fba3b4989..6ed71d41aa5 100644
--- a/.conflict-side-1/DPG/Tasks/ITS/itsImpParStudies.cxx
+++ b/.conflict-side-1/DPG/Tasks/ITS/itsImpParStudies.cxx
@@ -10,33 +10,32 @@
 // or submit itself to any jurisdiction.
 /// \author Samuele Cattaruzzi <samuele.cattaruzzi@cern.ch>
 
-#include <string>
-
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "ReconstructionDataFormats/DCA.h"
+#include "Common/Core/TrackSelection.h"
 #include "Common/Core/trackUtilities.h" // for propagation to primary vertex
-
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "CommonUtils/NameConf.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Common/Core/TrackSelection.h"
-#include "DetectorsVertexing/PVertexer.h"
-#include "ReconstructionDataFormats/Vertex.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "Framework/RunningWorkflowInfo.h"
 #include "CCDB/CcdbApi.h"
-#include "DataFormatsCalibration/MeanVertexObject.h"
 #include "CommonConstants/GeomConstants.h"
+#include "CommonUtils/NameConf.h"
+#include "DataFormatsCalibration/MeanVertexObject.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "DetectorsVertexing/PVertexer.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "ReconstructionDataFormats/DCA.h"
+#include "ReconstructionDataFormats/Vertex.h"
 
 #include "iostream"
-#include "vector"
 #include "set"
+#include "vector"
+#include <string>
 
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-1/DPG/Tasks/Monitor/MC/taskMcSimpleQC.cxx b/.conflict-side-1/DPG/Tasks/Monitor/MC/taskMcSimpleQC.cxx
index 5f285fcc2b4..cb773c8beb2 100644
--- a/.conflict-side-1/DPG/Tasks/Monitor/MC/taskMcSimpleQC.cxx
+++ b/.conflict-side-1/DPG/Tasks/Monitor/MC/taskMcSimpleQC.cxx
@@ -12,12 +12,13 @@
 /// \brief Simple QC task to run
 /// \author Fabrizio Grosa, fabrizio.grosa@cern.ch (CERN)
 
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::aod;
@@ -36,7 +37,7 @@ struct mcSimpleQc {
       {"histNumGlobalTracks", ";#it{N}_{global tracks};entries", {HistType::kTH1F, {{200, -0.5, 200.}}}},                               //
       {"histNumPvContributors", ";#it{N}_{PV contributors};entries", {HistType::kTH1F, {{200, -0.5, 200.}}}},                           //
       {"histFracAmbiguousTracks", ";#it{N}_{ambiguous tracks} / #it{N}_{tracks};entries", {HistType::kTH1F, {{100, 0., 1.}}}}           //
-    }                                                                                                                                   //
+    } //
   };
 
   using CollisionsWithMCLabels = soa::Join<aod::Collisions, aod::McCollisionLabels>;
@@ -84,4 +85,5 @@ struct mcSimpleQc {
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
   return WorkflowSpec{adaptAnalysisTask<mcSimpleQc>(cfgc)};
-}
\ No newline at end of file
+}
+ 
\ No newline at end of file
diff --git a/.conflict-side-1/DPG/Tasks/TOF/tofOfflineCalib.cxx b/.conflict-side-1/DPG/Tasks/TOF/tofOfflineCalib.cxx
index ccfea13f1b1..cae7f462dec 100644
--- a/.conflict-side-1/DPG/Tasks/TOF/tofOfflineCalib.cxx
+++ b/.conflict-side-1/DPG/Tasks/TOF/tofOfflineCalib.cxx
@@ -16,15 +16,16 @@
 /// \brief  Task to produce calibration objects for the TOF. Based on AO2D or TOF skimmed data
 ///
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "tofSkimsTableCreator.h"
+
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/FT0Corrected.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "tofSkimsTableCreator.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/DPG/Tasks/TOF/tofSkimsTableCreator.cxx b/.conflict-side-1/DPG/Tasks/TOF/tofSkimsTableCreator.cxx
index 1c2d1a79608..9b4ed496252 100644
--- a/.conflict-side-1/DPG/Tasks/TOF/tofSkimsTableCreator.cxx
+++ b/.conflict-side-1/DPG/Tasks/TOF/tofSkimsTableCreator.cxx
@@ -16,15 +16,16 @@
 /// \brief  Task to defined the skimmed data format for the TOF skims
 ///
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "tofSkimsTableCreator.h"
+
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/FT0Corrected.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "tofSkimsTableCreator.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/DPG/Tasks/TOF/tofSkimsTableCreator.h b/.conflict-side-1/DPG/Tasks/TOF/tofSkimsTableCreator.h
index 4f0ec48ed06..aa79ae4cdf5 100644
--- a/.conflict-side-1/DPG/Tasks/TOF/tofSkimsTableCreator.h
+++ b/.conflict-side-1/DPG/Tasks/TOF/tofSkimsTableCreator.h
@@ -19,9 +19,10 @@
 #ifndef DPG_TASKS_TOF_TOFSKIMSTABLECREATOR_H_
 #define DPG_TASKS_TOF_TOFSKIMSTABLECREATOR_H_
 
-#include "Common/TableProducer/PID/pidTOFBase.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/FT0Corrected.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/TableProducer/PID/pidTOFBase.h"
+
 #include "Framework/AnalysisDataModel.h"
 
 namespace o2::aod
diff --git a/.conflict-side-1/DPG/Tasks/TPC/tpcSkimsTableCreator.h b/.conflict-side-1/DPG/Tasks/TPC/tpcSkimsTableCreator.h
index decb3a9de60..583e38efd32 100644
--- a/.conflict-side-1/DPG/Tasks/TPC/tpcSkimsTableCreator.h
+++ b/.conflict-side-1/DPG/Tasks/TPC/tpcSkimsTableCreator.h
@@ -19,11 +19,12 @@
 #ifndef DPG_TASKS_TPC_TPCSKIMSTABLECREATOR_H_
 #define DPG_TASKS_TPC_TPCSKIMSTABLECREATOR_H_
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/PIDResponse.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+
 namespace o2::aod
 {
 namespace tpcskims
diff --git a/.conflict-side-1/DPG/Tasks/TPC/tpcTreeCreatorLight.cxx b/.conflict-side-1/DPG/Tasks/TPC/tpcTreeCreatorLight.cxx
index 807c85ba414..d17d850a9da 100644
--- a/.conflict-side-1/DPG/Tasks/TPC/tpcTreeCreatorLight.cxx
+++ b/.conflict-side-1/DPG/Tasks/TPC/tpcTreeCreatorLight.cxx
@@ -17,7 +17,9 @@
 /// \author Jeremy Wilkinson <jeremy.wilkinson@cern.ch>
 
 #include "tpcTreeCreatorLight.h"
+
 #include <CCDB/BasicCCDBManager.h>
+
 #include <cmath>
 /// ROOT
 #include "TRandom3.h"
@@ -27,10 +29,10 @@
 #include "Framework/runDataProcessing.h"
 /// O2Physics
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
 
 using namespace o2;
 using namespace o2::framework;
@@ -197,8 +199,8 @@ struct TreeWriterTPCTOF {
       }
 
     } /// Loop tracks
-  }   /// process
-};    /// struct TreeWriterTPCTOF
+  } /// process
+}; /// struct TreeWriterTPCTOF
 
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
diff --git a/.conflict-side-1/DPG/Tasks/TPC/tpcTreeCreatorLight.h b/.conflict-side-1/DPG/Tasks/TPC/tpcTreeCreatorLight.h
index df02c1de1ec..f8d806da5da 100644
--- a/.conflict-side-1/DPG/Tasks/TPC/tpcTreeCreatorLight.h
+++ b/.conflict-side-1/DPG/Tasks/TPC/tpcTreeCreatorLight.h
@@ -17,11 +17,12 @@
 #ifndef DPG_TASKS_TPC_TPCTREECREATORLIGHT_H_
 #define DPG_TASKS_TPC_TPCTREECREATORLIGHT_H_
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/PIDResponse.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+
 enum ParticleSpecies {
   kPionTrack = BIT(0),
   kKaonTrack = BIT(1),
diff --git a/.conflict-side-1/EventFiltering/PWGCF/CFFilter.cxx b/.conflict-side-1/EventFiltering/PWGCF/CFFilter.cxx
index 7219ba03d45..30dbfe6f071 100644
--- a/.conflict-side-1/EventFiltering/PWGCF/CFFilter.cxx
+++ b/.conflict-side-1/EventFiltering/PWGCF/CFFilter.cxx
@@ -14,27 +14,27 @@
 ///
 /// \author Laura Serksnyte, TU München, laura.serksnyte@cern.ch
 
-#include <string>
-
-#include "../filterTables.h"
 #include "../../PWGCF/FemtoDream/FemtoUtils.h"
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/HistogramRegistry.h"
+#include "../filterTables.h"
 
 #include "PWGCF/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoDream/FemtoDreamParticleHisto.h"
+#include "PWGCF/FemtoDream/FemtoDreamContainer.h"
+#include "PWGCF/FemtoDream/FemtoDreamDetaDphiStar.h"
 #include "PWGCF/FemtoDream/FemtoDreamMath.h"
 #include "PWGCF/FemtoDream/FemtoDreamPairCleaner.h"
-#include "PWGCF/FemtoDream/FemtoDreamDetaDphiStar.h"
-#include "PWGCF/FemtoDream/FemtoDreamContainer.h"
+#include "PWGCF/FemtoDream/FemtoDreamParticleHisto.h"
 
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+
+#include <string>
+
 namespace
 {
 
diff --git a/.conflict-side-1/EventFiltering/PWGCF/CFFilterAll.cxx b/.conflict-side-1/EventFiltering/PWGCF/CFFilterAll.cxx
index efc7625b215..512c6d48f32 100644
--- a/.conflict-side-1/EventFiltering/PWGCF/CFFilterAll.cxx
+++ b/.conflict-side-1/EventFiltering/PWGCF/CFFilterAll.cxx
@@ -14,36 +14,36 @@
 ///
 /// \author Laura Serksnyte, TU München, laura.serksnyte@cern.ch; Anton Riedel, TU München, anton.riedel@cern.ch; Maximilian Korwieser, TU Munich, maximilian.korwieser@cern.ch
 
-#include <string>
-#include <vector>
-
 #include "../filterTables.h"
 
-#include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "DetectorsBase/Propagator.h"
+#include "PWGLF/Utils/strangenessBuilderHelper.h"
 
-#include "fairlogger/Logger.h"
+#include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/PIDResponseITS.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/Core/RecoDecay.h"
 
+#include "CCDB/BasicCCDBManager.h"
+#include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DetectorsBase/Propagator.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/Configurable.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
 
-#include "PWGLF/Utils/strangenessBuilderHelper.h"
-
 #include "Math/GenVector/Boost.h"
 #include "Math/Vector4D.h"
 #include "TMath.h"
 
+#include "fairlogger/Logger.h"
+
+#include <string>
+#include <vector>
+
 using namespace o2;
 using namespace o2::aod;
 using namespace o2::framework;
diff --git a/.conflict-side-1/EventFiltering/PWGCF/CFFilterPPPhi.cxx b/.conflict-side-1/EventFiltering/PWGCF/CFFilterPPPhi.cxx
index 623b5cb9086..1c849a7707b 100644
--- a/.conflict-side-1/EventFiltering/PWGCF/CFFilterPPPhi.cxx
+++ b/.conflict-side-1/EventFiltering/PWGCF/CFFilterPPPhi.cxx
@@ -14,29 +14,32 @@
 ///
 /// \author Anton Riedel, TU München, anton.riedel@cern.ch
 
-#include <Math/GenVector/Boost.h>
-#include <Math/Vector4D.h>
-#include <TMath.h>
-#include <iostream>
-#include <iterator>
-#include <string>
-
 #include "../filterTables.h"
 
-#include "Framework/Configurable.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonConstants/MathConstants.h"
+#include "DataFormatsTPC/BetheBlochAleph.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/Configurable.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
+
+#include <Math/GenVector/Boost.h>
+#include <Math/Vector4D.h>
+#include <TMath.h>
+
 #include "fairlogger/Logger.h"
-#include "CommonConstants/MathConstants.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "DataFormatsTPC/BetheBlochAleph.h"
+
+#include <iostream>
+#include <iterator>
+#include <string>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/EventFiltering/PWGCF/CFFilterQA.cxx b/.conflict-side-1/EventFiltering/PWGCF/CFFilterQA.cxx
index 372b3387dc1..2108c7bc0d7 100644
--- a/.conflict-side-1/EventFiltering/PWGCF/CFFilterQA.cxx
+++ b/.conflict-side-1/EventFiltering/PWGCF/CFFilterQA.cxx
@@ -14,33 +14,36 @@
 ///
 /// \author Laura Serksnyte, TU München, laura.serksnyte@cern.ch; Anton Riedel, TU München, anton.riedel@cern.ch
 
-#include <Framework/Configurable.h>
-#include <Math/GenVector/Boost.h>
-#include <Math/Vector4D.h>
-#include <TMath.h>
-#include <cstdint>
-#include <iostream>
-#include <iterator>
-#include <string>
-
 #include "../filterTables.h"
 
-#include "Framework/ASoAHelpers.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
-#include "CommonConstants/MathConstants.h"
+#include "PWGCF/DataModel/FemtoDerived.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGCF/DataModel/FemtoDerived.h"
-#include "DataFormatsTPC/BetheBlochAleph.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
 #include "CCDB/CcdbApi.h"
+#include "CommonConstants/MathConstants.h"
+#include "DataFormatsTPC/BetheBlochAleph.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include <Framework/Configurable.h>
+
+#include <Math/GenVector/Boost.h>
+#include <Math/Vector4D.h>
+#include <TMath.h>
+
+#include <cstdint>
+#include <iostream>
+#include <iterator>
+#include <string>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/EventFiltering/PWGCF/CFFilterTwoN.cxx b/.conflict-side-1/EventFiltering/PWGCF/CFFilterTwoN.cxx
index 2d2b64a1088..03d14a4713e 100644
--- a/.conflict-side-1/EventFiltering/PWGCF/CFFilterTwoN.cxx
+++ b/.conflict-side-1/EventFiltering/PWGCF/CFFilterTwoN.cxx
@@ -14,29 +14,28 @@
 ///
 /// \author Anton Riedel, TU München, anton.riedel@cern.ch
 
-#include <Framework/Configurable.h>
-#include <TMath.h>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/HistogramRegistry.h"
-
-#include "../filterTables.h"
 #include "../../PWGCF/FemtoDream/FemtoUtils.h"
+#include "../filterTables.h"
 
 #include "PWGCF/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoDream/FemtoDreamParticleHisto.h"
-#include "PWGCF/FemtoDream/FemtoDreamPairCleaner.h"
 #include "PWGCF/FemtoDream/FemtoDreamContainer.h"
+#include "PWGCF/FemtoDream/FemtoDreamDetaDphiStar.h"
 #include "PWGCF/FemtoDream/FemtoDreamMath.h"
 #include "PWGCF/FemtoDream/FemtoDreamPairCleaner.h"
-#include "PWGCF/FemtoDream/FemtoDreamDetaDphiStar.h"
-#include "PWGCF/FemtoDream/FemtoDreamContainer.h"
+#include "PWGCF/FemtoDream/FemtoDreamParticleHisto.h"
 
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
+
 #include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include <Framework/Configurable.h>
+
+#include <TMath.h>
 
 #include <vector>
 
diff --git a/.conflict-side-1/EventFiltering/PWGEM/EMPhotonFilter.cxx b/.conflict-side-1/EventFiltering/PWGEM/EMPhotonFilter.cxx
index a254c7245a1..119e36daa69 100644
--- a/.conflict-side-1/EventFiltering/PWGEM/EMPhotonFilter.cxx
+++ b/.conflict-side-1/EventFiltering/PWGEM/EMPhotonFilter.cxx
@@ -12,16 +12,19 @@
 // \brief software trigger for EM photon
 // \author daiki.sekihata@cern.ch
 
-#include "Math/Vector4D.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/CaloClusters.h"
-#include "DataFormatsPHOS/TriggerRecord.h"
 #include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+
+#include "Common/DataModel/CaloClusters.h"
 #include "EventFiltering/filterTables.h"
+
+#include "DataFormatsPHOS/TriggerRecord.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+
+#include "Math/Vector4D.h"
 
 using namespace o2;
 using namespace o2::soa;
diff --git a/.conflict-side-1/EventFiltering/PWGEM/EMPhotonFilterQC.cxx b/.conflict-side-1/EventFiltering/PWGEM/EMPhotonFilterQC.cxx
index de4d59f00da..d03bcd50908 100644
--- a/.conflict-side-1/EventFiltering/PWGEM/EMPhotonFilterQC.cxx
+++ b/.conflict-side-1/EventFiltering/PWGEM/EMPhotonFilterQC.cxx
@@ -12,18 +12,21 @@
 // \brief Quick QC task for CEFP for EM photon
 // \author daiki.sekihata@cern.ch
 
-#include "Math/Vector4D.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/CaloClusters.h"
-#include "DataFormatsPHOS/TriggerRecord.h"
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
 #include "PWGEM/PhotonMeson/Core/CutsLibrary.h"
+#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+
+#include "Common/DataModel/CaloClusters.h"
 #include "EventFiltering/filterTables.h"
+
+#include "DataFormatsPHOS/TriggerRecord.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+
+#include "Math/Vector4D.h"
 
 using namespace o2;
 using namespace o2::soa;
diff --git a/.conflict-side-1/EventFiltering/PWGEM/HeavyNeutralMesonFilter.cxx b/.conflict-side-1/EventFiltering/PWGEM/HeavyNeutralMesonFilter.cxx
index 6909d1561ee..46f86de11f0 100644
--- a/.conflict-side-1/EventFiltering/PWGEM/HeavyNeutralMesonFilter.cxx
+++ b/.conflict-side-1/EventFiltering/PWGEM/HeavyNeutralMesonFilter.cxx
@@ -16,32 +16,34 @@
 /// \author Nicolas Strangmann (nicolas.strangmann@cern.ch) - Goethe University Frankfurt; Maximilian Korwieser (maximilian.korwieser@cern.ch) - Technical University Munich
 ///
 
-#include <vector>
-#include <iterator>
-#include <string>
-
-#include "Math/GenVector/Boost.h"
-#include "Math/Vector4D.h"
-#include "TMath.h"
-#include "TRandom3.h"
-
 #include "PWGEM/PhotonMeson/Utils/HNMUtilities.h"
 #include "PWGJE/DataModel/EMCALMatchedCollisions.h"
 
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/PIDResponseITS.h"
-#include "fairlogger/Logger.h"
-#include "Framework/Configurable.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonConstants/MathConstants.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/Configurable.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
-#include "CommonConstants/MathConstants.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
+
+#include "Math/GenVector/Boost.h"
+#include "Math/Vector4D.h"
+#include "TMath.h"
+#include "TRandom3.h"
+
+#include "fairlogger/Logger.h"
+
+#include <iterator>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/EventFiltering/PWGHF/HFFilterPrepareMLSamples.cxx b/.conflict-side-1/EventFiltering/PWGHF/HFFilterPrepareMLSamples.cxx
index b7a9637ba10..cfbcb6573da 100644
--- a/.conflict-side-1/EventFiltering/PWGHF/HFFilterPrepareMLSamples.cxx
+++ b/.conflict-side-1/EventFiltering/PWGHF/HFFilterPrepareMLSamples.cxx
@@ -28,8 +28,6 @@
 #include "Common/DataModel/PIDResponseTPC.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
-#include <onnxruntime_cxx_api.h>
-
 #include <CCDB/BasicCCDBManager.h>
 #include <CCDB/CcdbApi.h>
 #include <CommonConstants/PhysicsConstants.h>
@@ -46,6 +44,8 @@
 
 #include <TPDGCode.h>
 
+#include <onnxruntime_cxx_api.h>
+
 #include <Rtypes.h>
 
 #include <array>
diff --git a/.conflict-side-1/EventFiltering/PWGJE/fullJetFilter.cxx b/.conflict-side-1/EventFiltering/PWGJE/fullJetFilter.cxx
index 25096b7bb7a..d8d851fde88 100644
--- a/.conflict-side-1/EventFiltering/PWGJE/fullJetFilter.cxx
+++ b/.conflict-side-1/EventFiltering/PWGJE/fullJetFilter.cxx
@@ -12,35 +12,36 @@
 // Full Jet Filter
 // Author: Gijs van Weelden
 
-#include <array>
-#include <cmath>
-#include <string>
-#include <string_view>
-#include <TMath.h>
+#include "../filterTables.h"
 
-#include <boost/algorithm/string/case_conv.hpp>
+#include "PWGJE/Core/FastJetUtilities.h"
+#include "PWGJE/Core/JetFinder.h"
+#include "PWGJE/DataModel/EMCALClusters.h"
+#include "PWGJE/DataModel/Jet.h"
+
+#include "Common/CCDB/TriggerAliases.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
 #include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsCTP/Configuration.h"
 #include "EMCALBase/Geometry.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoA.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/CCDB/TriggerAliases.h"
+#include <TMath.h>
 
-#include "PWGJE/DataModel/Jet.h"
-#include "PWGJE/DataModel/EMCALClusters.h"
-#include "PWGJE/Core/JetFinder.h"
-#include "PWGJE/Core/FastJetUtilities.h"
+#include <boost/algorithm/string/case_conv.hpp>
 
-#include "../filterTables.h"
+#include <array>
+#include <cmath>
+#include <string>
+#include <string_view>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/EventFiltering/PWGJE/jetFilter.cxx b/.conflict-side-1/EventFiltering/PWGJE/jetFilter.cxx
index 277f749d22b..d147a4a6849 100644
--- a/.conflict-side-1/EventFiltering/PWGJE/jetFilter.cxx
+++ b/.conflict-side-1/EventFiltering/PWGJE/jetFilter.cxx
@@ -11,32 +11,32 @@
 
 // Author: Filip Krizek
 
-#include <TMath.h>
-#include <cmath>
-#include <string>
-#include <vector>
+#include "../filterTables.h"
 
-#include "Framework/ASoA.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "ReconstructionDataFormats/Track.h"
+#include "PWGJE/Core/FastJetUtilities.h"
+#include "PWGJE/Core/JetBkgSubUtils.h"
+#include "PWGJE/Core/JetFinder.h"
+#include "PWGJE/DataModel/EMCALClusters.h"
+#include "PWGJE/DataModel/Jet.h"
 
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
-#include "PWGJE/Core/JetFinder.h"
-#include "PWGJE/Core/FastJetUtilities.h"
-#include "PWGJE/Core/JetBkgSubUtils.h"
-#include "PWGJE/DataModel/EMCALClusters.h"
-#include "PWGJE/DataModel/Jet.h"
+#include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
-#include "../filterTables.h"
+#include <TMath.h>
 
-#include "Framework/HistogramRegistry.h"
+#include <cmath>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/EventFiltering/PWGJE/jetHFFilter.cxx b/.conflict-side-1/EventFiltering/PWGJE/jetHFFilter.cxx
index 6657e785751..61f627256c5 100644
--- a/.conflict-side-1/EventFiltering/PWGJE/jetHFFilter.cxx
+++ b/.conflict-side-1/EventFiltering/PWGJE/jetHFFilter.cxx
@@ -11,31 +11,31 @@
 
 // Author: Nima Zardoshti
 
-#include <TMath.h>
-#include <cmath>
-#include <string>
+#include "../filterTables.h"
 
-#include "Framework/ASoA.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "ReconstructionDataFormats/Track.h"
+#include "PWGJE/Core/FastJetUtilities.h"
+#include "PWGJE/Core/JetBkgSubUtils.h"
+#include "PWGJE/Core/JetFinder.h"
+#include "PWGJE/DataModel/EMCALClusters.h"
+#include "PWGJE/DataModel/Jet.h"
 
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
-#include "PWGJE/Core/JetFinder.h"
-#include "PWGJE/Core/FastJetUtilities.h"
-#include "PWGJE/Core/JetBkgSubUtils.h"
-#include "PWGJE/DataModel/EMCALClusters.h"
-#include "PWGJE/DataModel/Jet.h"
+#include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
-#include "../filterTables.h"
+#include <TMath.h>
 
-#include "Framework/HistogramRegistry.h"
+#include <cmath>
+#include <string>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/EventFiltering/PWGLF/filterdoublephi.cxx b/.conflict-side-1/EventFiltering/PWGLF/filterdoublephi.cxx
index 0ee9f34b535..5b92f2ff092 100644
--- a/.conflict-side-1/EventFiltering/PWGLF/filterdoublephi.cxx
+++ b/.conflict-side-1/EventFiltering/PWGLF/filterdoublephi.cxx
@@ -14,37 +14,41 @@
 ///
 /// \author Sourav Kundu, sourav.kundu@cern.ch
 
+#include "../filterTables.h"
+
+#include "PWGLF/DataModel/ReducedDoublePhiTables.h"
+
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/PIDResponseITS.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
+#include "CommonConstants/MathConstants.h"
+#include "DataFormatsTPC/BetheBlochAleph.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 #include <Framework/Configurable.h>
+
 #include <Math/GenVector/Boost.h>
 #include <Math/Vector4D.h>
+#include <TDatabasePDG.h> // FIXME
 #include <TMath.h>
+#include <TPDGCode.h> // FIXME
+
 #include <fairlogger/Logger.h>
-#include <TDatabasePDG.h> // FIXME
-#include <TPDGCode.h>     // FIXME
 
 #include <iostream>
 #include <iterator>
 #include <string>
 #include <vector>
 
-#include "../filterTables.h"
-#include "PWGLF/DataModel/ReducedDoublePhiTables.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
-#include "CommonConstants/MathConstants.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "DataFormatsTPC/BetheBlochAleph.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "CCDB/CcdbApi.h"
-#include "Common/DataModel/PIDResponseITS.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-1/EventFiltering/PWGLF/filterf1proton.cxx b/.conflict-side-1/EventFiltering/PWGLF/filterf1proton.cxx
index abdfe9c272a..4a679fc22b8 100644
--- a/.conflict-side-1/EventFiltering/PWGLF/filterf1proton.cxx
+++ b/.conflict-side-1/EventFiltering/PWGLF/filterf1proton.cxx
@@ -14,43 +14,48 @@
 ///
 /// \author Sourav Kundu, sourav.kundu@cern.ch
 
+#include "../filterTables.h"
+
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/Utils/strangenessBuilderHelper.h"
+
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
+#include "CommonConstants/MathConstants.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DataFormatsTPC/BetheBlochAleph.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+#include "ReconstructionDataFormats/TrackParametrization.h"
 #include <Framework/Configurable.h>
+
 #include <Math/GenVector/Boost.h>
 #include <Math/Vector4D.h>
 #include <TLorentzVector.h>
 #include <TMath.h>
+
 #include <fairlogger/Logger.h>
+
 #include <iostream>
 #include <iterator>
 #include <string>
 #include <vector>
 
-#include "DataFormatsParameters/GRPMagField.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "ReconstructionDataFormats/TrackParametrization.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "../filterTables.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
-#include "CommonConstants/MathConstants.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/Utils/strangenessBuilderHelper.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "DataFormatsTPC/BetheBlochAleph.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "CCDB/CcdbApi.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-1/EventFiltering/PWGLF/nucleiFilter.cxx b/.conflict-side-1/EventFiltering/PWGLF/nucleiFilter.cxx
index 54f3ed507ad..bd82fd3c2f8 100644
--- a/.conflict-side-1/EventFiltering/PWGLF/nucleiFilter.cxx
+++ b/.conflict-side-1/EventFiltering/PWGLF/nucleiFilter.cxx
@@ -10,37 +10,38 @@
 // or submit itself to any jurisdiction.
 // O2 includes
 
-#include <cmath>
-#include <string>
+#include "../filterTables.h"
 
-#include "Math/Vector4D.h"
-#include "Math/GenVector/Boost.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/DataModel/Vtx3BodyTables.h"
+#include "PWGLF/DataModel/pidTOFGeneric.h"
+
+#include "Common/Core/PID/PIDTOF.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DataFormatsTOF/ParameterContainers.h"
 #include "DataFormatsTPC/BetheBlochAleph.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
 
-#include "PWGLF/DataModel/Vtx3BodyTables.h"
-#include "../filterTables.h"
+#include "Math/GenVector/Boost.h"
+#include "Math/Vector4D.h"
 
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/trackUtilities.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "DataFormatsTOF/ParameterContainers.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "PWGLF/DataModel/pidTOFGeneric.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "Common/Core/PID/PIDTOF.h"
+#include <cmath>
+#include <string>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/EventFiltering/PWGLF/strangenessFilter.cxx b/.conflict-side-1/EventFiltering/PWGLF/strangenessFilter.cxx
index ceabf8eddfb..e54fb617c1a 100644
--- a/.conflict-side-1/EventFiltering/PWGLF/strangenessFilter.cxx
+++ b/.conflict-side-1/EventFiltering/PWGLF/strangenessFilter.cxx
@@ -14,32 +14,37 @@
 /// \author Francesca Ercolessi (francesca.ercolessi@cern.ch)
 /// \since June 1, 2021
 
-#include <cmath>
-#include "TVector3.h"
+#include "../filterTables.h"
+
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/Utils/strangenessBuilderHelper.h"
+
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "DCAFitter/DCAFitterN.h"
 #include "DataFormatsParameters/GRPMagField.h"
 #include "DataFormatsParameters/GRPObject.h"
-#include "DCAFitter/DCAFitterN.h"
 #include "DetectorsBase/Propagator.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
 #include "ReconstructionDataFormats/TrackParametrization.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "../filterTables.h"
-#include "PWGLF/Utils/strangenessBuilderHelper.h"
+
+#include "TVector3.h"
+
+#include <cmath>
 
 using namespace o2;
 using namespace o2::framework;
@@ -778,7 +783,7 @@ struct strangenessFilter {
     }
 
     for (auto& casc : cascadesBase) { // loop over cascades
-      hCandidate->Fill(0.5); // All candidates
+      hCandidate->Fill(0.5);          // All candidates
 
       const auto bachTrack = casc.bachelor_as<TrackCandidates>();
       const auto v0Dau = casc.v0_as<o2::aod::V0s>();
diff --git a/.conflict-side-1/EventFiltering/PWGUD/diffractionBCFilter.cxx b/.conflict-side-1/EventFiltering/PWGUD/diffractionBCFilter.cxx
index c6ce85ec845..d07fe3c0948 100644
--- a/.conflict-side-1/EventFiltering/PWGUD/diffractionBCFilter.cxx
+++ b/.conflict-side-1/EventFiltering/PWGUD/diffractionBCFilter.cxx
@@ -14,13 +14,15 @@
 // \author P. Buehler, paul.buehler@oeaw.ac.at
 // \since December, 2022
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "PWGUD/TableProducer/DGBCCandProducer.h"
+#include "../filterTables.h"
+
 #include "PWGUD/Core/DGCutparHolder.h"
 #include "PWGUD/Core/DGSelector.h"
 #include "PWGUD/Core/UDHelpers.h"
-#include "../filterTables.h"
+#include "PWGUD/TableProducer/DGBCCandProducer.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/EventFiltering/PWGUD/diffractionFilter.cxx b/.conflict-side-1/EventFiltering/PWGUD/diffractionFilter.cxx
index c5adfcf90c5..07bbf115535 100644
--- a/.conflict-side-1/EventFiltering/PWGUD/diffractionFilter.cxx
+++ b/.conflict-side-1/EventFiltering/PWGUD/diffractionFilter.cxx
@@ -14,14 +14,17 @@
 // \author P. Buehler, paul.buehler@oeaw.ac.at
 // \since June 1, 2021
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/StaticFor.h"
-#include "Common/DataModel/EventSelection.h"
+#include "../filterTables.h"
+
 #include "PWGUD/Core/DGCutparHolder.h"
 #include "PWGUD/Core/DGSelector.h"
 #include "PWGUD/Core/UDHelpers.h"
-#include "../filterTables.h"
+
+#include "Common/DataModel/EventSelection.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/EventFiltering/cefpTask.cxx b/.conflict-side-1/EventFiltering/cefpTask.cxx
index 64cf4435b85..584c8292903 100644
--- a/.conflict-side-1/EventFiltering/cefpTask.cxx
+++ b/.conflict-side-1/EventFiltering/cefpTask.cxx
@@ -10,6 +10,19 @@
 // or submit itself to any jurisdiction.
 // O2 includes
 
+#include "filterTables.h"
+
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonConstants/LHCConstants.h"
+#include "CommonDataFormat/InteractionRecord.h"
+#include "DataFormatsCTP/Scalers.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+
 #include <fmt/format.h>
 #include <rapidjson/document.h>
 #include <rapidjson/filereadstream.h>
@@ -18,21 +31,9 @@
 #include <random>
 #include <string>
 #include <string_view>
-#include <vector>
 #include <unordered_map>
 #include <utility>
-
-#include "filterTables.h"
-
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/HistogramRegistry.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "CommonConstants/LHCConstants.h"
-#include "CommonDataFormat/InteractionRecord.h"
-#include "DataFormatsCTP/Scalers.h"
+#include <vector>
 
 // we need to add workflow options before including Framework/runDataProcessing
 void customize(std::vector<o2::framework::ConfigParamSpec>& workflowOptions)
diff --git a/.conflict-side-1/EventFiltering/filterTables.h b/.conflict-side-1/EventFiltering/filterTables.h
index 1371d152e75..1ae7472fea6 100644
--- a/.conflict-side-1/EventFiltering/filterTables.h
+++ b/.conflict-side-1/EventFiltering/filterTables.h
@@ -12,10 +12,10 @@
 #define EVENTFILTERING_FILTERTABLES_H_
 
 #include <array>
-#include <unordered_map>
+#include <cstdint>
 #include <string>
+#include <unordered_map>
 #include <vector>
-#include <cstdint>
 
 namespace o2::aod
 {
diff --git a/.conflict-side-1/EventFiltering/macros/checkBCRange.C b/.conflict-side-1/EventFiltering/macros/checkBCRange.C
index 9bcc14981f4..76bdab016b0 100644
--- a/.conflict-side-1/EventFiltering/macros/checkBCRange.C
+++ b/.conflict-side-1/EventFiltering/macros/checkBCRange.C
@@ -10,12 +10,13 @@
 // or submit itself to any jurisdiction.
 // O2 includes
 
-#include <iostream>
+#include "CommonDataFormat/IRFrame.h"
+#include "CommonDataFormat/InteractionRecord.h"
+
 #include <TFile.h>
 #include <TTree.h>
 
-#include "CommonDataFormat/InteractionRecord.h"
-#include "CommonDataFormat/IRFrame.h"
+#include <iostream>
 
 using o2::InteractionRecord;
 using o2::dataformats::IRFrame;
diff --git a/.conflict-side-1/EventFiltering/macros/checkBCrangesSkimming.C b/.conflict-side-1/EventFiltering/macros/checkBCrangesSkimming.C
index f71212238c3..078aac59999 100644
--- a/.conflict-side-1/EventFiltering/macros/checkBCrangesSkimming.C
+++ b/.conflict-side-1/EventFiltering/macros/checkBCrangesSkimming.C
@@ -10,16 +10,18 @@
 // or submit itself to any jurisdiction.
 // O2 includes
 
-#include <cmath>
-#include <vector>
-#include <regex>
-#include <iostream>
+#include "CommonDataFormat/IRFrame.h"
+#include "CommonDataFormat/InteractionRecord.h"
+
 #include <TFile.h>
 #include <TGrid.h>
 #include <TH1.h>
 #include <TTree.h>
-#include "CommonDataFormat/InteractionRecord.h"
-#include "CommonDataFormat/IRFrame.h"
+
+#include <cmath>
+#include <iostream>
+#include <regex>
+#include <vector>
 
 using o2::InteractionRecord;
 using o2::dataformats::IRFrame;
diff --git a/.conflict-side-1/EventFiltering/macros/checkSkimming.C b/.conflict-side-1/EventFiltering/macros/checkSkimming.C
index 5496f303873..d7888dbd43e 100644
--- a/.conflict-side-1/EventFiltering/macros/checkSkimming.C
+++ b/.conflict-side-1/EventFiltering/macros/checkSkimming.C
@@ -10,15 +10,15 @@
 // or submit itself to any jurisdiction.
 
 #include <TCanvas.h>
-#include <TH1.h>
 #include <TFile.h>
+#include <TH1.h>
 #include <TStyle.h>
 
 #include <fstream>
 #include <iostream>
-#include <vector>
-#include <string>
 #include <regex>
+#include <string>
+#include <vector>
 
 void checkSkimming(std::string original_path = "AnalysisResults.root", std::string skimmed_path = "AnalysisResults_skimmed.root", TFile* outputFile = nullptr, bool skipDownscaled = true)
 {
@@ -129,4 +129,5 @@ void checkSkimming(std::string listName = "period.txt", bool skipDownscaled = tr
     counter++;
   }
   outputFile->Close();
-}
\ No newline at end of file
+}
+ 
\ No newline at end of file
diff --git a/.conflict-side-1/EventFiltering/macros/splitFile.C b/.conflict-side-1/EventFiltering/macros/splitFile.C
index b38149dca42..51da9f1aae7 100644
--- a/.conflict-side-1/EventFiltering/macros/splitFile.C
+++ b/.conflict-side-1/EventFiltering/macros/splitFile.C
@@ -10,12 +10,13 @@
 // or submit itself to any jurisdiction.
 // O2 includes
 
-#include <iostream>
-#include <string>
-#include "TFile.h"
 #include "TDirectory.h"
+#include "TFile.h"
 #include "TTree.h"
 
+#include <iostream>
+#include <string>
+
 void splitFile(const char* inputFileName = "bcSelection.root", const char* outputFileName1 = "bcRanges.root")
 {
   // Open the input ROOT file
diff --git a/.conflict-side-1/EventFiltering/macros/uploadOTSobjects.C b/.conflict-side-1/EventFiltering/macros/uploadOTSobjects.C
index 2a9be2de17e..0e950545aaf 100644
--- a/.conflict-side-1/EventFiltering/macros/uploadOTSobjects.C
+++ b/.conflict-side-1/EventFiltering/macros/uploadOTSobjects.C
@@ -10,13 +10,10 @@
 // or submit itself to any jurisdiction.
 //
 
-#include <fstream>
-#include <iostream>
-#include <vector>
-#include <string>
-#include <map>
-#include <array>
-#include <cmath>
+#include "EventFiltering/ZorroHelper.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonConstants/LHCConstants.h"
 
 #include "TFile.h"
 #include "TGrid.h"
@@ -25,9 +22,13 @@
 #include "TSystem.h"
 #include "TTree.h"
 
-#include "CCDB/BasicCCDBManager.h"
-#include "EventFiltering/ZorroHelper.h"
-#include "CommonConstants/LHCConstants.h"
+#include <array>
+#include <cmath>
+#include <fstream>
+#include <iostream>
+#include <map>
+#include <string>
+#include <vector>
 
 constexpr uint32_t chunkSize = 1000000;
 
diff --git a/.conflict-side-1/EventFiltering/selectBCRange.cxx b/.conflict-side-1/EventFiltering/selectBCRange.cxx
index 8a2d200e8e6..99261d38b4a 100644
--- a/.conflict-side-1/EventFiltering/selectBCRange.cxx
+++ b/.conflict-side-1/EventFiltering/selectBCRange.cxx
@@ -9,16 +9,17 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
+#include "filterTables.h"
+
 #include "Common/DataModel/EventSelection.h"
+
 #include "CommonConstants/LHCConstants.h"
-#include "CommonDataFormat/InteractionRecord.h"
 #include "CommonDataFormat/IRFrame.h"
+#include "CommonDataFormat/InteractionRecord.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/Logger.h"
 #include "Framework/runDataProcessing.h"
 
-#include "filterTables.h"
-
 using namespace o2;
 using namespace o2::framework;
 using o2::dataformats::IRFrame;
diff --git a/.conflict-side-1/PWGCF/Core/AnalysisConfigurableCuts.h b/.conflict-side-1/PWGCF/Core/AnalysisConfigurableCuts.h
index 886d78c95fe..65288471902 100644
--- a/.conflict-side-1/PWGCF/Core/AnalysisConfigurableCuts.h
+++ b/.conflict-side-1/PWGCF/Core/AnalysisConfigurableCuts.h
@@ -11,12 +11,14 @@
 #ifndef PWGCF_CORE_ANALYSISCONFIGURABLECUTS_H_
 #define PWGCF_CORE_ANALYSISCONFIGURABLECUTS_H_
 
+#include <TMath.h>
+#include <TNamed.h>
+#include <TObject.h>
+
+#include <Rtypes.h>
+
 #include <string>
 #include <vector>
-#include <Rtypes.h>
-#include <TObject.h>
-#include <TNamed.h>
-#include <TMath.h>
 
 namespace o2
 {
diff --git a/.conflict-side-1/PWGCF/Core/CorrelationContainer.cxx b/.conflict-side-1/PWGCF/Core/CorrelationContainer.cxx
index 1421288bd18..9ef399d2acb 100644
--- a/.conflict-side-1/PWGCF/Core/CorrelationContainer.cxx
+++ b/.conflict-side-1/PWGCF/Core/CorrelationContainer.cxx
@@ -15,20 +15,22 @@
 // Author: Jan Fiete Grosse-Oetringhaus
 
 #include "PWGCF/Core/CorrelationContainer.h"
-#include "Framework/StepTHn.h"
+
+#include "CommonConstants/MathConstants.h"
+#include "Framework/HistogramSpec.h"
 #include "Framework/Logger.h"
-#include "THnSparse.h"
-#include "TMath.h"
-#include "TList.h"
+#include "Framework/StepTHn.h"
+
+#include "TCanvas.h"
 #include "TCollection.h"
+#include "TF1.h"
 #include "TH1D.h"
 #include "TH2D.h"
 #include "TH3D.h"
-#include "TCanvas.h"
-#include "TF1.h"
 #include "THn.h"
-#include "Framework/HistogramSpec.h"
-#include "CommonConstants/MathConstants.h"
+#include "THnSparse.h"
+#include "TList.h"
+#include "TMath.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGCF/Core/CorrelationContainer.h b/.conflict-side-1/PWGCF/Core/CorrelationContainer.h
index b037b7d7ad4..7d30c042de0 100644
--- a/.conflict-side-1/PWGCF/Core/CorrelationContainer.h
+++ b/.conflict-side-1/PWGCF/Core/CorrelationContainer.h
@@ -14,9 +14,10 @@
 
 // encapsulate histogram and corrections for correlation analysis
 
+#include "Framework/HistogramSpec.h"
+
 #include "TNamed.h"
 #include "TString.h"
-#include "Framework/HistogramSpec.h"
 
 class TH1;
 class TH1F;
diff --git a/.conflict-side-1/PWGCF/Core/PairCuts.h b/.conflict-side-1/PWGCF/Core/PairCuts.h
index b90094f30e2..a65647f1d65 100644
--- a/.conflict-side-1/PWGCF/Core/PairCuts.h
+++ b/.conflict-side-1/PWGCF/Core/PairCuts.h
@@ -12,11 +12,11 @@
 #ifndef O2_ANALYSIS_PAIRCUTS_H
 #define O2_ANALYSIS_PAIRCUTS_H
 
-#include <cmath>
-
-#include "Framework/Logger.h"
-#include "Framework/HistogramRegistry.h"
 #include "CommonConstants/MathConstants.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/Logger.h"
+
+#include <cmath>
 
 // Functions which cut on particle pairs (decays, conversions, two-track cuts)
 //
@@ -147,7 +147,7 @@ bool PairCuts::twoTrackCut(T const& track1, T const& track2, int magField)
       }
 
       if (dphistarminabs < mTwoTrackDistance && std::fabs(deta) < mTwoTrackDistance) {
-        //LOGF(debug, "Removed track pair %ld %ld with %f %f %f %f %d %f %f %d %d", track1.index(), track2.index(), deta, dphistarminabs, track1.phi2(), track1.pt(), track1.sign(), track2.phi2(), track2.pt(), track2.sign(), magField);
+        // LOGF(debug, "Removed track pair %ld %ld with %f %f %f %f %d %f %f %d %d", track1.index(), track2.index(), deta, dphistarminabs, track1.phi2(), track1.pt(), track1.sign(), track2.phi2(), track2.pt(), track2.sign(), magField);
         return true;
       }
 
@@ -163,7 +163,7 @@ bool PairCuts::twoTrackCut(T const& track1, T const& track2, int magField)
 template <typename T>
 bool PairCuts::conversionCut(T const& track1, T const& track2, Particle conv, double cut)
 {
-  //LOGF(info, "pt is %f %f", track1.pt(), track2.pt());
+  // LOGF(info, "pt is %f %f", track1.pt(), track2.pt());
 
   if (cut < 0) {
     return false;
@@ -304,7 +304,7 @@ double PairCuts::getInvMassSquaredFast(T const& track1, double m0_1, T const& tr
 
   double mass2 = m0_1 * m0_1 + m0_2 * m0_2 + 2.0f * (std::sqrt(e1squ * e2squ) - (pt1 * pt2 * (cosDeltaPhi + 1.0f / tantheta1 / tantheta2)));
 
-  //LOGF(debug, "%f %f %f %f %f %f %f %f %f", pt1, eta1, phi1, pt2, eta2, phi2, m0_1, m0_2, mass2);
+  // LOGF(debug, "%f %f %f %f %f %f %f %f %f", pt1, eta1, phi1, pt2, eta2, phi2, m0_1, m0_2, mass2);
 
   return mass2;
 }
diff --git a/.conflict-side-1/PWGCF/DataModel/FemtoDerived.h b/.conflict-side-1/PWGCF/DataModel/FemtoDerived.h
index 4caf0166303..7e916d543ff 100644
--- a/.conflict-side-1/PWGCF/DataModel/FemtoDerived.h
+++ b/.conflict-side-1/PWGCF/DataModel/FemtoDerived.h
@@ -12,18 +12,21 @@
 #ifndef PWGCF_DATAMODEL_FEMTODERIVED_H_
 #define PWGCF_DATAMODEL_FEMTODERIVED_H_
 
-#include <cmath>
-#include "Framework/ASoA.h"
-#include "MathUtils/Utils.h"
-#include "Framework/DataTypes.h"
 #include "PWGHF/Core/HfHelper.h"
 #include "PWGHF/DataModel/CandidateReconstructionTables.h"
 #include "PWGHF/DataModel/CandidateSelectionTables.h"
+
 #include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoA.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/DataTypes.h"
 #include "Framework/Expressions.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
+#include "MathUtils/Utils.h"
+
+#include <cmath>
 
 namespace o2::aod
 {
diff --git a/.conflict-side-1/PWGCF/DataModel/SPTableZDC.h b/.conflict-side-1/PWGCF/DataModel/SPTableZDC.h
index fcafff23c90..19896dd0c32 100644
--- a/.conflict-side-1/PWGCF/DataModel/SPTableZDC.h
+++ b/.conflict-side-1/PWGCF/DataModel/SPTableZDC.h
@@ -14,13 +14,14 @@
 #ifndef PWGCF_DATAMODEL_SPTABLEZDC_H_
 #define PWGCF_DATAMODEL_SPTABLEZDC_H_
 
-#include <cmath>
-
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/Core/RecoDecay.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/AnalysisDataModel.h"
 
+#include <cmath>
+
 namespace o2::aod
 {
 namespace sptablezdc
diff --git a/.conflict-side-1/PWGCF/EbyEFluctuations/Tasks/Diff_pT_fluct_PID.cxx b/.conflict-side-1/PWGCF/EbyEFluctuations/Tasks/Diff_pT_fluct_PID.cxx
index 5710ab1e864..16afcb3219e 100644
--- a/.conflict-side-1/PWGCF/EbyEFluctuations/Tasks/Diff_pT_fluct_PID.cxx
+++ b/.conflict-side-1/PWGCF/EbyEFluctuations/Tasks/Diff_pT_fluct_PID.cxx
@@ -13,37 +13,37 @@
 ///           v0(pT) along with its statistical uncertainity using subsampling technique.
 /// \author Anna Binoy (anna.binoy@niser.ac.in)
 
-#include <CCDB/BasicCCDBManager.h>
-#include <algorithm>
-#include <numeric>
-#include <cmath>
-#include <vector>
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/HistogramSpec.h"
+#include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StaticFor.h"
-
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
+#include "Framework/runDataProcessing.h"
+#include <CCDB/BasicCCDBManager.h>
 
 #include "TDatabasePDG.h"
-#include "TLorentzVector.h"
+#include "TF1.h"
+#include "TH1D.h"
+#include "TH2D.h"
 #include "TList.h"
+#include "TLorentzVector.h"
+#include "TMath.h"
 #include "TProfile.h"
 #include "TProfile2D.h"
-#include "TH2D.h"
-#include "TH1D.h"
 #include "TRandom3.h"
-#include "TMath.h"
-#include "TF1.h"
+
+#include <algorithm>
+#include <cmath>
+#include <numeric>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGCF/EbyEFluctuations/Tasks/FactorialMomentsTask.cxx b/.conflict-side-1/PWGCF/EbyEFluctuations/Tasks/FactorialMomentsTask.cxx
index c76556ec26f..4c905ede9ed 100644
--- a/.conflict-side-1/PWGCF/EbyEFluctuations/Tasks/FactorialMomentsTask.cxx
+++ b/.conflict-side-1/PWGCF/EbyEFluctuations/Tasks/FactorialMomentsTask.cxx
@@ -13,22 +13,24 @@
 /// \author Salman Malik
 /// \author Balwan Singh
 
-#include <iostream>
-#include <array>
-#include <TH1F.h>
 #include "TRandom.h"
+#include <TH1F.h>
+
+#include <array>
+#include <iostream>
 // O2 includes
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "ReconstructionDataFormats/GlobalTrackID.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "Framework/ASoAHelpers.h"
 using std::array;
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGCF/EbyEFluctuations/Tasks/NetProtonCumulants.cxx b/.conflict-side-1/PWGCF/EbyEFluctuations/Tasks/NetProtonCumulants.cxx
index a18b0b97df9..79ea94ab5ad 100644
--- a/.conflict-side-1/PWGCF/EbyEFluctuations/Tasks/NetProtonCumulants.cxx
+++ b/.conflict-side-1/PWGCF/EbyEFluctuations/Tasks/NetProtonCumulants.cxx
@@ -9,26 +9,27 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <CCDB/BasicCCDBManager.h>
-#include <cmath>
-#include <vector>
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/HistogramRegistry.h"
-
-#include "Common/DataModel/EventSelection.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include <CCDB/BasicCCDBManager.h>
 
 #include "TList.h"
+#include "TMath.h"
 #include "TProfile.h"
 #include "TProfile2D.h"
 #include "TRandom3.h"
-#include "TMath.h"
+
+#include <cmath>
+#include <vector>
 
 namespace o2::aod
 {
diff --git a/.conflict-side-1/PWGCF/EbyEFluctuations/Tasks/RobustFluctuationObservables.cxx b/.conflict-side-1/PWGCF/EbyEFluctuations/Tasks/RobustFluctuationObservables.cxx
index f4d50ac9c7a..2db80cf4351 100644
--- a/.conflict-side-1/PWGCF/EbyEFluctuations/Tasks/RobustFluctuationObservables.cxx
+++ b/.conflict-side-1/PWGCF/EbyEFluctuations/Tasks/RobustFluctuationObservables.cxx
@@ -12,35 +12,34 @@
 /// \brief This task is a QA task to accumulate basic event- and track-level plots.
 /// \author Igor Altsybeev, Igor.Altsybeev@cern.ch
 
-#include <iostream>
-#include <string>
-#include <memory>
-#include <vector>
-#include <map>
-
-#include "TF1.h"
-#include "TGraphErrors.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
+#include "Common/CCDB/EventSelectionParams.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/FT0Corrected.h"
 #include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/CCDB/EventSelectionParams.h"
 
 #include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPObject.h"
+#include "DataFormatsFT0/Digit.h"
 #include "DataFormatsParameters/GRPECSObject.h"
 #include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
-#include "Common/DataModel/FT0Corrected.h"
-#include "DataFormatsFT0/Digit.h"
+#include "TF1.h"
+#include "TGraphErrors.h"
 
-#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include <iostream>
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
 
 using namespace std;
 using namespace o2;
@@ -2293,8 +2292,8 @@ struct RobustFluctuationObservables {
         }
 
       } // end of v0 loop
-    }   // end of if (flagIncludeQAHistK0S)
-  }     // end of processRobustFluctuationObservables()
+    } // end of if (flagIncludeQAHistK0S)
+  } // end of processRobustFluctuationObservables()
 
   // shortcut function to fill 2D histograms
   void fillHistForThisCut(string cutName, int multNTracksPV, int multTrk, int nTracksGlobalAccepted, double multT0A, double multT0C, double multV0A, double /*t0cCentr*/, int bc)
diff --git a/.conflict-side-1/PWGCF/EbyEFluctuations/Tasks/antiprotonCumulantsMc.cxx b/.conflict-side-1/PWGCF/EbyEFluctuations/Tasks/antiprotonCumulantsMc.cxx
index f0398450cae..3da35749d11 100644
--- a/.conflict-side-1/PWGCF/EbyEFluctuations/Tasks/antiprotonCumulantsMc.cxx
+++ b/.conflict-side-1/PWGCF/EbyEFluctuations/Tasks/antiprotonCumulantsMc.cxx
@@ -13,48 +13,49 @@
 /// \brief Task for analyzing efficiency of proton, and net-proton distributions in MC reconstructed and generated, and calculating net-proton cumulants
 /// \author Swati Saha
 
-#include <CCDB/BasicCCDBManager.h>
-#include <cstdlib>
-#include <cmath>
-#include <array>
-#include <vector>
-#include <string>
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/StepTHn.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/PIDResponseITS.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CommonConstants/PhysicsConstants.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "DataFormatsParameters/GRPObject.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include <TList.h>
-#include <TProfile.h>
-#include <TProfile2D.h>
-#include <TRandom3.h>
-#include <TMath.h>
-#include <TH1F.h>
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+#include <CCDB/BasicCCDBManager.h>
+
 #include <TDirectory.h>
+#include <TF1.h>
+#include <TFile.h>
+#include <TH1F.h>
+#include <TH2F.h>
 #include <THn.h>
+#include <TList.h>
 #include <TLorentzVector.h>
 #include <TMath.h>
 #include <TObjArray.h>
-#include <TFile.h>
-#include <TH2F.h>
-#include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <TF1.h>
+#include <TProfile.h>
+#include <TProfile2D.h>
+#include <TRandom3.h>
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGCF/EbyEFluctuations/Tasks/kaonIsospinFluctuations.cxx b/.conflict-side-1/PWGCF/EbyEFluctuations/Tasks/kaonIsospinFluctuations.cxx
index 4170d078843..7284bbc329b 100644
--- a/.conflict-side-1/PWGCF/EbyEFluctuations/Tasks/kaonIsospinFluctuations.cxx
+++ b/.conflict-side-1/PWGCF/EbyEFluctuations/Tasks/kaonIsospinFluctuations.cxx
@@ -14,22 +14,21 @@
 ///
 /// \author Rahul Verma (rahul.verma@iitb.ac.in) :: Sadhana Dash (sadhana@phy.iitb.ac.in)
 
-#include <algorithm>
-#include <vector>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/O2DatabasePDGPlugin.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/DataModel/mcCentrality.h"
 
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 
-#include "PWGLF/DataModel/mcCentrality.h"
+#include <algorithm>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGCF/EbyEFluctuations/Tasks/meanPtFlucId.cxx b/.conflict-side-1/PWGCF/EbyEFluctuations/Tasks/meanPtFlucId.cxx
index d6eca57ad0e..e010e737227 100644
--- a/.conflict-side-1/PWGCF/EbyEFluctuations/Tasks/meanPtFlucId.cxx
+++ b/.conflict-side-1/PWGCF/EbyEFluctuations/Tasks/meanPtFlucId.cxx
@@ -16,26 +16,27 @@
 ///
 /// \author Tanu Gahlaut <tanu.gahlaut@cern.ch>
 
-#include <utility>
-#include <vector>
-#include <string>
-#include <TPDGCode.h>
+#include "Common/Core/RecoDecay.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "CCDB/BasicCCDBManager.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/HistogramSpec.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/Core/RecoDecay.h"
-#include "CCDB/BasicCCDBManager.h"
+#include <TPDGCode.h>
+
+#include <string>
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGCF/EbyEFluctuations/Tasks/nchCumulantsId.cxx b/.conflict-side-1/PWGCF/EbyEFluctuations/Tasks/nchCumulantsId.cxx
index 2d4ba400285..acd5185be1b 100644
--- a/.conflict-side-1/PWGCF/EbyEFluctuations/Tasks/nchCumulantsId.cxx
+++ b/.conflict-side-1/PWGCF/EbyEFluctuations/Tasks/nchCumulantsId.cxx
@@ -13,8 +13,11 @@
 /// \brief Event by Event conserved charges fluctuations
 /// \author Pravata Panigrahi <pravata.panigrahi@cern.ch> :: Sadhana Dash(sadhana@phy.iitb.ac.in)
 
-#include <algorithm>
-#include <vector>
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
@@ -24,11 +27,8 @@
 #include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/runDataProcessing.h"
 
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include <algorithm>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGCF/EbyEFluctuations/Tasks/netprotonCumulantsMc.cxx b/.conflict-side-1/PWGCF/EbyEFluctuations/Tasks/netprotonCumulantsMc.cxx
index 36a797a17a9..62318743462 100644
--- a/.conflict-side-1/PWGCF/EbyEFluctuations/Tasks/netprotonCumulantsMc.cxx
+++ b/.conflict-side-1/PWGCF/EbyEFluctuations/Tasks/netprotonCumulantsMc.cxx
@@ -13,48 +13,49 @@
 /// \brief Task for analyzing efficiency of proton, and net-proton distributions in MC reconstructed and generated, and calculating net-proton cumulants
 /// \author Swati Saha
 
-#include <CCDB/BasicCCDBManager.h>
-#include <cstdlib>
-#include <cmath>
-#include <array>
-#include <vector>
-#include <string>
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/StepTHn.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/PIDResponseITS.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CommonConstants/PhysicsConstants.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "DataFormatsParameters/GRPObject.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include <TList.h>
-#include <TProfile.h>
-#include <TProfile2D.h>
-#include <TRandom3.h>
-#include <TMath.h>
-#include <TH1F.h>
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+#include <CCDB/BasicCCDBManager.h>
+
 #include <TDirectory.h>
+#include <TF1.h>
+#include <TFile.h>
+#include <TH1F.h>
+#include <TH2F.h>
 #include <THn.h>
+#include <TList.h>
 #include <TLorentzVector.h>
 #include <TMath.h>
 #include <TObjArray.h>
-#include <TFile.h>
-#include <TH2F.h>
-#include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <TF1.h>
+#include <TProfile.h>
+#include <TProfile2D.h>
+#include <TRandom3.h>
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGCF/Femto/DataModel/PionDeuteronTables.h b/.conflict-side-1/PWGCF/Femto/DataModel/PionDeuteronTables.h
index 89754a8cc97..89fc4cdfa8f 100644
--- a/.conflict-side-1/PWGCF/Femto/DataModel/PionDeuteronTables.h
+++ b/.conflict-side-1/PWGCF/Femto/DataModel/PionDeuteronTables.h
@@ -15,8 +15,8 @@
 /// \author CMY
 /// \date 2025-04-10
 
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
 
 #ifndef PWGCF_FEMTO_DATAMODEL_PIONDEUTERONTABLES_H_
 #define PWGCF_FEMTO_DATAMODEL_PIONDEUTERONTABLES_H_
diff --git a/.conflict-side-1/PWGCF/Femto3D/Core/femto3dPairTask.h b/.conflict-side-1/PWGCF/Femto3D/Core/femto3dPairTask.h
index db5949f4ae0..12638089841 100755
--- a/.conflict-side-1/PWGCF/Femto3D/Core/femto3dPairTask.h
+++ b/.conflict-side-1/PWGCF/Femto3D/Core/femto3dPairTask.h
@@ -24,14 +24,15 @@
 // #include "Framework/Logger.h"
 // #include "Common/DataModel/Multiplicity.h"
 
-#include <vector>
-#include <memory>
+#include "CommonConstants/MathConstants.h"
+#include "CommonConstants/PhysicsConstants.h"
+
+#include "TDatabasePDG.h"
 #include "TLorentzVector.h"
 #include "TVector3.h"
-#include "TDatabasePDG.h"
 
-#include "CommonConstants/PhysicsConstants.h"
-#include "CommonConstants/MathConstants.h"
+#include <memory>
+#include <vector>
 
 double particle_mass(const int PDGcode)
 {
diff --git a/.conflict-side-1/PWGCF/Femto3D/DataModel/PIDutils.h b/.conflict-side-1/PWGCF/Femto3D/DataModel/PIDutils.h
index 9e28f7b5863..2c2eda3e2ce 100644
--- a/.conflict-side-1/PWGCF/Femto3D/DataModel/PIDutils.h
+++ b/.conflict-side-1/PWGCF/Femto3D/DataModel/PIDutils.h
@@ -19,10 +19,11 @@
 #ifndef PWGCF_FEMTO3D_DATAMODEL_PIDUTILS_H_
 #define PWGCF_FEMTO3D_DATAMODEL_PIDUTILS_H_
 
+#include "Common/DataModel/PIDResponse.h"
+
 #include <type_traits>
 #include <utility>
 #include <vector>
-#include "Common/DataModel/PIDResponse.h"
 
 namespace o2::aod::singletrackselector
 {
diff --git a/.conflict-side-1/PWGCF/Femto3D/DataModel/singletrackselector.h b/.conflict-side-1/PWGCF/Femto3D/DataModel/singletrackselector.h
index c7323d15a32..2156db8bf2e 100644
--- a/.conflict-side-1/PWGCF/Femto3D/DataModel/singletrackselector.h
+++ b/.conflict-side-1/PWGCF/Femto3D/DataModel/singletrackselector.h
@@ -17,16 +17,18 @@
 #define PWGCF_FEMTO3D_DATAMODEL_SINGLETRACKSELECTOR_H_
 
 // #include <experimental/type_traits>
-#include <utility>
-#include <vector>
+#include "PWGCF/Femto3D/DataModel/PIDutils.h"
 
-#include "Framework/ASoA.h"
-#include "Framework/AnalysisDataModel.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/PIDResponseITS.h"
+
+#include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
 #include "Framework/Logger.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "PWGCF/Femto3D/DataModel/PIDutils.h"
+
+#include <utility>
+#include <vector>
 
 namespace o2::aod
 {
diff --git a/.conflict-side-1/PWGCF/Femto3D/TableProducer/Converters/singleTrackSelectorConverter.cxx b/.conflict-side-1/PWGCF/Femto3D/TableProducer/Converters/singleTrackSelectorConverter.cxx
index 4a44e331e9b..5ca57c11369 100644
--- a/.conflict-side-1/PWGCF/Femto3D/TableProducer/Converters/singleTrackSelectorConverter.cxx
+++ b/.conflict-side-1/PWGCF/Femto3D/TableProducer/Converters/singleTrackSelectorConverter.cxx
@@ -13,11 +13,13 @@
 /// \author Sofia Tomassini, Gleb Romanenko, Nicolò Jacazio
 /// \since 03 May 2024
 
-#include <fairlogger/Logger.h>
 #include "PWGCF/Femto3D/DataModel/singletrackselector.h"
+
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
 
+#include <fairlogger/Logger.h>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-1/PWGCF/Femto3D/TableProducer/Converters/singleTrackSelectorConverterV1.cxx b/.conflict-side-1/PWGCF/Femto3D/TableProducer/Converters/singleTrackSelectorConverterV1.cxx
index 584760ce74a..a664b83e39d 100644
--- a/.conflict-side-1/PWGCF/Femto3D/TableProducer/Converters/singleTrackSelectorConverterV1.cxx
+++ b/.conflict-side-1/PWGCF/Femto3D/TableProducer/Converters/singleTrackSelectorConverterV1.cxx
@@ -13,11 +13,13 @@
 /// \author Sofia Tomassini, Gleb Romanenko, Nicolò Jacazio
 /// \since 03 May 2024
 
-#include <fairlogger/Logger.h>
 #include "PWGCF/Femto3D/DataModel/singletrackselector.h"
+
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
 
+#include <fairlogger/Logger.h>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-1/PWGCF/Femto3D/TableProducer/singleTrackSelector.cxx b/.conflict-side-1/PWGCF/Femto3D/TableProducer/singleTrackSelector.cxx
index 729538a1470..188aedb2077 100644
--- a/.conflict-side-1/PWGCF/Femto3D/TableProducer/singleTrackSelector.cxx
+++ b/.conflict-side-1/PWGCF/Femto3D/TableProducer/singleTrackSelector.cxx
@@ -13,32 +13,31 @@
 /// \author Sofia Tomassini, Gleb Romanenko, Nicolò Jacazio
 /// \since 31 May 2023
 
-#include <fairlogger/Logger.h>
-#include <Framework/AnalysisDataModel.h>
-
-#include <vector>
-#include <string>
-#include <utility>
+#include "PWGCF/Femto3D/DataModel/singletrackselector.h"
 
+#include "Common/CCDB/ctpRateFetcher.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/PIDResponseITS.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 #include "EventFiltering/Zorro.h"
 #include "EventFiltering/ZorroSummary.h"
 
-#include "PWGCF/Femto3D/DataModel/singletrackselector.h"
-
+#include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/Propagator.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/PIDResponseITS.h"
-#include "Common/CCDB/ctpRateFetcher.h"
+#include <Framework/AnalysisDataModel.h>
 
-#include "DetectorsBase/Propagator.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
+#include <fairlogger/Logger.h>
+
+#include <string>
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGCF/Femto3D/TableProducer/singleTrackSelectorExtra.cxx b/.conflict-side-1/PWGCF/Femto3D/TableProducer/singleTrackSelectorExtra.cxx
index 0f065371ca8..6387eb2b450 100644
--- a/.conflict-side-1/PWGCF/Femto3D/TableProducer/singleTrackSelectorExtra.cxx
+++ b/.conflict-side-1/PWGCF/Femto3D/TableProducer/singleTrackSelectorExtra.cxx
@@ -15,13 +15,13 @@
 
 // this task produces a dummy "SingleCollExtras" table that is now required in the analysis tasks. Needed to have a compatibility with old der. data
 
-#include <fairlogger/Logger.h>
-#include <Framework/AnalysisDataModel.h>
-
 #include "PWGCF/Femto3D/DataModel/singletrackselector.h"
 
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
+#include <Framework/AnalysisDataModel.h>
+
+#include <fairlogger/Logger.h>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGCF/Femto3D/TableProducer/singleTrackSelectorPIDMaker.cxx b/.conflict-side-1/PWGCF/Femto3D/TableProducer/singleTrackSelectorPIDMaker.cxx
index ebdc786469b..3bb5e025d7d 100644
--- a/.conflict-side-1/PWGCF/Femto3D/TableProducer/singleTrackSelectorPIDMaker.cxx
+++ b/.conflict-side-1/PWGCF/Femto3D/TableProducer/singleTrackSelectorPIDMaker.cxx
@@ -14,17 +14,17 @@
 /// \author Sofia Tomassini, Gleb Romanenko, Nicolò Jacazio
 /// \since 22 January 2025
 
-#include <fairlogger/Logger.h>
-#include <Framework/AnalysisDataModel.h>
-
-#include <vector>
-#include <string>
-#include <unordered_map>
-
 #include "PWGCF/Femto3D/DataModel/singletrackselector.h"
 
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
+#include <Framework/AnalysisDataModel.h>
+
+#include <fairlogger/Logger.h>
+
+#include <string>
+#include <unordered_map>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGCF/Femto3D/Tasks/femto3dPairTask.cxx b/.conflict-side-1/PWGCF/Femto3D/Tasks/femto3dPairTask.cxx
index 83aa740795c..bf02d11da69 100644
--- a/.conflict-side-1/PWGCF/Femto3D/Tasks/femto3dPairTask.cxx
+++ b/.conflict-side-1/PWGCF/Femto3D/Tasks/femto3dPairTask.cxx
@@ -13,31 +13,34 @@
 /// \author Sofia Tomassini, Gleb Romanenko, Nicolò Jacazio
 /// \since 31 May 2023
 
-#include <ctime>
-#include <algorithm> // std::random_shuffle
-#include <random>
-#include <chrono>
-#include <vector>
-#include <map>
-#include <memory>
-#include <utility>
-#include <TParameter.h>
-#include <TH1F.h>
-
 #include "PWGCF/Femto3D/Core/femto3dPairTask.h"
+
 #include "PWGCF/Femto3D/DataModel/singletrackselector.h"
-#include "TLorentzVector.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
+#include "Common/DataModel/Multiplicity.h"
+
 #include "Framework/ASoA.h"
-#include "Framework/DataTypes.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/DataTypes.h"
 #include "Framework/Expressions.h"
+#include "Framework/HistogramRegistry.h"
 #include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
 #include "MathUtils/Utils.h"
-#include "Common/DataModel/Multiplicity.h"
+
+#include "TLorentzVector.h"
+#include <TH1F.h>
+#include <TParameter.h>
+
+#include <algorithm> // std::random_shuffle
+#include <chrono>
+#include <ctime>
+#include <map>
+#include <memory>
+#include <random>
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::soa;
diff --git a/.conflict-side-1/PWGCF/Femto3D/Tasks/femto3dPairTaskMC.cxx b/.conflict-side-1/PWGCF/Femto3D/Tasks/femto3dPairTaskMC.cxx
index b776d34e629..ecf9e90392d 100644
--- a/.conflict-side-1/PWGCF/Femto3D/Tasks/femto3dPairTaskMC.cxx
+++ b/.conflict-side-1/PWGCF/Femto3D/Tasks/femto3dPairTaskMC.cxx
@@ -13,27 +13,29 @@
 /// \author Sofia Tomassini, Gleb Romanenko, Nicolò Jacazio
 /// \since 31 May 2023
 
-#include <vector>
-#include <map>
-#include <memory>
-#include <utility>
-#include <TParameter.h>
-#include <TH1F.h>
-
 #include "PWGCF/Femto3D/Core/femto3dPairTask.h"
 #include "PWGCF/Femto3D/DataModel/singletrackselector.h"
-#include "TLorentzVector.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
+#include "Common/DataModel/Multiplicity.h"
+
 #include "Framework/ASoA.h"
-#include "Framework/DataTypes.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/DataTypes.h"
 #include "Framework/Expressions.h"
+#include "Framework/HistogramRegistry.h"
 #include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
 #include "MathUtils/Utils.h"
-#include "Common/DataModel/Multiplicity.h"
+
+#include "TLorentzVector.h"
+#include <TH1F.h>
+#include <TParameter.h>
+
+#include <map>
+#include <memory>
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::soa;
diff --git a/.conflict-side-1/PWGCF/Femto3D/Tasks/femto3dQA.cxx b/.conflict-side-1/PWGCF/Femto3D/Tasks/femto3dQA.cxx
index 64858324b48..dacc092da86 100644
--- a/.conflict-side-1/PWGCF/Femto3D/Tasks/femto3dQA.cxx
+++ b/.conflict-side-1/PWGCF/Femto3D/Tasks/femto3dQA.cxx
@@ -13,26 +13,27 @@
 /// \author Sofia Tomassini, Gleb Romanenko, Nicolò Jacazio
 /// \since 31 May 2023
 
-#include <vector>
-#include <memory>
-#include <utility>
+#include "PWGCF/Femto3D/Core/femto3dPairTask.h"
+#include "PWGCF/Femto3D/DataModel/singletrackselector.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include <TParameter.h>
-#include <TH1F.h>
+#include "Common/DataModel/Multiplicity.h"
 
 #include "Framework/ASoA.h"
-#include "MathUtils/Utils.h"
-#include "Framework/DataTypes.h"
-#include "Common/DataModel/Multiplicity.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/DataTypes.h"
 #include "Framework/Expressions.h"
-
+#include "Framework/HistogramRegistry.h"
 #include "Framework/StaticFor.h"
-#include "PWGCF/Femto3D/DataModel/singletrackselector.h"
-#include "PWGCF/Femto3D/Core/femto3dPairTask.h"
+#include "Framework/runDataProcessing.h"
+#include "MathUtils/Utils.h"
+
+#include <TH1F.h>
+#include <TParameter.h>
+
+#include <memory>
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::soa;
diff --git a/.conflict-side-1/PWGCF/Femto3D/Tools/checkPacking.cxx b/.conflict-side-1/PWGCF/Femto3D/Tools/checkPacking.cxx
index 51d26443200..e71c73ac2cb 100644
--- a/.conflict-side-1/PWGCF/Femto3D/Tools/checkPacking.cxx
+++ b/.conflict-side-1/PWGCF/Femto3D/Tools/checkPacking.cxx
@@ -17,8 +17,9 @@
 ///
 
 #include "PWGCF/Femto3D/DataModel/singletrackselector.h"
-#include "TH1F.h"
+
 #include "TCanvas.h"
+#include "TH1F.h"
 #include "TRandom.h"
 
 using namespace o2;
diff --git a/.conflict-side-1/PWGCF/FemtoDream/Core/femtoDreamCascadeSelection.h b/.conflict-side-1/PWGCF/FemtoDream/Core/femtoDreamCascadeSelection.h
index 2a07c851d09..a861036d640 100644
--- a/.conflict-side-1/PWGCF/FemtoDream/Core/femtoDreamCascadeSelection.h
+++ b/.conflict-side-1/PWGCF/FemtoDream/Core/femtoDreamCascadeSelection.h
@@ -22,20 +22,21 @@
 #ifndef PWGCF_FEMTODREAM_CORE_FEMTODREAMCASCADESELECTION_H_
 #define PWGCF_FEMTODREAM_CORE_FEMTODREAMCASCADESELECTION_H_
 
-#include <iostream>
-#include <string>
-#include <vector>
-
-#include <TDatabasePDG.h> // FIXME
-
 #include "PWGCF/FemtoDream/Core/femtoDreamObjectSelection.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamSelection.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamTrackSelection.h"
 
 #include "Common/Core/RecoDecay.h"
+
 #include "Framework/HistogramRegistry.h"
 #include "ReconstructionDataFormats/PID.h"
 
+#include <TDatabasePDG.h> // FIXME
+
+#include <iostream>
+#include <string>
+#include <vector>
+
 using namespace o2::framework;
 
 namespace o2::analysis::femtoDream
diff --git a/.conflict-side-1/PWGCF/FemtoDream/Core/femtoDreamCollisionSelection.h b/.conflict-side-1/PWGCF/FemtoDream/Core/femtoDreamCollisionSelection.h
index 8fe58ce9d7b..b0b56eaf92b 100644
--- a/.conflict-side-1/PWGCF/FemtoDream/Core/femtoDreamCollisionSelection.h
+++ b/.conflict-side-1/PWGCF/FemtoDream/Core/femtoDreamCollisionSelection.h
@@ -16,13 +16,15 @@
 #ifndef PWGCF_FEMTODREAM_CORE_FEMTODREAMCOLLISIONSELECTION_H_
 #define PWGCF_FEMTODREAM_CORE_FEMTODREAMCOLLISIONSELECTION_H_
 
-#include <string>
-#include <iostream>
 #include "Common/CCDB/TriggerAliases.h"
 #include "Common/DataModel/EventSelection.h"
+
 #include "Framework/HistogramRegistry.h"
 #include "Framework/Logger.h"
 
+#include <iostream>
+#include <string>
+
 using namespace o2::framework;
 
 namespace o2::analysis::femtoDream
diff --git a/.conflict-side-1/PWGCF/FemtoDream/Core/femtoDreamContainer.h b/.conflict-side-1/PWGCF/FemtoDream/Core/femtoDreamContainer.h
index 5e0222a4f07..78a25e29c08 100644
--- a/.conflict-side-1/PWGCF/FemtoDream/Core/femtoDreamContainer.h
+++ b/.conflict-side-1/PWGCF/FemtoDream/Core/femtoDreamContainer.h
@@ -19,18 +19,20 @@
 #ifndef PWGCF_FEMTODREAM_CORE_FEMTODREAMCONTAINER_H_
 #define PWGCF_FEMTODREAM_CORE_FEMTODREAMCONTAINER_H_
 
-#include <fairlogger/Logger.h>
-#include <vector>
-#include <string>
-
-#include "Framework/HistogramRegistry.h"
+#include "PWGCF/DataModel/FemtoDerived.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamMath.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
-#include "PWGCF/DataModel/FemtoDerived.h"
+
+#include "Framework/HistogramRegistry.h"
 
 #include "Math/Vector4D.h"
 #include "TMath.h"
 
+#include <fairlogger/Logger.h>
+
+#include <string>
+#include <vector>
+
 using namespace o2::framework;
 
 namespace o2::analysis::femtoDream
diff --git a/.conflict-side-1/PWGCF/FemtoDream/Core/femtoDreamContainerThreeBody.h b/.conflict-side-1/PWGCF/FemtoDream/Core/femtoDreamContainerThreeBody.h
index a6c60793060..fdfc05252b0 100644
--- a/.conflict-side-1/PWGCF/FemtoDream/Core/femtoDreamContainerThreeBody.h
+++ b/.conflict-side-1/PWGCF/FemtoDream/Core/femtoDreamContainerThreeBody.h
@@ -20,16 +20,18 @@
 #ifndef PWGCF_FEMTODREAM_CORE_FEMTODREAMCONTAINERTHREEBODY_H_
 #define PWGCF_FEMTODREAM_CORE_FEMTODREAMCONTAINERTHREEBODY_H_
 
-#include <fairlogger/Logger.h>
-#include <vector>
-#include <string>
+#include "PWGCF/FemtoDream/Core/femtoDreamMath.h"
 
 #include "Framework/HistogramRegistry.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamMath.h"
 
 #include "Math/Vector4D.h"
-#include "TMath.h"
 #include "TDatabasePDG.h"
+#include "TMath.h"
+
+#include <fairlogger/Logger.h>
+
+#include <string>
+#include <vector>
 
 using namespace o2::framework;
 
diff --git a/.conflict-side-1/PWGCF/FemtoDream/Core/femtoDreamDetaDphiStar.h b/.conflict-side-1/PWGCF/FemtoDream/Core/femtoDreamDetaDphiStar.h
index 58dc6c9ded4..23f35a9af9c 100644
--- a/.conflict-side-1/PWGCF/FemtoDream/Core/femtoDreamDetaDphiStar.h
+++ b/.conflict-side-1/PWGCF/FemtoDream/Core/femtoDreamDetaDphiStar.h
@@ -16,11 +16,13 @@
 #ifndef PWGCF_FEMTODREAM_CORE_FEMTODREAMDETADPHISTAR_H_
 #define PWGCF_FEMTODREAM_CORE_FEMTODREAMDETADPHISTAR_H_
 
+#include "PWGCF/DataModel/FemtoDerived.h"
+
+#include "Framework/HistogramRegistry.h"
+
 #include <memory>
 #include <string>
 #include <vector>
-#include "PWGCF/DataModel/FemtoDerived.h"
-#include "Framework/HistogramRegistry.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGCF/FemtoDream/Core/femtoDreamEventHisto.h b/.conflict-side-1/PWGCF/FemtoDream/Core/femtoDreamEventHisto.h
index 2d668d15c58..23bbbccce64 100644
--- a/.conflict-side-1/PWGCF/FemtoDream/Core/femtoDreamEventHisto.h
+++ b/.conflict-side-1/PWGCF/FemtoDream/Core/femtoDreamEventHisto.h
@@ -17,6 +17,7 @@
 #define PWGCF_FEMTODREAM_CORE_FEMTODREAMEVENTHISTO_H_
 
 #include "PWGCF/DataModel/FemtoDerived.h"
+
 #include "Framework/HistogramRegistry.h"
 
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGCF/FemtoDream/Core/femtoDreamMath.h b/.conflict-side-1/PWGCF/FemtoDream/Core/femtoDreamMath.h
index aba07f96c9c..7a895486cc0 100644
--- a/.conflict-side-1/PWGCF/FemtoDream/Core/femtoDreamMath.h
+++ b/.conflict-side-1/PWGCF/FemtoDream/Core/femtoDreamMath.h
@@ -16,13 +16,13 @@
 #ifndef PWGCF_FEMTODREAM_CORE_FEMTODREAMMATH_H_
 #define PWGCF_FEMTODREAM_CORE_FEMTODREAMMATH_H_
 
-#include <iostream>
-
-#include "Math/Vector4D.h"
 #include "Math/Boost.h"
+#include "Math/Vector4D.h"
 #include "TLorentzVector.h"
 #include "TMath.h"
 
+#include <iostream>
+
 namespace o2::analysis::femtoDream
 {
 
diff --git a/.conflict-side-1/PWGCF/FemtoDream/Core/femtoDreamObjectSelection.h b/.conflict-side-1/PWGCF/FemtoDream/Core/femtoDreamObjectSelection.h
index d01ce564f66..b89c87a2037 100644
--- a/.conflict-side-1/PWGCF/FemtoDream/Core/femtoDreamObjectSelection.h
+++ b/.conflict-side-1/PWGCF/FemtoDream/Core/femtoDreamObjectSelection.h
@@ -16,15 +16,16 @@
 #ifndef PWGCF_FEMTODREAM_CORE_FEMTODREAMOBJECTSELECTION_H_
 #define PWGCF_FEMTODREAM_CORE_FEMTODREAMOBJECTSELECTION_H_
 
+#include "PWGCF/DataModel/FemtoDerived.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamSelection.h"
+
+#include "Framework/HistogramRegistry.h"
+#include "ReconstructionDataFormats/PID.h"
+
 #include <algorithm>
 #include <string>
 #include <vector>
 
-#include "PWGCF/FemtoDream/Core/femtoDreamSelection.h"
-#include "ReconstructionDataFormats/PID.h"
-#include "Framework/HistogramRegistry.h"
-#include "PWGCF/DataModel/FemtoDerived.h"
-
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-side-1/PWGCF/FemtoDream/Core/femtoDreamPairCleaner.h b/.conflict-side-1/PWGCF/FemtoDream/Core/femtoDreamPairCleaner.h
index 3b248657b1f..ca58aa4c18e 100644
--- a/.conflict-side-1/PWGCF/FemtoDream/Core/femtoDreamPairCleaner.h
+++ b/.conflict-side-1/PWGCF/FemtoDream/Core/femtoDreamPairCleaner.h
@@ -17,6 +17,7 @@
 #define PWGCF_FEMTODREAM_CORE_FEMTODREAMPAIRCLEANER_H_
 
 #include "PWGCF/DataModel/FemtoDerived.h"
+
 #include "Framework/HistogramRegistry.h"
 
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h b/.conflict-side-1/PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h
index 4148e8b3efc..3f771c48c1f 100644
--- a/.conflict-side-1/PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h
+++ b/.conflict-side-1/PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h
@@ -18,11 +18,14 @@
 #ifndef PWGCF_FEMTODREAM_CORE_FEMTODREAMPARTICLEHISTO_H_
 #define PWGCF_FEMTODREAM_CORE_FEMTODREAMPARTICLEHISTO_H_
 
-#include <TMath.h>
-#include <string>
 #include "PWGCF/DataModel/FemtoDerived.h"
-#include "Framework/HistogramRegistry.h"
+
 #include "CommonConstants/PhysicsConstants.h"
+#include "Framework/HistogramRegistry.h"
+
+#include <TMath.h>
+
+#include <string>
 
 using namespace o2::framework;
 
diff --git a/.conflict-side-1/PWGCF/FemtoDream/Core/femtoDreamSelection.h b/.conflict-side-1/PWGCF/FemtoDream/Core/femtoDreamSelection.h
index 0e3592bf650..d50d10e929c 100644
--- a/.conflict-side-1/PWGCF/FemtoDream/Core/femtoDreamSelection.h
+++ b/.conflict-side-1/PWGCF/FemtoDream/Core/femtoDreamSelection.h
@@ -16,10 +16,12 @@
 #ifndef PWGCF_FEMTODREAM_CORE_FEMTODREAMSELECTION_H_
 #define PWGCF_FEMTODREAM_CORE_FEMTODREAMSELECTION_H_
 
-#include <cmath>
-#include "Framework/HistogramRegistry.h"
 #include "PWGCF/DataModel/FemtoDerived.h"
 
+#include "Framework/HistogramRegistry.h"
+
+#include <cmath>
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-side-1/PWGCF/FemtoDream/Core/femtoDreamTrackSelection.h b/.conflict-side-1/PWGCF/FemtoDream/Core/femtoDreamTrackSelection.h
index 9cab0f9e78b..78cf91947eb 100644
--- a/.conflict-side-1/PWGCF/FemtoDream/Core/femtoDreamTrackSelection.h
+++ b/.conflict-side-1/PWGCF/FemtoDream/Core/femtoDreamTrackSelection.h
@@ -17,20 +17,22 @@
 #ifndef PWGCF_FEMTODREAM_CORE_FEMTODREAMTRACKSELECTION_H_
 #define PWGCF_FEMTODREAM_CORE_FEMTODREAMTRACKSELECTION_H_
 
-#include <string>
-#include <vector>
-#include <cmath>
-#include <iostream>
-
 #include "PWGCF/DataModel/FemtoDerived.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/PIDResponseITS.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamObjectSelection.h"
+
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamObjectSelection.h"
-#include "ReconstructionDataFormats/PID.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/PIDResponseITS.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/HistogramRegistry.h"
+#include "ReconstructionDataFormats/PID.h"
+
+#include <cmath>
+#include <iostream>
+#include <string>
+#include <vector>
 
 using namespace o2::framework;
 
diff --git a/.conflict-side-1/PWGCF/FemtoDream/Core/femtoDreamUtils.h b/.conflict-side-1/PWGCF/FemtoDream/Core/femtoDreamUtils.h
index c5db8dcc70e..b03de6e9f06 100644
--- a/.conflict-side-1/PWGCF/FemtoDream/Core/femtoDreamUtils.h
+++ b/.conflict-side-1/PWGCF/FemtoDream/Core/femtoDreamUtils.h
@@ -16,11 +16,13 @@
 #ifndef PWGCF_FEMTODREAM_CORE_FEMTODREAMUTILS_H_
 #define PWGCF_FEMTODREAM_CORE_FEMTODREAMUTILS_H_
 
-#include <vector>
-#include <string>
-#include "CommonConstants/PhysicsConstants.h"
 #include "PWGCF/DataModel/FemtoDerived.h"
 
+#include "CommonConstants/PhysicsConstants.h"
+
+#include <string>
+#include <vector>
+
 namespace o2::analysis::femtoDream
 {
 
diff --git a/.conflict-side-1/PWGCF/FemtoDream/Core/femtoDreamV0Selection.h b/.conflict-side-1/PWGCF/FemtoDream/Core/femtoDreamV0Selection.h
index 40158105a5b..fde9af93474 100644
--- a/.conflict-side-1/PWGCF/FemtoDream/Core/femtoDreamV0Selection.h
+++ b/.conflict-side-1/PWGCF/FemtoDream/Core/femtoDreamV0Selection.h
@@ -18,18 +18,19 @@
 #ifndef PWGCF_FEMTODREAM_CORE_FEMTODREAMV0SELECTION_H_
 #define PWGCF_FEMTODREAM_CORE_FEMTODREAMV0SELECTION_H_
 
-#include <iostream>
-#include <string>
-#include <vector>
-
 #include "PWGCF/FemtoDream/Core/femtoDreamObjectSelection.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamSelection.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamTrackSelection.h"
 
 #include "Common/Core/RecoDecay.h"
+
 #include "Framework/HistogramRegistry.h"
 #include "ReconstructionDataFormats/PID.h"
 
+#include <iostream>
+#include <string>
+#include <vector>
+
 using namespace o2::framework;
 
 namespace o2::analysis::femtoDream
diff --git a/.conflict-side-1/PWGCF/FemtoDream/TableProducer/femtoDreamProducerReducedTask.cxx b/.conflict-side-1/PWGCF/FemtoDream/TableProducer/femtoDreamProducerReducedTask.cxx
index a879a18517f..69a39e24b07 100644
--- a/.conflict-side-1/PWGCF/FemtoDream/TableProducer/femtoDreamProducerReducedTask.cxx
+++ b/.conflict-side-1/PWGCF/FemtoDream/TableProducer/femtoDreamProducerReducedTask.cxx
@@ -15,29 +15,33 @@
 /// \author Georgios Mantzaridis, TU München, georgios.mantzaridis@tum.de
 /// \author Anton Riedel, TU München, anton.riedel@tum.de
 
-#include <vector>
-#include "TMath.h"
-#include "CCDB/BasicCCDBManager.h"
+#include "PWGCF/DataModel/FemtoDerived.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamCollisionSelection.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamTrackSelection.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
-#include "PWGCF/DataModel/FemtoDerived.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/PIDResponseITS.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/PIDResponseITS.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+
 #include "Math/Vector4D.h"
+#include "TMath.h"
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis::femtoDream;
diff --git a/.conflict-side-1/PWGCF/FemtoDream/TableProducer/femtoDreamProducerTask.cxx b/.conflict-side-1/PWGCF/FemtoDream/TableProducer/femtoDreamProducerTask.cxx
index 7272382f357..a92292fafaa 100644
--- a/.conflict-side-1/PWGCF/FemtoDream/TableProducer/femtoDreamProducerTask.cxx
+++ b/.conflict-side-1/PWGCF/FemtoDream/TableProducer/femtoDreamProducerTask.cxx
@@ -13,35 +13,40 @@
 /// \brief Tasks that produces the track tables used for the pairing
 /// \author Laura Serksnyte, TU München, laura.serksnyte@tum.de
 
-#include <CCDB/BasicCCDBManager.h>
-#include <fairlogger/Logger.h>
-#include <vector>
-#include <string>
+#include "PWGCF/DataModel/FemtoDerived.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamCascadeSelection.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamCollisionSelection.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamTrackSelection.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamV0Selection.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/PIDResponseITS.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+#include "EventFiltering/Zorro.h"
+
 #include "DataFormatsParameters/GRPMagField.h"
 #include "DataFormatsParameters/GRPObject.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamCollisionSelection.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamTrackSelection.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamV0Selection.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamCascadeSelection.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
-#include "EventFiltering/Zorro.h"
-#include "PWGCF/DataModel/FemtoDerived.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "TMath.h"
+#include <CCDB/BasicCCDBManager.h>
+
 #include "Math/Vector4D.h"
+#include "TMath.h"
+
+#include <fairlogger/Logger.h>
+
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGCF/FemtoDream/TableProducer/femtoDreamProducerTaskWithCascades.cxx b/.conflict-side-1/PWGCF/FemtoDream/TableProducer/femtoDreamProducerTaskWithCascades.cxx
index a7e02ec87e6..e76c0245622 100644
--- a/.conflict-side-1/PWGCF/FemtoDream/TableProducer/femtoDreamProducerTaskWithCascades.cxx
+++ b/.conflict-side-1/PWGCF/FemtoDream/TableProducer/femtoDreamProducerTaskWithCascades.cxx
@@ -13,35 +13,40 @@
 /// \brief Tasks that produces the track tables used for the pairing
 /// \author Laura Serksnyte, TU München, laura.serksnyte@tum.de
 
-#include <CCDB/BasicCCDBManager.h>
-#include <fairlogger/Logger.h>
-#include <vector>
-#include <string>
+#include "PWGCF/DataModel/FemtoDerived.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamCascadeSelection.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamCollisionSelection.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamTrackSelection.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamV0Selection.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/PIDResponseITS.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+#include "EventFiltering/Zorro.h"
+
 #include "DataFormatsParameters/GRPMagField.h"
 #include "DataFormatsParameters/GRPObject.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamCollisionSelection.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamTrackSelection.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamV0Selection.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamCascadeSelection.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
-#include "EventFiltering/Zorro.h"
-#include "PWGCF/DataModel/FemtoDerived.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "TMath.h"
+#include <CCDB/BasicCCDBManager.h>
+
 #include "Math/Vector4D.h"
+#include "TMath.h"
+
+#include <fairlogger/Logger.h>
+
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGCF/FemtoDream/Tasks/femtoDreamCollisionMasker.cxx b/.conflict-side-1/PWGCF/FemtoDream/Tasks/femtoDreamCollisionMasker.cxx
index fddbee16a88..b0bfcf727c5 100644
--- a/.conflict-side-1/PWGCF/FemtoDream/Tasks/femtoDreamCollisionMasker.cxx
+++ b/.conflict-side-1/PWGCF/FemtoDream/Tasks/femtoDreamCollisionMasker.cxx
@@ -14,23 +14,24 @@
 /// \author Anton Riedel, TU München, anton.riedel@tum.de
 /// \author Laura Serksnyte, TU München, laura.serksnyte@tum.de
 
-#include <cstdint>
-#include <vector>
-#include <string>
-#include <bitset>
-#include <algorithm>
-#include <random>
-#include <chrono>
+#include "PWGCF/DataModel/FemtoDerived.h"
 
-#include "fairlogger/Logger.h"
-#include "Framework/Configurable.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
+#include "Framework/Configurable.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
 
-#include "PWGCF/DataModel/FemtoDerived.h"
+#include "fairlogger/Logger.h"
+
+#include <algorithm>
+#include <bitset>
+#include <chrono>
+#include <cstdint>
+#include <random>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-side-1/PWGCF/FemtoDream/Tasks/femtoDreamDebugCascade.cxx b/.conflict-side-1/PWGCF/FemtoDream/Tasks/femtoDreamDebugCascade.cxx
index 54324361ec0..47f77a2732a 100644
--- a/.conflict-side-1/PWGCF/FemtoDream/Tasks/femtoDreamDebugCascade.cxx
+++ b/.conflict-side-1/PWGCF/FemtoDream/Tasks/femtoDreamDebugCascade.cxx
@@ -14,23 +14,25 @@
 /// \author Luca Barioglio, TU München, luca.barioglio@cern.ch
 /// \author Georgios Mantzaridis, TU München, luca.barioglio@cern.ch
 
-#include <cstdint>
-#include <iostream>
-#include <vector>
+#include "PWGCF/DataModel/FemtoDerived.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamEventHisto.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamMath.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
+
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/runDataProcessing.h"
+
 #include "fairlogger/Logger.h"
 
-#include "PWGCF/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamEventHisto.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamMath.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
+#include <cstdint>
+#include <iostream>
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis::femtoDream;
diff --git a/.conflict-side-1/PWGCF/FemtoDream/Tasks/femtoDreamDebugTrack.cxx b/.conflict-side-1/PWGCF/FemtoDream/Tasks/femtoDreamDebugTrack.cxx
index 68fab988fb9..71fdcdb426c 100644
--- a/.conflict-side-1/PWGCF/FemtoDream/Tasks/femtoDreamDebugTrack.cxx
+++ b/.conflict-side-1/PWGCF/FemtoDream/Tasks/femtoDreamDebugTrack.cxx
@@ -13,7 +13,10 @@
 /// \brief Tasks that reads the particle tables and fills QA histograms for tracks
 /// \author Luca Barioglio, TU München, luca.barioglio@cern.ch
 
-#include <Framework/Expressions.h>
+#include "PWGCF/DataModel/FemtoDerived.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamEventHisto.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h"
+
 #include "DataFormatsParameters/GRPObject.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
@@ -21,10 +24,7 @@
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
 #include "Framework/runDataProcessing.h"
-
-#include "PWGCF/FemtoDream/Core/femtoDreamEventHisto.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h"
-#include "PWGCF/DataModel/FemtoDerived.h"
+#include <Framework/Expressions.h>
 
 using namespace o2;
 using namespace o2::analysis::femtoDream;
diff --git a/.conflict-side-1/PWGCF/FemtoDream/Tasks/femtoDreamDebugV0.cxx b/.conflict-side-1/PWGCF/FemtoDream/Tasks/femtoDreamDebugV0.cxx
index 91010d4368e..3dc0c5f9875 100644
--- a/.conflict-side-1/PWGCF/FemtoDream/Tasks/femtoDreamDebugV0.cxx
+++ b/.conflict-side-1/PWGCF/FemtoDream/Tasks/femtoDreamDebugV0.cxx
@@ -13,24 +13,25 @@
 /// \brief Tasks that reads the particle tables and fills QA histograms for V0s
 /// \author Luca Barioglio, TU München, luca.barioglio@cern.ch
 
-#include <cstdint>
-#include <iostream>
-#include <vector>
-
-#include "TVector3.h"
+#include "PWGCF/DataModel/FemtoDerived.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamEventHisto.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h"
 
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TVector3.h"
+
 #include "fairlogger/Logger.h"
 
-#include "PWGCF/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamEventHisto.h"
+#include <cstdint>
+#include <iostream>
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis::femtoDream;
diff --git a/.conflict-side-1/PWGCF/FemtoDream/Tasks/femtoDreamHashTask.cxx b/.conflict-side-1/PWGCF/FemtoDream/Tasks/femtoDreamHashTask.cxx
index fe0aa6c0e3d..00ecf5a4af1 100644
--- a/.conflict-side-1/PWGCF/FemtoDream/Tasks/femtoDreamHashTask.cxx
+++ b/.conflict-side-1/PWGCF/FemtoDream/Tasks/femtoDreamHashTask.cxx
@@ -15,10 +15,12 @@
 /// \author Andi Mathis, TU München, andreas.mathis@ph.tum.de
 
 #include "PWGCF/DataModel/FemtoDerived.h"
+
 #include "Common/Core/EventMixing.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "Framework/ASoAHelpers.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGCF/FemtoDream/Tasks/femtoDreamPairTaskTrackCascade.cxx b/.conflict-side-1/PWGCF/FemtoDream/Tasks/femtoDreamPairTaskTrackCascade.cxx
index 05696761afa..cbf191e34cd 100644
--- a/.conflict-side-1/PWGCF/FemtoDream/Tasks/femtoDreamPairTaskTrackCascade.cxx
+++ b/.conflict-side-1/PWGCF/FemtoDream/Tasks/femtoDreamPairTaskTrackCascade.cxx
@@ -11,23 +11,26 @@
 /// \file femtoDreamPairTaskTrackTrack.cxx
 /// \brief Tasks that reads the track tables used for the pairing and builds pairs of two tracks
 /// \author Andi Mathis, TU München, andreas.mathis@ph.tum.de
-#include <sys/stat.h>
-#include <cstdint>
-#include <vector>
-#include <string>
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/Expressions.h"
 #include "PWGCF/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamEventHisto.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamPairCleaner.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamContainer.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamDetaDphiStar.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamEventHisto.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamPairCleaner.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/Expressions.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+
+#include <sys/stat.h>
+
+#include <cstdint>
+#include <string>
+#include <vector>
 using namespace o2;
 using namespace o2::aod;
 using namespace o2::soa;
diff --git a/.conflict-side-1/PWGCF/FemtoDream/Tasks/femtoDreamPairTaskTrackTrack.cxx b/.conflict-side-1/PWGCF/FemtoDream/Tasks/femtoDreamPairTaskTrackTrack.cxx
index 9f080fd2dd0..2e2eda2f68e 100644
--- a/.conflict-side-1/PWGCF/FemtoDream/Tasks/femtoDreamPairTaskTrackTrack.cxx
+++ b/.conflict-side-1/PWGCF/FemtoDream/Tasks/femtoDreamPairTaskTrackTrack.cxx
@@ -15,28 +15,30 @@
 /// \author Georgios Mantzaridis, TU München, georgios.mantzaridis@tum.de
 /// \author Anton Riedel, TU München, anton.riedel@tum.de
 
-#include <cstdint>
-#include <vector>
-#include <bitset>
-#include <string>
-#include "TRandom3.h"
+#include "PWGCF/DataModel/FemtoDerived.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamContainer.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamDetaDphiStar.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamEventHisto.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamPairCleaner.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
+#include "Framework/Configurable.h"
+#include "Framework/Expressions.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
+#include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "Framework/Configurable.h"
-#include "Framework/Expressions.h"
+#include "Framework/runDataProcessing.h"
 
-#include "PWGCF/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamEventHisto.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamPairCleaner.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamContainer.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamDetaDphiStar.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
+#include "TRandom3.h"
+
+#include <bitset>
+#include <cstdint>
+#include <string>
+#include <vector>
 
 using namespace o2::aod;
 using namespace o2::soa;
diff --git a/.conflict-side-1/PWGCF/FemtoDream/Tasks/femtoDreamPairTaskTrackV0.cxx b/.conflict-side-1/PWGCF/FemtoDream/Tasks/femtoDreamPairTaskTrackV0.cxx
index 7798f3d59c8..428375e1cf9 100644
--- a/.conflict-side-1/PWGCF/FemtoDream/Tasks/femtoDreamPairTaskTrackV0.cxx
+++ b/.conflict-side-1/PWGCF/FemtoDream/Tasks/femtoDreamPairTaskTrackV0.cxx
@@ -13,25 +13,27 @@
 /// \brief Tasks that reads the track tables used for the pairing and builds pairs of two tracks
 /// \author Andi Mathis, TU München, andreas.mathis@ph.tum.de
 
-#include <sys/stat.h>
-#include <cstdint>
-#include <vector>
-#include <string>
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/Expressions.h"
-
 #include "PWGCF/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamEventHisto.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamPairCleaner.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamContainer.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamDetaDphiStar.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamEventHisto.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamPairCleaner.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/Expressions.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+
+#include <sys/stat.h>
+
+#include <cstdint>
+#include <string>
+#include <vector>
+
 using namespace o2;
 using namespace o2::aod;
 using namespace o2::soa;
diff --git a/.conflict-side-1/PWGCF/FemtoDream/Tasks/femtoDreamTripletTaskTrackTrackTrack.cxx b/.conflict-side-1/PWGCF/FemtoDream/Tasks/femtoDreamTripletTaskTrackTrackTrack.cxx
index 899de5659b1..9542b6c364b 100644
--- a/.conflict-side-1/PWGCF/FemtoDream/Tasks/femtoDreamTripletTaskTrackTrackTrack.cxx
+++ b/.conflict-side-1/PWGCF/FemtoDream/Tasks/femtoDreamTripletTaskTrackTrackTrack.cxx
@@ -13,24 +13,26 @@
 /// \brief Tasks that reads the track tables and creates track triplets; only three identical particles can be used
 /// \author Laura Serksnyte, TU München, laura.serksnyte@tum.de
 
-#include <vector>
-#include <string>
+#include "PWGCF/DataModel/FemtoDerived.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamContainerThreeBody.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamDetaDphiStar.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamEventHisto.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamPairCleaner.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
+#include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TDatabasePDG.h"
 
-#include "PWGCF/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamEventHisto.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamPairCleaner.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamContainerThreeBody.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamDetaDphiStar.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis::femtoDream;
diff --git a/.conflict-side-1/PWGCF/FemtoDream/Tasks/femtoDreamTripletTaskTrackTrackV0.cxx b/.conflict-side-1/PWGCF/FemtoDream/Tasks/femtoDreamTripletTaskTrackTrackV0.cxx
index 136b8f9d5ff..a01e51ce3a8 100644
--- a/.conflict-side-1/PWGCF/FemtoDream/Tasks/femtoDreamTripletTaskTrackTrackV0.cxx
+++ b/.conflict-side-1/PWGCF/FemtoDream/Tasks/femtoDreamTripletTaskTrackTrackV0.cxx
@@ -13,25 +13,27 @@
 /// \brief Tasks that reads the track and V0 tables and creates triplets; only two identical tracks and a V0 can be used
 /// \author Laura Serksnyte, TU München, laura.serksnyte@tum.de
 
-#include <vector>
-#include <bitset>
-#include <string>
+#include "PWGCF/DataModel/FemtoDerived.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamContainerThreeBody.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamDetaDphiStar.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamEventHisto.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamPairCleaner.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
+#include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TDatabasePDG.h"
 
-#include "PWGCF/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamEventHisto.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamPairCleaner.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamContainerThreeBody.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamDetaDphiStar.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
+#include <bitset>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis::femtoDream;
diff --git a/.conflict-side-1/PWGCF/FemtoDream/Utils/femtoDreamCutCulator.cxx b/.conflict-side-1/PWGCF/FemtoDream/Utils/femtoDreamCutCulator.cxx
index d6aa862851f..a1a6653c799 100644
--- a/.conflict-side-1/PWGCF/FemtoDream/Utils/femtoDreamCutCulator.cxx
+++ b/.conflict-side-1/PWGCF/FemtoDream/Utils/femtoDreamCutCulator.cxx
@@ -13,13 +13,15 @@
 /// \brief Executable that encodes physical selection criteria in a bit-wise
 /// selection \author Andi Mathis, TU München, andreas.mathis@ph.tum.de
 
-#include <iostream>
-#include <random>
-#include <string>
 #include "PWGCF/FemtoDream/Utils/femtoDreamCutCulator.h"
+
+#include "PWGCF/DataModel/FemtoDerived.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamSelection.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamTrackSelection.h"
-#include "PWGCF/DataModel/FemtoDerived.h"
+
+#include <iostream>
+#include <random>
+#include <string>
 
 using namespace o2::analysis::femtoDream;
 
diff --git a/.conflict-side-1/PWGCF/FemtoDream/Utils/femtoDreamCutCulator.h b/.conflict-side-1/PWGCF/FemtoDream/Utils/femtoDreamCutCulator.h
index f54a9ff62a4..dea6efebb3a 100644
--- a/.conflict-side-1/PWGCF/FemtoDream/Utils/femtoDreamCutCulator.h
+++ b/.conflict-side-1/PWGCF/FemtoDream/Utils/femtoDreamCutCulator.h
@@ -18,21 +18,22 @@
 #ifndef PWGCF_FEMTODREAM_UTILS_FEMTODREAMCUTCULATOR_H_
 #define PWGCF_FEMTODREAM_UTILS_FEMTODREAMCUTCULATOR_H_
 
+#include "PWGCF/FemtoDream/Core/femtoDreamCascadeSelection.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamSelection.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamTrackSelection.h"
+#include "PWGCF/FemtoDream/Core/femtoDreamV0Selection.h"
+
+#include <boost/property_tree/json_parser.hpp>
+#include <boost/property_tree/ptree.hpp>
+
+#include <algorithm>
 #include <bitset>
 #include <functional>
 #include <iostream>
+#include <iterator>
 #include <random>
 #include <string>
 #include <vector>
-#include <algorithm>
-#include <iterator>
-#include <boost/property_tree/json_parser.hpp>
-#include <boost/property_tree/ptree.hpp>
-
-#include "PWGCF/FemtoDream/Core/femtoDreamSelection.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamTrackSelection.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamV0Selection.h"
-#include "PWGCF/FemtoDream/Core/femtoDreamCascadeSelection.h"
 
 namespace o2::analysis::femtoDream
 {
diff --git a/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniverse3DContainer.h b/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniverse3DContainer.h
index 864487cdcb0..4579ec9ffd7 100644
--- a/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniverse3DContainer.h
+++ b/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniverse3DContainer.h
@@ -17,15 +17,18 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSE3DCONTAINER_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSE3DCONTAINER_H_
 
-#include <fairlogger/Logger.h>
-#include <vector>
-#include <string>
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
 
 #include "Framework/HistogramRegistry.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
+
 #include "Math/Vector4D.h"
-#include "TMath.h"
 #include "TDatabasePDG.h"
+#include "TMath.h"
+
+#include <fairlogger/Logger.h>
+
+#include <string>
+#include <vector>
 
 using namespace o2::framework;
 
diff --git a/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniverseAngularContainer.h b/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniverseAngularContainer.h
index 4d267fb67d3..92a2359e497 100644
--- a/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniverseAngularContainer.h
+++ b/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniverseAngularContainer.h
@@ -20,17 +20,20 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEANGULARCONTAINER_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEANGULARCONTAINER_H_
 
-#include <fairlogger/Logger.h>
-#include <vector>
-#include <string>
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
 
-#include "Framework/HistogramRegistry.h"
 #include "Common/Core/RecoDecay.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
+
+#include "Framework/HistogramRegistry.h"
 
 #include "Math/Vector4D.h"
-#include "TMath.h"
 #include "TDatabasePDG.h"
+#include "TMath.h"
+
+#include <fairlogger/Logger.h>
+
+#include <string>
+#include <vector>
 
 using namespace o2::framework;
 
diff --git a/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniverseCascadeSelection.h b/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniverseCascadeSelection.h
index 3a389da705e..d5ddc7a1948 100644
--- a/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniverseCascadeSelection.h
+++ b/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniverseCascadeSelection.h
@@ -21,15 +21,18 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSECASCADESELECTION_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSECASCADESELECTION_H_
 
-#include <string>
-#include <vector>
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseObjectSelection.h"
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseSelection.h"
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
+
 #include "Common/Core/RecoDecay.h"
+
 #include "Framework/HistogramRegistry.h"
 #include "ReconstructionDataFormats/PID.h"
 
+#include <string>
+#include <vector>
+
 namespace o2::analysis::femto_universe
 {
 namespace femto_universe_cascade_selection
diff --git a/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniverseCollisionSelection.h b/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniverseCollisionSelection.h
index 633bba05760..ab47405cb9c 100644
--- a/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniverseCollisionSelection.h
+++ b/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniverseCollisionSelection.h
@@ -18,11 +18,13 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSECOLLISIONSELECTION_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSECOLLISIONSELECTION_H_
 
-#include <string>
 #include "Common/CCDB/TriggerAliases.h"
+
 #include "Framework/HistogramRegistry.h"
 #include "Framework/Logger.h"
 
+#include <string>
+
 using namespace o2::framework;
 
 namespace o2::analysis::femto_universe
diff --git a/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniverseCutculator.h b/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniverseCutculator.h
index 40b7c425e5c..58e278cdde7 100644
--- a/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniverseCutculator.h
+++ b/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniverseCutculator.h
@@ -18,19 +18,20 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSECUTCULATOR_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSECUTCULATOR_H_
 
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseSelection.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseV0Selection.h"
+
+#include <boost/property_tree/json_parser.hpp>
+#include <boost/property_tree/ptree.hpp>
+
+#include <algorithm>
 #include <bitset>
 #include <iostream>
+#include <iterator>
 #include <random>
 #include <string>
 #include <vector>
-#include <algorithm>
-#include <iterator>
-#include <boost/property_tree/json_parser.hpp>
-#include <boost/property_tree/ptree.hpp>
-
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseSelection.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseV0Selection.h"
 
 namespace o2::analysis::femto_universe
 {
diff --git a/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h b/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h
index e8941e7cbd9..d7a0d70f38a 100644
--- a/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h
+++ b/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h
@@ -19,16 +19,19 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEDETADPHISTAR_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEDETADPHISTAR_H_
 
-#include <memory>
-#include <string>
-#include <vector>
-#include "TMath.h"
-#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseFemtoContainer.h"
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseAngularContainer.h"
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseContainer.h"
-#include "Framework/HistogramRegistry.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseFemtoContainer.h"
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
+#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
+
+#include "Framework/HistogramRegistry.h"
+
+#include "TMath.h"
+
+#include <memory>
+#include <string>
+#include <vector>
 
 namespace o2::analysis
 {
diff --git a/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniverseEfficiencyCalculator.h b/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniverseEfficiencyCalculator.h
index a96b70180aa..da40cfbf4d3 100644
--- a/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniverseEfficiencyCalculator.h
+++ b/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniverseEfficiencyCalculator.h
@@ -16,15 +16,17 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEEFFICIENCYCALCULATOR_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEEFFICIENCYCALCULATOR_H_
 
-#include <vector>
-#include <map>
-#include <string>
-#include <algorithm>
+#include "FemtoUniverseParticleHisto.h"
 
-#include "Framework/Configurable.h"
-#include "CCDB/BasicCCDBManager.h"
 #include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
-#include "FemtoUniverseParticleHisto.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "Framework/Configurable.h"
+
+#include <algorithm>
+#include <map>
+#include <string>
+#include <vector>
 
 namespace o2::analysis::femto_universe::efficiency
 {
diff --git a/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h b/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h
index 03d4b5b1fb4..dfe2bd35d62 100644
--- a/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h
+++ b/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h
@@ -18,6 +18,7 @@
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEEVENTHISTO_H_
 
 #include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
+
 #include "Framework/HistogramRegistry.h"
 
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniverseFemtoContainer.h b/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniverseFemtoContainer.h
index 4719561ccf6..8f5954429cd 100644
--- a/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniverseFemtoContainer.h
+++ b/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniverseFemtoContainer.h
@@ -20,16 +20,18 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEFEMTOCONTAINER_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEFEMTOCONTAINER_H_
 
-#include <fairlogger/Logger.h>
-#include <vector>
-#include <string>
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
 
 #include "Framework/HistogramRegistry.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
 
 #include "Math/Vector4D.h"
-#include "TMath.h"
 #include "TDatabasePDG.h"
+#include "TMath.h"
+
+#include <fairlogger/Logger.h>
+
+#include <string>
+#include <vector>
 
 using namespace o2::framework;
 
diff --git a/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h b/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h
index ec40ea035e6..aee87f1a057 100644
--- a/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h
+++ b/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h
@@ -19,14 +19,14 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEMATH_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEMATH_H_
 
-#include <vector>
-#include <algorithm>
-
-#include "Math/Vector4D.h"
 #include "Math/Boost.h"
+#include "Math/Vector4D.h"
 #include "TLorentzVector.h"
 #include "TMath.h"
 
+#include <algorithm>
+#include <vector>
+
 namespace o2::analysis::femto_universe
 {
 
diff --git a/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniverseObjectSelection.h b/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniverseObjectSelection.h
index 07491f92c8f..f01de84b75d 100644
--- a/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniverseObjectSelection.h
+++ b/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniverseObjectSelection.h
@@ -17,15 +17,16 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEOBJECTSELECTION_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEOBJECTSELECTION_H_
 
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseSelection.h"
+#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
+
+#include "Framework/HistogramRegistry.h"
+#include "ReconstructionDataFormats/PID.h"
+
 #include <algorithm>
 #include <string>
 #include <vector>
 
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseSelection.h"
-#include "ReconstructionDataFormats/PID.h"
-#include "Framework/HistogramRegistry.h"
-#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
-
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniversePairAngularWithCentMultKt.h b/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniversePairAngularWithCentMultKt.h
index 31b256f43f7..b63455ee3cf 100644
--- a/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniversePairAngularWithCentMultKt.h
+++ b/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniversePairAngularWithCentMultKt.h
@@ -17,9 +17,10 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEPAIRANGULARWITHCENTMULTKT_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEPAIRANGULARWITHCENTMULTKT_H_
 
+#include "Framework/HistogramRegistry.h"
+
 #include <string>
 #include <vector>
-#include "Framework/HistogramRegistry.h"
 
 namespace o2::analysis::femto_universe
 {
diff --git a/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h b/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h
index b27d8e25abf..32da4810b85 100644
--- a/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h
+++ b/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h
@@ -20,6 +20,7 @@
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEPAIRCLEANER_H_
 
 #include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
+
 #include "Framework/HistogramRegistry.h"
 
 namespace o2::analysis::femto_universe
diff --git a/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniversePairSHCentMultKt.h b/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniversePairSHCentMultKt.h
index ea8626cbe32..5c33b6cf30e 100644
--- a/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniversePairSHCentMultKt.h
+++ b/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniversePairSHCentMultKt.h
@@ -16,11 +16,12 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEPAIRSHCENTMULTKT_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEPAIRSHCENTMULTKT_H_
 
-#include <vector>
-#include <string>
+#include "Framework/HistogramRegistry.h"
+
 #include <complex>
 #include <memory>
-#include "Framework/HistogramRegistry.h"
+#include <string>
+#include <vector>
 
 // using namespace o2::constants::physics;
 
diff --git a/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniversePairWithCentMultKt.h b/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniversePairWithCentMultKt.h
index 5cfef9c433f..1f2651ad2f6 100644
--- a/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniversePairWithCentMultKt.h
+++ b/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniversePairWithCentMultKt.h
@@ -17,9 +17,10 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEPAIRWITHCENTMULTKT_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEPAIRWITHCENTMULTKT_H_
 
+#include "Framework/HistogramRegistry.h"
+
 #include <string>
 #include <vector>
-#include "Framework/HistogramRegistry.h"
 
 namespace o2::analysis::femto_universe
 {
diff --git a/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h b/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h
index 865efa0f36d..b14edcb3aad 100644
--- a/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h
+++ b/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h
@@ -20,11 +20,13 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEPARTICLEHISTO_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEPARTICLEHISTO_H_
 
-#include <string>
-#include <optional>
 #include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
-#include "Framework/HistogramRegistry.h"
+
 #include "CommonConstants/MathConstants.h"
+#include "Framework/HistogramRegistry.h"
+
+#include <optional>
+#include <string>
 
 using namespace o2::framework; // o2-linter: disable=using-directive
 
diff --git a/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniversePhiSelection.h b/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniversePhiSelection.h
index 0ee0bfe4162..c43217ceb72 100644
--- a/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniversePhiSelection.h
+++ b/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniversePhiSelection.h
@@ -19,18 +19,20 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEPHISELECTION_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEPHISELECTION_H_
 
-#include <string>
-#include <vector>
-
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseObjectSelection.h"
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseSelection.h"
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
 
 #include "Common/Core/RecoDecay.h"
+
 #include "Framework/HistogramRegistry.h"
 #include "ReconstructionDataFormats/PID.h"
+
 #include "TLorentzVector.h"
 
+#include <string>
+#include <vector>
+
 namespace o2::analysis::femto_universe
 {
 namespace femto_universe_phi_selection
diff --git a/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniverseSHContainer.h b/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniverseSHContainer.h
index 558874133cb..25b875a0333 100644
--- a/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniverseSHContainer.h
+++ b/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniverseSHContainer.h
@@ -17,18 +17,21 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSESHCONTAINER_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSESHCONTAINER_H_
 
-#include <fairlogger/Logger.h>
-#include <vector>
-#include <string>
-#include <complex>
-#include <memory>
-
-#include "Framework/HistogramRegistry.h"
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseSpherHarMath.h"
+
+#include "Framework/HistogramRegistry.h"
+
 #include "Math/Vector4D.h"
-#include "TMath.h"
 #include "TDatabasePDG.h"
+#include "TMath.h"
+
+#include <fairlogger/Logger.h>
+
+#include <complex>
+#include <memory>
+#include <string>
+#include <vector>
 
 namespace o2::analysis::femto_universe
 {
diff --git a/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniverseSoftPionRemoval.h b/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniverseSoftPionRemoval.h
index 9631b5b3377..4a97c83865d 100644
--- a/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniverseSoftPionRemoval.h
+++ b/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniverseSoftPionRemoval.h
@@ -16,11 +16,12 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSESOFTPIONREMOVAL_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSESOFTPIONREMOVAL_H_
 
-#include <vector>
-
 #include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
+
 #include "Framework/HistogramRegistry.h"
 
+#include <vector>
+
 namespace o2::analysis::femto_universe
 {
 
diff --git a/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniverseSpherHarMath.h b/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniverseSpherHarMath.h
index d92560ceb72..0efa7593a9f 100644
--- a/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniverseSpherHarMath.h
+++ b/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniverseSpherHarMath.h
@@ -16,14 +16,14 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSESPHERHARMATH_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSESPHERHARMATH_H_
 
-#include <vector>
-#include <algorithm>
-
-#include "Math/Vector4D.h"
 #include "Math/Boost.h"
+#include "Math/Vector4D.h"
 #include "TLorentzVector.h"
 #include "TMath.h"
 
+#include <algorithm>
+#include <vector>
+
 namespace o2::analysis::femto_universe
 {
 
diff --git a/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h b/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h
index 75276f24a6d..51c711c8165 100644
--- a/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h
+++ b/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h
@@ -18,17 +18,19 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSETRACKSELECTION_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSETRACKSELECTION_H_
 
-#include <string>
-#include <vector>
-#include <cmath>
-
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseObjectSelection.h"
 #include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseObjectSelection.h"
-#include "ReconstructionDataFormats/PID.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/HistogramRegistry.h"
+#include "ReconstructionDataFormats/PID.h"
+
+#include <cmath>
+#include <string>
+#include <vector>
 
 // using namespace o2::framework;
 
diff --git a/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniverseV0Selection.h b/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniverseV0Selection.h
index 805da180cc3..8b45f664f15 100644
--- a/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniverseV0Selection.h
+++ b/.conflict-side-1/PWGCF/FemtoUniverse/Core/FemtoUniverseV0Selection.h
@@ -19,17 +19,18 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEV0SELECTION_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUNIVERSEV0SELECTION_H_
 
-#include <string>
-#include <vector>
-
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseObjectSelection.h"
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseSelection.h"
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
 
 #include "Common/Core/RecoDecay.h"
+
 #include "Framework/HistogramRegistry.h"
 #include "ReconstructionDataFormats/PID.h"
 
+#include <string>
+#include <vector>
+
 namespace o2::analysis::femto_universe
 {
 namespace femto_universe_v0_selection
diff --git a/.conflict-side-1/PWGCF/FemtoUniverse/Core/femtoUtils.h b/.conflict-side-1/PWGCF/FemtoUniverse/Core/femtoUtils.h
index 70a02e98b8c..ddc1833c335 100644
--- a/.conflict-side-1/PWGCF/FemtoUniverse/Core/femtoUtils.h
+++ b/.conflict-side-1/PWGCF/FemtoUniverse/Core/femtoUtils.h
@@ -17,12 +17,14 @@
 #ifndef PWGCF_FEMTOUNIVERSE_CORE_FEMTOUTILS_H_
 #define PWGCF_FEMTOUNIVERSE_CORE_FEMTOUTILS_H_
 
-#include <vector>
-#include <functional>
-#include <algorithm>
-#include "Framework/ASoAHelpers.h"
 #include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
 
+#include "Framework/ASoAHelpers.h"
+
+#include <algorithm>
+#include <functional>
+#include <vector>
+
 namespace o2::analysis::femto_universe
 {
 
diff --git a/.conflict-side-1/PWGCF/FemtoUniverse/DataModel/FemtoDerived.h b/.conflict-side-1/PWGCF/FemtoUniverse/DataModel/FemtoDerived.h
index c103b52791e..83bf3f7fd72 100644
--- a/.conflict-side-1/PWGCF/FemtoUniverse/DataModel/FemtoDerived.h
+++ b/.conflict-side-1/PWGCF/FemtoUniverse/DataModel/FemtoDerived.h
@@ -16,15 +16,17 @@
 #ifndef PWGCF_FEMTOUNIVERSE_DATAMODEL_FEMTODERIVED_H_
 #define PWGCF_FEMTOUNIVERSE_DATAMODEL_FEMTODERIVED_H_
 
-#include <cmath>
-#include "Framework/ASoA.h"
-#include "MathUtils/Utils.h"
-#include "Framework/DataTypes.h"
 #include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoA.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/DataTypes.h"
 #include "Framework/Expressions.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
+#include "MathUtils/Utils.h"
+
+#include <cmath>
 
 namespace o2::aod
 {
diff --git a/.conflict-side-1/PWGCF/FemtoUniverse/Macros/calculateEfficiencyCorrection.cxx b/.conflict-side-1/PWGCF/FemtoUniverse/Macros/calculateEfficiencyCorrection.cxx
index 3880661d9f7..3d3137abc4a 100644
--- a/.conflict-side-1/PWGCF/FemtoUniverse/Macros/calculateEfficiencyCorrection.cxx
+++ b/.conflict-side-1/PWGCF/FemtoUniverse/Macros/calculateEfficiencyCorrection.cxx
@@ -21,15 +21,16 @@
 #include <TH2F.h>
 #include <TH3F.h>
 #include <TSystem.h>
-#include <unistd.h>
 
 #include <cassert>
 #include <cmath>
 #include <filesystem> // NOLINT
-#include <iostream>
 #include <format>
+#include <iostream>
 #include <string>
 
+#include <unistd.h>
+
 namespace fs = std::filesystem;
 
 auto* getHistogram(TFile* file, const std::string& name)
diff --git a/.conflict-side-1/PWGCF/FemtoUniverse/TableProducer/femtoUniverseProducerReducedTask.cxx b/.conflict-side-1/PWGCF/FemtoUniverse/TableProducer/femtoUniverseProducerReducedTask.cxx
index 4ae5b3b01f2..9eee793ee74 100644
--- a/.conflict-side-1/PWGCF/FemtoUniverse/TableProducer/femtoUniverseProducerReducedTask.cxx
+++ b/.conflict-side-1/PWGCF/FemtoUniverse/TableProducer/femtoUniverseProducerReducedTask.cxx
@@ -16,29 +16,32 @@
 /// \author Anton Riedel, TU München, anton.riedel@tum.de
 /// \author Zuzanna Chochulska, WUT Warsaw & CTU Prague, zchochul@cern.ch
 
-#include <CCDB/BasicCCDBManager.h>
-#include <vector>
-
-#include "TMath.h"
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseCollisionSelection.h"
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
+#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
 #include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+#include <CCDB/BasicCCDBManager.h>
+
 #include "Math/Vector4D.h"
-#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
+#include "TMath.h"
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis::femto_universe;
diff --git a/.conflict-side-1/PWGCF/FemtoUniverse/TableProducer/femtoUniverseProducerTaskV0Only.cxx b/.conflict-side-1/PWGCF/FemtoUniverse/TableProducer/femtoUniverseProducerTaskV0Only.cxx
index 968d3fab7ba..d7da7c67b8c 100644
--- a/.conflict-side-1/PWGCF/FemtoUniverse/TableProducer/femtoUniverseProducerTaskV0Only.cxx
+++ b/.conflict-side-1/PWGCF/FemtoUniverse/TableProducer/femtoUniverseProducerTaskV0Only.cxx
@@ -13,30 +13,33 @@
 /// \author Andi Mathis, TU München, andreas.mathis@ph.tum.de
 /// \author Zuzanna Chochulska, WUT Warsaw & CTU Prague, zchochul@cern.ch
 
-#include <CCDB/BasicCCDBManager.h>
-#include <vector>
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseCollisionSelection.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseV0Selection.h"
+#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "DataFormatsParameters/GRPMagField.h"
 #include "DataFormatsParameters/GRPObject.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseCollisionSelection.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseV0Selection.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
-#include "Math/Vector4D.h"
-#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "ReconstructionDataFormats/Track.h"
+#include <CCDB/BasicCCDBManager.h>
+
+#include "Math/Vector4D.h"
 #include "TMath.h"
 
+#include <vector>
+
 using namespace o2;
 using namespace o2::analysis::femto_universe;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGCF/FemtoUniverse/Tasks/femtoUniverseCutCulator.cxx b/.conflict-side-1/PWGCF/FemtoUniverse/Tasks/femtoUniverseCutCulator.cxx
index 6e5af4e8d52..bae1565238a 100644
--- a/.conflict-side-1/PWGCF/FemtoUniverse/Tasks/femtoUniverseCutCulator.cxx
+++ b/.conflict-side-1/PWGCF/FemtoUniverse/Tasks/femtoUniverseCutCulator.cxx
@@ -14,14 +14,16 @@
 /// \author Andi Mathis, TU München, andreas.mathis@ph.tum.de
 /// \author Zuzanna Chochulska, WUT Warsaw & CTU Prague, zchochul@cern.ch
 
-#include <filesystem>
-#include <iostream>
-#include <random>
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseCutculator.h"
+
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseSelection.h"
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
 #include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
 
+#include <filesystem>
+#include <iostream>
+#include <random>
+
 using namespace o2::analysis::femto_universe;
 
 /// The function takes the path to the dpl-config.json as a argument and the
diff --git a/.conflict-side-1/PWGCF/FemtoUniverse/Tasks/femtoUniverseDebugTrack.cxx b/.conflict-side-1/PWGCF/FemtoUniverse/Tasks/femtoUniverseDebugTrack.cxx
index 984ab7d973e..da9e59016d9 100644
--- a/.conflict-side-1/PWGCF/FemtoUniverse/Tasks/femtoUniverseDebugTrack.cxx
+++ b/.conflict-side-1/PWGCF/FemtoUniverse/Tasks/femtoUniverseDebugTrack.cxx
@@ -14,6 +14,12 @@
 /// \author Luca Barioglio, TU München, luca.barioglio@cern.ch
 /// \author Zuzanna Chochulska, WUT Warsaw & CTU Prague, zchochul@cern.ch
 
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
+#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
+#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
+
 #include "DataFormatsParameters/GRPObject.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
@@ -22,12 +28,6 @@
 #include "Framework/StepTHn.h"
 #include "Framework/runDataProcessing.h"
 
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
-#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
-#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
-
 using namespace o2;
 using namespace o2::analysis::femto_universe;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGCF/FemtoUniverse/Tasks/femtoUniverseDebugV0.cxx b/.conflict-side-1/PWGCF/FemtoUniverse/Tasks/femtoUniverseDebugV0.cxx
index fe1bf2e7983..1207d1ff10f 100644
--- a/.conflict-side-1/PWGCF/FemtoUniverse/Tasks/femtoUniverseDebugV0.cxx
+++ b/.conflict-side-1/PWGCF/FemtoUniverse/Tasks/femtoUniverseDebugV0.cxx
@@ -14,24 +14,27 @@
 /// \author Luca Barioglio, TU München, luca.barioglio@cern.ch
 /// \author Zuzanna Chochulska, WUT Warsaw & CTU Prague, zchochul@cern.ch
 
-#include <fairlogger/Logger.h>
-#include <cstdint>
-#include <vector>
-#include <TDatabasePDG.h>
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
+#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
+#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
+
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
+#include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/runDataProcessing.h"
 
-#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
-#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
+#include <TDatabasePDG.h>
+
+#include <fairlogger/Logger.h>
+
+#include <cstdint>
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis::femto_universe;
diff --git a/.conflict-side-1/PWGCF/FemtoUniverse/Tasks/femtoUniverseEfficiencyTask.cxx b/.conflict-side-1/PWGCF/FemtoUniverse/Tasks/femtoUniverseEfficiencyTask.cxx
index fcd9c56d452..dd13cdcede2 100644
--- a/.conflict-side-1/PWGCF/FemtoUniverse/Tasks/femtoUniverseEfficiencyTask.cxx
+++ b/.conflict-side-1/PWGCF/FemtoUniverse/Tasks/femtoUniverseEfficiencyTask.cxx
@@ -17,20 +17,22 @@
 /// \author Zuzanna Chochulska, WUT Warsaw & CTU Prague, zchochul@cern.ch
 
 // O2 includes
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseCollisionSelection.h"
+#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
+#include "PWGLF/DataModel/LFResonanceTables.h"
+
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/Core/trackUtilities.h"
+
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseCollisionSelection.h"
-#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
-#include "Framework/O2DatabasePDGPlugin.h"
 
 #include "TPDGCode.h"
 
diff --git a/.conflict-side-1/PWGCF/FemtoUniverse/Tasks/femtoUniverseHashTask.cxx b/.conflict-side-1/PWGCF/FemtoUniverse/Tasks/femtoUniverseHashTask.cxx
index 6f7a7d5db2b..0ec405b26ff 100644
--- a/.conflict-side-1/PWGCF/FemtoUniverse/Tasks/femtoUniverseHashTask.cxx
+++ b/.conflict-side-1/PWGCF/FemtoUniverse/Tasks/femtoUniverseHashTask.cxx
@@ -15,10 +15,12 @@
 /// \author Zuzanna Chochulska, WUT Warsaw & CTU Prague, zchochul@cern.ch
 
 #include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
+
 #include "Common/Core/EventMixing.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "Framework/ASoAHelpers.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackCascadeExtended.cxx b/.conflict-side-1/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackCascadeExtended.cxx
index dd019a046db..e2e06229f40 100644
--- a/.conflict-side-1/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackCascadeExtended.cxx
+++ b/.conflict-side-1/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackCascadeExtended.cxx
@@ -14,22 +14,24 @@
 /// \author Barbara Chytla, WUT Warsaw, barbara.chytla@cern.ch
 /// \author Shirajum Monira, WUT Warsaw, shirajum.monira@cern.ch
 
-#include <vector>
-#include <set>
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/StepTHn.h"
-#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseContainer.h"
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
 #include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
+#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
+
+#include <set>
+#include <vector>
 
 using namespace o2;
 using namespace o2::soa;
diff --git a/.conflict-side-1/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackD0.cxx b/.conflict-side-1/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackD0.cxx
index 3e68a275452..7e28f498fbb 100644
--- a/.conflict-side-1/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackD0.cxx
+++ b/.conflict-side-1/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackD0.cxx
@@ -17,38 +17,37 @@
 /// \author Zuzanna Chochulska, WUT Warsaw & CTU Prague, zchochul@cern.ch
 /// \author Katarzyna Gwiździel, WUT Warsaw, katarzyna.gwizdziel@cern.ch
 
-#include <vector>
-#include <string>
-
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "ReconstructionDataFormats/PID.h"
-
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/RecoDecay.h"
-
-#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseFemtoContainer.h"
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseAngularContainer.h"
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h"
-#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseSoftPionRemoval.h"
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseEfficiencyCalculator.h"
-
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseFemtoContainer.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseSoftPionRemoval.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
+#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
+#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
 #include "PWGHF/Core/HfHelper.h"
 #include "PWGHF/Core/SelectorCuts.h"
 #include "PWGHF/DataModel/CandidateReconstructionTables.h"
 #include "PWGHF/DataModel/CandidateSelectionTables.h"
 
+#include "Common/Core/RecoDecay.h"
+#include "Common/DataModel/PIDResponse.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/PID.h"
+
+#include <string>
+#include <vector>
+
 using namespace o2;
 using namespace o2::analysis;
 using namespace o2::analysis::femto_universe;
diff --git a/.conflict-side-1/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackNucleus.cxx b/.conflict-side-1/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackNucleus.cxx
index f5fe1dc91a4..8c4462f3973 100644
--- a/.conflict-side-1/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackNucleus.cxx
+++ b/.conflict-side-1/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackNucleus.cxx
@@ -18,29 +18,31 @@
 /// \author Alicja Płachta, WUT Warsaw, alicja.plachta.stud@pw.edu.pl
 /// \author Anna-Mariia Andrushko, WUT Warsaw, anna-mariia.andrushko@cern.ch
 
-#include <vector>
-#include <string>
-#include <cmath>
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseFemtoContainer.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairWithCentMultKt.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
+#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
+#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
+
+#include "Common/DataModel/PIDResponse.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
+#include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/PID.h"
-#include "Common/DataModel/PIDResponse.h"
 
-#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseFemtoContainer.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h"
-#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairWithCentMultKt.h"
+#include <cmath>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis::femto_universe;
diff --git a/.conflict-side-1/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrack.cxx b/.conflict-side-1/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrack.cxx
index f4eb45752dc..1d623d6ec24 100644
--- a/.conflict-side-1/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrack.cxx
+++ b/.conflict-side-1/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrack.cxx
@@ -16,24 +16,25 @@
 /// \author Anton Riedel, TU München, anton.riedel@tum.de
 /// \author Zuzanna Chochulska, WUT Warsaw & CTU Prague, zchochul@cern.ch
 
-#include <vector>
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseAngularContainer.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseFemtoContainer.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
+#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
+#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
+#include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 
-#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseFemtoContainer.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseAngularContainer.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h"
-#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis::femto_universe;
diff --git a/.conflict-side-1/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrack3DMultKtExtended.cxx b/.conflict-side-1/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrack3DMultKtExtended.cxx
index f5c6242f456..4cb264949b1 100644
--- a/.conflict-side-1/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrack3DMultKtExtended.cxx
+++ b/.conflict-side-1/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrack3DMultKtExtended.cxx
@@ -14,30 +14,33 @@
 /// \remark This file is inherited from ~/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackMultKtExtended.cxx on 10/01/2024
 /// \author Pritam Chakraborty, WUT Warsaw, pritam.chakraborty@pw.edu.pl
 
-#include <vector>
-#include <string>
-#include "TRandom2.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverse3DContainer.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseContainer.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairWithCentMultKt.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
+#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
+#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
+
+#include "Common/DataModel/PIDResponse.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
+#include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/PID.h"
-#include "Common/DataModel/PIDResponse.h"
 
-#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverse3DContainer.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseContainer.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h"
-#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairWithCentMultKt.h"
+#include "TRandom2.h"
+
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis::femto_universe;
diff --git a/.conflict-side-1/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackExtended.cxx b/.conflict-side-1/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackExtended.cxx
index 06665491396..7760a8f2451 100644
--- a/.conflict-side-1/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackExtended.cxx
+++ b/.conflict-side-1/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackExtended.cxx
@@ -16,24 +16,24 @@
 /// \author Anton Riedel, TU München, anton.riedel@tum.de
 /// \author Zuzanna Chochulska, WUT Warsaw & CTU Prague, zchochul@cern.ch
 
-#include <Framework/O2DatabasePDGPlugin.h>
-#include <string>
-#include <vector>
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseContainer.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEfficiencyCorrection.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
+#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
 
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/PID.h"
+#include <Framework/O2DatabasePDGPlugin.h>
 
-#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseContainer.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEfficiencyCorrection.h"
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis::femto_universe;
diff --git a/.conflict-side-1/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackMC.cxx b/.conflict-side-1/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackMC.cxx
index 5b74f18a31e..66214ba9fd2 100644
--- a/.conflict-side-1/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackMC.cxx
+++ b/.conflict-side-1/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackMC.cxx
@@ -17,28 +17,31 @@
 /// \author Zuzanna Chochulska, WUT Warsaw, zuzanna.chochulska.stud@pw.edu.pl
 /// \author Zuzanna Chochulska, WUT Warsaw & CTU Prague, zchochul@cern.ch
 
-#include <vector>
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseContainer.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairAngularWithCentMultKt.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
+#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
+#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
+
+#include "Common/DataModel/PIDResponse.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
+#include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "TDatabasePDG.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/PID.h"
-#include "Common/DataModel/PIDResponse.h"
 
-#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseContainer.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h"
-#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairAngularWithCentMultKt.h"
+#include "TDatabasePDG.h"
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis::femto_universe;
diff --git a/.conflict-side-1/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackMcTruth.cxx b/.conflict-side-1/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackMcTruth.cxx
index d74b76ab237..804dc30e9d7 100644
--- a/.conflict-side-1/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackMcTruth.cxx
+++ b/.conflict-side-1/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackMcTruth.cxx
@@ -14,24 +14,26 @@
 /// \author Malgorzata Janik, WUT, majanik@cern.ch
 /// \author Zuzanna Chochulska, WUT Warsaw & CTU Prague, zchochul@cern.ch
 
-#include <vector>
-#include <random>
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseContainer.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
+#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
+#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
+#include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TDatabasePDG.h"
 
-#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseContainer.h"
-#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
+#include <random>
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis::femto_universe;
diff --git a/.conflict-side-1/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackMultKtExtended.cxx b/.conflict-side-1/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackMultKtExtended.cxx
index 76487c59269..23b0bab4057 100644
--- a/.conflict-side-1/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackMultKtExtended.cxx
+++ b/.conflict-side-1/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackMultKtExtended.cxx
@@ -17,29 +17,32 @@
 /// \author Zuzanna Chochulska, WUT Warsaw & CTU Prague, zchochul@cern.ch
 /// \author Alicja Płachta, WUT Warsaw, alicja.plachta.stud@pw.edu.pl
 
-#include <vector>
-#include <string>
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseFemtoContainer.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairWithCentMultKt.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
+#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
+#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
+
+#include "Common/DataModel/PIDResponse.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
+#include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "TDatabasePDG.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/PID.h"
-#include "Common/DataModel/PIDResponse.h"
 
-#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseFemtoContainer.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h"
-#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairWithCentMultKt.h"
+#include "TDatabasePDG.h"
+
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis::femto_universe;
diff --git a/.conflict-side-1/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackSpherHarMultKtExtended.cxx b/.conflict-side-1/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackSpherHarMultKtExtended.cxx
index 05c910b0b24..ccb74fb5600 100644
--- a/.conflict-side-1/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackSpherHarMultKtExtended.cxx
+++ b/.conflict-side-1/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackSpherHarMultKtExtended.cxx
@@ -14,29 +14,32 @@
 /// \remark This file is inherited from ~/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrack3DMultKtExtended.cxx on 17/06/2024
 /// \author Pritam Chakraborty, WUT Warsaw, pritam.chakraborty@pw.edu.pl
 
-#include <vector>
-#include <string>
-#include "TRandom2.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairSHCentMultKt.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseSHContainer.h"
+#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
+#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
+#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
+
+#include "Common/DataModel/PIDResponse.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
+#include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/PID.h"
-#include "Common/DataModel/PIDResponse.h"
 
-#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseSHContainer.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h"
-#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseMath.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
-#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairSHCentMultKt.h"
+#include "TRandom2.h"
+
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis::femto_universe;
diff --git a/.conflict-side-1/PWGCF/FemtoWorld/Core/FemtoWorldCollisionSelection.h b/.conflict-side-1/PWGCF/FemtoWorld/Core/FemtoWorldCollisionSelection.h
index d2404f3e214..d581dcaa4ee 100644
--- a/.conflict-side-1/PWGCF/FemtoWorld/Core/FemtoWorldCollisionSelection.h
+++ b/.conflict-side-1/PWGCF/FemtoWorld/Core/FemtoWorldCollisionSelection.h
@@ -17,13 +17,14 @@
 #ifndef PWGCF_FEMTOWORLD_CORE_FEMTOWORLDCOLLISIONSELECTION_H_
 #define PWGCF_FEMTOWORLD_CORE_FEMTOWORLDCOLLISIONSELECTION_H_
 
-#include <string>
-#include <iostream>
-
 #include "Common/CCDB/TriggerAliases.h"
+
 #include "Framework/HistogramRegistry.h"
 #include "Framework/Logger.h"
 
+#include <iostream>
+#include <string>
+
 using namespace o2::framework;
 
 namespace o2::analysis::femtoWorld
diff --git a/.conflict-side-1/PWGCF/FemtoWorld/Core/FemtoWorldContainer.h b/.conflict-side-1/PWGCF/FemtoWorld/Core/FemtoWorldContainer.h
index a80af060d56..5bf2a122062 100644
--- a/.conflict-side-1/PWGCF/FemtoWorld/Core/FemtoWorldContainer.h
+++ b/.conflict-side-1/PWGCF/FemtoWorld/Core/FemtoWorldContainer.h
@@ -18,19 +18,20 @@
 #ifndef PWGCF_FEMTOWORLD_CORE_FEMTOWORLDCONTAINER_H_
 #define PWGCF_FEMTOWORLD_CORE_FEMTOWORLDCONTAINER_H_
 
-#include <vector>
-#include <string>
-#include "Framework/HistogramRegistry.h"
 #include "PWGCF/FemtoWorld/Core/FemtoWorldMath.h"
 
+#include "CommonConstants/MathConstants.h"
+#include "Framework/HistogramRegistry.h"
+
 #include "Math/Vector4D.h"
-#include "TMath.h"
 #include "TDatabasePDG.h"
-
 #include "TLorentzVector.h"
-#include "CommonConstants/MathConstants.h"
+#include "TMath.h"
 #include "TRandom.h"
 
+#include <string>
+#include <vector>
+
 using namespace o2::framework;
 
 namespace o2::analysis::femtoWorld
diff --git a/.conflict-side-1/PWGCF/FemtoWorld/Core/FemtoWorldDetaDphiStar.h b/.conflict-side-1/PWGCF/FemtoWorld/Core/FemtoWorldDetaDphiStar.h
index f7262481a77..c7085de74ce 100644
--- a/.conflict-side-1/PWGCF/FemtoWorld/Core/FemtoWorldDetaDphiStar.h
+++ b/.conflict-side-1/PWGCF/FemtoWorld/Core/FemtoWorldDetaDphiStar.h
@@ -17,13 +17,14 @@
 #ifndef PWGCF_FEMTOWORLD_CORE_FEMTOWORLDDETADPHISTAR_H_
 #define PWGCF_FEMTOWORLD_CORE_FEMTOWORLDDETADPHISTAR_H_
 
-#include <string>
-#include <memory>
-#include <vector>
-
 #include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
+
 #include "Framework/HistogramRegistry.h"
 
+#include <memory>
+#include <string>
+#include <vector>
+
 namespace o2::analysis
 {
 namespace femtoWorld
diff --git a/.conflict-side-1/PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h b/.conflict-side-1/PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h
index fade16ebb00..c7c1c672816 100644
--- a/.conflict-side-1/PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h
+++ b/.conflict-side-1/PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h
@@ -18,6 +18,7 @@
 #define FEMTOWORLDEVENTHISTO_H_
 
 #include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
+
 #include "Framework/HistogramRegistry.h"
 
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGCF/FemtoWorld/Core/FemtoWorldMath.h b/.conflict-side-1/PWGCF/FemtoWorld/Core/FemtoWorldMath.h
index 6eff2f212b8..921b34aa8f5 100644
--- a/.conflict-side-1/PWGCF/FemtoWorld/Core/FemtoWorldMath.h
+++ b/.conflict-side-1/PWGCF/FemtoWorld/Core/FemtoWorldMath.h
@@ -17,8 +17,8 @@
 #ifndef FEMTOWORLDMATH_H_
 #define FEMTOWORLDMATH_H_
 
-#include "Math/Vector4D.h"
 #include "Math/Boost.h"
+#include "Math/Vector4D.h"
 #include "TLorentzVector.h"
 #include "TMath.h"
 
diff --git a/.conflict-side-1/PWGCF/FemtoWorld/Core/FemtoWorldObjectSelection.h b/.conflict-side-1/PWGCF/FemtoWorld/Core/FemtoWorldObjectSelection.h
index d940f9d13ef..2ab9c7a05f2 100644
--- a/.conflict-side-1/PWGCF/FemtoWorld/Core/FemtoWorldObjectSelection.h
+++ b/.conflict-side-1/PWGCF/FemtoWorld/Core/FemtoWorldObjectSelection.h
@@ -18,8 +18,8 @@
 
 #include "PWGCF/FemtoWorld/Core/FemtoWorldSelection.h"
 
-#include "ReconstructionDataFormats/PID.h"
 #include "Framework/HistogramRegistry.h"
+#include "ReconstructionDataFormats/PID.h"
 
 using namespace o2::framework;
 
diff --git a/.conflict-side-1/PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h b/.conflict-side-1/PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h
index 5c20af3813e..f0f6b24dead 100644
--- a/.conflict-side-1/PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h
+++ b/.conflict-side-1/PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h
@@ -18,6 +18,7 @@
 #define PWGCF_FEMTOWORLD_CORE_FEMTOWORLDPAIRCLEANER_H_
 
 #include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
+
 #include "Framework/HistogramRegistry.h"
 
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGCF/FemtoWorld/Core/FemtoWorldPairWithCentrality.h b/.conflict-side-1/PWGCF/FemtoWorld/Core/FemtoWorldPairWithCentrality.h
index 2a2548b5d5b..fee7b1aed33 100644
--- a/.conflict-side-1/PWGCF/FemtoWorld/Core/FemtoWorldPairWithCentrality.h
+++ b/.conflict-side-1/PWGCF/FemtoWorld/Core/FemtoWorldPairWithCentrality.h
@@ -13,10 +13,11 @@
 #ifndef PWGCF_FEMTOWORLD_CORE_FEMTOWORLDPAIRWITHCENTRALITY_H_
 #define PWGCF_FEMTOWORLD_CORE_FEMTOWORLDPAIRWITHCENTRALITY_H_
 
-#include <string>
+#include "Framework/HistogramRegistry.h"
+
 #include <iostream>
+#include <string>
 #include <vector>
-#include "Framework/HistogramRegistry.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h b/.conflict-side-1/PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h
index 0671c267200..574fa371ae8 100644
--- a/.conflict-side-1/PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h
+++ b/.conflict-side-1/PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h
@@ -17,10 +17,12 @@
 #ifndef PWGCF_FEMTOWORLD_CORE_FEMTOWORLDPARTICLEHISTO_H_
 #define PWGCF_FEMTOWORLD_CORE_FEMTOWORLDPARTICLEHISTO_H_
 
-#include <string>
 #include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
+
 #include "Framework/HistogramRegistry.h"
 
+#include <string>
+
 using namespace o2::framework;
 // using namespace o2::aod::o2::aod;
 
diff --git a/.conflict-side-1/PWGCF/FemtoWorld/Core/FemtoWorldPhiSelection.h b/.conflict-side-1/PWGCF/FemtoWorld/Core/FemtoWorldPhiSelection.h
index 39040d70ec0..52ed3db69ed 100644
--- a/.conflict-side-1/PWGCF/FemtoWorld/Core/FemtoWorldPhiSelection.h
+++ b/.conflict-side-1/PWGCF/FemtoWorld/Core/FemtoWorldPhiSelection.h
@@ -19,19 +19,20 @@
 #ifndef PWGCF_FEMTOWORLD_CORE_FEMTOWORLDPHISELECTION_H_
 #define PWGCF_FEMTOWORLD_CORE_FEMTOWORLDPHISELECTION_H_
 
-#include <string>
-#include <vector>
-
-#include <TDatabasePDG.h> // FIXME
-
 #include "PWGCF/FemtoWorld/Core/FemtoWorldObjectSelection.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldTrackSelection.h"
 #include "PWGCF/FemtoWorld/Core/FemtoWorldSelection.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldTrackSelection.h"
 
-#include "ReconstructionDataFormats/PID.h"
 #include "Common/Core/RecoDecay.h"
+
 #include "Framework/HistogramRegistry.h"
+#include "ReconstructionDataFormats/PID.h"
+
 #include "TLorentzVector.h"
+#include <TDatabasePDG.h> // FIXME
+
+#include <string>
+#include <vector>
 
 using namespace o2::framework;
 
diff --git a/.conflict-side-1/PWGCF/FemtoWorld/Core/FemtoWorldPionContainer.h b/.conflict-side-1/PWGCF/FemtoWorld/Core/FemtoWorldPionContainer.h
index 9c68ac7c76e..fe4641b9463 100644
--- a/.conflict-side-1/PWGCF/FemtoWorld/Core/FemtoWorldPionContainer.h
+++ b/.conflict-side-1/PWGCF/FemtoWorld/Core/FemtoWorldPionContainer.h
@@ -18,19 +18,20 @@
 #ifndef PWGCF_FEMTOWORLD_CORE_FEMTOWORLDPIONCONTAINER_H_
 #define PWGCF_FEMTOWORLD_CORE_FEMTOWORLDPIONCONTAINER_H_
 
-#include <vector>
-#include <string>
-#include "Framework/HistogramRegistry.h"
 #include "PWGCF/FemtoWorld/Core/FemtoWorldMath.h"
 
+#include "CommonConstants/MathConstants.h"
+#include "Framework/HistogramRegistry.h"
+
 #include "Math/Vector4D.h"
-#include "TMath.h"
 #include "TDatabasePDG.h"
-
 #include "TLorentzVector.h"
-#include "CommonConstants/MathConstants.h"
+#include "TMath.h"
 #include "TRandom.h"
 
+#include <string>
+#include <vector>
+
 using namespace o2::framework;
 
 namespace o2::analysis::femtoWorld
diff --git a/.conflict-side-1/PWGCF/FemtoWorld/Core/FemtoWorldTrackSelection.h b/.conflict-side-1/PWGCF/FemtoWorld/Core/FemtoWorldTrackSelection.h
index 1853be4bd3c..ea06a1433a4 100644
--- a/.conflict-side-1/PWGCF/FemtoWorld/Core/FemtoWorldTrackSelection.h
+++ b/.conflict-side-1/PWGCF/FemtoWorld/Core/FemtoWorldTrackSelection.h
@@ -18,14 +18,16 @@
 #ifndef FEMTOWORLDTRACKSELECTION_H_
 #define FEMTOWORLDTRACKSELECTION_H_
 
+#include "PWGCF/FemtoWorld/Core/FemtoWorldObjectSelection.h"
 #include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldObjectSelection.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "ReconstructionDataFormats/PID.h"
 #include "Framework/HistogramRegistry.h"
+#include "ReconstructionDataFormats/PID.h"
+
 #include <cmath>
 #include <iostream>
 
@@ -278,7 +280,7 @@ class FemtoWorldTrackSelection : public FemtoWorldObjectSelection<float, femtoWo
                                                                           "Maximal DCA_z (cm)",
                                                                           "Minimal DCA (cm)",
                                                                           "Maximal PID (nSigma)"}; ///< Helper information for the different selections
-};                                                                                                 // namespace femtoWorld
+}; // namespace femtoWorld
 
 template <o2::aod::femtoworldparticle::ParticleType part, o2::aod::femtoworldparticle::TrackType tracktype, typename cutContainerType>
 void FemtoWorldTrackSelection::init(HistogramRegistry* registry)
diff --git a/.conflict-side-1/PWGCF/FemtoWorld/Core/FemtoWorldUtils.h b/.conflict-side-1/PWGCF/FemtoWorld/Core/FemtoWorldUtils.h
index 6f7ae6e31e3..a918e674e45 100644
--- a/.conflict-side-1/PWGCF/FemtoWorld/Core/FemtoWorldUtils.h
+++ b/.conflict-side-1/PWGCF/FemtoWorld/Core/FemtoWorldUtils.h
@@ -18,8 +18,9 @@
 #ifndef FEMTOWORLD_UTILS_H_
 #define FEMTOWORLD_UTILS_H_
 
-#include "Framework/ASoAHelpers.h"
 #include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
+
+#include "Framework/ASoAHelpers.h"
 #include <CCDB/BasicCCDBManager.h>
 
 #include <vector>
diff --git a/.conflict-side-1/PWGCF/FemtoWorld/Core/FemtoWorldV0Selection.h b/.conflict-side-1/PWGCF/FemtoWorld/Core/FemtoWorldV0Selection.h
index b86171502e8..e5202efbc65 100644
--- a/.conflict-side-1/PWGCF/FemtoWorld/Core/FemtoWorldV0Selection.h
+++ b/.conflict-side-1/PWGCF/FemtoWorld/Core/FemtoWorldV0Selection.h
@@ -20,12 +20,13 @@
 #define FEMTOWORLDV0SELECTION_H_
 
 #include "PWGCF/FemtoWorld/Core/FemtoWorldObjectSelection.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldTrackSelection.h"
 #include "PWGCF/FemtoWorld/Core/FemtoWorldSelection.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldTrackSelection.h"
 
-#include "ReconstructionDataFormats/PID.h"
 #include "Common/Core/RecoDecay.h"
+
 #include "Framework/HistogramRegistry.h"
+#include "ReconstructionDataFormats/PID.h"
 
 using namespace o2::framework;
 
diff --git a/.conflict-side-1/PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h b/.conflict-side-1/PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h
index d112f11c2ab..4d3071b5575 100644
--- a/.conflict-side-1/PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h
+++ b/.conflict-side-1/PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h
@@ -12,16 +12,18 @@
 #ifndef PWGCF_FEMTOWORLD_DATAMODEL_FEMTOWORLDDERIVED_H_
 #define PWGCF_FEMTOWORLD_DATAMODEL_FEMTOWORLDDERIVED_H_
 
-#include <cmath>
-#include "Framework/ASoA.h"
-#include "MathUtils/Utils.h"
-#include "Framework/DataTypes.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoA.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/DataTypes.h"
 #include "Framework/Expressions.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Centrality.h"
+#include "MathUtils/Utils.h"
+
+#include <cmath>
 
 namespace o2::aod
 {
diff --git a/.conflict-side-1/PWGCF/FemtoWorld/TableProducer/femtoWorldProducerReducedTask.cxx b/.conflict-side-1/PWGCF/FemtoWorld/TableProducer/femtoWorldProducerReducedTask.cxx
index 06bb8dff109..c6380dd97d2 100644
--- a/.conflict-side-1/PWGCF/FemtoWorld/TableProducer/femtoWorldProducerReducedTask.cxx
+++ b/.conflict-side-1/PWGCF/FemtoWorld/TableProducer/femtoWorldProducerReducedTask.cxx
@@ -16,23 +16,25 @@
 #include "PWGCF/FemtoWorld/Core/FemtoWorldCollisionSelection.h"
 #include "PWGCF/FemtoWorld/Core/FemtoWorldTrackSelection.h"
 #include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "DataFormatsParameters/GRPObject.h"
+#include <CCDB/BasicCCDBManager.h>
+
 #include "Math/Vector4D.h"
 #include "TMath.h"
-#include <CCDB/BasicCCDBManager.h>
 
 using namespace o2;
 using namespace o2::analysis::femtoWorld;
diff --git a/.conflict-side-1/PWGCF/FemtoWorld/TableProducer/femtoWorldProducerTask.cxx b/.conflict-side-1/PWGCF/FemtoWorld/TableProducer/femtoWorldProducerTask.cxx
index ce5b415b275..861e7ff8005 100644
--- a/.conflict-side-1/PWGCF/FemtoWorld/TableProducer/femtoWorldProducerTask.cxx
+++ b/.conflict-side-1/PWGCF/FemtoWorld/TableProducer/femtoWorldProducerTask.cxx
@@ -14,38 +14,38 @@
 /// \author Andi Mathis, TU München, andreas.mathis@ph.tum.de
 /// \author Zuzanna Chochulska, WUT Warsaw, zchochul@cern.ch
 
-#include <TDatabasePDG.h> // FIXME
-
-#include "CCDB/BasicCCDBManager.h"
 #include "PWGCF/FemtoWorld/Core/FemtoWorldCollisionSelection.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldPhiSelection.h"
 #include "PWGCF/FemtoWorld/Core/FemtoWorldTrackSelection.h"
 #include "PWGCF/FemtoWorld/Core/FemtoWorldV0Selection.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldPhiSelection.h"
 #include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h"
-
 #include "PWGHF/Core/HfHelper.h"
 #include "PWGHF/DataModel/CandidateReconstructionTables.h"
 #include "PWGHF/DataModel/CandidateSelectionTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "TLorentzVector.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsParameters/GRPMagField.h"
 #include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
 #include "Math/Vector4D.h"
+#include "TLorentzVector.h"
 #include "TMath.h"
+#include <TDatabasePDG.h> // FIXME
 
 using namespace o2;
 using namespace o2::analysis::femtoWorld;
diff --git a/.conflict-side-1/PWGCF/FemtoWorld/TableProducer/femtoWorldProducerTaskV0Only.cxx b/.conflict-side-1/PWGCF/FemtoWorld/TableProducer/femtoWorldProducerTaskV0Only.cxx
index b576f2c125b..0e635dc97ee 100644
--- a/.conflict-side-1/PWGCF/FemtoWorld/TableProducer/femtoWorldProducerTaskV0Only.cxx
+++ b/.conflict-side-1/PWGCF/FemtoWorld/TableProducer/femtoWorldProducerTaskV0Only.cxx
@@ -17,23 +17,25 @@
 #include "PWGCF/FemtoWorld/Core/FemtoWorldTrackSelection.h"
 #include "PWGCF/FemtoWorld/Core/FemtoWorldV0Selection.h"
 #include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "DataFormatsParameters/GRPObject.h"
+#include <CCDB/BasicCCDBManager.h>
+
 #include "Math/Vector4D.h"
 #include "TMath.h"
-#include <CCDB/BasicCCDBManager.h>
 
 using namespace o2;
 using namespace o2::analysis::femtoWorld;
diff --git a/.conflict-side-1/PWGCF/FemtoWorld/Tasks/femtoWorldDebugTrack.cxx b/.conflict-side-1/PWGCF/FemtoWorld/Tasks/femtoWorldDebugTrack.cxx
index cb5fd945b3c..a0f158df070 100644
--- a/.conflict-side-1/PWGCF/FemtoWorld/Tasks/femtoWorldDebugTrack.cxx
+++ b/.conflict-side-1/PWGCF/FemtoWorld/Tasks/femtoWorldDebugTrack.cxx
@@ -13,18 +13,18 @@
 /// \brief Tasks that reads the particle tables and fills QA histograms for tracks
 /// \author Luca Barioglio, TU München, luca.barioglio@cern.ch
 
+#include "PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldUtils.h"
+#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
+
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-#include "DataFormatsParameters/GRPObject.h"
-
-#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldUtils.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::analysis::femtoWorld;
diff --git a/.conflict-side-1/PWGCF/FemtoWorld/Tasks/femtoWorldDebugV0.cxx b/.conflict-side-1/PWGCF/FemtoWorld/Tasks/femtoWorldDebugV0.cxx
index b2080ba4789..31c37c84772 100644
--- a/.conflict-side-1/PWGCF/FemtoWorld/Tasks/femtoWorldDebugV0.cxx
+++ b/.conflict-side-1/PWGCF/FemtoWorld/Tasks/femtoWorldDebugV0.cxx
@@ -13,18 +13,18 @@
 /// \brief Tasks that reads the particle tables and fills QA histograms for V0s
 /// \author Luca Barioglio, TU München, luca.barioglio@cern.ch
 
+#include "PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldUtils.h"
+#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
+
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-#include "DataFormatsParameters/GRPObject.h"
-
-#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldUtils.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::analysis::femtoWorld;
diff --git a/.conflict-side-1/PWGCF/FemtoWorld/Tasks/femtoWorldEfficiencyTask.cxx b/.conflict-side-1/PWGCF/FemtoWorld/Tasks/femtoWorldEfficiencyTask.cxx
index 9cad450302f..a4fb0717a75 100644
--- a/.conflict-side-1/PWGCF/FemtoWorld/Tasks/femtoWorldEfficiencyTask.cxx
+++ b/.conflict-side-1/PWGCF/FemtoWorld/Tasks/femtoWorldEfficiencyTask.cxx
@@ -16,20 +16,22 @@
 /// \author Barbara Chytla, WUT Warsaw, barbara.chytla@cern.ch
 
 // O2 includes
+#include "PWGCF/FemtoWorld/Core/FemtoWorldCollisionSelection.h"
+#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
+#include "PWGLF/DataModel/LFResonanceTables.h"
+
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/Core/trackUtilities.h"
+
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldCollisionSelection.h"
-#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
-#include "Framework/O2DatabasePDGPlugin.h"
 
 #include "TPDGCode.h"
 
diff --git a/.conflict-side-1/PWGCF/FemtoWorld/Tasks/femtoWorldEfficiencyTaskDe.cxx b/.conflict-side-1/PWGCF/FemtoWorld/Tasks/femtoWorldEfficiencyTaskDe.cxx
index b0108b37a2b..cd0d2e4b247 100644
--- a/.conflict-side-1/PWGCF/FemtoWorld/Tasks/femtoWorldEfficiencyTaskDe.cxx
+++ b/.conflict-side-1/PWGCF/FemtoWorld/Tasks/femtoWorldEfficiencyTaskDe.cxx
@@ -16,19 +16,21 @@
 /// \author Barbara Chytla, WUT Warsaw, barbara.chytla@cern.ch
 
 // O2 includes
+#include "PWGCF/FemtoWorld/Core/FemtoWorldCollisionSelection.h"
+#include "PWGLF/DataModel/LFResonanceTables.h"
+
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/Core/trackUtilities.h"
+
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldCollisionSelection.h"
-#include "Framework/O2DatabasePDGPlugin.h"
 
 #include "TPDGCode.h"
 
diff --git a/.conflict-side-1/PWGCF/FemtoWorld/Tasks/femtoWorldHashTask.cxx b/.conflict-side-1/PWGCF/FemtoWorld/Tasks/femtoWorldHashTask.cxx
index 4a6bdac3a2b..a990af3bf9e 100644
--- a/.conflict-side-1/PWGCF/FemtoWorld/Tasks/femtoWorldHashTask.cxx
+++ b/.conflict-side-1/PWGCF/FemtoWorld/Tasks/femtoWorldHashTask.cxx
@@ -16,11 +16,12 @@
 /// \author Zuzanna Chochulska, WUT Warsaw, zchochul@cern.ch
 
 #include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
+
 #include "Common/Core/EventMixing.h"
-#include "Framework/AnalysisTask.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "Framework/ASoAHelpers.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskPionPion.cxx b/.conflict-side-1/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskPionPion.cxx
index a2d061ed1f4..07185918140 100644
--- a/.conflict-side-1/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskPionPion.cxx
+++ b/.conflict-side-1/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskPionPion.cxx
@@ -15,20 +15,20 @@
 /// \author Zuzanna Chochulska, WUT Warsaw, zchochul@cern.ch
 /// \author Alicja Plachta, WUT Warsaw
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/StepTHn.h"
-
-#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldDetaDphiStar.h"
 #include "PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h"
 #include "PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h"
 #include "PWGCF/FemtoWorld/Core/FemtoWorldPionContainer.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldDetaDphiStar.h"
 #include "PWGCF/FemtoWorld/Core/FemtoWorldUtils.h"
+#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::analysis::femtoWorld;
diff --git a/.conflict-side-1/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskProtonAntiproton.cxx b/.conflict-side-1/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskProtonAntiproton.cxx
index 066307a91d4..46f6f802ae6 100644
--- a/.conflict-side-1/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskProtonAntiproton.cxx
+++ b/.conflict-side-1/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskProtonAntiproton.cxx
@@ -15,20 +15,20 @@
 /// \author Zuzanna Chochulska, WUT Warsaw, zchochul@cern.ch
 /// \author Barbara Chytła, WUT Warsaw, barbara.chytla.stud@pw.edu.pl
 
+#include "PWGCF/FemtoWorld/Core/FemtoWorldContainer.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldDetaDphiStar.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldUtils.h"
+#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-
-#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldContainer.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldDetaDphiStar.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldUtils.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::analysis::femtoWorld;
diff --git a/.conflict-side-1/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskTrackD0.cxx b/.conflict-side-1/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskTrackD0.cxx
index 8f1452c1c49..6a1fa8331c6 100644
--- a/.conflict-side-1/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskTrackD0.cxx
+++ b/.conflict-side-1/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskTrackD0.cxx
@@ -14,24 +14,23 @@
 /// \author Andi Mathis, TU München, andreas.mathis@ph.tum.de
 /// \author Zuzanna Chochulska, WUT Warsaw, zchochul@cern.ch
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/StepTHn.h"
-
-#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h"
 #include "PWGCF/FemtoWorld/Core/FemtoWorldContainer.h"
 #include "PWGCF/FemtoWorld/Core/FemtoWorldDetaDphiStar.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h"
 #include "PWGCF/FemtoWorld/Core/FemtoWorldUtils.h"
-
+#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
 #include "PWGHF/DataModel/CandidateReconstructionTables.h"
 #include "PWGHF/DataModel/CandidateSelectionTables.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::analysis::femtoWorld;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskTrackPhi.cxx b/.conflict-side-1/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskTrackPhi.cxx
index e5201b379d5..3e6c1a066bb 100644
--- a/.conflict-side-1/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskTrackPhi.cxx
+++ b/.conflict-side-1/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskTrackPhi.cxx
@@ -14,20 +14,20 @@
 /// \author Andi Mathis, TU München, andreas.mathis@ph.tum.de
 /// \author Zuzanna Chochulska, WUT Warsaw, zchochul@cern.ch
 
+#include "PWGCF/FemtoWorld/Core/FemtoWorldContainer.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldDetaDphiStar.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldUtils.h"
+#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-
-#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldContainer.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldDetaDphiStar.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldUtils.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::analysis::femtoWorld;
diff --git a/.conflict-side-1/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskTrackTrack.cxx b/.conflict-side-1/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskTrackTrack.cxx
index 4037bd991e0..1cacc212d47 100644
--- a/.conflict-side-1/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskTrackTrack.cxx
+++ b/.conflict-side-1/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskTrackTrack.cxx
@@ -14,20 +14,20 @@
 /// \author Andi Mathis, TU München, andreas.mathis@ph.tum.de
 /// \author Zuzanna Chochulska, WUT Warsaw, zchochul@cern.ch
 
+#include "PWGCF/FemtoWorld/Core/FemtoWorldContainer.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldDetaDphiStar.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldUtils.h"
+#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-
-#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldContainer.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldDetaDphiStar.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldUtils.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::analysis::femtoWorld;
diff --git a/.conflict-side-1/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskTrackV0.cxx b/.conflict-side-1/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskTrackV0.cxx
index 36094a0f16a..2d8be41c0c1 100644
--- a/.conflict-side-1/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskTrackV0.cxx
+++ b/.conflict-side-1/PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskTrackV0.cxx
@@ -13,20 +13,20 @@
 /// \brief Tasks that reads the track tables used for the pairing and builds pairs of two tracks
 /// \author Andi Mathis, TU München, andreas.mathis@ph.tum.de
 
+#include "PWGCF/FemtoWorld/Core/FemtoWorldContainer.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldDetaDphiStar.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldUtils.h"
+#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-
-#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldContainer.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldDetaDphiStar.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldUtils.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::analysis::femtoWorld;
diff --git a/.conflict-side-1/PWGCF/FemtoWorld/Tasks/femtoWorldPionAllPairTask.cxx b/.conflict-side-1/PWGCF/FemtoWorld/Tasks/femtoWorldPionAllPairTask.cxx
index 44278d89471..ba41e02a12d 100644
--- a/.conflict-side-1/PWGCF/FemtoWorld/Tasks/femtoWorldPionAllPairTask.cxx
+++ b/.conflict-side-1/PWGCF/FemtoWorld/Tasks/femtoWorldPionAllPairTask.cxx
@@ -15,23 +15,24 @@
 /// \author Zuzanna Chochulska, WUT Warsaw, zchochul@cern.ch
 /// \author Deependra Sharma, IITB, deependra.sharma@cern.ch
 
+#include "PWGCF/FemtoWorld/Core/FemtoWorldContainer.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldDetaDphiStar.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldMath.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldPairWithCentrality.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldUtils.h"
+#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-#include "TDatabasePDG.h"
+#include "Framework/runDataProcessing.h"
 
-#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldContainer.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldDetaDphiStar.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldUtils.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldMath.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldPairWithCentrality.h"
+#include "TDatabasePDG.h"
 
 using namespace o2;
 using namespace o2::analysis::femtoWorld;
diff --git a/.conflict-side-1/PWGCF/FemtoWorld/Tasks/femtoWorldPionPairTaskTrackTrack.cxx b/.conflict-side-1/PWGCF/FemtoWorld/Tasks/femtoWorldPionPairTaskTrackTrack.cxx
index 9d83c1ca3ec..3bba47662c9 100644
--- a/.conflict-side-1/PWGCF/FemtoWorld/Tasks/femtoWorldPionPairTaskTrackTrack.cxx
+++ b/.conflict-side-1/PWGCF/FemtoWorld/Tasks/femtoWorldPionPairTaskTrackTrack.cxx
@@ -15,20 +15,20 @@
 /// \author Zuzanna Chochulska, WUT Warsaw, zchochul@cern.ch
 /// \author Deependra Sharma, IITB, deependra.sharma@cern.ch
 
+#include "PWGCF/FemtoWorld/Core/FemtoWorldContainer.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldDetaDphiStar.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h"
+#include "PWGCF/FemtoWorld/Core/FemtoWorldUtils.h"
+#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StepTHn.h"
-
-#include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldEventHisto.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldPairCleaner.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldContainer.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldDetaDphiStar.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldUtils.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::analysis::femtoWorld;
diff --git a/.conflict-side-1/PWGCF/Flow/TableProducer/zdcQVectors.cxx b/.conflict-side-1/PWGCF/Flow/TableProducer/zdcQVectors.cxx
index c748b1f51ec..095bc857326 100644
--- a/.conflict-side-1/PWGCF/Flow/TableProducer/zdcQVectors.cxx
+++ b/.conflict-side-1/PWGCF/Flow/TableProducer/zdcQVectors.cxx
@@ -14,47 +14,48 @@
 /// \since  11/2024
 /// \brief  In this task the energy calibration and recentring of Q-vectors constructed in the ZDCs will be done
 
-#include <stdlib.h>
-#include <cmath>
-#include <algorithm>
-#include <numeric>
-#include <vector>
-#include <typeinfo>
-#include <memory>
-#include <string>
+#include "PWGCF/DataModel/SPTableZDC.h"
 
-#include "CCDB/BasicCCDBManager.h"
 #include "Common/CCDB/EventSelectionParams.h"
 #include "Common/CCDB/TriggerAliases.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "Framework/AnalysisTask.h"
+#include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StaticFor.h"
-
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/GlobalTrackID.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "PWGCF/DataModel/SPTableZDC.h"
 
+#include "TCanvas.h"
+#include "TF1.h"
+#include "TFitResult.h"
 #include "TH1F.h"
 #include "TH2F.h"
-#include "TProfile.h"
 #include "TObjArray.h"
-#include "TF1.h"
-#include "TFitResult.h"
-#include "TCanvas.h"
-#include "TSystem.h"
+#include "TProfile.h"
 #include "TROOT.h"
+#include "TSystem.h"
+
+#include <algorithm>
+#include <cmath>
+#include <memory>
+#include <numeric>
+#include <string>
+#include <typeinfo>
+#include <vector>
+
+#include <stdlib.h>
 
 #define O2_DEFINE_CONFIGURABLE(NAME, TYPE, DEFAULT, HELP) Configurable<TYPE> NAME{#NAME, DEFAULT, HELP};
 
@@ -80,7 +81,7 @@ std::vector<double> pyZDC = {-1.75, -1.75, 1.75, 1.75};
 double alphaZDC = 0.395;
 
 // q-vectors before (q) and after (qRec) recentering.
-std::vector<double> q(4); // start values of [QxA, QyA, QxC, QyC]
+std::vector<double> q(4);     // start values of [QxA, QyA, QxC, QyC]
 std::vector<double> qNoEq(4); // start values of [QxA, QyA, QxC, QyC]
 
 // for energy calibration
diff --git a/.conflict-side-1/PWGCF/Flow/Tasks/flowAnalysisGF.cxx b/.conflict-side-1/PWGCF/Flow/Tasks/flowAnalysisGF.cxx
index 08e223befb6..38b5ddf9eb7 100644
--- a/.conflict-side-1/PWGCF/Flow/Tasks/flowAnalysisGF.cxx
+++ b/.conflict-side-1/PWGCF/Flow/Tasks/flowAnalysisGF.cxx
@@ -9,35 +9,36 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <CCDB/BasicCCDBManager.h>
-#include <DataFormatsParameters/GRPObject.h>
-#include <DataFormatsParameters/GRPMagField.h>
-#include <algorithm>
-#include <numeric>
-#include <vector>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/HistogramRegistry.h"
-
-#include "Common/DataModel/EventSelection.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-
-#include "GFWPowerArray.h"
-#include "GFW.h"
-#include "GFWCumulant.h"
 #include "FlowContainer.h"
 #include "FlowPtContainer.h"
+#include "GFW.h"
 #include "GFWConfig.h"
+#include "GFWCumulant.h"
+#include "GFWPowerArray.h"
 #include "GFWWeights.h"
+
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include <CCDB/BasicCCDBManager.h>
+#include <DataFormatsParameters/GRPMagField.h>
+#include <DataFormatsParameters/GRPObject.h>
+
+#include <TF1.h>
 #include <TProfile.h>
 #include <TRandom3.h>
-#include <TF1.h>
+
+#include <algorithm>
+#include <numeric>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGCF/Flow/Tasks/flowEfficiencyCasc.cxx b/.conflict-side-1/PWGCF/Flow/Tasks/flowEfficiencyCasc.cxx
index 25e23838586..e47d25cc6bf 100644
--- a/.conflict-side-1/PWGCF/Flow/Tasks/flowEfficiencyCasc.cxx
+++ b/.conflict-side-1/PWGCF/Flow/Tasks/flowEfficiencyCasc.cxx
@@ -14,23 +14,27 @@
 /// \since  Feb/21/2025
 /// \brief  This task is to calculate V0s and cascades local density efficiency
 
-#include <vector>
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
+#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/DataModel/cascqaanalysis.h"
+
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGLF/DataModel/cascqaanalysis.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 #include <TPDGCode.h>
 
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-1/PWGCF/Flow/Tasks/flowEsePHe3.cxx b/.conflict-side-1/PWGCF/Flow/Tasks/flowEsePHe3.cxx
index 2a4955c1419..1577b36037e 100644
--- a/.conflict-side-1/PWGCF/Flow/Tasks/flowEsePHe3.cxx
+++ b/.conflict-side-1/PWGCF/Flow/Tasks/flowEsePHe3.cxx
@@ -14,41 +14,41 @@
 /// \brief  task to calculate the P He3 flow correlation.
 // C++/ROOT includes.
 #include <CCDB/BasicCCDBManager.h>
-#include <chrono>
-#include <string>
-#include <vector>
-#include <utility>
-#include <memory>
-#include <TF1.h>
+
 #include <TComplex.h>
+#include <TF1.h>
 #include <TH1F.h>
 #include <TH2D.h>
 #include <TMath.h>
 #include <TVector2.h>
 
-// o2Physics includes.
-#include "Framework/ASoA.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/StaticFor.h"
-
-#include "DataFormatsTPC/BetheBlochAleph.h"
+#include <chrono>
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
 
-#include "Common/DataModel/Qvectors.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Multiplicity.h"
+// o2Physics includes.
 #include "Common/Core/EventPlaneHelper.h"
 #include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/PIDResponseITS.h"
+#include "Common/DataModel/Qvectors.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
 #include "CommonConstants/PhysicsConstants.h"
+#include "DataFormatsTPC/BetheBlochAleph.h"
+#include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGCF/Flow/Tasks/flowGfwOmegaXi.cxx b/.conflict-side-1/PWGCF/Flow/Tasks/flowGfwOmegaXi.cxx
index 741f4b5b33a..0dbc93d8bdd 100644
--- a/.conflict-side-1/PWGCF/Flow/Tasks/flowGfwOmegaXi.cxx
+++ b/.conflict-side-1/PWGCF/Flow/Tasks/flowGfwOmegaXi.cxx
@@ -196,7 +196,7 @@ struct FlowGfwOmegaXi {
 
   using TracksPID = soa::Join<aod::pidTPCPi, aod::pidTPCKa, aod::pidTPCPr, aod::pidTOFPi, aod::pidTOFKa, aod::pidTOFPr>;
   using AodTracks = soa::Filtered<soa::Join<aod::Tracks, aod::TrackSelection, o2::aod::TrackSelectionExtension, aod::TracksExtra, TracksPID, aod::TracksIU>>; // tracks filter
-  using AodCollisions = soa::Filtered<soa::Join<aod::Collisions, aod::EvSels, aod::CentFT0Cs, aod::Mults>>;  // collisions filter
+  using AodCollisions = soa::Filtered<soa::Join<aod::Collisions, aod::EvSels, aod::CentFT0Cs, aod::Mults>>;                                                   // collisions filter
   using DaughterTracks = soa::Join<aod::Tracks, aod::TracksExtra, aod::TracksDCA, TracksPID, aod::TrackSelection, o2::aod::TrackSelectionExtension>;
 
   // Connect to ccdb
diff --git a/.conflict-side-1/PWGCF/Flow/Tasks/flowGfwTask.cxx b/.conflict-side-1/PWGCF/Flow/Tasks/flowGfwTask.cxx
index e5854dcf43b..9e2d03f41d1 100644
--- a/.conflict-side-1/PWGCF/Flow/Tasks/flowGfwTask.cxx
+++ b/.conflict-side-1/PWGCF/Flow/Tasks/flowGfwTask.cxx
@@ -14,40 +14,41 @@
 /// \since  Mar 28, 2024
 /// \brief  Multiparticle flow measurements with FT0 and ZDC
 
-#include <CCDB/BasicCCDBManager.h>
-#include <DataFormatsParameters/GRPMagField.h>
-#include <cmath>
-#include <vector>
-#include <string>
-#include <memory>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/AnalysisDataModel.h"
+#include "FlowContainer.h"
+#include "GFW.h"
+#include "GFWCumulant.h"
+#include "GFWPowerArray.h"
+#include "GFWWeights.h"
 
-#include "Common/DataModel/EventSelection.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/GlobalTrackID.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "TPDGCode.h"
+#include <CCDB/BasicCCDBManager.h>
+#include <DataFormatsParameters/GRPMagField.h>
 
-#include "GFWPowerArray.h"
-#include "GFW.h"
-#include "GFWCumulant.h"
-#include "GFWWeights.h"
-#include "FlowContainer.h"
 #include "TList.h"
+#include "TPDGCode.h"
+#include <TF1.h>
 #include <TProfile.h>
 #include <TRandom3.h>
-#include <TF1.h>
+
+#include <cmath>
+#include <memory>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGCF/Flow/Tasks/flowMc.cxx b/.conflict-side-1/PWGCF/Flow/Tasks/flowMc.cxx
index b310096ef40..81ed7e3f95b 100644
--- a/.conflict-side-1/PWGCF/Flow/Tasks/flowMc.cxx
+++ b/.conflict-side-1/PWGCF/Flow/Tasks/flowMc.cxx
@@ -14,34 +14,39 @@
 /// \since  Feb/5/2025
 /// \brief  QC of synthetic flow exercise
 
-#include <CCDB/BasicCCDBManager.h>
-#include <vector>
-#include <string>
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "FlowContainer.h"
+#include "GFW.h"
+#include "GFWCumulant.h"
+#include "GFWPowerArray.h"
+#include "GFWWeights.h"
+
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGMM/Mult/DataModel/Index.h" // for Particles2Tracks table
+
 #include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
 #include "Common/Core/trackUtilities.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "DataFormatsParameters/GRPObject.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "DataFormatsParameters/GRPMagField.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGMM/Mult/DataModel/Index.h" // for Particles2Tracks table
-#include "GFWPowerArray.h"
-#include "GFW.h"
-#include "GFWCumulant.h"
-#include "GFWWeights.h"
-#include "FlowContainer.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+#include <CCDB/BasicCCDBManager.h>
+
+#include <TF1.h>
+#include <TPDGCode.h>
 #include <TProfile.h>
 #include <TRandom3.h>
-#include <TPDGCode.h>
-#include <TF1.h>
+
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGCF/Flow/Tasks/flowPidCme.cxx b/.conflict-side-1/PWGCF/Flow/Tasks/flowPidCme.cxx
index bd91bdc4450..0248af750d6 100644
--- a/.conflict-side-1/PWGCF/Flow/Tasks/flowPidCme.cxx
+++ b/.conflict-side-1/PWGCF/Flow/Tasks/flowPidCme.cxx
@@ -14,39 +14,40 @@
 /// \brief  task to calculate the pikp cme signal and bacground.
 // C++/ROOT includes.
 #include <CCDB/BasicCCDBManager.h>
-#include <chrono>
-#include <string>
-#include <vector>
-#include <utility>
-#include <memory>
-#include <TF1.h>
+
 #include <TComplex.h>
+#include <TF1.h>
 #include <TH1F.h>
 #include <TH2D.h>
 #include <TMath.h>
 #include <TVector2.h>
 
-// o2Physics includes.
-#include "Framework/ASoA.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/StaticFor.h"
+#include <chrono>
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
 
-#include "Common/DataModel/Qvectors.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Multiplicity.h"
+// o2Physics includes.
 #include "Common/Core/EventPlaneHelper.h"
 #include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/PIDResponseITS.h"
+#include "Common/DataModel/Qvectors.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
 #include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
 
 // o2 includes.
 
diff --git a/.conflict-side-1/PWGCF/Flow/Tasks/flowPtEfficiency.cxx b/.conflict-side-1/PWGCF/Flow/Tasks/flowPtEfficiency.cxx
index 217b6f7fb36..a66de51e212 100644
--- a/.conflict-side-1/PWGCF/Flow/Tasks/flowPtEfficiency.cxx
+++ b/.conflict-side-1/PWGCF/Flow/Tasks/flowPtEfficiency.cxx
@@ -14,29 +14,31 @@
 /// \since  Jun/08/2023
 /// \brief  a task to calculate the pt efficiency
 
-#include <CCDB/BasicCCDBManager.h>
-#include <vector>
-#include <string>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/HistogramRegistry.h"
+#include "FlowContainer.h"
+#include "GFW.h"
+#include "GFWCumulant.h"
+#include "GFWPowerArray.h"
+#include "GFWWeights.h"
 
 #include "Common/Core/RecoDecay.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
-#include "GFWPowerArray.h"
-#include "GFW.h"
-#include "GFWCumulant.h"
-#include "GFWWeights.h"
-#include "FlowContainer.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include <CCDB/BasicCCDBManager.h>
+
+#include <TPDGCode.h>
 #include <TProfile.h>
 #include <TRandom3.h>
-#include <TPDGCode.h>
+
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGCF/Flow/Tasks/flowQa.cxx b/.conflict-side-1/PWGCF/Flow/Tasks/flowQa.cxx
index 1eaa6d8437d..3d52e9ec429 100644
--- a/.conflict-side-1/PWGCF/Flow/Tasks/flowQa.cxx
+++ b/.conflict-side-1/PWGCF/Flow/Tasks/flowQa.cxx
@@ -14,36 +14,38 @@
 /// \since  Feb/23/2025
 /// \brief  jira: PWGCF-254, QA for flow analysis
 
-#include <CCDB/BasicCCDBManager.h>
-#include <cmath>
-#include <vector>
-#include <unordered_map>
-#include <string>
-#include <memory>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/HistogramRegistry.h"
+#include "FlowContainer.h"
+#include "GFW.h"
+#include "GFWCumulant.h"
+#include "GFWPowerArray.h"
+#include "GFWWeights.h"
 
-#include "Common/DataModel/EventSelection.h"
+#include "Common/CCDB/ctpRateFetcher.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/CCDB/ctpRateFetcher.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include <CCDB/BasicCCDBManager.h>
 
-#include "GFWPowerArray.h"
-#include "GFW.h"
-#include "GFWCumulant.h"
-#include "GFWWeights.h"
-#include "FlowContainer.h"
 #include "TList.h"
+#include <TF1.h>
+#include <TObjArray.h>
 #include <TProfile.h>
 #include <TRandom3.h>
-#include <TObjArray.h>
-#include <TF1.h>
+
+#include <cmath>
+#include <memory>
+#include <string>
+#include <unordered_map>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGCF/Flow/Tasks/flowRunbyRun.cxx b/.conflict-side-1/PWGCF/Flow/Tasks/flowRunbyRun.cxx
index 620063e1d5d..b0221c34c3c 100644
--- a/.conflict-side-1/PWGCF/Flow/Tasks/flowRunbyRun.cxx
+++ b/.conflict-side-1/PWGCF/Flow/Tasks/flowRunbyRun.cxx
@@ -15,36 +15,38 @@
 /// \since  Oct/30/2024
 /// \brief  jira: PWGCF-254, produce Run-by-Run QA plots and flow analysis for Run3
 
-#include <CCDB/BasicCCDBManager.h>
-#include <cmath>
-#include <vector>
-#include <unordered_map>
-#include <map>
-#include <string>
-#include <memory>
-#include <utility>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/HistogramRegistry.h"
+#include "FlowContainer.h"
+#include "GFW.h"
+#include "GFWCumulant.h"
+#include "GFWPowerArray.h"
+#include "GFWWeights.h"
 
-#include "Common/DataModel/EventSelection.h"
+#include "Common/CCDB/ctpRateFetcher.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/CCDB/ctpRateFetcher.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include <CCDB/BasicCCDBManager.h>
 
-#include "GFWPowerArray.h"
-#include "GFW.h"
-#include "GFWCumulant.h"
-#include "GFWWeights.h"
-#include "FlowContainer.h"
 #include "TList.h"
+#include <TF1.h>
 #include <TProfile.h>
 #include <TRandom3.h>
-#include <TF1.h>
+
+#include <cmath>
+#include <map>
+#include <memory>
+#include <string>
+#include <unordered_map>
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGCF/Flow/Tasks/flowSP.cxx b/.conflict-side-1/PWGCF/Flow/Tasks/flowSP.cxx
index f37c15eac01..cc3f51e91d0 100644
--- a/.conflict-side-1/PWGCF/Flow/Tasks/flowSP.cxx
+++ b/.conflict-side-1/PWGCF/Flow/Tasks/flowSP.cxx
@@ -14,35 +14,37 @@
 /// \since  01/12/2024
 /// \brief  task to evaluate flow with respect to spectator plane.
 
-#include <CCDB/BasicCCDBManager.h>
-#include <DataFormatsParameters/GRPObject.h>
-#include <DataFormatsParameters/GRPMagField.h>
-#include <algorithm>
-#include <numeric>
-#include <vector>
-#include <string>
-#include <unordered_map>
+#include "GFWWeights.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/O2DatabasePDGPlugin.h"
+#include "PWGCF/DataModel/SPTableZDC.h"
 
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/Centrality.h"
-#include "Common/Core/RecoDecay.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include <CCDB/BasicCCDBManager.h>
+#include <DataFormatsParameters/GRPMagField.h>
+#include <DataFormatsParameters/GRPObject.h>
 
-#include "PWGCF/DataModel/SPTableZDC.h"
-#include "GFWWeights.h"
 #include "TF1.h"
 #include "TPDGCode.h"
 
+#include <algorithm>
+#include <numeric>
+#include <string>
+#include <unordered_map>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-1/PWGCF/Flow/Tasks/flowTask.cxx b/.conflict-side-1/PWGCF/Flow/Tasks/flowTask.cxx
index 9ebe74d1f76..bb6d1749e5d 100644
--- a/.conflict-side-1/PWGCF/Flow/Tasks/flowTask.cxx
+++ b/.conflict-side-1/PWGCF/Flow/Tasks/flowTask.cxx
@@ -14,36 +14,38 @@
 /// \since  Dec/10/2023
 /// \brief  jira: PWGCF-254, task to measure flow observables with cumulant method
 
-#include <CCDB/BasicCCDBManager.h>
-#include <cmath>
-#include <vector>
-#include <unordered_map>
-#include <string>
-#include <memory>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/HistogramRegistry.h"
+#include "FlowContainer.h"
+#include "GFW.h"
+#include "GFWCumulant.h"
+#include "GFWPowerArray.h"
+#include "GFWWeights.h"
 
-#include "Common/DataModel/EventSelection.h"
+#include "Common/CCDB/ctpRateFetcher.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/CCDB/ctpRateFetcher.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include <CCDB/BasicCCDBManager.h>
 
-#include "GFWPowerArray.h"
-#include "GFW.h"
-#include "GFWCumulant.h"
-#include "GFWWeights.h"
-#include "FlowContainer.h"
 #include "TList.h"
+#include <TF1.h>
+#include <TObjArray.h>
 #include <TProfile.h>
 #include <TRandom3.h>
-#include <TObjArray.h>
-#include <TF1.h>
+
+#include <cmath>
+#include <memory>
+#include <string>
+#include <unordered_map>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGCF/GenericFramework/Core/BootstrapProfile.h b/.conflict-side-1/PWGCF/GenericFramework/Core/BootstrapProfile.h
index 829c58cc11a..e7d0b62e45e 100644
--- a/.conflict-side-1/PWGCF/GenericFramework/Core/BootstrapProfile.h
+++ b/.conflict-side-1/PWGCF/GenericFramework/Core/BootstrapProfile.h
@@ -16,11 +16,11 @@
 #ifndef PWGCF_GENERICFRAMEWORK_CORE_BOOTSTRAPPROFILE_H_
 #define PWGCF_GENERICFRAMEWORK_CORE_BOOTSTRAPPROFILE_H_
 
-#include "TProfile.h"
-#include "TList.h"
-#include "TString.h"
 #include "TCollection.h"
+#include "TList.h"
 #include "TMath.h"
+#include "TProfile.h"
+#include "TString.h"
 
 class BootstrapProfile : public TProfile
 {
diff --git a/.conflict-side-1/PWGCF/GenericFramework/Core/FlowContainer.h b/.conflict-side-1/PWGCF/GenericFramework/Core/FlowContainer.h
index bb330c049b6..5cba4eed279 100644
--- a/.conflict-side-1/PWGCF/GenericFramework/Core/FlowContainer.h
+++ b/.conflict-side-1/PWGCF/GenericFramework/Core/FlowContainer.h
@@ -15,23 +15,24 @@
 
 #ifndef PWGCF_GENERICFRAMEWORK_CORE_FLOWCONTAINER_H_
 #define PWGCF_GENERICFRAMEWORK_CORE_FLOWCONTAINER_H_
-#include <vector>
-#include "TH3F.h"
-#include "TProfile2D.h"
-#include "TProfile.h"
-#include "TNamed.h"
+#include "ProfileSubset.h"
+
+#include "Framework/HistogramSpec.h"
+
+#include "TAxis.h"
+#include "TCollection.h"
+#include "TFile.h"
 #include "TH1.h"
+#include "TH3F.h"
 #include "TMath.h"
-#include "TFile.h"
-#include "TAxis.h"
-#include "TString.h"
+#include "TNamed.h"
 #include "TObjArray.h"
+#include "TProfile.h"
+#include "TProfile2D.h"
 #include "TRandom.h"
 #include "TString.h"
-#include "TCollection.h"
-#include "TAxis.h"
-#include "ProfileSubset.h"
-#include "Framework/HistogramSpec.h"
+
+#include <vector>
 
 class FlowContainer : public TNamed
 {
diff --git a/.conflict-side-1/PWGCF/GenericFramework/Core/FlowPtContainer.cxx b/.conflict-side-1/PWGCF/GenericFramework/Core/FlowPtContainer.cxx
index 33f2e303711..5e3e3a45306 100644
--- a/.conflict-side-1/PWGCF/GenericFramework/Core/FlowPtContainer.cxx
+++ b/.conflict-side-1/PWGCF/GenericFramework/Core/FlowPtContainer.cxx
@@ -14,9 +14,10 @@
 /// \author Emil Gorm Nielsen, NBI, emil.gorm.nielsen@cern.ch
 
 #include "FlowPtContainer.h"
+
 #include <algorithm>
-#include <vector>
 #include <cstdio>
+#include <vector>
 
 FlowPtContainer::FlowPtContainer() : fCMTermList(0),
                                      fCorrList(0),
diff --git a/.conflict-side-1/PWGCF/GenericFramework/Core/FlowPtContainer.h b/.conflict-side-1/PWGCF/GenericFramework/Core/FlowPtContainer.h
index 207e1a36fe7..b0bd6b6a72c 100644
--- a/.conflict-side-1/PWGCF/GenericFramework/Core/FlowPtContainer.h
+++ b/.conflict-side-1/PWGCF/GenericFramework/Core/FlowPtContainer.h
@@ -16,18 +16,21 @@
 #ifndef PWGCF_GENERICFRAMEWORK_CORE_FLOWPTCONTAINER_H_
 #define PWGCF_GENERICFRAMEWORK_CORE_FLOWPTCONTAINER_H_
 
-#include <algorithm>
-#include <vector>
-#include <complex>
-#include <variant>
 #include "BootstrapProfile.h"
-#include "TNamed.h"
-#include "TList.h"
-#include "TCollection.h"
-#include "Framework/HistogramSpec.h"
 #include "GFW.h"
 #include "GFWConfig.h"
 
+#include "Framework/HistogramSpec.h"
+
+#include "TCollection.h"
+#include "TList.h"
+#include "TNamed.h"
+
+#include <algorithm>
+#include <complex>
+#include <variant>
+#include <vector>
+
 namespace o2::analysis::genericframework::eventweight
 {
 enum EventWeight {
diff --git a/.conflict-side-1/PWGCF/GenericFramework/Core/GFWConfig.h b/.conflict-side-1/PWGCF/GenericFramework/Core/GFWConfig.h
index 779d06b604e..949a16e23d1 100644
--- a/.conflict-side-1/PWGCF/GenericFramework/Core/GFWConfig.h
+++ b/.conflict-side-1/PWGCF/GenericFramework/Core/GFWConfig.h
@@ -12,13 +12,15 @@
 #ifndef PWGCF_GENERICFRAMEWORK_CORE_GFWCONFIG_H_
 #define PWGCF_GENERICFRAMEWORK_CORE_GFWCONFIG_H_
 
+#include "GFW.h"
+
+#include <TMath.h>
+#include <TObject.h>
+
 #include <algorithm>
+#include <string>
 #include <utility>
 #include <vector>
-#include <string>
-#include <TObject.h>
-#include <TMath.h>
-#include "GFW.h"
 
 namespace o2
 {
diff --git a/.conflict-side-1/PWGCF/GenericFramework/Core/GFWPowerArray.h b/.conflict-side-1/PWGCF/GenericFramework/Core/GFWPowerArray.h
index ba38f2fcc54..8b0a5eca32c 100644
--- a/.conflict-side-1/PWGCF/GenericFramework/Core/GFWPowerArray.h
+++ b/.conflict-side-1/PWGCF/GenericFramework/Core/GFWPowerArray.h
@@ -16,9 +16,9 @@
 #ifndef PWGCF_GENERICFRAMEWORK_CORE_GFWPOWERARRAY_H_
 #define PWGCF_GENERICFRAMEWORK_CORE_GFWPOWERARRAY_H_
 
-#include <vector>
 #include <cmath>
 #include <string>
+#include <vector>
 
 typedef std::vector<int> HarSet;
 class GFWPowerArray
diff --git a/.conflict-side-1/PWGCF/GenericFramework/Core/GFWWeights.cxx b/.conflict-side-1/PWGCF/GenericFramework/Core/GFWWeights.cxx
index 4d2d41cd85d..b729213d80d 100644
--- a/.conflict-side-1/PWGCF/GenericFramework/Core/GFWWeights.cxx
+++ b/.conflict-side-1/PWGCF/GenericFramework/Core/GFWWeights.cxx
@@ -10,7 +10,9 @@
 // or submit itself to any jurisdiction.
 
 #include "GFWWeights.h"
+
 #include "TMath.h"
+
 #include <cstdio>
 
 GFWWeights::GFWWeights() : TNamed("", ""),
diff --git a/.conflict-side-1/PWGCF/GenericFramework/Core/GFWWeights.h b/.conflict-side-1/PWGCF/GenericFramework/Core/GFWWeights.h
index f60783ccec8..c0be3f7caeb 100644
--- a/.conflict-side-1/PWGCF/GenericFramework/Core/GFWWeights.h
+++ b/.conflict-side-1/PWGCF/GenericFramework/Core/GFWWeights.h
@@ -18,13 +18,13 @@
 
 #include "Framework/Logger.h"
 
-#include "TObjArray.h"
-#include "TNamed.h"
-#include "TH3D.h"
-#include "TH2D.h"
-#include "TH1D.h"
-#include "TFile.h"
 #include "TCollection.h"
+#include "TFile.h"
+#include "TH1D.h"
+#include "TH2D.h"
+#include "TH3D.h"
+#include "TNamed.h"
+#include "TObjArray.h"
 #include "TString.h"
 
 class GFWWeights : public TNamed
diff --git a/.conflict-side-1/PWGCF/GenericFramework/Core/GFWWeightsList.cxx b/.conflict-side-1/PWGCF/GenericFramework/Core/GFWWeightsList.cxx
index 11a6ffe3159..104c6c77907 100644
--- a/.conflict-side-1/PWGCF/GenericFramework/Core/GFWWeightsList.cxx
+++ b/.conflict-side-1/PWGCF/GenericFramework/Core/GFWWeightsList.cxx
@@ -14,9 +14,10 @@
 /// \since  Dec/25/2024
 /// \brief  one object to hold a list of GFWWeights objects,
 
-#include <utility>
 #include "GFWWeightsList.h"
 
+#include <utility>
+
 GFWWeightsList::GFWWeightsList() : TNamed("", ""), list(0)
 {
   runNumberMap.clear();
diff --git a/.conflict-side-1/PWGCF/GenericFramework/Core/GFWWeightsList.h b/.conflict-side-1/PWGCF/GenericFramework/Core/GFWWeightsList.h
index c0f208a7088..dab5b345fa0 100644
--- a/.conflict-side-1/PWGCF/GenericFramework/Core/GFWWeightsList.h
+++ b/.conflict-side-1/PWGCF/GenericFramework/Core/GFWWeightsList.h
@@ -16,15 +16,16 @@
 
 #ifndef PWGCF_GENERICFRAMEWORK_CORE_GFWWEIGHTSLIST_H_
 #define PWGCF_GENERICFRAMEWORK_CORE_GFWWEIGHTSLIST_H_
-#include <map>
-#include <cstdio>
-#include <string>
-#include <vector>
+#include "GFWWeights.h"
 
 #include "Framework/Logger.h"
 
 #include "TObjArray.h"
-#include "GFWWeights.h"
+
+#include <cstdio>
+#include <map>
+#include <string>
+#include <vector>
 
 class GFWWeightsList : public TNamed
 {
diff --git a/.conflict-side-1/PWGCF/GenericFramework/Core/ProfileSubset.cxx b/.conflict-side-1/PWGCF/GenericFramework/Core/ProfileSubset.cxx
index 66969f699af..333f1eea5e0 100644
--- a/.conflict-side-1/PWGCF/GenericFramework/Core/ProfileSubset.cxx
+++ b/.conflict-side-1/PWGCF/GenericFramework/Core/ProfileSubset.cxx
@@ -10,6 +10,7 @@
 // or submit itself to any jurisdiction.
 
 #include "ProfileSubset.h"
+
 #include "TProfile2D.h"
 
 TProfile* ProfileSubset::GetSubset(bool onX, const char* name, int firstbin, int lastbin, int l_nbins, double* l_binarray)
diff --git a/.conflict-side-1/PWGCF/GenericFramework/Core/ProfileSubset.h b/.conflict-side-1/PWGCF/GenericFramework/Core/ProfileSubset.h
index fc920b898c4..f2b09d1a640 100644
--- a/.conflict-side-1/PWGCF/GenericFramework/Core/ProfileSubset.h
+++ b/.conflict-side-1/PWGCF/GenericFramework/Core/ProfileSubset.h
@@ -16,9 +16,9 @@
 #ifndef PWGCF_GENERICFRAMEWORK_CORE_PROFILESUBSET_H_
 #define PWGCF_GENERICFRAMEWORK_CORE_PROFILESUBSET_H_
 
+#include "TError.h"
 #include "TProfile.h"
 #include "TProfile2D.h"
-#include "TError.h"
 
 class ProfileSubset : public TProfile2D
 {
diff --git a/.conflict-side-1/PWGCF/GenericFramework/Tasks/flowGenericFramework.cxx b/.conflict-side-1/PWGCF/GenericFramework/Tasks/flowGenericFramework.cxx
index 79e56fbcff6..31aa9d9e194 100644
--- a/.conflict-side-1/PWGCF/GenericFramework/Tasks/flowGenericFramework.cxx
+++ b/.conflict-side-1/PWGCF/GenericFramework/Tasks/flowGenericFramework.cxx
@@ -13,42 +13,43 @@
 /// \brief Task to analyse angular and transverse momentum correlations with GFW
 /// \author Emil Gorm Nielsen, NBI, emil.gorm.nielsen@cern.ch
 
-#include <CCDB/BasicCCDBManager.h>
-#include <DataFormatsParameters/GRPObject.h>
-#include <DataFormatsParameters/GRPMagField.h>
-#include <algorithm>
-#include <numeric>
-#include <vector>
-#include <complex>
-#include <string>
-#include <map>
-#include <utility>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/HistogramRegistry.h"
-
-#include "Common/DataModel/EventSelection.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/PIDResponse.h"
-
-#include "GFWPowerArray.h"
-#include "GFW.h"
-#include "GFWCumulant.h"
 #include "FlowContainer.h"
 #include "FlowPtContainer.h"
+#include "GFW.h"
 #include "GFWConfig.h"
+#include "GFWCumulant.h"
+#include "GFWPowerArray.h"
 #include "GFWWeights.h"
 #include "GFWWeightsList.h"
-#include <TProfile.h>
-#include <TRandom3.h>
+
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include <CCDB/BasicCCDBManager.h>
+#include <DataFormatsParameters/GRPMagField.h>
+#include <DataFormatsParameters/GRPObject.h>
+
 #include <TF1.h>
 #include <TPDGCode.h>
+#include <TProfile.h>
+#include <TRandom3.h>
+
+#include <algorithm>
+#include <complex>
+#include <map>
+#include <numeric>
+#include <string>
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGCF/JCorran/Core/FlowJHistManager.cxx b/.conflict-side-1/PWGCF/JCorran/Core/FlowJHistManager.cxx
index 880ec409dbd..4a13ac5f31d 100644
--- a/.conflict-side-1/PWGCF/JCorran/Core/FlowJHistManager.cxx
+++ b/.conflict-side-1/PWGCF/JCorran/Core/FlowJHistManager.cxx
@@ -16,6 +16,7 @@
 
 // O2 Physics headers.
 #include "PWGCF/JCorran/Core/FlowJHistManager.h"
+
 #include "CommonConstants/MathConstants.h"
 
 // Namespaces.
diff --git a/.conflict-side-1/PWGCF/JCorran/Core/FlowJHistManager.h b/.conflict-side-1/PWGCF/JCorran/Core/FlowJHistManager.h
index e067a9f00b5..3c7b1773eac 100644
--- a/.conflict-side-1/PWGCF/JCorran/Core/FlowJHistManager.h
+++ b/.conflict-side-1/PWGCF/JCorran/Core/FlowJHistManager.h
@@ -16,16 +16,17 @@
 #define PWGCF_JCORRAN_CORE_FLOWJHISTMANAGER_H_
 
 /* Header files. */
-#include <vector>
-#include <array>
-#include <string>
-#include <string_view>
 #include "TH1.h"
 #include "TH2.h"
 #include "TH3.h"
 #include "TProfile.h"
 #include "TProfile2D.h"
 
+#include <array>
+#include <string>
+#include <string_view>
+#include <vector>
+
 // O2 headers. //
 #include "Framework/HistogramRegistry.h"
 
diff --git a/.conflict-side-1/PWGCF/JCorran/Core/FlowJSPCAnalysis.h b/.conflict-side-1/PWGCF/JCorran/Core/FlowJSPCAnalysis.h
index ba584d1e1eb..d1bd45354ec 100644
--- a/.conflict-side-1/PWGCF/JCorran/Core/FlowJSPCAnalysis.h
+++ b/.conflict-side-1/PWGCF/JCorran/Core/FlowJSPCAnalysis.h
@@ -16,15 +16,17 @@
 #define PWGCF_JCORRAN_CORE_FLOWJSPCANALYSIS_H_
 
 /* Header files. */
-#include <array>
-#include <vector>
 #include <TComplex.h>
 #include <TProfile.h>
 
+#include <array>
+#include <vector>
+
 // O2 headers. //
-#include "Framework/HistogramRegistry.h"
 #include "PWGCF/JCorran/Core/JQVectors.h"
+
 #include "CommonConstants/MathConstants.h"
+#include "Framework/HistogramRegistry.h"
 
 class FlowJSPCAnalysis
 {
diff --git a/.conflict-side-1/PWGCF/JCorran/Core/JFFlucAnalysis.cxx b/.conflict-side-1/PWGCF/JCorran/Core/JFFlucAnalysis.cxx
index 9dc4189a810..4c3b01adeca 100644
--- a/.conflict-side-1/PWGCF/JCorran/Core/JFFlucAnalysis.cxx
+++ b/.conflict-side-1/PWGCF/JCorran/Core/JFFlucAnalysis.cxx
@@ -12,10 +12,12 @@
 /// \author Jasper Parkkila (jparkkil@cern.ch)
 /// \since Sep 2022
 
-#include <TMath.h>
+#include "JFFlucAnalysis.h"
+
 #include <TComplex.h>
+#include <TMath.h>
+
 #include <algorithm>
-#include "JFFlucAnalysis.h"
 
 JFFlucAnalysis::JFFlucAnalysis() : TNamed(),
                                    fVertex(0),
diff --git a/.conflict-side-1/PWGCF/JCorran/Core/JFFlucAnalysis.h b/.conflict-side-1/PWGCF/JCorran/Core/JFFlucAnalysis.h
index 01589a09849..039dc51d421 100644
--- a/.conflict-side-1/PWGCF/JCorran/Core/JFFlucAnalysis.h
+++ b/.conflict-side-1/PWGCF/JCorran/Core/JFFlucAnalysis.h
@@ -15,13 +15,15 @@
 #ifndef PWGCF_JCORRAN_CORE_JFFLUCANALYSIS_H_
 #define PWGCF_JCORRAN_CORE_JFFLUCANALYSIS_H_
 
-#include <experimental/type_traits>
 #include "JQVectors.h"
+
 #include <TComplex.h>
-#include <TNamed.h>
 #include <TH1.h>
 #include <THn.h>
 #include <THnSparse.h>
+#include <TNamed.h>
+
+#include <experimental/type_traits>
 
 class JFFlucAnalysis : public TNamed
 {
diff --git a/.conflict-side-1/PWGCF/JCorran/Core/JFFlucAnalysisO2Hist.cxx b/.conflict-side-1/PWGCF/JCorran/Core/JFFlucAnalysisO2Hist.cxx
index b3419ff7dc8..55520ba8158 100644
--- a/.conflict-side-1/PWGCF/JCorran/Core/JFFlucAnalysisO2Hist.cxx
+++ b/.conflict-side-1/PWGCF/JCorran/Core/JFFlucAnalysisO2Hist.cxx
@@ -12,10 +12,12 @@
 /// \since Sep 2024
 
 #include "JFFlucAnalysisO2Hist.h"
-#include <vector>
-#include <memory>
+
 #include "CommonConstants/MathConstants.h"
 
+#include <memory>
+#include <vector>
+
 using namespace o2;
 
 JFFlucAnalysisO2Hist::JFFlucAnalysisO2Hist(HistogramRegistry& registry, AxisSpec& axisMultiplicity, AxisSpec& phiAxis, AxisSpec& etaAxis, AxisSpec& zvtAxis, AxisSpec& ptAxis, AxisSpec& massAxis, const TString& folder) : JFFlucAnalysis()
diff --git a/.conflict-side-1/PWGCF/JCorran/Core/JFFlucAnalysisO2Hist.h b/.conflict-side-1/PWGCF/JCorran/Core/JFFlucAnalysisO2Hist.h
index a9de2fd7864..1c65334d607 100644
--- a/.conflict-side-1/PWGCF/JCorran/Core/JFFlucAnalysisO2Hist.h
+++ b/.conflict-side-1/PWGCF/JCorran/Core/JFFlucAnalysisO2Hist.h
@@ -15,6 +15,7 @@
 #define PWGCF_JCORRAN_CORE_JFFLUCANALYSISO2HIST_H_
 
 #include "JFFlucAnalysis.h"
+
 #include "Framework/HistogramRegistry.h"
 
 using namespace o2;
diff --git a/.conflict-side-1/PWGCF/JCorran/Core/JQVectors.h b/.conflict-side-1/PWGCF/JCorran/Core/JQVectors.h
index c96aac454b7..210968d23ec 100644
--- a/.conflict-side-1/PWGCF/JCorran/Core/JQVectors.h
+++ b/.conflict-side-1/PWGCF/JCorran/Core/JQVectors.h
@@ -15,9 +15,10 @@
 #ifndef PWGCF_JCORRAN_CORE_JQVECTORS_H_
 #define PWGCF_JCORRAN_CORE_JQVECTORS_H_
 
-#include <experimental/type_traits>
 #include <TMath.h>
 
+#include <experimental/type_traits>
+
 template <class Q, UInt_t nh, UInt_t nk>
 class JQVectorsGapBase
 {
diff --git a/.conflict-side-1/PWGCF/JCorran/TableProducer/JCatalyst.cxx b/.conflict-side-1/PWGCF/JCorran/TableProducer/JCatalyst.cxx
index e0cb26994e3..7b354a1541e 100644
--- a/.conflict-side-1/PWGCF/JCorran/TableProducer/JCatalyst.cxx
+++ b/.conflict-side-1/PWGCF/JCorran/TableProducer/JCatalyst.cxx
@@ -12,28 +12,29 @@
 /// \author Dong Jo Kim (djkim@jyu.fi)
 /// \since Sep 2022
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
 #include <CCDB/BasicCCDBManager.h>
-#include <Math/Vector4D.h>
+
 #include <Math/LorentzVector.h>
+#include <Math/Vector4D.h>
 #include <TRandom.h>
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/ASoAHelpers.h"
-
 // centrality
-#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Centrality.h"
 
 ////TODO: remove redundant:
-#include "Framework/HistogramRegistry.h"
-
-#include "DCAFitter/DCAFitterN.h"
 #include "PWGHF/DataModel/CandidateReconstructionTables.h"
+
 #include "Common/Core/trackUtilities.h"
+
+#include "DCAFitter/DCAFitterN.h"
+#include "Framework/HistogramRegistry.h"
 #include "ReconstructionDataFormats/DCA.h"
 #include "ReconstructionDataFormats/V0.h"
 ////
diff --git a/.conflict-side-1/PWGCF/JCorran/Tasks/flowJNUACreation.cxx b/.conflict-side-1/PWGCF/JCorran/Tasks/flowJNUACreation.cxx
index 31edc2a7c3d..ab4fef15591 100644
--- a/.conflict-side-1/PWGCF/JCorran/Tasks/flowJNUACreation.cxx
+++ b/.conflict-side-1/PWGCF/JCorran/Tasks/flowJNUACreation.cxx
@@ -13,31 +13,31 @@
 // \author  Maxim Virta (maxim.virta@cern.ch)
 
 // Standard headers.
+#include <TRandom3.h>
+
 #include <chrono>
 #include <string>
 #include <vector>
-#include <TRandom3.h>
 
 // O2 headers. //
 // The first two are mandatory.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
 #include "CCDB/BasicCCDBManager.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 
 // O2 Physics headers. //
+#include "PWGCF/JCorran/Core/FlowJHistManager.h"
+
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/FT0Corrected.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/Core/TrackSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
-#include "PWGCF/JCorran/Core/FlowJHistManager.h"
-
 // Namespaces and definitions.
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGCF/JCorran/Tasks/flowJSPCAnalysis.cxx b/.conflict-side-1/PWGCF/JCorran/Tasks/flowJSPCAnalysis.cxx
index 2ce4568348f..ad7a05b7a07 100644
--- a/.conflict-side-1/PWGCF/JCorran/Tasks/flowJSPCAnalysis.cxx
+++ b/.conflict-side-1/PWGCF/JCorran/Tasks/flowJSPCAnalysis.cxx
@@ -13,34 +13,34 @@
 // \author  Maxim Virta (maxim.virta@cern.ch), Cindy Mordasini (cindy.mordasini@cern.ch)
 
 // Standard headers.
+#include <TRandom3.h>
+
 #include <chrono>
 #include <string>
 #include <vector>
-#include <TRandom3.h>
 
 // O2 headers. //
 // The first two are mandatory.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 
 // O2 Physics headers. //
+#include "PWGCF/DataModel/CorrelationsDerived.h"
+#include "PWGCF/JCorran/Core/FlowJHistManager.h"
+#include "PWGCF/JCorran/Core/FlowJSPCAnalysis.h"
+#include "PWGCF/JCorran/Core/FlowJSPCObservables.h"
+#include "PWGCF/JCorran/DataModel/JCatalyst.h"
+
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/FT0Corrected.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/Core/TrackSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
-#include "PWGCF/DataModel/CorrelationsDerived.h"
-#include "PWGCF/JCorran/DataModel/JCatalyst.h"
-#include "PWGCF/JCorran/Core/FlowJSPCAnalysis.h"
-#include "PWGCF/JCorran/Core/FlowJSPCObservables.h"
-#include "PWGCF/JCorran/Core/FlowJHistManager.h"
-
 // Namespaces and definitions.
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGCF/JCorran/Tasks/jEPDzeroFlowAnalysis.cxx b/.conflict-side-1/PWGCF/JCorran/Tasks/jEPDzeroFlowAnalysis.cxx
index be132b44684..2fe4adb49ca 100644
--- a/.conflict-side-1/PWGCF/JCorran/Tasks/jEPDzeroFlowAnalysis.cxx
+++ b/.conflict-side-1/PWGCF/JCorran/Tasks/jEPDzeroFlowAnalysis.cxx
@@ -11,52 +11,47 @@
 /// \author junlee.kim@cern.ch
 /// \since Jul 2024
 
-#include <experimental/type_traits>
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <chrono>
-#include <string>
-#include <vector>
-
-#include "TLorentzVector.h"
-#include "TRandom3.h"
-#include "TF1.h"
-#include "TVector2.h"
-#include "Math/Vector3D.h"
-#include "Math/Vector4D.h"
-#include "Math/GenVector/Boost.h"
-#include <TMath.h>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/StaticFor.h"
+#include "PWGCF/DataModel/CorrelationsDerived.h"
 
+#include "Common/Core/EventPlaneHelper.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Qvectors.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "Common/Core/trackUtilities.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/Core/EventPlaneHelper.h"
-
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
 #include "CommonConstants/PhysicsConstants.h"
-
-#include "ReconstructionDataFormats/Track.h"
-
-#include "DataFormatsParameters/GRPObject.h"
 #include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/StaticFor.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
-#include "CCDB/CcdbApi.h"
-#include "CCDB/BasicCCDBManager.h"
+#include "Math/GenVector/Boost.h"
+#include "Math/Vector3D.h"
+#include "Math/Vector4D.h"
+#include "TF1.h"
+#include "TLorentzVector.h"
+#include "TRandom3.h"
+#include "TVector2.h"
+#include <TMath.h>
 
-#include "PWGCF/DataModel/CorrelationsDerived.h"
+#include <array>
+#include <chrono>
+#include <cmath>
+#include <cstdlib>
+#include <experimental/type_traits>
+#include <string>
+#include <vector>
 
 using namespace std;
 using namespace o2;
diff --git a/.conflict-side-1/PWGCF/JCorran/Tasks/jEPFlowAnalysis.cxx b/.conflict-side-1/PWGCF/JCorran/Tasks/jEPFlowAnalysis.cxx
index f3f43744f19..fc36ab43d35 100644
--- a/.conflict-side-1/PWGCF/JCorran/Tasks/jEPFlowAnalysis.cxx
+++ b/.conflict-side-1/PWGCF/JCorran/Tasks/jEPFlowAnalysis.cxx
@@ -11,20 +11,20 @@
 /// \author Maxim Virta (maxim.virta@cern.ch)
 /// \since Jul 2024
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/HistogramRegistry.h"
+#include "JEPFlowAnalysis.h"
 
-#include "Common/DataModel/EventSelection.h"
-#include "Common/Core/TrackSelection.h"
-#include "Framework/runDataProcessing.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "FlowJHistManager.h"
 
-#include "Common/DataModel/Qvectors.h"
 #include "Common/Core/EventPlaneHelper.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Qvectors.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "FlowJHistManager.h"
-#include "JEPFlowAnalysis.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGCF/JCorran/Tasks/jFlucEfficiencyTask.cxx b/.conflict-side-1/PWGCF/JCorran/Tasks/jFlucEfficiencyTask.cxx
index 59ca8b18903..e50baa4c1cb 100644
--- a/.conflict-side-1/PWGCF/JCorran/Tasks/jFlucEfficiencyTask.cxx
+++ b/.conflict-side-1/PWGCF/JCorran/Tasks/jFlucEfficiencyTask.cxx
@@ -14,20 +14,23 @@
 /// \author DongJo Kim, Jasper Parkkila, Bong-Hwi Lim (djkim@cern.ch, jparkkil@cern.ch, bong-hwi.lim@cern.ch)
 /// \since March 2024
 
-#include <vector>
-#include <string>
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/O2DatabasePDGPlugin.h"
+#include "PWGCF/DataModel/CorrelationsDerived.h"
+#include "PWGLF/Utils/collisionCuts.h"
+
 #include "Common/Core/TrackSelection.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "PWGCF/DataModel/CorrelationsDerived.h"
-#include "PWGLF/Utils/collisionCuts.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGCF/JCorran/Tasks/jflucAnalysisTask.cxx b/.conflict-side-1/PWGCF/JCorran/Tasks/jflucAnalysisTask.cxx
index 6e0ba68d2df..12e2a599f55 100644
--- a/.conflict-side-1/PWGCF/JCorran/Tasks/jflucAnalysisTask.cxx
+++ b/.conflict-side-1/PWGCF/JCorran/Tasks/jflucAnalysisTask.cxx
@@ -12,25 +12,27 @@
 /// \author Dong Jo Kim (djkim@jyu.fi)
 /// \since Sep 2022
 
-#include <deque>
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "Framework/AnalysisTask.h"
 #include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-
-#include "Common/DataModel/EventSelection.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Centrality.h"
+#include "Framework/RunningWorkflowInfo.h"
 #include "ReconstructionDataFormats/V0.h"
 
+#include <deque>
+
 // #include "CCDB/BasicCCDBManager.h"
 
-#include "PWGCF/JCorran/DataModel/JCatalyst.h"
-#include "PWGCF/DataModel/CorrelationsDerived.h"
 #include "JFFlucAnalysis.h"
 #include "JFFlucAnalysisO2Hist.h"
+
+#include "PWGCF/DataModel/CorrelationsDerived.h"
+#include "PWGCF/JCorran/DataModel/JCatalyst.h"
+
 #include "Framework/runDataProcessing.h"
 
 using namespace o2;
diff --git a/.conflict-side-1/PWGCF/JCorran/Tasks/jflucWeightsLoader.cxx b/.conflict-side-1/PWGCF/JCorran/Tasks/jflucWeightsLoader.cxx
index 244035fd310..438a73d4bbf 100644
--- a/.conflict-side-1/PWGCF/JCorran/Tasks/jflucWeightsLoader.cxx
+++ b/.conflict-side-1/PWGCF/JCorran/Tasks/jflucWeightsLoader.cxx
@@ -12,27 +12,27 @@
 /// \since May 2024
 // o2-linter: disable='doc/file'
 
-#include <experimental/type_traits>
-#include <string>
-#include <TFile.h>
-#include <THn.h>
-
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/HistogramRegistry.h"
+#include "PWGCF/DataModel/CorrelationsDerived.h"
+#include "PWGCF/JCorran/DataModel/JCatalyst.h"
 
-#include "Common/DataModel/EventSelection.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/Centrality.h"
-#include "ReconstructionDataFormats/V0.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
 #include "CCDB/BasicCCDBManager.h"
-
-#include "PWGCF/JCorran/DataModel/JCatalyst.h"
-#include "PWGCF/DataModel/CorrelationsDerived.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
 #include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/V0.h"
+
+#include <TFile.h>
+#include <THn.h>
+
+#include <experimental/type_traits>
+#include <string>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGCF/MultiparticleCorrelations/Tasks/multiparticle-correlations-ar.cxx b/.conflict-side-1/PWGCF/MultiparticleCorrelations/Tasks/multiparticle-correlations-ar.cxx
index 5b1539deb9e..fb891b91365 100644
--- a/.conflict-side-1/PWGCF/MultiparticleCorrelations/Tasks/multiparticle-correlations-ar.cxx
+++ b/.conflict-side-1/PWGCF/MultiparticleCorrelations/Tasks/multiparticle-correlations-ar.cxx
@@ -13,23 +13,27 @@
 /// \brief multiparticle-correlations-ar - Task belonging to Anton Riedel for computing multiparticle correlations
 /// \author Anton Riedel, TU München, anton.riedel@tum.de
 
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/Expressions.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TComplex.h"
 #include <TMath.h>
+
 #include "fairlogger/Logger.h"
+
 #include <algorithm>
+#include <array>
 #include <cstdint>
 #include <iostream>
-#include <string_view>
+#include <numeric>
 #include <string>
+#include <string_view>
 #include <vector>
-#include <array>
-#include <numeric>
-#include "TComplex.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/Expressions.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGCF/MultiparticleCorrelations/Tasks/threeParticleCorrelations.cxx b/.conflict-side-1/PWGCF/MultiparticleCorrelations/Tasks/threeParticleCorrelations.cxx
index 299867abfd7..02fe0addf20 100644
--- a/.conflict-side-1/PWGCF/MultiparticleCorrelations/Tasks/threeParticleCorrelations.cxx
+++ b/.conflict-side-1/PWGCF/MultiparticleCorrelations/Tasks/threeParticleCorrelations.cxx
@@ -13,20 +13,23 @@
 /// \brief Task for producing particle correlations
 /// \author Joey Staa <joey.staa@fysik.lu.se>
 
-#include <algorithm>
+#include "RecoDecay.h"
+
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "CCDB/BasicCCDBManager.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/McCollisionExtra.h"
 #include "Common/DataModel/PIDResponse.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
-#include "RecoDecay.h"
 #include "TPDGCode.h"
 
+#include <algorithm>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-1/PWGCF/TableProducer/dptDptFilter.cxx b/.conflict-side-1/PWGCF/TableProducer/dptDptFilter.cxx
index 30f55cf3c3f..c55cec45f1e 100644
--- a/.conflict-side-1/PWGCF/TableProducer/dptDptFilter.cxx
+++ b/.conflict-side-1/PWGCF/TableProducer/dptDptFilter.cxx
@@ -13,40 +13,43 @@
 /// \brief Filters collisions and tracks according to selection criteria
 /// \author victor.gonzalez.sebastian@gmail.com
 
-#include <cmath>
-#include <algorithm>
-#include <string>
-#include <vector>
+#include "PWGCF/TableProducer/dptDptFilter.h"
+
+#include "PWGCF/Core/AnalysisConfigurableCuts.h"
+#include "PWGCF/DataModel/DptDptFiltered.h"
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
 #include "Common/Core/TableHelper.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/CollisionAssociationTables.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGCF/Core/AnalysisConfigurableCuts.h"
-#include "PWGCF/DataModel/DptDptFiltered.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/CollisionAssociationTables.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/RunningWorkflowInfo.h"
-#include <TROOT.h>
-#include <TPDGCode.h>
-#include <TParameter.h>
-#include <TList.h>
+#include "Framework/runDataProcessing.h"
+
 #include <TDirectory.h>
 #include <TFolder.h>
 #include <TH1.h>
 #include <TH2.h>
 #include <TH3.h>
+#include <TList.h>
+#include <TPDGCode.h>
+#include <TParameter.h>
 #include <TProfile3D.h>
+#include <TROOT.h>
 
-#include "PWGCF/TableProducer/dptDptFilter.h"
+#include <algorithm>
+#include <cmath>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGCF/TableProducer/dptDptFilter.h b/.conflict-side-1/PWGCF/TableProducer/dptDptFilter.h
index 18076266f1a..b107156d5f3 100644
--- a/.conflict-side-1/PWGCF/TableProducer/dptDptFilter.h
+++ b/.conflict-side-1/PWGCF/TableProducer/dptDptFilter.h
@@ -16,33 +16,36 @@
 #ifndef PWGCF_TABLEPRODUCER_DPTDPTFILTER_H_
 #define PWGCF_TABLEPRODUCER_DPTDPTFILTER_H_
 
+#include "PWGCF/Core/AnalysisConfigurableCuts.h"
+
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "ReconstructionDataFormats/PID.h"
 #include <CCDB/BasicCCDBManager.h>
-#include <TPDGCode.h>
-#include <TMCProcess.h>
+
 #include <TF1.h>
 #include <TList.h>
-#include <vector>
+#include <TMCProcess.h>
+#include <TPDGCode.h>
+
 #include <bitset>
-#include <string>
-#include <iomanip>
 #include <fstream>
-#include <locale>
-#include <sstream>
-#include <ranges>
 #include <functional>
+#include <iomanip>
+#include <locale>
 #include <map>
-
-#include "ReconstructionDataFormats/PID.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/Core/TrackSelectionDefaults.h"
-#include "PWGCF/Core/AnalysisConfigurableCuts.h"
+#include <ranges>
+#include <sstream>
+#include <string>
+#include <vector>
 
 namespace o2
 {
diff --git a/.conflict-side-1/PWGCF/Tasks/dptDptCorrelations.cxx b/.conflict-side-1/PWGCF/Tasks/dptDptCorrelations.cxx
index 065e4be286f..33b64e32bdc 100644
--- a/.conflict-side-1/PWGCF/Tasks/dptDptCorrelations.cxx
+++ b/.conflict-side-1/PWGCF/Tasks/dptDptCorrelations.cxx
@@ -13,7 +13,26 @@
 /// \brief implements two-particle correlations base data collection
 /// \author victor.gonzalez.sebastian@gmail.com
 
+#include "PWGCF/Core/AnalysisConfigurableCuts.h"
+#include "PWGCF/Core/PairCuts.h"
+#include "PWGCF/DataModel/DptDptFiltered.h"
+#include "PWGCF/TableProducer/dptDptFilter.h"
+
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/TableHelper.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
 #include <CCDB/BasicCCDBManager.h>
+
 #include <TDirectory.h>
 #include <TFolder.h>
 #include <TH1.h>
@@ -24,28 +43,12 @@
 #include <TProfile3D.h>
 #include <TROOT.h>
 #include <TVector2.h>
+
+#include <cmath>
 #include <cstdio>
+#include <ctime>
 #include <string>
 #include <vector>
-#include <cmath>
-#include <ctime>
-
-#include "Common/Core/TrackSelection.h"
-#include "Common/Core/TableHelper.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "PWGCF/Core/AnalysisConfigurableCuts.h"
-#include "PWGCF/Core/PairCuts.h"
-#include "PWGCF/DataModel/DptDptFiltered.h"
-#include "PWGCF/TableProducer/dptDptFilter.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGCF/Tasks/dptDptFilterQa.cxx b/.conflict-side-1/PWGCF/Tasks/dptDptFilterQa.cxx
index 85dee751438..876fd8ccb5e 100644
--- a/.conflict-side-1/PWGCF/Tasks/dptDptFilterQa.cxx
+++ b/.conflict-side-1/PWGCF/Tasks/dptDptFilterQa.cxx
@@ -13,15 +13,16 @@
 /// \brief basic checks for the behavior of the filter task
 /// \author victor.gonzalez.sebastian@gmail.com
 
-#include <cmath>
-#include <string>
+#include "PWGCF/DataModel/DptDptFiltered.h"
+#include "PWGCF/TableProducer/dptDptFilter.h"
 
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGCF/DataModel/DptDptFiltered.h"
-#include "PWGCF/TableProducer/dptDptFilter.h"
+
+#include <cmath>
+#include <string>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGCF/Tasks/matchRecoGen.cxx b/.conflict-side-1/PWGCF/Tasks/matchRecoGen.cxx
index 57ab00301b7..1881b17b268 100644
--- a/.conflict-side-1/PWGCF/Tasks/matchRecoGen.cxx
+++ b/.conflict-side-1/PWGCF/Tasks/matchRecoGen.cxx
@@ -13,25 +13,24 @@
 /// \brief basic check for the matching between generator level and detector level
 /// \author victor.gonzalez.sebastian@gmail.com
 
-#include <cmath>
-#include <string>
-#include <vector>
+#include "PWGCF/Core/AnalysisConfigurableCuts.h"
+#include "PWGCF/DataModel/DptDptFiltered.h"
+#include "PWGCF/TableProducer/dptDptFilter.h"
 
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGCF/Core/AnalysisConfigurableCuts.h"
-#include "PWGCF/DataModel/DptDptFiltered.h"
-#include "PWGCF/TableProducer/dptDptFilter.h"
+
 #include <TDirectory.h>
 #include <TFolder.h>
 #include <TH1.h>
@@ -42,6 +41,10 @@
 #include <TProfile3D.h>
 #include <TROOT.h>
 
+#include <cmath>
+#include <string>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::soa;
diff --git a/.conflict-side-1/PWGCF/Tutorial/CFTutorialTask1.cxx b/.conflict-side-1/PWGCF/Tutorial/CFTutorialTask1.cxx
index f79eb1871c2..14a541f45e1 100644
--- a/.conflict-side-1/PWGCF/Tutorial/CFTutorialTask1.cxx
+++ b/.conflict-side-1/PWGCF/Tutorial/CFTutorialTask1.cxx
@@ -12,12 +12,13 @@
 /// \author Luca Barioglio
 
 // O2 includes
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-1/PWGCF/Tutorial/CFTutorialTask2.cxx b/.conflict-side-1/PWGCF/Tutorial/CFTutorialTask2.cxx
index bf40ce17353..ae0bc6d6ae1 100644
--- a/.conflict-side-1/PWGCF/Tutorial/CFTutorialTask2.cxx
+++ b/.conflict-side-1/PWGCF/Tutorial/CFTutorialTask2.cxx
@@ -12,12 +12,13 @@
 /// \author Luca Barioglio
 
 // O2 includes
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-1/PWGCF/Tutorial/CFTutorialTask3.cxx b/.conflict-side-1/PWGCF/Tutorial/CFTutorialTask3.cxx
index 42b76f9f0db..d04fbe969ac 100644
--- a/.conflict-side-1/PWGCF/Tutorial/CFTutorialTask3.cxx
+++ b/.conflict-side-1/PWGCF/Tutorial/CFTutorialTask3.cxx
@@ -12,12 +12,13 @@
 /// \author Luca Barioglio
 
 // O2 includes
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-1/PWGCF/Tutorial/CFTutorialTask4.cxx b/.conflict-side-1/PWGCF/Tutorial/CFTutorialTask4.cxx
index a21f1ff7949..46790dca80f 100644
--- a/.conflict-side-1/PWGCF/Tutorial/CFTutorialTask4.cxx
+++ b/.conflict-side-1/PWGCF/Tutorial/CFTutorialTask4.cxx
@@ -12,12 +12,13 @@
 /// \author Luca Barioglio
 
 // O2 includes
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
+
 #include "CommonConstants/PhysicsConstants.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 #include "TLorentzVector.h"
 
diff --git a/.conflict-side-1/PWGCF/Tutorial/CFTutorialTask5.cxx b/.conflict-side-1/PWGCF/Tutorial/CFTutorialTask5.cxx
index 5357950aab1..a9f30b5db71 100644
--- a/.conflict-side-1/PWGCF/Tutorial/CFTutorialTask5.cxx
+++ b/.conflict-side-1/PWGCF/Tutorial/CFTutorialTask5.cxx
@@ -12,12 +12,13 @@
 /// \author Luca Barioglio
 
 // O2 includes
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
+
 #include "CommonConstants/PhysicsConstants.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 #include "TLorentzVector.h"
 
diff --git a/.conflict-side-1/PWGCF/Tutorial/post-config.json b/.conflict-side-1/PWGCF/Tutorial/post-config.json
index 4b484b32088..4c7a012c0fe 100644
--- a/.conflict-side-1/PWGCF/Tutorial/post-config.json
+++ b/.conflict-side-1/PWGCF/Tutorial/post-config.json
@@ -1,128 +1,128 @@
 {
-  "internal-dpl-clock": "",
-  "internal-dpl-aod-reader": {
-    "time-limit": "0",
-    "orbit-offset-enumeration": "0",
-    "orbit-multiplier-enumeration": "0",
-    "start-value-enumeration": "0",
-    "end-value-enumeration": "-1",
-    "step-value-enumeration": "1",
-    "aod-file": "FemtoAO2D.root"
-  },
-  "femto-dream-debug-track": {
-    "cfgCutTable": {
-      "labels_rows": "",
-      "labels_cols": [
-        "MaxPt",
-        "PIDthr",
-        "nSigmaTPC",
-        "nSigmaTPCTOF",
-        "MaxP"
-      ],
-      "values": [
-        [
-          "4.05",
-          "1",
-          "3.5",
-          "3.5",
-          "1"
-        ]
-      ]
+    "internal-dpl-clock": "",
+    "internal-dpl-aod-reader": {
+        "time-limit": "0",
+        "orbit-offset-enumeration": "0",
+        "orbit-multiplier-enumeration": "0",
+        "start-value-enumeration": "0",
+        "end-value-enumeration": "-1",
+        "step-value-enumeration": "1",
+        "aod-file": "FemtoAO2D.root"
     },
-    "ccfgNspecies": "1",
-    "ConfPDGCodePartOne": "2212",
-    "ConfCutPartOne": "168072266",
-    "ConfPIDPartOne": {
-      "values": [
-        "0"
-      ]
-    }
-  },
-  "femto-dream-pair-task-track-track": {
-    "cfgCutTable": {
-      "labels_rows": [
-        "PartOne",
-        "PartTwo"
-      ],
-      "labels_cols": [
-        "MaxPt",
-        "PIDthr",
-        "nSigmaTPC",
-        "nSigmaTPCTOF",
-        "MaxP"
-      ],
-      "values": [
-        [
-          "4.05",
-          "1",
-          "3",
-          "3",
-          "1"
-        ],
-        [
-          "4.05",
-          "1",
-          "3",
-          "3",
-          "1"
-        ]
-      ]
+    "femto-dream-debug-track": {
+        "cfgCutTable": {
+            "labels_rows": "",
+            "labels_cols": [
+                "MaxPt",
+                "PIDthr",
+                "nSigmaTPC",
+                "nSigmaTPCTOF",
+                "MaxP"
+            ],
+            "values": [
+                [
+                    "4.05",
+                    "1",
+                    "3.5",
+                    "3.5",
+                    "1"
+                ]
+            ]
+        },
+        "ccfgNspecies": "1",
+        "ConfPDGCodePartOne": "2212",
+        "ConfCutPartOne": "168072266",
+        "ConfPIDPartOne": {
+            "values": [
+                "0"
+            ]
+        }
     },
-    "ccfgNspecies": "1",
-    "ConfPDGCodePartOne": "2212",
-    "ConfCutPartOne": "168072266",
-    "ConfPIDPartOne": {
-      "values": [
-        "0"
-      ]
+    "femto-dream-pair-task-track-track": {
+        "cfgCutTable": {
+            "labels_rows": [
+                "PartOne",
+                "PartTwo"
+            ],
+            "labels_cols": [
+                "MaxPt",
+                "PIDthr",
+                "nSigmaTPC",
+                "nSigmaTPCTOF",
+                "MaxP"
+            ],
+            "values": [
+                [
+                    "4.05",
+                    "1",
+                    "3",
+                    "3",
+                    "1"
+                ],
+                [
+                    "4.05",
+                    "1",
+                    "3",
+                    "3",
+                    "1"
+                ]
+            ]
+        },
+        "ccfgNspecies": "1",
+        "ConfPDGCodePartOne": "2212",
+        "ConfCutPartOne": "168072266",
+        "ConfPIDPartOne": {
+            "values": [
+                "0"
+            ]
+        },
+        "ConfIsSame": "false",
+        "ConfPDGCodePartTwo": "2212",
+        "ConfCutPartTwo": "168072266",
+        "ConfPIDPartTwo": {
+            "values": [
+                "0"
+            ]
+        },
+        "CfgMultBins": {
+            "values": [
+                "0",
+                "0",
+                "20",
+                "40",
+                "60",
+                "80",
+                "100",
+                "200",
+                "99999"
+            ]
+        },
+        "CfgkstarBins": {
+            "values": [
+                "1500",
+                "0",
+                "6"
+            ]
+        },
+        "CfgkTBins": {
+            "values": [
+                "150",
+                "0",
+                "9"
+            ]
+        },
+        "CfgmTBins": {
+            "values": [
+                "225",
+                "0",
+                "7.5"
+            ]
+        },
+        "ConfNEventsMix": "5",
+        "ConfIsCPR": "true",
+        "processSameEvent": "true",
+        "processMixedEvent": "true"
     },
-    "ConfIsSame": "false",
-    "ConfPDGCodePartTwo": "2212",
-    "ConfCutPartTwo": "168072266",
-    "ConfPIDPartTwo": {
-      "values": [
-        "0"
-      ]
-    },
-    "CfgMultBins": {
-      "values": [
-        "0",
-        "0",
-        "20",
-        "40",
-        "60",
-        "80",
-        "100",
-        "200",
-        "99999"
-      ]
-    },
-    "CfgkstarBins": {
-      "values": [
-        "1500",
-        "0",
-        "6"
-      ]
-    },
-    "CfgkTBins": {
-      "values": [
-        "150",
-        "0",
-        "9"
-      ]
-    },
-    "CfgmTBins": {
-      "values": [
-        "225",
-        "0",
-        "7.5"
-      ]
-    },
-    "ConfNEventsMix": "5",
-    "ConfIsCPR": "true",
-    "processSameEvent": "true",
-    "processMixedEvent": "true"
-  },
-  "internal-dpl-injected-dummy-sink": "",
-  "internal-dpl-aod-global-analysis-file-sink": ""
+    "internal-dpl-injected-dummy-sink": "",
+    "internal-dpl-aod-global-analysis-file-sink": ""
 }
diff --git a/.conflict-side-1/PWGCF/Tutorial/prod-config.json b/.conflict-side-1/PWGCF/Tutorial/prod-config.json
index 8be00067d90..934b219a50a 100644
--- a/.conflict-side-1/PWGCF/Tutorial/prod-config.json
+++ b/.conflict-side-1/PWGCF/Tutorial/prod-config.json
@@ -1,47 +1,47 @@
 {
-  "internal-dpl-clock": "",
-  "internal-dpl-aod-reader": {
-    "time-limit": "0",
-    "orbit-offset-enumeration": "0",
-    "orbit-multiplier-enumeration": "0",
-    "start-value-enumeration": "0",
-    "end-value-enumeration": "-1",
-    "step-value-enumeration": "1",
-    "aod-file": "AO2D.root"
-  },
-  "internal-dpl-aod-index-builder": "",
-  "internal-dpl-aod-spawner": "",
-  "fdd-converter": "",
-  "timestamp-task": {
-    "verbose": "false",
-    "rct-path": "RCT/RunInformation/",
-    "start-orbit-path": "GRP/StartOrbit",
-    "ccdb-url": "http://alice-ccdb.cern.ch",
-    "isRun2MC": "false"
-  },
-  "tpc-pid": {
-    "param-file": "",
-    "param-signal": "BetheBloch",
-    "param-sigma": "TPCReso",
-    "ccdb-url": "http://alice-ccdb.cern.ch",
-    "ccdbPath": "Analysis/PID/TPC/Response",
-    "ccdb-timestamp": "-1",
-    "pid-el": "-1",
-    "pid-mu": "-1",
-    "pid-pi": "-1",
-    "pid-ka": "-1",
-    "pid-pr": "-1",
-    "pid-de": "-1",
-    "pid-tr": "-1",
-    "pid-he": "-1",
-    "pid-al": "-1"
-  },
-  "bc-selection-task": {
-    "processRun2": "false",
-    "processRun3": "true"
-  },
-  "tof-signal": "",
-  "track-propagation": {
+    "internal-dpl-clock": "",
+    "internal-dpl-aod-reader": {
+        "time-limit": "0",
+        "orbit-offset-enumeration": "0",
+        "orbit-multiplier-enumeration": "0",
+        "start-value-enumeration": "0",
+        "end-value-enumeration": "-1",
+        "step-value-enumeration": "1",
+        "aod-file": "AO2D.root"
+    },
+    "internal-dpl-aod-index-builder": "",
+    "internal-dpl-aod-spawner": "",
+    "fdd-converter": "",
+    "timestamp-task": {
+        "verbose": "false",
+        "rct-path": "RCT/RunInformation/",
+        "start-orbit-path": "GRP/StartOrbit",
+        "ccdb-url": "http://alice-ccdb.cern.ch",
+        "isRun2MC": "false"
+    },
+    "tpc-pid": {
+        "param-file": "",
+        "param-signal": "BetheBloch",
+        "param-sigma": "TPCReso",
+        "ccdb-url": "http://alice-ccdb.cern.ch",
+        "ccdbPath": "Analysis/PID/TPC/Response",
+        "ccdb-timestamp": "-1",
+        "pid-el": "-1",
+        "pid-mu": "-1",
+        "pid-pi": "-1",
+        "pid-ka": "-1",
+        "pid-pr": "-1",
+        "pid-de": "-1",
+        "pid-tr": "-1",
+        "pid-he": "-1",
+        "pid-al": "-1"
+    },
+    "bc-selection-task": {
+        "processRun2": "false",
+        "processRun3": "true"
+    },
+    "tof-signal": "",
+    "track-propagation": {
         "ccdb-url": "http://alice-ccdb.cern.ch",
         "lutPath": "GLO/Param/MatLUT",
         "geoPath": "GLO/Config/GeometryAligned",
@@ -50,196 +50,196 @@
         "processStandard": "true",
         "processCovariance": "false"
     },
-  "tof-pid-base": {},
-  "tof-pid": {
-    "param-file": "",
-    "param-sigma": "TOFResoParams",
-    "ccdb-url": "http://alice-ccdb.cern.ch",
-    "ccdbPath": "Analysis/PID/TOF",
-    "ccdb-timestamp": "-1",
-    "pid-el": "-1",
-    "pid-mu": "-1",
-    "pid-pi": "-1",
-    "pid-ka": "-1",
-    "pid-pr": "-1",
-    "pid-de": "-1",
-    "pid-tr": "-1",
-    "pid-he": "-1",
-    "pid-al": "-1",
-    "processEvTime": "true",
-    "processNoEvTime": "false"
-  },
-  "lambdakzero-builder": {
-    "dcanegtopv": "0.1",
-    "dcapostopv": "0.1",
-    "mincrossedrows": "70",
-    "isRun2": "1",
-    "v0cospa": "0.995",
-    "dcav0dau": "1",
-    "v0radius": "5",
-    "useMatCorrType": "0",
-    "rejDiffCollTracks": "0",
+    "tof-pid-base": {},
+    "tof-pid": {
+        "param-file": "",
+        "param-sigma": "TOFResoParams",
+        "ccdb-url": "http://alice-ccdb.cern.ch",
+        "ccdbPath": "Analysis/PID/TOF",
+        "ccdb-timestamp": "-1",
+        "pid-el": "-1",
+        "pid-mu": "-1",
+        "pid-pi": "-1",
+        "pid-ka": "-1",
+        "pid-pr": "-1",
+        "pid-de": "-1",
+        "pid-tr": "-1",
+        "pid-he": "-1",
+        "pid-al": "-1",
+        "processEvTime": "true",
+        "processNoEvTime": "false"
+    },
+    "lambdakzero-builder": {
+        "dcanegtopv": "0.1",
+        "dcapostopv": "0.1",
+        "mincrossedrows": "70",
+        "isRun2": "1",
+        "v0cospa": "0.995",
+        "dcav0dau": "1",
+        "v0radius": "5",
+        "useMatCorrType": "0",
+        "rejDiffCollTracks": "0",
         "processRun2": "false",
         "processRun3": "true"
-  },
-  "event-selection-task": {
-    "syst": "pp",
-    "muonSelection": "0",
-    "customDeltaBC": "300",
-    "isMC": "false",
-    "processRun2": "false",
-    "processRun3": "true"
-  },
-  "multiplicity-table": {
-    "processRun2": "false",
-    "processRun3": "true"
-  },
-  "femto-dream-producer-task": {
-    "ConfDebugOutput": "true",
-    "ConfIsTrigger": "false",
-    "ConfIsRun3": "true",
-    "ConfEvtZvtx": "10",
-    "ConfEvtTriggerCheck": "true",
-    "ConfEvtTriggerSel": "0",
-    "ConfEvtOfflineCheck": "true",
-    "ConfStoreV0": "true",
-    "ConfTrkSign": {
-      "values": [
-        "-1",
-        "1"
-      ]
-    },
-    "ConfTrkPtMin": {
-      "values": [
-        "0.4",
-        "0.6",
-        "0.5"
-      ]
-    },
-    "ConfTrkEtaMax": {
-      "values": [
-        "0.8",
-        "0.7",
-        "0.9"
-      ]
-    },
-    "ConfTrkTPCnClsMin": {
-      "values": [
-        "80",
-        "70",
-        "60"
-      ]
-    },
-    "ConfTrkTPCfClsMin": {
-      "values": [
-        "0.7",
-        "0.8",
-        "0.9"
-      ]
-    },
-    "ConfTrkTPCcRowsMin": {
-      "values": [
-        "70",
-        "60",
-        "80"
-      ]
-    },
-    "ConfTrkTPCsClsMax": {
-      "values": [
-        "0.1",
-        "160"
-      ]
-    },
-    "ConfTrkITSnClsMin": {
-      "values": [
-        "-1",
-        "2",
-        "4"
-      ]
-    },
-    "ConfTrkITSnClsIbMin": {
-      "values": [
-        "-1",
-        "1"
-      ]
     },
-    "ConfTrkDCAxyMax": {
-      "values": [
-        "0.1",
-        "3.5"
-      ]
-    },
-    "ConfTrkDCAzMax": {
-      "values": [
-        "0.2",
-        "3.5"
-      ]
-    },
-    "ConfTrkPIDnSigmaMax": {
-      "values": [
-        "3.5",
-        "3",
-        "2.5"
-      ]
-    },
-    "ConfTrkTPIDspecies": {
-      "values": [
-        "2",
-        "4"
-      ]
-    },
-    "ConfV0Sign": {
-      "values": [
-        "-1",
-        "1"
-      ]
-    },
-    "ConfV0PtMin": {
-      "values": [
-        "0.3",
-        "0.4",
-        "0.5"
-      ]
-    },
-    "ConfV0DCAdaughMax": {
-      "values": [
-        "1.2",
-        "1.5"
-      ]
-    },
-    "ConfV0CPAMin": {
-      "values": [
-        "0.90",
-        "0.995"
-      ]
-    },
-    "ConfV0TranRadMin": {
-      "values": [
-        "0.2"
-      ]
-    },
-    "ConfV0TranRadMax": {
-      "values": [
-        "100"
-      ]
-    },
-    "ConfV0DecVecMax": {
-      "values": [
-        "100"
-      ]
+    "event-selection-task": {
+        "syst": "pp",
+        "muonSelection": "0",
+        "customDeltaBC": "300",
+        "isMC": "false",
+        "processRun2": "false",
+        "processRun3": "true"
     },
-    "ConfV0DaughTPIDspecies": {
-      "values": [
-        "2",
-        "4"
-      ]
+    "multiplicity-table": {
+        "processRun2": "false",
+        "processRun3": "true"
     },
-    "ConfInvMassLowLimit": "0",
-    "ConfInvMassUpLimit": "100"
-  },
-  "track-selection": {
-    "isRun3": "true"
-  },
-  "internal-dpl-aod-global-analysis-file-sink": "",
-  "internal-dpl-aod-writer": ""
+    "femto-dream-producer-task": {
+        "ConfDebugOutput": "true",
+        "ConfIsTrigger": "false",
+        "ConfIsRun3": "true",
+        "ConfEvtZvtx": "10",
+        "ConfEvtTriggerCheck": "true",
+        "ConfEvtTriggerSel": "0",
+        "ConfEvtOfflineCheck": "true",
+        "ConfStoreV0": "true",
+        "ConfTrkSign": {
+            "values": [
+                "-1",
+                "1"
+            ]
+        },
+        "ConfTrkPtMin": {
+            "values": [
+                "0.4",
+                "0.6",
+                "0.5"
+            ]
+        },
+        "ConfTrkEtaMax": {
+            "values": [
+                "0.8",
+                "0.7",
+                "0.9"
+            ]
+        },
+        "ConfTrkTPCnClsMin": {
+            "values": [
+                "80",
+                "70",
+                "60"
+            ]
+        },
+        "ConfTrkTPCfClsMin": {
+            "values": [
+                "0.7",
+                "0.8",
+                "0.9"
+            ]
+        },
+        "ConfTrkTPCcRowsMin": {
+            "values": [
+                "70",
+                "60",
+                "80"
+            ]
+        },
+        "ConfTrkTPCsClsMax": {
+            "values": [
+                "0.1",
+                "160"
+            ]
+        },
+        "ConfTrkITSnClsMin": {
+            "values": [
+                "-1",
+                "2",
+                "4"
+            ]
+        },
+        "ConfTrkITSnClsIbMin": {
+            "values": [
+                "-1",
+                "1"
+            ]
+        },
+        "ConfTrkDCAxyMax": {
+            "values": [
+                "0.1",
+                "3.5"
+            ]
+        },
+        "ConfTrkDCAzMax": {
+            "values": [
+                "0.2",
+                "3.5"
+            ]
+        },
+        "ConfTrkPIDnSigmaMax": {
+            "values": [
+                "3.5",
+                "3",
+                "2.5"
+            ]
+        },
+        "ConfTrkTPIDspecies": {
+            "values": [
+                "2",
+                "4"
+            ]
+        },
+        "ConfV0Sign": {
+            "values": [
+                "-1",
+                "1"
+            ]
+        },
+        "ConfV0PtMin": {
+            "values": [
+                "0.3",
+                "0.4",
+                "0.5"
+            ]
+        },
+        "ConfV0DCAdaughMax": {
+            "values": [
+                "1.2",
+                "1.5"
+            ]
+        },
+        "ConfV0CPAMin": {
+            "values": [
+                "0.90",
+                "0.995"
+            ]
+        },
+        "ConfV0TranRadMin": {
+            "values": [
+                "0.2"
+            ]
+        },
+        "ConfV0TranRadMax": {
+            "values": [
+                "100"
+            ]
+        },
+        "ConfV0DecVecMax": {
+            "values": [
+                "100"
+            ]
+        },
+        "ConfV0DaughTPIDspecies": {
+            "values": [
+                "2",
+                "4"
+            ]
+        },
+        "ConfInvMassLowLimit": "0",
+        "ConfInvMassUpLimit": "100"
+    },
+    "track-selection": {
+        "isRun3": "true"
+    },
+    "internal-dpl-aod-global-analysis-file-sink": "",
+    "internal-dpl-aod-writer": ""
 }
diff --git a/.conflict-side-1/PWGCF/Tutorial/run-config.json b/.conflict-side-1/PWGCF/Tutorial/run-config.json
index 424db80fbb8..1c7c55db103 100644
--- a/.conflict-side-1/PWGCF/Tutorial/run-config.json
+++ b/.conflict-side-1/PWGCF/Tutorial/run-config.json
@@ -1,135 +1,135 @@
 {
-  "internal-dpl-clock": "",
-  "internal-dpl-aod-reader": {
-    "time-limit": "0",
-    "orbit-offset-enumeration": "0",
-    "orbit-multiplier-enumeration": "0",
-    "start-value-enumeration": "0",
-    "end-value-enumeration": "-1",
-    "step-value-enumeration": "1",
-    "aod-file": "AO2D.root"
-  },
-  "internal-dpl-aod-index-builder": "",
-  "internal-dpl-aod-spawner": "",
-  "fdd-converter": "",
-  "timestamp-task": {
-    "verbose": "false",
-    "rct-path": "RCT/RunInformation/",
-    "start-orbit-path": "GRP/StartOrbit",
-    "ccdb-url": "http://alice-ccdb.cern.ch",
-    "isRun2MC": "false"
-  },
-  "tpc-pid": {
-    "param-file": "",
-    "param-signal": "BetheBloch",
-    "param-sigma": "TPCReso",
-    "ccdb-url": "http://alice-ccdb.cern.ch",
-    "ccdbPath": "Analysis/PID/TPC/Response",
-    "ccdb-timestamp": "-1",
-    "pid-el": "-1",
-    "pid-mu": "-1",
-    "pid-pi": "-1",
-    "pid-ka": "-1",
-    "pid-pr": "-1",
-    "pid-de": "-1",
-    "pid-tr": "-1",
-    "pid-he": "-1",
-    "pid-al": "-1"
-  },
-  "bc-selection-task": {
-    "processRun2": "false",
-    "processRun3": "true"
-  },
-  "tof-signal": "",
-  "track-propagation": {
-    "ccdb-url": "http://alice-ccdb.cern.ch",
-    "lutPath": "GLO/Param/MatLUT",
-    "geoPath": "GLO/Config/GeometryAligned",
-    "grpPath": "GLO/GRP/GRP",
-    "mVtxPath": "GLO/Calib/MeanVertex",
-    "processStandard": "true",
-    "processCovariance": "false"
-  },
-  "event-selection-task": {
-    "syst": "pp",
-    "muonSelection": "0",
-    "customDeltaBC": "300",
-    "isMC": "false",
-    "processRun2": "false",
-    "processRun3": "true"
-  },
-  "multiplicity-table": {
-    "processRun2": "false",
-    "processRun3": "true"
-  },
-  "track-selection": {
-    "isRun3": "true"
-  },
-  "c-f-tutorial-task0": "",
-  "c-f-tutorial-task1": "",
-  "c-f-tutorial-task2": {
-    "ConfZvtxCut": "10",
-    "ConfEtaCut": "0.8",
-    "ConfMaxPtCut": "3",
-    "ConfMinPtCut": "0.5",
-    "ConfMinNSigmaTPCCut": "3"
-  },
-  "c-f-tutorial-task3": {
-    "ConfZvtxCut": "10",
-    "ConfEtaCut": "0.8",
-    "ConfMaxPtCut": "3",
-    "ConfMinPtCut": "0.5",
-    "ConfMinNSigmaTPCCut": "3",
-    "ConfChargeCut": "0"
-  },
-  "c-f-tutorial-task4": {
-    "ConfZvtxCut": "10",
-    "ConfEtaCut": "0.8",
-    "ConfMaxPtCut": "3",
-    "ConfMinPtCut": "0.5",
-    "ConfMinNSigmaTPCCut": "3",
-    "ConfChargeCut": "0"
-  },
-  "c-f-tutorial-task5": {
-    "ConfZvtxCut": "10",
-    "ConfEtaCut": "0.8",
-    "ConfMaxPtCut": "3",
-    "ConfMinPtCut": "0.5",
-    "ConfMinNSigmaTPCCut": "3",
-    "ConfChargeCut": "0",
-    "ConfMultBins": {
-      "values": [
-        "0",
-        "0",
-        "20",
-        "40",
-        "60",
-        "80",
-        "100",
-        "200",
-        "99999"
-      ]
+    "internal-dpl-clock": "",
+    "internal-dpl-aod-reader": {
+        "time-limit": "0",
+        "orbit-offset-enumeration": "0",
+        "orbit-multiplier-enumeration": "0",
+        "start-value-enumeration": "0",
+        "end-value-enumeration": "-1",
+        "step-value-enumeration": "1",
+        "aod-file": "AO2D.root"
     },
-    "ConfVtxBins": {
-      "values": [
-        "0",
-        "-10",
-        "-8",
-        "-6",
-        "-4",
-        "-2",
-        "0",
-        "2",
-        "4",
-        "6",
-        "8",
-        "10"
-      ]
+    "internal-dpl-aod-index-builder": "",
+    "internal-dpl-aod-spawner": "",
+    "fdd-converter": "",
+    "timestamp-task": {
+        "verbose": "false",
+        "rct-path": "RCT/RunInformation/",
+        "start-orbit-path": "GRP/StartOrbit",
+        "ccdb-url": "http://alice-ccdb.cern.ch",
+        "isRun2MC": "false"
     },
-    "processSame": "true",
-    "processMixed": "true",
-    "processMixedEventInterface": "true"
-  },
-  "internal-dpl-aod-global-analysis-file-sink": "",
-  "internal-dpl-aod-writer": ""
+    "tpc-pid": {
+        "param-file": "",
+        "param-signal": "BetheBloch",
+        "param-sigma": "TPCReso",
+        "ccdb-url": "http://alice-ccdb.cern.ch",
+        "ccdbPath": "Analysis/PID/TPC/Response",
+        "ccdb-timestamp": "-1",
+        "pid-el": "-1",
+        "pid-mu": "-1",
+        "pid-pi": "-1",
+        "pid-ka": "-1",
+        "pid-pr": "-1",
+        "pid-de": "-1",
+        "pid-tr": "-1",
+        "pid-he": "-1",
+        "pid-al": "-1"
+    },
+    "bc-selection-task": {
+        "processRun2": "false",
+        "processRun3": "true"
+    },
+    "tof-signal": "",
+    "track-propagation": {
+        "ccdb-url": "http://alice-ccdb.cern.ch",
+        "lutPath": "GLO/Param/MatLUT",
+        "geoPath": "GLO/Config/GeometryAligned",
+        "grpPath": "GLO/GRP/GRP",
+        "mVtxPath": "GLO/Calib/MeanVertex",
+        "processStandard": "true",
+        "processCovariance": "false"
+    },
+    "event-selection-task": {
+        "syst": "pp",
+        "muonSelection": "0",
+        "customDeltaBC": "300",
+        "isMC": "false",
+        "processRun2": "false",
+        "processRun3": "true"
+    },
+    "multiplicity-table": {
+        "processRun2": "false",
+        "processRun3": "true"
+    },
+    "track-selection": {
+        "isRun3": "true"
+    },
+    "c-f-tutorial-task0": "",
+    "c-f-tutorial-task1": "",
+    "c-f-tutorial-task2": {
+        "ConfZvtxCut": "10",
+        "ConfEtaCut": "0.8",
+        "ConfMaxPtCut": "3",
+        "ConfMinPtCut": "0.5",
+        "ConfMinNSigmaTPCCut": "3"
+    },
+    "c-f-tutorial-task3": {
+        "ConfZvtxCut": "10",
+        "ConfEtaCut": "0.8",
+        "ConfMaxPtCut": "3",
+        "ConfMinPtCut": "0.5",
+        "ConfMinNSigmaTPCCut": "3",
+        "ConfChargeCut": "0"
+    },
+    "c-f-tutorial-task4": {
+        "ConfZvtxCut": "10",
+        "ConfEtaCut": "0.8",
+        "ConfMaxPtCut": "3",
+        "ConfMinPtCut": "0.5",
+        "ConfMinNSigmaTPCCut": "3",
+        "ConfChargeCut": "0"
+    },
+    "c-f-tutorial-task5": {
+        "ConfZvtxCut": "10",
+        "ConfEtaCut": "0.8",
+        "ConfMaxPtCut": "3",
+        "ConfMinPtCut": "0.5",
+        "ConfMinNSigmaTPCCut": "3",
+        "ConfChargeCut": "0",
+        "ConfMultBins": {
+            "values": [
+                "0",
+                "0",
+                "20",
+                "40",
+                "60",
+                "80",
+                "100",
+                "200",
+                "99999"
+            ]
+        },
+        "ConfVtxBins": {
+            "values": [
+                "0",
+                "-10",
+                "-8",
+                "-6",
+                "-4",
+                "-2",
+                "0",
+                "2",
+                "4",
+                "6",
+                "8",
+                "10"
+            ]
+        },
+        "processSame": "true",
+        "processMixed": "true",
+        "processMixedEventInterface": "true"
+    },
+    "internal-dpl-aod-global-analysis-file-sink": "",
+    "internal-dpl-aod-writer": ""
 }
diff --git a/.conflict-side-1/PWGCF/TwoParticleCorrelations/Core/EventSelectionFilterAndAnalysis.cxx b/.conflict-side-1/PWGCF/TwoParticleCorrelations/Core/EventSelectionFilterAndAnalysis.cxx
index 57a65059663..cb2ca3398b2 100644
--- a/.conflict-side-1/PWGCF/TwoParticleCorrelations/Core/EventSelectionFilterAndAnalysis.cxx
+++ b/.conflict-side-1/PWGCF/TwoParticleCorrelations/Core/EventSelectionFilterAndAnalysis.cxx
@@ -9,11 +9,13 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <boost/regex.hpp>
-#include <TObjArray.h>
+#include "EventSelectionFilterAndAnalysis.h"
 
 #include "Framework/AnalysisTask.h"
-#include "EventSelectionFilterAndAnalysis.h"
+
+#include <TObjArray.h>
+
+#include <boost/regex.hpp>
 
 using namespace o2;
 using namespace o2::analysis::PWGCF;
diff --git a/.conflict-side-1/PWGCF/TwoParticleCorrelations/Core/EventSelectionFilterAndAnalysis.h b/.conflict-side-1/PWGCF/TwoParticleCorrelations/Core/EventSelectionFilterAndAnalysis.h
index 72e8d6672c0..63a10c2bd78 100644
--- a/.conflict-side-1/PWGCF/TwoParticleCorrelations/Core/EventSelectionFilterAndAnalysis.h
+++ b/.conflict-side-1/PWGCF/TwoParticleCorrelations/Core/EventSelectionFilterAndAnalysis.h
@@ -11,15 +11,17 @@
 #ifndef EVENTSELECTIONFILTERANDANALYSIS_H
 #define EVENTSELECTIONFILTERANDANALYSIS_H
 
-#include <Rtypes.h>
-#include <TString.h>
-#include <TObject.h>
-#include <TNamed.h>
+#include "SelectionFilterAndAnalysis.h"
+#include "SkimmingConfigurableCuts.h"
+
 #include <TList.h>
+#include <TNamed.h>
+#include <TObject.h>
+#include <TString.h>
 
 #include <fairlogger/Logger.h>
-#include "SkimmingConfigurableCuts.h"
-#include "SelectionFilterAndAnalysis.h"
+
+#include <Rtypes.h>
 
 namespace o2
 {
diff --git a/.conflict-side-1/PWGCF/TwoParticleCorrelations/Core/FilterAndAnalysisFramework.cxx b/.conflict-side-1/PWGCF/TwoParticleCorrelations/Core/FilterAndAnalysisFramework.cxx
index ba83f4aa2ed..40c4cebf8c8 100644
--- a/.conflict-side-1/PWGCF/TwoParticleCorrelations/Core/FilterAndAnalysisFramework.cxx
+++ b/.conflict-side-1/PWGCF/TwoParticleCorrelations/Core/FilterAndAnalysisFramework.cxx
@@ -9,14 +9,16 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
+#include "FilterAndAnalysisFramework.h"
+
+#include <TList.h>
+#include <TObjString.h>
+
 #include <fairlogger/Logger.h>
+
 #include <iomanip>
 #include <map>
 #include <string>
-#include <TList.h>
-#include <TObjString.h>
-
-#include "FilterAndAnalysisFramework.h"
 
 using namespace o2;
 using namespace o2::analysis::PWGCF;
diff --git a/.conflict-side-1/PWGCF/TwoParticleCorrelations/Core/FilterAndAnalysisFramework.h b/.conflict-side-1/PWGCF/TwoParticleCorrelations/Core/FilterAndAnalysisFramework.h
index fa3b7aaeb6e..54d1656ad3d 100644
--- a/.conflict-side-1/PWGCF/TwoParticleCorrelations/Core/FilterAndAnalysisFramework.h
+++ b/.conflict-side-1/PWGCF/TwoParticleCorrelations/Core/FilterAndAnalysisFramework.h
@@ -11,18 +11,21 @@
 #ifndef PWGCF_TWOPARTICLECORRELATIONS_CORE_FILTERANDANALYSISFRAMEWORK_H_
 #define PWGCF_TWOPARTICLECORRELATIONS_CORE_FILTERANDANALYSISFRAMEWORK_H_
 
+#include "PWGCF/TwoParticleCorrelations/Core/EventSelectionFilterAndAnalysis.h"
+#include "PWGCF/TwoParticleCorrelations/Core/PIDSelectionFilterAndAnalysis.h"
+#include "PWGCF/TwoParticleCorrelations/Core/TrackSelectionFilterAndAnalysis.h"
+
 #include <CCDB/BasicCCDBManager.h>
-#include <vector>
-#include <string>
-#include <Rtypes.h>
-#include <TString.h>
-#include <TObject.h>
-#include <TNamed.h>
+
 #include <TList.h>
+#include <TNamed.h>
+#include <TObject.h>
+#include <TString.h>
 
-#include "PWGCF/TwoParticleCorrelations/Core/EventSelectionFilterAndAnalysis.h"
-#include "PWGCF/TwoParticleCorrelations/Core/TrackSelectionFilterAndAnalysis.h"
-#include "PWGCF/TwoParticleCorrelations/Core/PIDSelectionFilterAndAnalysis.h"
+#include <Rtypes.h>
+
+#include <string>
+#include <vector>
 
 namespace o2
 {
diff --git a/.conflict-side-1/PWGCF/TwoParticleCorrelations/Core/PIDSelectionFilterAndAnalysis.cxx b/.conflict-side-1/PWGCF/TwoParticleCorrelations/Core/PIDSelectionFilterAndAnalysis.cxx
index bfe06121f9e..519b3a825e1 100644
--- a/.conflict-side-1/PWGCF/TwoParticleCorrelations/Core/PIDSelectionFilterAndAnalysis.cxx
+++ b/.conflict-side-1/PWGCF/TwoParticleCorrelations/Core/PIDSelectionFilterAndAnalysis.cxx
@@ -9,14 +9,17 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <boost/regex.hpp>
-#include <TObjArray.h>
+#include "PIDSelectionFilterAndAnalysis.h"
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PIDSelectionFilterAndAnalysis.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+
+#include <TObjArray.h>
+
+#include <boost/regex.hpp>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGCF/TwoParticleCorrelations/Core/PIDSelectionFilterAndAnalysis.h b/.conflict-side-1/PWGCF/TwoParticleCorrelations/Core/PIDSelectionFilterAndAnalysis.h
index 1d8645b351c..530a2f95658 100644
--- a/.conflict-side-1/PWGCF/TwoParticleCorrelations/Core/PIDSelectionFilterAndAnalysis.h
+++ b/.conflict-side-1/PWGCF/TwoParticleCorrelations/Core/PIDSelectionFilterAndAnalysis.h
@@ -11,14 +11,15 @@
 #ifndef PIDSELECTIONFILTERANDANALYSIS_H
 #define PIDSELECTIONFILTERANDANALYSIS_H
 
-#include <Rtypes.h>
-#include <TString.h>
-#include <TObject.h>
-#include <TNamed.h>
+#include "SelectionFilterAndAnalysis.h"
+#include "SkimmingConfigurableCuts.h"
+
 #include <TList.h>
+#include <TNamed.h>
+#include <TObject.h>
+#include <TString.h>
 
-#include "SkimmingConfigurableCuts.h"
-#include "SelectionFilterAndAnalysis.h"
+#include <Rtypes.h>
 
 #undef INCORPORATEBAYESIANPID
 
diff --git a/.conflict-side-1/PWGCF/TwoParticleCorrelations/Core/SelectionFilterAndAnalysis.cxx b/.conflict-side-1/PWGCF/TwoParticleCorrelations/Core/SelectionFilterAndAnalysis.cxx
index 1c816268063..eb15706406d 100644
--- a/.conflict-side-1/PWGCF/TwoParticleCorrelations/Core/SelectionFilterAndAnalysis.cxx
+++ b/.conflict-side-1/PWGCF/TwoParticleCorrelations/Core/SelectionFilterAndAnalysis.cxx
@@ -9,13 +9,15 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <boost/regex.hpp>
-#include <TObjArray.h>
+#include "SelectionFilterAndAnalysis.h"
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
-#include "SelectionFilterAndAnalysis.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+
+#include <TObjArray.h>
+
+#include <boost/regex.hpp>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGCF/TwoParticleCorrelations/Core/SelectionFilterAndAnalysis.h b/.conflict-side-1/PWGCF/TwoParticleCorrelations/Core/SelectionFilterAndAnalysis.h
index f3680d188f4..ea88f12edca 100644
--- a/.conflict-side-1/PWGCF/TwoParticleCorrelations/Core/SelectionFilterAndAnalysis.h
+++ b/.conflict-side-1/PWGCF/TwoParticleCorrelations/Core/SelectionFilterAndAnalysis.h
@@ -11,11 +11,12 @@
 #ifndef SELECTIONFILTERANDANALYSIS_H
 #define SELECTIONFILTERANDANALYSIS_H
 
-#include <Rtypes.h>
-#include <TString.h>
-#include <TObject.h>
-#include <TNamed.h>
 #include <TList.h>
+#include <TNamed.h>
+#include <TObject.h>
+#include <TString.h>
+
+#include <Rtypes.h>
 
 namespace o2
 {
diff --git a/.conflict-side-1/PWGCF/TwoParticleCorrelations/Core/SkimmingConfigurableCuts.cxx b/.conflict-side-1/PWGCF/TwoParticleCorrelations/Core/SkimmingConfigurableCuts.cxx
index 81436952bd0..9c9c131e768 100644
--- a/.conflict-side-1/PWGCF/TwoParticleCorrelations/Core/SkimmingConfigurableCuts.cxx
+++ b/.conflict-side-1/PWGCF/TwoParticleCorrelations/Core/SkimmingConfigurableCuts.cxx
@@ -9,11 +9,13 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <regex>
+#include "PWGCF/TwoParticleCorrelations/Core/SkimmingConfigurableCuts.h"
+
 #include <TObjArray.h>
 
 #include <fairlogger/Logger.h>
-#include "PWGCF/TwoParticleCorrelations/Core/SkimmingConfigurableCuts.h"
+
+#include <regex>
 
 using namespace o2;
 using namespace o2::analysis::PWGCF;
diff --git a/.conflict-side-1/PWGCF/TwoParticleCorrelations/Core/SkimmingConfigurableCuts.h b/.conflict-side-1/PWGCF/TwoParticleCorrelations/Core/SkimmingConfigurableCuts.h
index 53e1c56dcaa..823f6a848ac 100644
--- a/.conflict-side-1/PWGCF/TwoParticleCorrelations/Core/SkimmingConfigurableCuts.h
+++ b/.conflict-side-1/PWGCF/TwoParticleCorrelations/Core/SkimmingConfigurableCuts.h
@@ -11,20 +11,23 @@
 #ifndef SKIMMING_CONFIGURABLE_CUTS_CLASSES_H
 #define SKIMMING_CONFIGURABLE_CUTS_CLASSES_H
 
-#include <Rtypes.h>
-#include <TString.h>
-#include <TObject.h>
-#include <TNamed.h>
-#include <TMath.h>
-#include <TList.h>
+#include "Framework/DataTypes.h"
+
 #include <TF1.h>
-#include <set>
-#include <vector>
-#include <regex>
+#include <TList.h>
+#include <TMath.h>
+#include <TNamed.h>
 #include <TObjArray.h>
+#include <TObject.h>
+#include <TString.h>
 
 #include <fairlogger/Logger.h>
-#include "Framework/DataTypes.h"
+
+#include <Rtypes.h>
+
+#include <regex>
+#include <set>
+#include <vector>
 
 namespace o2
 {
diff --git a/.conflict-side-1/PWGCF/TwoParticleCorrelations/Core/TrackSelectionFilterAndAnalysis.cxx b/.conflict-side-1/PWGCF/TwoParticleCorrelations/Core/TrackSelectionFilterAndAnalysis.cxx
index 4b5708fdc90..859c6d04802 100644
--- a/.conflict-side-1/PWGCF/TwoParticleCorrelations/Core/TrackSelectionFilterAndAnalysis.cxx
+++ b/.conflict-side-1/PWGCF/TwoParticleCorrelations/Core/TrackSelectionFilterAndAnalysis.cxx
@@ -9,11 +9,12 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <boost/regex.hpp>
+#include "TrackSelectionFilterAndAnalysis.h"
+
 #include <TObjArray.h>
 
+#include <boost/regex.hpp>
 #include <fairlogger/Logger.h>
-#include "TrackSelectionFilterAndAnalysis.h"
 
 using namespace o2;
 using namespace o2::analysis::PWGCF;
diff --git a/.conflict-side-1/PWGCF/TwoParticleCorrelations/Core/TrackSelectionFilterAndAnalysis.h b/.conflict-side-1/PWGCF/TwoParticleCorrelations/Core/TrackSelectionFilterAndAnalysis.h
index 8c186a97109..cfb6e4524cd 100644
--- a/.conflict-side-1/PWGCF/TwoParticleCorrelations/Core/TrackSelectionFilterAndAnalysis.h
+++ b/.conflict-side-1/PWGCF/TwoParticleCorrelations/Core/TrackSelectionFilterAndAnalysis.h
@@ -11,15 +11,17 @@
 #ifndef TRACKSELECTIONFILTERANDANALYSIS_H
 #define TRACKSELECTIONFILTERANDANALYSIS_H
 
-#include <Rtypes.h>
-#include <TString.h>
-#include <TObject.h>
-#include <TNamed.h>
+#include "SelectionFilterAndAnalysis.h"
+#include "SkimmingConfigurableCuts.h"
+
 #include <TList.h>
+#include <TNamed.h>
+#include <TObject.h>
+#include <TString.h>
 
 #include <fairlogger/Logger.h>
-#include "SkimmingConfigurableCuts.h"
-#include "SelectionFilterAndAnalysis.h"
+
+#include <Rtypes.h>
 
 namespace o2
 {
diff --git a/.conflict-side-1/PWGCF/TwoParticleCorrelations/DataModel/TwoParticleCorrelationsFiltered.h b/.conflict-side-1/PWGCF/TwoParticleCorrelations/DataModel/TwoParticleCorrelationsFiltered.h
index ac35f064808..f0e48acab70 100644
--- a/.conflict-side-1/PWGCF/TwoParticleCorrelations/DataModel/TwoParticleCorrelationsFiltered.h
+++ b/.conflict-side-1/PWGCF/TwoParticleCorrelations/DataModel/TwoParticleCorrelationsFiltered.h
@@ -11,9 +11,10 @@
 #ifndef O2_ANALYSIS_TWOPARTFILTERED_H
 #define O2_ANALYSIS_TWOPARTFILTERED_H
 
+#include "TwoParticleCorrelationsSkimmed.h"
+
 #include "Framework/ASoA.h"
 #include "Framework/AnalysisDataModel.h"
-#include "TwoParticleCorrelationsSkimmed.h"
 
 namespace o2
 {
diff --git a/.conflict-side-1/PWGCF/TwoParticleCorrelations/DataModel/TwoParticleCorrelationsSkimmed.h b/.conflict-side-1/PWGCF/TwoParticleCorrelations/DataModel/TwoParticleCorrelationsSkimmed.h
index b032d89647f..c91c3d491d1 100644
--- a/.conflict-side-1/PWGCF/TwoParticleCorrelations/DataModel/TwoParticleCorrelationsSkimmed.h
+++ b/.conflict-side-1/PWGCF/TwoParticleCorrelations/DataModel/TwoParticleCorrelationsSkimmed.h
@@ -12,19 +12,22 @@
 #ifndef PWGCF_TWOPARTICLECORRELATIONS_DATAMODEL_TWOPARTICLECORRELATIONSSKIMMED_H_
 #define PWGCF_TWOPARTICLECORRELATIONS_DATAMODEL_TWOPARTICLECORRELATIONSSKIMMED_H_
 
-#include <vector>
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoA.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Centrality.h"
-#include "PWGCF/TwoParticleCorrelations/Core/SkimmingConfigurableCuts.h"
 #include "PWGCF/TwoParticleCorrelations/Core/EventSelectionFilterAndAnalysis.h"
-#include "PWGCF/TwoParticleCorrelations/Core/TrackSelectionFilterAndAnalysis.h"
 #include "PWGCF/TwoParticleCorrelations/Core/PIDSelectionFilterAndAnalysis.h"
+#include "PWGCF/TwoParticleCorrelations/Core/SkimmingConfigurableCuts.h"
+#include "PWGCF/TwoParticleCorrelations/Core/TrackSelectionFilterAndAnalysis.h"
+
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
 
+#include <vector>
+
 namespace o2
 {
 namespace aod
@@ -60,15 +63,15 @@ DECLARE_SOA_TABLE(CFMCCollMasks, "AOD", "CFMCCOLLMASK", //! Generated collision/
 using CFMCCollMask = CFMCCollMasks::iterator;
 namespace cfskim
 {
-DECLARE_SOA_INDEX_COLUMN(CFCollision, cfcollision);     //! Reconstructed collision/event
-DECLARE_SOA_INDEX_COLUMN(CFMCCollision, cfmccollision); //! Generated collision/event
-DECLARE_SOA_COLUMN(CFTrackFlags, trackflags, uint64_t); //! The skimming flags for track selection, B0 track/particle positive charge, B1 track/particle negative charge
+DECLARE_SOA_INDEX_COLUMN(CFCollision, cfcollision);         //! Reconstructed collision/event
+DECLARE_SOA_INDEX_COLUMN(CFMCCollision, cfmccollision);     //! Generated collision/event
+DECLARE_SOA_COLUMN(CFTrackFlags, trackflags, uint64_t);     //! The skimming flags for track selection, B0 track/particle positive charge, B1 track/particle negative charge
 DECLARE_SOA_COLUMN(CFMCTrackFlags, mctrackflags, uint64_t); //! The skimming flags for particle selection, B0 track/particle positive charge, B1 track/particle negative charge
 DECLARE_SOA_COLUMN(CFPidFlags, pidflags, uint64_t);         //! The PID skimming flags for track selection
-DECLARE_SOA_COLUMN(Pt, pt, float);                      //! The track transverse momentum
-DECLARE_SOA_COLUMN(Eta, eta, float);                    //! The track pseudorapidity
-DECLARE_SOA_COLUMN(Phi, phi, float);                    //! The track azimuthal angle
-DECLARE_SOA_DYNAMIC_COLUMN(Sign, sign,                  //! Charge: positive: 1, negative: -1
+DECLARE_SOA_COLUMN(Pt, pt, float);                          //! The track transverse momentum
+DECLARE_SOA_COLUMN(Eta, eta, float);                        //! The track pseudorapidity
+DECLARE_SOA_COLUMN(Phi, phi, float);                        //! The track azimuthal angle
+DECLARE_SOA_DYNAMIC_COLUMN(Sign, sign,                      //! Charge: positive: 1, negative: -1
                            [](uint64_t mask) -> int8_t { return ((mask & 0x1L) == 0x1L) ? 1 : ((mask & 0x2L) == 0x2L) ? -1
                                                                                                                       : 0; });
 
diff --git a/.conflict-side-1/PWGCF/TwoParticleCorrelations/TableProducer/Productions/skimmingconf_20221115.cxx b/.conflict-side-1/PWGCF/TwoParticleCorrelations/TableProducer/Productions/skimmingconf_20221115.cxx
index cd174dc8d86..0299ca49dcf 100644
--- a/.conflict-side-1/PWGCF/TwoParticleCorrelations/TableProducer/Productions/skimmingconf_20221115.cxx
+++ b/.conflict-side-1/PWGCF/TwoParticleCorrelations/TableProducer/Productions/skimmingconf_20221115.cxx
@@ -9,10 +9,11 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <vector>
-#include <string>
-#include "Framework/AnalysisTask.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+
+#include <string>
+#include <vector>
 
 struct : o2::framework::ConfigurableGroup {
   o2::framework::Configurable<std::vector<std::string>> bfield{"evtflt_bfield", {"positive-yes", "negative-yes"}, "B filed polarity cut: both 'yes' default, anything else alternative"};
diff --git a/.conflict-side-1/PWGCF/TwoParticleCorrelations/TableProducer/identifiedBfFilter.cxx b/.conflict-side-1/PWGCF/TwoParticleCorrelations/TableProducer/identifiedBfFilter.cxx
index 535dd77cce2..d55ee0c8e78 100644
--- a/.conflict-side-1/PWGCF/TwoParticleCorrelations/TableProducer/identifiedBfFilter.cxx
+++ b/.conflict-side-1/PWGCF/TwoParticleCorrelations/TableProducer/identifiedBfFilter.cxx
@@ -15,35 +15,38 @@
 
 #include "PWGCF/TwoParticleCorrelations/TableProducer/identifiedBfFilter.h"
 
-#include <cmath>
-#include <algorithm>
-#include <string>
-#include <vector>
+#include "PWGCF/Core/AnalysisConfigurableCuts.h"
+#include "PWGCF/TwoParticleCorrelations/DataModel/IdentifiedBfFiltered.h"
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/CollisionAssociationTables.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGCF/Core/AnalysisConfigurableCuts.h"
-#include "PWGCF/TwoParticleCorrelations/DataModel/IdentifiedBfFiltered.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/CollisionAssociationTables.h"
-#include "Framework/runDataProcessing.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include <TROOT.h>
-#include <TParameter.h>
-#include <TPDGCode.h>
-#include <TList.h>
+#include "Framework/runDataProcessing.h"
+
 #include <TDirectory.h>
 #include <TFolder.h>
 #include <TH1.h>
 #include <TH2.h>
 #include <TH3.h>
+#include <TList.h>
+#include <TPDGCode.h>
+#include <TParameter.h>
 #include <TProfile3D.h>
+#include <TROOT.h>
+
+#include <algorithm>
+#include <cmath>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
@@ -1843,8 +1846,8 @@ inline MatchRecoGenSpecies IdentifiedBfFilterTracks::identifyTrack(TrackObject c
     for (int sp = 0; (sp < kIdBfNoOfSpecies) && !doublematch; ++sp) { // iterate over all species while there's no double match and we're in the list
       if (sp != spMinNSigma) {                                        // for species not current minimum nsigma species
         // LOGF(info, "looking at Reject Range");
-        if (std::fabs(nsigmas[sp]) < rejectRange[spMinNSigma][sp]) {  // If secondary species is in rejection range
-          doublematch = true;                                         // Set double match true
+        if (std::fabs(nsigmas[sp]) < rejectRange[spMinNSigma][sp]) { // If secondary species is in rejection range
+          doublematch = true;                                        // Set double match true
           spDouble = MatchRecoGenSpecies(sp);
         }
       }
@@ -1921,11 +1924,11 @@ inline int8_t IdentifiedBfFilterTracks::acceptTrack(TrackObject const& track)
       if (!(sp < 0)) {
         fillTrackHistosAfterSelection(track, sp); //<Fill accepted track histo with PID
         if (track.sign() > 0) {                   // if positive
-          trkMultPos[sp]++; //<< Update Particle Multiplicity
+          trkMultPos[sp]++;                       //<< Update Particle Multiplicity
           return speciesChargeValue1[sp];
         }
         if (track.sign() < 0) { // if negative
-          trkMultNeg[sp]++; //<< Update Particle Multiplicity
+          trkMultNeg[sp]++;     //<< Update Particle Multiplicity
           return speciesChargeValue1[sp] + 1;
         }
       }
diff --git a/.conflict-side-1/PWGCF/TwoParticleCorrelations/TableProducer/identifiedBfFilter.h b/.conflict-side-1/PWGCF/TwoParticleCorrelations/TableProducer/identifiedBfFilter.h
index 7335b36c421..ea7f52553b6 100644
--- a/.conflict-side-1/PWGCF/TwoParticleCorrelations/TableProducer/identifiedBfFilter.h
+++ b/.conflict-side-1/PWGCF/TwoParticleCorrelations/TableProducer/identifiedBfFilter.h
@@ -16,23 +16,24 @@
 #ifndef PWGCF_TWOPARTICLECORRELATIONS_TABLEPRODUCER_IDENTIFIEDBFFILTER_H_
 #define PWGCF_TWOPARTICLECORRELATIONS_TABLEPRODUCER_IDENTIFIEDBFFILTER_H_
 
-#include <CCDB/BasicCCDBManager.h>
-
-#include <vector>
-#include <string>
+#include "PWGCF/Core/AnalysisConfigurableCuts.h"
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/O2DatabasePDGPlugin.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/Core/TrackSelectionDefaults.h"
-#include "PWGCF/Core/AnalysisConfigurableCuts.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 #include "MathUtils/Utils.h"
+#include <CCDB/BasicCCDBManager.h>
+
+#include <string>
+#include <vector>
 
 namespace o2
 
diff --git a/.conflict-side-1/PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsFiltering.cxx b/.conflict-side-1/PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsFiltering.cxx
index 7bdaddd053d..5d0108119f6 100644
--- a/.conflict-side-1/PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsFiltering.cxx
+++ b/.conflict-side-1/PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsFiltering.cxx
@@ -9,23 +9,25 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <cmath>
-
-#include "Framework/AnalysisTask.h"
 #include "PWGCF/TwoParticleCorrelations/Core/FilterAndAnalysisFramework.h"
-#include "PWGCF/TwoParticleCorrelations/DataModel/TwoParticleCorrelationsSkimmed.h"
 #include "PWGCF/TwoParticleCorrelations/DataModel/TwoParticleCorrelationsFiltered.h"
+#include "PWGCF/TwoParticleCorrelations/DataModel/TwoParticleCorrelationsSkimmed.h"
+
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include <TROOT.h>
+
 #include <TDatabasePDG.h>
-#include <TParameter.h>
-#include <TList.h>
 #include <TDirectory.h>
 #include <TFolder.h>
 #include <TH1.h>
 #include <TH2.h>
 #include <TH3.h>
+#include <TList.h>
+#include <TParameter.h>
 #include <TProfile3D.h>
+#include <TROOT.h>
+
+#include <cmath>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsFullSkimming.cxx b/.conflict-side-1/PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsFullSkimming.cxx
index 2dec74acf61..f4e8e9ac797 100644
--- a/.conflict-side-1/PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsFullSkimming.cxx
+++ b/.conflict-side-1/PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsFullSkimming.cxx
@@ -9,18 +9,20 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <CCDB/BasicCCDBManager.h>
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "PWGCF/TwoParticleCorrelations/Core/FilterAndAnalysisFramework.h"
+#include "PWGCF/TwoParticleCorrelations/DataModel/TwoParticleCorrelationsSkimmed.h"
+
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGCF/TwoParticleCorrelations/DataModel/TwoParticleCorrelationsSkimmed.h"
-#include "PWGCF/TwoParticleCorrelations/Core/FilterAndAnalysisFramework.h"
-#include "Framework/runDataProcessing.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include <CCDB/BasicCCDBManager.h>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsNotStoredSkimming.cxx b/.conflict-side-1/PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsNotStoredSkimming.cxx
index 3964b745b91..497371fea43 100644
--- a/.conflict-side-1/PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsNotStoredSkimming.cxx
+++ b/.conflict-side-1/PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsNotStoredSkimming.cxx
@@ -9,18 +9,20 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <CCDB/BasicCCDBManager.h>
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "PWGCF/TwoParticleCorrelations/Core/FilterAndAnalysisFramework.h"
+#include "PWGCF/TwoParticleCorrelations/DataModel/TwoParticleCorrelationsSkimmed.h"
+
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGCF/TwoParticleCorrelations/DataModel/TwoParticleCorrelationsSkimmed.h"
-#include "PWGCF/TwoParticleCorrelations/Core/FilterAndAnalysisFramework.h"
-#include "Framework/runDataProcessing.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include <CCDB/BasicCCDBManager.h>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsRegisterSkimming.cxx b/.conflict-side-1/PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsRegisterSkimming.cxx
index 20bbd90efbc..8fb759fec54 100644
--- a/.conflict-side-1/PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsRegisterSkimming.cxx
+++ b/.conflict-side-1/PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsRegisterSkimming.cxx
@@ -9,12 +9,13 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <CCDB/BasicCCDBManager.h>
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
 #include "PWGCF/TwoParticleCorrelations/Core/FilterAndAnalysisFramework.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
+#include <CCDB/BasicCCDBManager.h>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGCF/TwoParticleCorrelations/Tasks/corrSparse.cxx b/.conflict-side-1/PWGCF/TwoParticleCorrelations/Tasks/corrSparse.cxx
index 489c99bdbff..117457911da 100644
--- a/.conflict-side-1/PWGCF/TwoParticleCorrelations/Tasks/corrSparse.cxx
+++ b/.conflict-side-1/PWGCF/TwoParticleCorrelations/Tasks/corrSparse.cxx
@@ -13,30 +13,32 @@
 /// \brief Provides a sparse with usefull two particle correlation info
 /// \author Thor Jensen (thor.kjaersgaard.jensen@cern.ch)
 
-#include <CCDB/BasicCCDBManager.h>
-#include "TRandom3.h"
-#include <vector>
+#include "PWGCF/Core/CorrelationContainer.h"
+#include "PWGCF/Core/PairCuts.h"
+#include "PWGCF/DataModel/CorrelationsDerived.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/StepTHn.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "CommonConstants/MathConstants.h"
 #include "Common/Core/RecoDecay.h"
-
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/CollisionAssociationTables.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Centrality.h"
-#include "PWGCF/DataModel/CorrelationsDerived.h"
-#include "Common/DataModel/CollisionAssociationTables.h"
-#include "PWGCF/Core/CorrelationContainer.h"
-#include "PWGCF/Core/PairCuts.h"
-#include "DataFormatsParameters/GRPObject.h"
+
+#include "CommonConstants/MathConstants.h"
 #include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
+#include <CCDB/BasicCCDBManager.h>
+
+#include "TRandom3.h"
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGCF/TwoParticleCorrelations/Tasks/diHadronCor.cxx b/.conflict-side-1/PWGCF/TwoParticleCorrelations/Tasks/diHadronCor.cxx
index e3eb978e08f..498a1772882 100644
--- a/.conflict-side-1/PWGCF/TwoParticleCorrelations/Tasks/diHadronCor.cxx
+++ b/.conflict-side-1/PWGCF/TwoParticleCorrelations/Tasks/diHadronCor.cxx
@@ -14,39 +14,41 @@
 /// \author Zhiyong Lu (zhiyong.lu@cern.ch)
 /// \since  May/03/2025
 
-#include <CCDB/BasicCCDBManager.h>
-#include "TRandom3.h"
-#include "TF1.h"
-#include <vector>
-#include <string>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/StepTHn.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "CommonConstants/MathConstants.h"
-#include "Common/Core/RecoDecay.h"
-
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Centrality.h"
-#include "PWGCF/DataModel/CorrelationsDerived.h"
-#include "Common/DataModel/CollisionAssociationTables.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "PWGCF/Core/CorrelationContainer.h"
 #include "PWGCF/Core/PairCuts.h"
-#include "PWGCF/GenericFramework/Core/GFWPowerArray.h"
+#include "PWGCF/DataModel/CorrelationsDerived.h"
 #include "PWGCF/GenericFramework/Core/GFW.h"
 #include "PWGCF/GenericFramework/Core/GFWCumulant.h"
+#include "PWGCF/GenericFramework/Core/GFWPowerArray.h"
 #include "PWGCF/GenericFramework/Core/GFWWeights.h"
-#include "DataFormatsParameters/GRPObject.h"
+
+#include "Common/Core/RecoDecay.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/CollisionAssociationTables.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonConstants/MathConstants.h"
 #include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
+#include <CCDB/BasicCCDBManager.h>
+
+#include "TF1.h"
+#include "TRandom3.h"
 #include <TPDGCode.h>
 
+#include <string>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-1/PWGCF/TwoParticleCorrelations/Tasks/dptDptEfficiencyAndQc.cxx b/.conflict-side-1/PWGCF/TwoParticleCorrelations/Tasks/dptDptEfficiencyAndQc.cxx
index 0fdbca208bf..1bb717b98f8 100644
--- a/.conflict-side-1/PWGCF/TwoParticleCorrelations/Tasks/dptDptEfficiencyAndQc.cxx
+++ b/.conflict-side-1/PWGCF/TwoParticleCorrelations/Tasks/dptDptEfficiencyAndQc.cxx
@@ -13,35 +13,38 @@
 /// \brief Provides efficiency extraction and QC for track cuts and PID
 /// \author victor.gonzalez.sebastian@gmail.com
 
-#include <TH2F.h>
-#include <TProfile2D.h>
-#include <THnSparse.h>
-#include <TPDGCode.h>
-#include <TMCProcess.h>
-#include <CCDB/BasicCCDBManager.h>
-#include <vector>
-#include <algorithm>
-#include <cstdio>
-#include <memory>
-#include <string>
-#include "ReconstructionDataFormats/PID.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/Core/TableHelper.h"
+#include "PWGCF/Core/AnalysisConfigurableCuts.h"
+#include "PWGCF/DataModel/DptDptFiltered.h"
+#include "PWGCF/TableProducer/dptDptFilter.h"
+
 #include "Common/Core/RecoDecay.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/Core/TableHelper.h"
+#include "Common/Core/TrackSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoAHelpers.h"
-#include "Framework/Expressions.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
+#include "Framework/Expressions.h"
 #include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/PID.h"
+#include <CCDB/BasicCCDBManager.h>
+
 #include "Math/MatrixFunctions.h"
 #include "Math/SMatrix.h"
+#include <TH2F.h>
+#include <THnSparse.h>
+#include <TMCProcess.h>
+#include <TPDGCode.h>
+#include <TProfile2D.h>
 
-#include "PWGCF/Core/AnalysisConfigurableCuts.h"
-#include "PWGCF/DataModel/DptDptFiltered.h"
-#include "PWGCF/TableProducer/dptDptFilter.h"
+#include <algorithm>
+#include <cstdio>
+#include <memory>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGCF/TwoParticleCorrelations/Tasks/dptDptPerRunExtraQc.cxx b/.conflict-side-1/PWGCF/TwoParticleCorrelations/Tasks/dptDptPerRunExtraQc.cxx
index 8617a65de2f..c9304ec1ef9 100644
--- a/.conflict-side-1/PWGCF/TwoParticleCorrelations/Tasks/dptDptPerRunExtraQc.cxx
+++ b/.conflict-side-1/PWGCF/TwoParticleCorrelations/Tasks/dptDptPerRunExtraQc.cxx
@@ -13,18 +13,18 @@
 /// \brief basic per run check of the per analyzed species p vs TPC IW momentum
 /// \author victor.gonzalez.sebastian@gmail.com
 
-#include <array>
-#include <cmath>
-#include <unordered_map>
+#include "PWGCF/DataModel/DptDptFiltered.h"
+#include "PWGCF/TableProducer/dptDptFilter.h"
 
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
 
-#include "PWGCF/DataModel/DptDptFiltered.h"
-#include "PWGCF/TableProducer/dptDptFilter.h"
+#include <array>
+#include <cmath>
+#include <unordered_map>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGCF/TwoParticleCorrelations/Tasks/dptDptPerRunQc.cxx b/.conflict-side-1/PWGCF/TwoParticleCorrelations/Tasks/dptDptPerRunQc.cxx
index 598d3305539..286641391ea 100644
--- a/.conflict-side-1/PWGCF/TwoParticleCorrelations/Tasks/dptDptPerRunQc.cxx
+++ b/.conflict-side-1/PWGCF/TwoParticleCorrelations/Tasks/dptDptPerRunQc.cxx
@@ -13,29 +13,28 @@
 /// \brief basic per run check of the ITS dead chips and of the hadronic interaction rate
 /// \author victor.gonzalez.sebastian@gmail.com
 
-#include <array>
-#include <cmath>
-#include <unordered_map>
-#include <memory>
-#include <vector>
-#include <string>
+#include "PWGCF/DataModel/DptDptFiltered.h"
+#include "PWGCF/TableProducer/dptDptFilter.h"
 
-#include "CCDB/BasicCCDBManager.h"
 #include "Common/CCDB/ctpRateFetcher.h"
 
-#include "DataFormatsParameters/AggregatedRunInfo.h"
+#include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsITSMFT/NoiseMap.h" // missing include in TimeDeadMap.h
 #include "DataFormatsITSMFT/TimeDeadMap.h"
-#include "ITSMFTReconstruction/ChipMappingITS.h"
-
+#include "DataFormatsParameters/AggregatedRunInfo.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
+#include "ITSMFTReconstruction/ChipMappingITS.h"
 
-#include "PWGCF/DataModel/DptDptFiltered.h"
-#include "PWGCF/TableProducer/dptDptFilter.h"
+#include <array>
+#include <cmath>
+#include <memory>
+#include <string>
+#include <unordered_map>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGCF/TwoParticleCorrelations/Tasks/identifiedbf.cxx b/.conflict-side-1/PWGCF/TwoParticleCorrelations/Tasks/identifiedbf.cxx
index b357272c17c..100291176ec 100644
--- a/.conflict-side-1/PWGCF/TwoParticleCorrelations/Tasks/identifiedbf.cxx
+++ b/.conflict-side-1/PWGCF/TwoParticleCorrelations/Tasks/identifiedbf.cxx
@@ -12,7 +12,25 @@
 /// \file identifiedbf.cxx
 /// \brief Fills histograms with particles and tracks to calculate the Balance Function
 /// \author bghanley1995@gmail.com
+#include "PWGCF/Core/AnalysisConfigurableCuts.h"
+#include "PWGCF/Core/PairCuts.h"
+#include "PWGCF/TwoParticleCorrelations/DataModel/IdentifiedBfFiltered.h"
+#include "PWGCF/TwoParticleCorrelations/TableProducer/identifiedBfFilter.h"
+
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 #include <CCDB/BasicCCDBManager.h>
+
 #include <TDirectory.h>
 #include <TFolder.h>
 #include <TH1.h>
@@ -23,27 +41,12 @@
 #include <TProfile3D.h>
 #include <TROOT.h>
 #include <TVector2.h>
+
 #include <cmath>
+#include <cstdio>
 #include <ctime>
-#include <vector>
 #include <string>
-#include <cstdio>
-
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/Core/RecoDecay.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "PWGCF/Core/AnalysisConfigurableCuts.h"
-#include "PWGCF/Core/PairCuts.h"
-#include "PWGCF/TwoParticleCorrelations/DataModel/IdentifiedBfFiltered.h"
-#include "PWGCF/TwoParticleCorrelations/TableProducer/identifiedBfFilter.h"
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
@@ -93,24 +96,24 @@ struct IdentifiedbfTask {
     // The IdentifiedBfCorrelationsAnalysisTask output objects
     //============================================================================================
     /* histograms */
-    TH1F* fhVertexZA;                                                             //!<! the z vertex distribution for the current multiplicity/centrality class
-    std::vector<TH1F*> fhN1VsPt{nch, nullptr};                                    //!<! weighted single particle distribution vs \f$p_T\f$, for the different species
-    std::vector<TH2F*> fhN1VsEtaPhi{nch, nullptr};                                //!<! weighted single particle distribution vs \f$\eta,\;\phi\f$, for the different species
-    std::vector<TH2F*> fhSum1PtVsEtaPhi{nch, nullptr};                            //!<! accumulated sum of weighted \f$p_T\f$ vs \f$\eta,\;\phi\f$, for the different species
-    std::vector<TH3F*> fhN1VsZEtaPhiPt{nch + 1, nullptr};                         //!<! single particle distribution vs \f$\mbox{vtx}_z,\; \eta,\;\phi,\;p_T\f$, for the different species
-    std::vector<TH3F*> fhN1VsZEtaPhiPtPrimary{nch, nullptr};                      //!<! single particle distribution of primary particles vs \f$\mbox{vtx}_z,\; \eta,\;\phi,\;p_T\f$, for the different species
-    std::vector<TH3F*> fhN1VsZEtaPhiPtSecondary{nch, nullptr};                    //!<! single particle distribution of primary particles vs \f$\mbox{vtx}_z,\; \eta,\;\phi,\;p_T\f$, for the different species
-    std::vector<TH3F*> fhN1VsZEtaPhiPtPure{nch + 1, nullptr};                     //!<! single particle distribution of pure particles vs \f$\mbox{vtx}_z,\; \eta,\;\phi,\;p_T\f$, for the different species
-    std::vector<TH3F*> fhSum1PtVsZEtaPhiPt{nch, nullptr};                         //!<! accumulated sum of weighted \f$p_T\f$ vs \f$\mbox{vtx}_z,\; \eta,\;\phi,\;p_T\f$, for the different species
-    std::vector<TH3*> fhNuaNueVsZEtaPhiPt{nch, nullptr};                          //!<! NUA+NUE correction vs \f$\mbox{vtx}_z,\; \eta,\;\phi,\;p_T\f$, for the differents species
-    std::vector<TH2*> fhPtAvgVsEtaPhi{nch, nullptr};                              //!<! average \f$p_T\f$ vs \f$\eta,\;\phi\f$, for the different species
-    std::vector<std::vector<TH2F*>> fhN2VsPtPt{nch, {nch, nullptr}};              //!<! weighted two particle distribution vs \f${p_T}_1, {p_T}_2\f$ for the different species combinations
-    std::vector<std::vector<TH2F*>> fhN2VsDEtaDPhi{nch, {nch, nullptr}};          //!<! two-particle distribution vs \f$\Delta\eta,\;\Delta\phi\f$ for the different species combinations
-    std::vector<std::vector<TH2F*>> fhN2ContVsDEtaDPhi{nch, {nch, nullptr}};      //!<! two-particle distribution continuous vs \f$\Delta\eta,\;\Delta\phi\f$ for the different species combinations
-    std::vector<std::vector<TH2F*>> fhSum2PtPtVsDEtaDPhi{nch, {nch, nullptr}};    //!<! two-particle  \f$\sum {p_T}_1 {p_T}_2\f$ distribution vs \f$\Delta\eta,\;\Delta\phi\f$ for the different species combinations
-    std::vector<std::vector<TH2F*>> fhSum2DptDptVsDEtaDPhi{nch, {nch, nullptr}};  //!<! two-particle  \f$\sum ({p_T}_1- <{p_T}_1>) ({p_T}_2 - <{p_T}_2>) \f$ distribution vs \f$\Delta\eta,\;\Delta\phi\f$ for the different species combinations
-    std::vector<std::vector<TH2F*>> fhSupN1N1VsDEtaDPhi{nch, {nch, nullptr}};     //!<! suppressed n1n1 two-particle distribution vs \f$\Delta\eta,\;\Delta\phi\f$ for the different species combinations
-    std::vector<std::vector<TH2F*>> fhSupPt1Pt1VsDEtaDPhi{nch, {nch, nullptr}};   //!<! suppressed \f${p_T}_1 {p_T}_2\f$ two-particle distribution vs \f$\Delta\eta,\;\Delta\phi\f$ for the different species combinations
+    TH1F* fhVertexZA;                                                            //!<! the z vertex distribution for the current multiplicity/centrality class
+    std::vector<TH1F*> fhN1VsPt{nch, nullptr};                                   //!<! weighted single particle distribution vs \f$p_T\f$, for the different species
+    std::vector<TH2F*> fhN1VsEtaPhi{nch, nullptr};                               //!<! weighted single particle distribution vs \f$\eta,\;\phi\f$, for the different species
+    std::vector<TH2F*> fhSum1PtVsEtaPhi{nch, nullptr};                           //!<! accumulated sum of weighted \f$p_T\f$ vs \f$\eta,\;\phi\f$, for the different species
+    std::vector<TH3F*> fhN1VsZEtaPhiPt{nch + 1, nullptr};                        //!<! single particle distribution vs \f$\mbox{vtx}_z,\; \eta,\;\phi,\;p_T\f$, for the different species
+    std::vector<TH3F*> fhN1VsZEtaPhiPtPrimary{nch, nullptr};                     //!<! single particle distribution of primary particles vs \f$\mbox{vtx}_z,\; \eta,\;\phi,\;p_T\f$, for the different species
+    std::vector<TH3F*> fhN1VsZEtaPhiPtSecondary{nch, nullptr};                   //!<! single particle distribution of primary particles vs \f$\mbox{vtx}_z,\; \eta,\;\phi,\;p_T\f$, for the different species
+    std::vector<TH3F*> fhN1VsZEtaPhiPtPure{nch + 1, nullptr};                    //!<! single particle distribution of pure particles vs \f$\mbox{vtx}_z,\; \eta,\;\phi,\;p_T\f$, for the different species
+    std::vector<TH3F*> fhSum1PtVsZEtaPhiPt{nch, nullptr};                        //!<! accumulated sum of weighted \f$p_T\f$ vs \f$\mbox{vtx}_z,\; \eta,\;\phi,\;p_T\f$, for the different species
+    std::vector<TH3*> fhNuaNueVsZEtaPhiPt{nch, nullptr};                         //!<! NUA+NUE correction vs \f$\mbox{vtx}_z,\; \eta,\;\phi,\;p_T\f$, for the differents species
+    std::vector<TH2*> fhPtAvgVsEtaPhi{nch, nullptr};                             //!<! average \f$p_T\f$ vs \f$\eta,\;\phi\f$, for the different species
+    std::vector<std::vector<TH2F*>> fhN2VsPtPt{nch, {nch, nullptr}};             //!<! weighted two particle distribution vs \f${p_T}_1, {p_T}_2\f$ for the different species combinations
+    std::vector<std::vector<TH2F*>> fhN2VsDEtaDPhi{nch, {nch, nullptr}};         //!<! two-particle distribution vs \f$\Delta\eta,\;\Delta\phi\f$ for the different species combinations
+    std::vector<std::vector<TH2F*>> fhN2ContVsDEtaDPhi{nch, {nch, nullptr}};     //!<! two-particle distribution continuous vs \f$\Delta\eta,\;\Delta\phi\f$ for the different species combinations
+    std::vector<std::vector<TH2F*>> fhSum2PtPtVsDEtaDPhi{nch, {nch, nullptr}};   //!<! two-particle  \f$\sum {p_T}_1 {p_T}_2\f$ distribution vs \f$\Delta\eta,\;\Delta\phi\f$ for the different species combinations
+    std::vector<std::vector<TH2F*>> fhSum2DptDptVsDEtaDPhi{nch, {nch, nullptr}}; //!<! two-particle  \f$\sum ({p_T}_1- <{p_T}_1>) ({p_T}_2 - <{p_T}_2>) \f$ distribution vs \f$\Delta\eta,\;\Delta\phi\f$ for the different species combinations
+    std::vector<std::vector<TH2F*>> fhSupN1N1VsDEtaDPhi{nch, {nch, nullptr}};    //!<! suppressed n1n1 two-particle distribution vs \f$\Delta\eta,\;\Delta\phi\f$ for the different species combinations
+    std::vector<std::vector<TH2F*>> fhSupPt1Pt1VsDEtaDPhi{nch, {nch, nullptr}};  //!<! suppressed \f${p_T}_1 {p_T}_2\f$ two-particle distribution vs \f$\Delta\eta,\;\Delta\phi\f$ for the different species combinations
     /* versus centrality/multiplicity  profiles */
     std::vector<TProfile*> fhN1VsC{nch, nullptr};                               //!<! weighted single particle distribution vs event centrality/multiplicity, track 1 and 2
     std::vector<TProfile*> fhSum1PtVsC{nch, nullptr};                           //!<! accumulated sum of weighted \f$p_T\f$ vs event centrality/multiplicity, track 1 and 2
diff --git a/.conflict-side-1/PWGCF/TwoParticleCorrelations/Tasks/identifiedbfqa.cxx b/.conflict-side-1/PWGCF/TwoParticleCorrelations/Tasks/identifiedbfqa.cxx
index a52ff377832..f519dbf2eac 100644
--- a/.conflict-side-1/PWGCF/TwoParticleCorrelations/Tasks/identifiedbfqa.cxx
+++ b/.conflict-side-1/PWGCF/TwoParticleCorrelations/Tasks/identifiedbfqa.cxx
@@ -9,14 +9,15 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <cmath>
+#include "PWGCF/TwoParticleCorrelations/DataModel/IdentifiedBfFiltered.h"
+#include "PWGCF/TwoParticleCorrelations/TableProducer/identifiedBfFilter.h"
 
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGCF/TwoParticleCorrelations/DataModel/IdentifiedBfFiltered.h"
-#include "PWGCF/TwoParticleCorrelations/TableProducer/identifiedBfFilter.h"
+
+#include <cmath>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGCF/TwoParticleCorrelations/Tasks/longrangeCorrelation.cxx b/.conflict-side-1/PWGCF/TwoParticleCorrelations/Tasks/longrangeCorrelation.cxx
index 5fb1bc8e1c8..f4942e1515a 100644
--- a/.conflict-side-1/PWGCF/TwoParticleCorrelations/Tasks/longrangeCorrelation.cxx
+++ b/.conflict-side-1/PWGCF/TwoParticleCorrelations/Tasks/longrangeCorrelation.cxx
@@ -15,42 +15,44 @@
 /// \author Abhi Modak (abhi.modak@cern.ch) and Debojit sarkar (debojit.sarkar@cern.ch)
 /// \since April 22, 2025
 
-#include <TH1F.h>
-#include <chrono>
-#include <string>
-#include <vector>
-#include <TComplex.h>
-#include <TMath.h>
-#include <cstdio>
+#include "PWGCF/Core/CorrelationContainer.h"
+#include "PWGCF/Core/PairCuts.h"
+#include "PWGCF/DataModel/CorrelationsDerived.h"
 
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/StepTHn.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/DataModel/CollisionAssociationTables.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/Core/trackUtilities.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/TrackSelection.h"
-#include "Framework/ASoAHelpers.h"
 #include "Common/DataModel/FT0Corrected.h"
-#include "Common/Core/RecoDecay.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
 #include "CommonConstants/MathConstants.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "DetectorsCommonDataFormats/AlignParam.h"
 #include "FT0Base/Geometry.h"
 #include "FV0Base/Geometry.h"
-#include "PWGCF/DataModel/CorrelationsDerived.h"
-#include "Common/DataModel/CollisionAssociationTables.h"
-#include "PWGCF/Core/CorrelationContainer.h"
-#include "PWGCF/Core/PairCuts.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
-#include "CCDB/CcdbApi.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "DetectorsCommonDataFormats/AlignParam.h"
+#include <TComplex.h>
+#include <TH1F.h>
+#include <TMath.h>
+
+#include <chrono>
+#include <cstdio>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGCF/TwoParticleCorrelations/Tasks/neutronProtonCorrZdc.cxx b/.conflict-side-1/PWGCF/TwoParticleCorrelations/Tasks/neutronProtonCorrZdc.cxx
index 1870c66da80..39e6c3fda7c 100644
--- a/.conflict-side-1/PWGCF/TwoParticleCorrelations/Tasks/neutronProtonCorrZdc.cxx
+++ b/.conflict-side-1/PWGCF/TwoParticleCorrelations/Tasks/neutronProtonCorrZdc.cxx
@@ -13,15 +13,17 @@
 /// \brief Correlations between protons and neutrons in the ZDC
 /// \author Olaf Massen <olaf.massen@cern.ch>
 
-#include <string>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
+
+#include <string>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGCF/TwoParticleCorrelations/Tasks/r2p2-4-id.cxx b/.conflict-side-1/PWGCF/TwoParticleCorrelations/Tasks/r2p2-4-id.cxx
index e6c13fe1318..f12e1bdf044 100644
--- a/.conflict-side-1/PWGCF/TwoParticleCorrelations/Tasks/r2p2-4-id.cxx
+++ b/.conflict-side-1/PWGCF/TwoParticleCorrelations/Tasks/r2p2-4-id.cxx
@@ -9,14 +9,15 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <memory>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include <memory>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGCF/TwoParticleCorrelations/Tasks/twoParticleCorrelations.cxx b/.conflict-side-1/PWGCF/TwoParticleCorrelations/Tasks/twoParticleCorrelations.cxx
index a7a05beb310..135db8bb324 100644
--- a/.conflict-side-1/PWGCF/TwoParticleCorrelations/Tasks/twoParticleCorrelations.cxx
+++ b/.conflict-side-1/PWGCF/TwoParticleCorrelations/Tasks/twoParticleCorrelations.cxx
@@ -9,25 +9,27 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
+#include "PWGCF/Core/AnalysisConfigurableCuts.h"
+#include "PWGCF/Core/PairCuts.h"
+#include "PWGCF/TwoParticleCorrelations/Core/FilterAndAnalysisFramework.h"
+#include "PWGCF/TwoParticleCorrelations/DataModel/TwoParticleCorrelationsSkimmed.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 #include <DataFormatsParameters/GRPObject.h>
-#include <cmath>
-#include <TROOT.h>
+
 #include <TDatabasePDG.h>
-#include <TParameter.h>
-#include <TList.h>
 #include <TDirectory.h>
 #include <TFolder.h>
 #include <TH1.h>
 #include <TH2.h>
 #include <TH3.h>
+#include <TList.h>
+#include <TParameter.h>
 #include <TProfile3D.h>
+#include <TROOT.h>
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "PWGCF/Core/AnalysisConfigurableCuts.h"
-#include "PWGCF/TwoParticleCorrelations/Core/FilterAndAnalysisFramework.h"
-#include "PWGCF/TwoParticleCorrelations/DataModel/TwoParticleCorrelationsSkimmed.h"
-#include "PWGCF/Core/PairCuts.h"
+#include <cmath>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGDQ/Core/AnalysisCompositeCut.h b/.conflict-side-1/PWGDQ/Core/AnalysisCompositeCut.h
index f3d603909c4..692ba633638 100644
--- a/.conflict-side-1/PWGDQ/Core/AnalysisCompositeCut.h
+++ b/.conflict-side-1/PWGDQ/Core/AnalysisCompositeCut.h
@@ -18,6 +18,7 @@
 #define AnalysisCompositeCut_H
 
 #include "PWGDQ/Core/AnalysisCut.h"
+
 #include <vector>
 
 //_________________________________________________________________________
diff --git a/.conflict-side-1/PWGDQ/Core/AnalysisCut.h b/.conflict-side-1/PWGDQ/Core/AnalysisCut.h
index 6c7185b13ec..9457635798c 100644
--- a/.conflict-side-1/PWGDQ/Core/AnalysisCut.h
+++ b/.conflict-side-1/PWGDQ/Core/AnalysisCut.h
@@ -18,6 +18,7 @@
 #define AnalysisCut_H
 
 #include <TF1.h>
+
 #include <vector>
 
 //_________________________________________________________________________
diff --git a/.conflict-side-1/PWGDQ/Core/CutsLibrary.cxx b/.conflict-side-1/PWGDQ/Core/CutsLibrary.cxx
index 5cf99d6f22f..8d61904b7b8 100644
--- a/.conflict-side-1/PWGDQ/Core/CutsLibrary.cxx
+++ b/.conflict-side-1/PWGDQ/Core/CutsLibrary.cxx
@@ -12,14 +12,18 @@
 // Contact: iarsene@cern.ch, i.c.arsene@fys.uio.no
 //
 #include "PWGDQ/Core/CutsLibrary.h"
-#include <RtypesCore.h>
-#include <TF1.h>
-#include <vector>
-#include <string>
-#include <iostream>
+
 #include "AnalysisCompositeCut.h"
 #include "VarManager.h"
 
+#include <TF1.h>
+
+#include <RtypesCore.h>
+
+#include <iostream>
+#include <string>
+#include <vector>
+
 using std::cout;
 using std::endl;
 
diff --git a/.conflict-side-1/PWGDQ/Core/CutsLibrary.h b/.conflict-side-1/PWGDQ/Core/CutsLibrary.h
index c6ad4caded2..15ed07b1f11 100644
--- a/.conflict-side-1/PWGDQ/Core/CutsLibrary.h
+++ b/.conflict-side-1/PWGDQ/Core/CutsLibrary.h
@@ -15,12 +15,13 @@
 #ifndef PWGDQ_CORE_CUTSLIBRARY_H_
 #define PWGDQ_CORE_CUTSLIBRARY_H_
 
-#include <string>
-#include <vector>
-#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/AnalysisCompositeCut.h"
+#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/VarManager.h"
 
+#include <string>
+#include <vector>
+
 // ///////////////////////////////////////////////
 //   These are the Cuts used in the CEFP Task   //
 //   to select tracks in the event selection    //
diff --git a/.conflict-side-1/PWGDQ/Core/HistogramManager.cxx b/.conflict-side-1/PWGDQ/Core/HistogramManager.cxx
index fb5ce5f8d65..9133dede291 100644
--- a/.conflict-side-1/PWGDQ/Core/HistogramManager.cxx
+++ b/.conflict-side-1/PWGDQ/Core/HistogramManager.cxx
@@ -11,28 +11,29 @@
 
 #include "PWGDQ/Core/HistogramManager.h"
 
-#include <iostream>
-#include <memory>
+#include "Framework/Logger.h"
+
+#include <algorithm>
 #include <fstream>
+#include <iostream>
 #include <list>
+#include <memory>
 #include <vector>
-#include <algorithm>
-#include "Framework/Logger.h"
 using namespace std;
 
-#include <TObject.h>
-#include <TObjArray.h>
-#include <THashList.h>
+#include <TClass.h>
 #include <TH1F.h>
 #include <TH2F.h>
 #include <TH3F.h>
-#include <TProfile.h>
-#include <TProfile2D.h>
-#include <TProfile3D.h>
+#include <THashList.h>
 #include <THn.h>
 #include <THnSparse.h>
 #include <TIterator.h>
-#include <TClass.h>
+#include <TObjArray.h>
+#include <TObject.h>
+#include <TProfile.h>
+#include <TProfile2D.h>
+#include <TProfile3D.h>
 
 ClassImp(HistogramManager);
 
diff --git a/.conflict-side-1/PWGDQ/Core/HistogramManager.h b/.conflict-side-1/PWGDQ/Core/HistogramManager.h
index 4b1393b2eb7..1fc0cf858b8 100644
--- a/.conflict-side-1/PWGDQ/Core/HistogramManager.h
+++ b/.conflict-side-1/PWGDQ/Core/HistogramManager.h
@@ -17,17 +17,17 @@
 #ifndef PWGDQ_CORE_HISTOGRAMMANAGER_H_
 #define PWGDQ_CORE_HISTOGRAMMANAGER_H_
 
-#include <TString.h>
-#include <TNamed.h>
-#include <TList.h>
-#include <THashList.h>
-#include <TAxis.h>
 #include <TArrayD.h>
+#include <TAxis.h>
+#include <THashList.h>
+#include <TList.h>
+#include <TNamed.h>
+#include <TString.h>
 
-#include <string>
+#include <list>
 #include <map>
+#include <string>
 #include <vector>
-#include <list>
 
 class HistogramManager : public TNamed
 {
@@ -103,10 +103,10 @@ class HistogramManager : public TNamed
   std::map<std::string, std::list<std::vector<int>>> fVariablesMap; //!  map holding identifiers for all variables needed by histograms
 
   // various
-  bool fUseDefaultVariableNames;    //! toggle the usage of default variable names and units
-  uint64_t fBinsAllocated;          //! number of allocated bins
-  TString* fVariableNames;          //! variable names
-  TString* fVariableUnits;          //! variable units
+  bool fUseDefaultVariableNames; //! toggle the usage of default variable names and units
+  uint64_t fBinsAllocated;       //! number of allocated bins
+  TString* fVariableNames;       //! variable names
+  TString* fVariableUnits;       //! variable units
 
   void MakeAxisLabels(TAxis* ax, const char* labels);
 
diff --git a/.conflict-side-1/PWGDQ/Core/HistogramsLibrary.cxx b/.conflict-side-1/PWGDQ/Core/HistogramsLibrary.cxx
index 11c87e700de..5aca1c60acf 100644
--- a/.conflict-side-1/PWGDQ/Core/HistogramsLibrary.cxx
+++ b/.conflict-side-1/PWGDQ/Core/HistogramsLibrary.cxx
@@ -11,12 +11,15 @@
 //
 // Contact: iarsene@cern.ch, i.c.arsene@fys.uio.no
 //
-#include <vector>
-#include <algorithm>
 #include "PWGDQ/Core/HistogramsLibrary.h"
+
 #include "VarManager.h"
+
 #include "CommonConstants/MathConstants.h"
 
+#include <algorithm>
+#include <vector>
+
 void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* histClass, const char* groupName, const char* subGroupName)
 {
   //
diff --git a/.conflict-side-1/PWGDQ/Core/HistogramsLibrary.h b/.conflict-side-1/PWGDQ/Core/HistogramsLibrary.h
index 869fb3a85f3..6b7f6a09fc2 100644
--- a/.conflict-side-1/PWGDQ/Core/HistogramsLibrary.h
+++ b/.conflict-side-1/PWGDQ/Core/HistogramsLibrary.h
@@ -15,10 +15,13 @@
 #ifndef PWGDQ_CORE_HISTOGRAMSLIBRARY_H_
 #define PWGDQ_CORE_HISTOGRAMSLIBRARY_H_
 
-#include <TString.h>
 #include "PWGDQ/Core/HistogramManager.h"
 #include "PWGDQ/Core/VarManager.h"
+
 #include "CommonConstants/MathConstants.h"
+
+#include <TString.h>
+
 #include "rapidjson/document.h"
 
 namespace o2::aod
@@ -29,7 +32,7 @@ void DefineHistograms(HistogramManager* hm, const char* histClass, const char* g
 template <typename T>
 bool ValidateJSONHistogram(T hist);
 void AddHistogramsFromJSON(HistogramManager* hm, const char* json);
-}
+} // namespace dqhistograms
 } // namespace o2::aod
 
 #endif // PWGDQ_CORE_HISTOGRAMSLIBRARY_H_
diff --git a/.conflict-side-1/PWGDQ/Core/MCProng.cxx b/.conflict-side-1/PWGDQ/Core/MCProng.cxx
index 48f2c52ae36..925542fbe12 100644
--- a/.conflict-side-1/PWGDQ/Core/MCProng.cxx
+++ b/.conflict-side-1/PWGDQ/Core/MCProng.cxx
@@ -11,10 +11,10 @@
 
 #include "PWGDQ/Core/MCProng.h"
 
-#include <map>
-#include <vector>
 #include <cmath>
 #include <iostream>
+#include <map>
+#include <vector>
 
 ClassImp(MCProng);
 
diff --git a/.conflict-side-1/PWGDQ/Core/MCProng.h b/.conflict-side-1/PWGDQ/Core/MCProng.h
index cd42965d271..8e679db8bb8 100644
--- a/.conflict-side-1/PWGDQ/Core/MCProng.h
+++ b/.conflict-side-1/PWGDQ/Core/MCProng.h
@@ -60,9 +60,9 @@ A few non-existent PYTHIA codes are used to select more than one PYTHIA code.
 #include "TNamed.h"
 #include "TString.h"
 
-#include <vector>
 #include <iostream>
 #include <map>
+#include <vector>
 
 class MCProng
 {
diff --git a/.conflict-side-1/PWGDQ/Core/MCSignal.cxx b/.conflict-side-1/PWGDQ/Core/MCSignal.cxx
index 7a234b65088..ba62e86a6bd 100644
--- a/.conflict-side-1/PWGDQ/Core/MCSignal.cxx
+++ b/.conflict-side-1/PWGDQ/Core/MCSignal.cxx
@@ -9,11 +9,11 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <vector>
-#include <iostream>
-
 #include "PWGDQ/Core/MCSignal.h"
 
+#include <iostream>
+#include <vector>
+
 using std::cout;
 using std::endl;
 
diff --git a/.conflict-side-1/PWGDQ/Core/MCSignal.h b/.conflict-side-1/PWGDQ/Core/MCSignal.h
index 42fe0a0a050..534d6985da0 100644
--- a/.conflict-side-1/PWGDQ/Core/MCSignal.h
+++ b/.conflict-side-1/PWGDQ/Core/MCSignal.h
@@ -57,10 +57,11 @@ process(aod::McParticles const& mcTracks) {
 #define PWGDQ_CORE_MCSIGNAL_H_
 
 #include "MCProng.h"
+
 #include "TNamed.h"
 
-#include <vector>
 #include <iostream>
+#include <vector>
 
 class MCSignal : public TNamed
 {
diff --git a/.conflict-side-1/PWGDQ/Core/MCSignalLibrary.cxx b/.conflict-side-1/PWGDQ/Core/MCSignalLibrary.cxx
index 5e4f2ada1bb..4b953e2363a 100644
--- a/.conflict-side-1/PWGDQ/Core/MCSignalLibrary.cxx
+++ b/.conflict-side-1/PWGDQ/Core/MCSignalLibrary.cxx
@@ -15,11 +15,13 @@
 #include <vector>
 // #include <iostream>
 
-#include <TPDGCode.h>
-#include "CommonConstants/PhysicsConstants.h"
 #include "PWGDQ/Core/MCSignalLibrary.h"
+
+#include "CommonConstants/PhysicsConstants.h"
 #include "Framework/Logger.h"
 
+#include <TPDGCode.h>
+
 using namespace o2::constants::physics;
 // using std::cout;
 // using std::endl;
diff --git a/.conflict-side-1/PWGDQ/Core/MCSignalLibrary.h b/.conflict-side-1/PWGDQ/Core/MCSignalLibrary.h
index df01f60c978..f4c1c88e1df 100644
--- a/.conflict-side-1/PWGDQ/Core/MCSignalLibrary.h
+++ b/.conflict-side-1/PWGDQ/Core/MCSignalLibrary.h
@@ -15,11 +15,13 @@
 #ifndef PWGDQ_CORE_MCSIGNALLIBRARY_H_
 #define PWGDQ_CORE_MCSIGNALLIBRARY_H_
 
-#include <string>
-#include "rapidjson/document.h"
 #include "PWGDQ/Core/MCProng.h"
 #include "PWGDQ/Core/MCSignal.h"
 
+#include "rapidjson/document.h"
+
+#include <string>
+
 namespace o2::aod
 {
 namespace dqmcsignals
@@ -36,7 +38,7 @@ MCProng* ParseJSONMCProng(T prongJSON, const char* prongName);
 
 template <typename T>
 bool ValidateJSONMCProng(T prongJSON, const char* prongName);
-}
+} // namespace dqmcsignals
 } // namespace o2::aod
 
 #endif // PWGDQ_CORE_MCSIGNALLIBRARY_H_
diff --git a/.conflict-side-1/PWGDQ/Core/MixingHandler.cxx b/.conflict-side-1/PWGDQ/Core/MixingHandler.cxx
index 532b91ea9ac..d85c3181048 100644
--- a/.conflict-side-1/PWGDQ/Core/MixingHandler.cxx
+++ b/.conflict-side-1/PWGDQ/Core/MixingHandler.cxx
@@ -10,15 +10,16 @@
 // or submit itself to any jurisdiction.
 
 #include "PWGDQ/Core/MixingHandler.h"
+
 #include "PWGDQ/Core/VarManager.h"
 
-#include <iostream>
 #include <fstream>
+#include <iostream>
 using namespace std;
 
 #include <TMath.h>
-#include <TTimeStamp.h>
 #include <TRandom.h>
+#include <TTimeStamp.h>
 
 ClassImp(MixingHandler);
 
diff --git a/.conflict-side-1/PWGDQ/Core/MixingHandler.h b/.conflict-side-1/PWGDQ/Core/MixingHandler.h
index 0e38a89291e..f07f73fcef2 100644
--- a/.conflict-side-1/PWGDQ/Core/MixingHandler.h
+++ b/.conflict-side-1/PWGDQ/Core/MixingHandler.h
@@ -17,16 +17,16 @@
 #ifndef MixingHandler_H
 #define MixingHandler_H
 
-#include <TNamed.h>
+#include "PWGDQ/Core/HistogramManager.h"
+#include "PWGDQ/Core/VarManager.h"
+
 #include <TArrayF.h>
 #include <TArrayI.h>
 #include <TClonesArray.h>
 #include <TList.h>
+#include <TNamed.h>
 #include <TString.h>
 
-#include "PWGDQ/Core/HistogramManager.h"
-#include "PWGDQ/Core/VarManager.h"
-
 class MixingHandler : public TNamed
 {
 
diff --git a/.conflict-side-1/PWGDQ/Core/MixingLibrary.h b/.conflict-side-1/PWGDQ/Core/MixingLibrary.h
index db7f92583df..4c6a15eed73 100644
--- a/.conflict-side-1/PWGDQ/Core/MixingLibrary.h
+++ b/.conflict-side-1/PWGDQ/Core/MixingLibrary.h
@@ -11,10 +11,11 @@
 //
 // Contact: iarsene@cern.ch, i.c.arsene@fys.uio.no
 //
-#include <TString.h>
 #include "PWGDQ/Core/MixingHandler.h"
 #include "PWGDQ/Core/VarManager.h"
 
+#include <TString.h>
+
 namespace o2::aod
 {
 namespace dqmixing
diff --git a/.conflict-side-1/PWGDQ/Core/VarManager.cxx b/.conflict-side-1/PWGDQ/Core/VarManager.cxx
index 912dc06740a..999d5ef3cfe 100644
--- a/.conflict-side-1/PWGDQ/Core/VarManager.cxx
+++ b/.conflict-side-1/PWGDQ/Core/VarManager.cxx
@@ -8,12 +8,14 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
+#include "PWGDQ/Core/VarManager.h"
+
+#include "Tools/KFparticle/KFUtilities.h"
+
 #include <cmath>
 #include <iostream>
-#include <vector>
 #include <map>
-#include "PWGDQ/Core/VarManager.h"
-#include "Tools/KFparticle/KFUtilities.h"
+#include <vector>
 
 using std::cout;
 using std::endl;
@@ -28,7 +30,7 @@ bool VarManager::fgUsedVars[VarManager::kNVars] = {false};
 bool VarManager::fgUsedKF = false;
 float VarManager::fgMagField = 0.5;
 float VarManager::fgValues[VarManager::kNVars] = {0.0f};
-float VarManager::fgTPCInterSectorBoundary = 1.0;       // cm
+float VarManager::fgTPCInterSectorBoundary = 1.0; // cm
 int VarManager::fgITSROFbias = 0;
 int VarManager::fgITSROFlength = 100;
 int VarManager::fgITSROFBorderMarginLow = 0;
diff --git a/.conflict-side-1/PWGDQ/Core/VarManager.h b/.conflict-side-1/PWGDQ/Core/VarManager.h
index dfcba891bfc..7e885d342b8 100644
--- a/.conflict-side-1/PWGDQ/Core/VarManager.h
+++ b/.conflict-side-1/PWGDQ/Core/VarManager.h
@@ -18,7 +18,9 @@
 #define PWGDQ_CORE_VARMANAGER_H_
 
 #include <Framework/AnalysisDataModel.h>
+
 #include <Math/Vector4Dfwd.h>
+
 #include <cstdint>
 #ifndef HomogeneousField
 #define HomogeneousField
@@ -1189,15 +1191,15 @@ class VarManager : public TObject
   static void SetVariableDependencies(); // toggle those variables on which other used variables might depend
 
   static float fgMagField;
-  static float fgCenterOfMassEnergy;      // collision energy
-  static float fgMassofCollidingParticle; // mass of the colliding particle
-  static float fgTPCInterSectorBoundary;  // TPC inter-sector border size at the TPC outer radius, in cm
-  static int fgITSROFbias;                // ITS ROF bias (from ALPIDE parameters)
-  static int fgITSROFlength;              // ITS ROF length (from ALPIDE parameters)
-  static int fgITSROFBorderMarginLow;     // ITS ROF border low margin
-  static int fgITSROFBorderMarginHigh;    // ITS ROF border high margin
-  static uint64_t fgSOR;                  // Timestamp for start of run
-  static uint64_t fgEOR;                  // Timestamp for end of run
+  static float fgCenterOfMassEnergy;        // collision energy
+  static float fgMassofCollidingParticle;   // mass of the colliding particle
+  static float fgTPCInterSectorBoundary;    // TPC inter-sector border size at the TPC outer radius, in cm
+  static int fgITSROFbias;                  // ITS ROF bias (from ALPIDE parameters)
+  static int fgITSROFlength;                // ITS ROF length (from ALPIDE parameters)
+  static int fgITSROFBorderMarginLow;       // ITS ROF border low margin
+  static int fgITSROFBorderMarginHigh;      // ITS ROF border high margin
+  static uint64_t fgSOR;                    // Timestamp for start of run
+  static uint64_t fgEOR;                    // Timestamp for end of run
   static ROOT::Math::PxPyPzEVector fgBeamA; // beam from A-side 4-momentum vector
   static ROOT::Math::PxPyPzEVector fgBeamC; // beam from C-side 4-momentum vector
 
diff --git a/.conflict-side-1/PWGDQ/DataModel/ReducedInfoTables.h b/.conflict-side-1/PWGDQ/DataModel/ReducedInfoTables.h
index ae5fd853bf9..20e9298e908 100644
--- a/.conflict-side-1/PWGDQ/DataModel/ReducedInfoTables.h
+++ b/.conflict-side-1/PWGDQ/DataModel/ReducedInfoTables.h
@@ -752,7 +752,7 @@ DECLARE_SOA_COLUMN(CosThetaRM, costhetaRM, float);             //! Cosine in the
 DECLARE_SOA_COLUMN(CosThetaStarTPC, costhetaStarTPC, float);   //! global polarization, event plane reconstructed from TPC tracks
 DECLARE_SOA_COLUMN(CosThetaStarFT0A, costhetaStarFT0A, float); //! global polarization, event plane reconstructed from FT0A tracks
 DECLARE_SOA_COLUMN(CosThetaStarFT0C, costhetaStarFT0C, float); //! global polarization, event plane reconstructed from FT0C tracks
-DECLARE_SOA_DYNAMIC_COLUMN(Px, px, //!
+DECLARE_SOA_DYNAMIC_COLUMN(Px, px,                             //!
                            [](float pt, float phi) -> float { return pt * std::cos(phi); });
 DECLARE_SOA_DYNAMIC_COLUMN(Py, py, //!
                            [](float pt, float phi) -> float { return pt * std::sin(phi); });
diff --git a/.conflict-side-1/PWGDQ/Macros/configFit.json b/.conflict-side-1/PWGDQ/Macros/configFit.json
index 4fd44eee0ff..83d3d33efc8 100644
--- a/.conflict-side-1/PWGDQ/Macros/configFit.json
+++ b/.conflict-side-1/PWGDQ/Macros/configFit.json
@@ -1,186 +1,186 @@
 {
-  "input": {
-    "input_file_name": "tutorial.root",
-    "input_name": "histMass",
-    "pdf_dictionary": {
-      "pdf": [
-        "CB2",
-        "CB2",
-        "VWG",
-        "SUM"
-      ],
-      "pdfName": [
-        "Jpsi",
-        "Psi2s",
-        "Bkg",
-        "SUM"
-      ],
-      "pdfNameForLegend": [
-        "J/#psi",
-        "#psi(2S)",
-        "Background",
-        "Fit"
-      ],
-      "pdfColor": [
-        861,
-        417,
-        1
-      ],
-      "pdfStyle": [
-        1,
-        1,
-        2
-      ],
-      "parVal": [
-        [
-          3.096,
-          1.2e-01,
-          1.089,
-          3.393,
-          2.097,
-          8.694
-        ],
-        [
-          3.096,
-          1.2e-01,
-          1.089,
-          3.393,
-          2.097,
-          8.694
-        ],
-        [
-          1,
-          1,
-          1
-        ],
-        [
-          1000,
-          100,
-          100000
-        ]
-      ],
-      "parLimMin": [
-        [
-          2.9,
-          7.0e-02,
-          1.089,
-          3.393,
-          2.097,
-          8.694
-        ],
-        [
-          2.9,
-          7.0e-02,
-          1.089,
-          3.393,
-          2.097,
-          8.694
-        ],
-        [
-          -10,
-          0,
-          -100
-        ],
-        [
-          0,
-          0,
-          0
-        ]
-      ],
-      "parLimMax": [
-        [
-          3.5,
-          1.9e-01,
-          1.089,
-          3.393,
-          2.097,
-          8.694
-        ],
-        [
-          3.9,
-          1.9e-01,
-          1.089,
-          3.393,
-          2.097,
-          8.694
-        ],
-        [
-          10,
-          100,
-          100
-        ],
-        [
-          5000000,
-          5000000,
-          50000000
-        ]
-      ],
-      "parName": [
-        [
-          "mean_Jpsi",
-          "width_Jpsi",
-          "a_Jpsi",
-          "b_Jpsi",
-          "c_Jpsi",
-          "d_Jpsi"
-        ],
-        [
-          "sum::mean_Psi2s(mean_Jpsi,0.584)",
-          "prod::width_Psi2s(width_Jpsi,1.05)",
-          "a_Psi2s",
-          "b_Psi2s",
-          "c_Psi2s",
-          "d_Psi2s"
-        ],
-        [
-          "aa",
-          "bb",
-          "cc"
-        ],
-        [
-          "sig_Jpsi",
-          "sig_Psi2s",
-          "bkg"
-        ]
-      ],
-      "fitRangeMin": [
-        2,
-        2.1,
-        2.2
-      ],
-      "fitRangeMax": [
-        5,
-        4.9,
-        4.8
-      ],
-      "doPropagandaPlot": true,
-      "parForPropagandaPlot": [
-        "mean_Jpsi",
-        "width_Jpsi",
-        "sig_Jpsi",
-        "sig_Psi2s"
-      ],
-      "parNameForPropagandaPlot": [
-        "#mu_{J/#psi}",
-        "#sigma_{J/#psi}",
-        "#it{N}_{J/#psi}",
-        "#it{N}_{#psi(2S)}"
-      ],
-      "textForPropagandaPlot": [
-        [
-          0.20,
-          0.87,
-          "Simulation, toy MC"
-        ],
-        [
-          0.20,
-          0.80,
-          "2.5 < #it{y} < 4, J/#psi #rightarrow #mu^{+}#mu^{-}"
-        ]
-      ]
+    "input": {
+        "input_file_name": "tutorial.root",
+        "input_name": "histMass",
+        "pdf_dictionary": {
+            "pdf": [
+                "CB2",
+                "CB2",
+                "VWG",
+                "SUM"
+            ],
+            "pdfName": [
+                "Jpsi",
+                "Psi2s",
+                "Bkg",
+                "SUM"
+            ],
+            "pdfNameForLegend": [
+                "J/#psi",
+                "#psi(2S)",
+                "Background",
+                "Fit"
+            ],
+            "pdfColor": [
+                861,
+                417,
+                1
+            ],
+            "pdfStyle": [
+                1,
+                1,
+                2
+            ],
+            "parVal": [
+                [
+                    3.096,
+                    1.2e-01,
+                    1.089,
+                    3.393,
+                    2.097,
+                    8.694
+                ],
+                [
+                    3.096,
+                    1.2e-01,
+                    1.089,
+                    3.393,
+                    2.097,
+                    8.694
+                ],
+                [
+                    1,
+                    1,
+                    1
+                ],
+                [
+                    1000,
+                    100,
+                    100000
+                ]
+            ],
+            "parLimMin": [
+                [
+                    2.9,
+                    7.0e-02,
+                    1.089,
+                    3.393,
+                    2.097,
+                    8.694
+                ],
+                [
+                    2.9,
+                    7.0e-02,
+                    1.089,
+                    3.393,
+                    2.097,
+                    8.694
+                ],
+                [
+                    -10,
+                    0,
+                    -100
+                ],
+                [
+                    0,
+                    0,
+                    0
+                ]
+            ],
+            "parLimMax": [
+                [
+                    3.5,
+                    1.9e-01,
+                    1.089,
+                    3.393,
+                    2.097,
+                    8.694
+                ],
+                [
+                    3.9,
+                    1.9e-01,
+                    1.089,
+                    3.393,
+                    2.097,
+                    8.694
+                ],
+                [
+                    10,
+                    100,
+                    100
+                ],
+                [
+                    5000000,
+                    5000000,
+                    50000000
+                ]
+            ],
+            "parName": [
+                [
+                    "mean_Jpsi",
+                    "width_Jpsi",
+                    "a_Jpsi",
+                    "b_Jpsi",
+                    "c_Jpsi",
+                    "d_Jpsi"
+                ],
+                [
+                    "sum::mean_Psi2s(mean_Jpsi,0.584)",
+                    "prod::width_Psi2s(width_Jpsi,1.05)",
+                    "a_Psi2s",
+                    "b_Psi2s",
+                    "c_Psi2s",
+                    "d_Psi2s"
+                ],
+                [
+                    "aa",
+                    "bb",
+                    "cc"
+                ],
+                [
+                    "sig_Jpsi",
+                    "sig_Psi2s",
+                    "bkg"
+                ]
+            ],
+            "fitRangeMin": [
+                2,
+                2.1,
+                2.2
+            ],
+            "fitRangeMax": [
+                5,
+                4.9,
+                4.8
+            ],
+            "doPropagandaPlot": true,
+            "parForPropagandaPlot": [
+                "mean_Jpsi",
+                "width_Jpsi",
+                "sig_Jpsi",
+                "sig_Psi2s"
+            ],
+            "parNameForPropagandaPlot": [
+                "#mu_{J/#psi}",
+                "#sigma_{J/#psi}",
+                "#it{N}_{J/#psi}",
+                "#it{N}_{#psi(2S)}"
+            ],
+            "textForPropagandaPlot": [
+                [
+                    0.20,
+                    0.87,
+                    "Simulation, toy MC"
+                ],
+                [
+                    0.20,
+                    0.80,
+                    "2.5 < #it{y} < 4, J/#psi #rightarrow #mu^{+}#mu^{-}"
+                ]
+            ]
+        }
+    },
+    "output": {
+        "output_file_name": "output/"
     }
-  },
-  "output": {
-    "output_file_name": "output/"
-  }
-}
\ No newline at end of file
+}
diff --git a/.conflict-side-1/PWGDQ/Macros/dqFlowAccWeights.C b/.conflict-side-1/PWGDQ/Macros/dqFlowAccWeights.C
index 00cb5107d45..13695c9e799 100644
--- a/.conflict-side-1/PWGDQ/Macros/dqFlowAccWeights.C
+++ b/.conflict-side-1/PWGDQ/Macros/dqFlowAccWeights.C
@@ -14,18 +14,20 @@
 ///
 /// \author Chi ZHANG, CEA-Saclay, chi.zhang@cern.ch
 
-#include <gsl/span>
+#include "PWGCF/GenericFramework/Core/GFWWeights.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "Framework/Logger.h"
+
+#include <TFile.h>
+#include <TSystem.h>
+
 #include <cmath>
+#include <gsl/span>
+#include <iostream>
 #include <string>
 #include <unordered_map>
 #include <vector>
-#include <iostream>
-
-#include <TSystem.h>
-#include <TFile.h>
-#include "Framework/Logger.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "PWGCF/GenericFramework/Core/GFWWeights.h"
 
 using namespace o2;
 using namespace std;
diff --git a/.conflict-side-1/PWGDQ/Macros/evalMchTrackingEfficiency.cxx b/.conflict-side-1/PWGDQ/Macros/evalMchTrackingEfficiency.cxx
index 34610915850..e2c1ae796e3 100644
--- a/.conflict-side-1/PWGDQ/Macros/evalMchTrackingEfficiency.cxx
+++ b/.conflict-side-1/PWGDQ/Macros/evalMchTrackingEfficiency.cxx
@@ -14,17 +14,17 @@
 ///
 /// \author Zaida Conesa del Valle <zaida.conesa.del.valle@cern.ch>
 /// \author Andrea Tavira García <tavira-garcia@ijclab.in2p3.fr>
-#include <vector>
-
-#include "TFile.h"
+#include "TAxis.h"
+#include "TCanvas.h"
 #include "TDirectoryFile.h"
-#include "THn.h"
+#include "TFile.h"
 #include "TH1F.h"
 #include "TH2F.h"
-#include "TAxis.h"
-#include "TCanvas.h"
-#include "TStyle.h"
+#include "THn.h"
 #include "TLegend.h"
+#include "TStyle.h"
+
+#include <vector>
 
 double computeEfficiencyPerChamber(THnF* hnf, int iAxis, int iCh, double binLimits[2]);
 double computeEfficiencyPerChamber(THnF* hnf, const int iAxis[3], int iCh, double binLimits[3][2]);
diff --git a/.conflict-side-1/PWGDQ/Macros/fit_library/CB2Pdf.cxx b/.conflict-side-1/PWGDQ/Macros/fit_library/CB2Pdf.cxx
index 7f2501825e3..43fc0d0a613 100644
--- a/.conflict-side-1/PWGDQ/Macros/fit_library/CB2Pdf.cxx
+++ b/.conflict-side-1/PWGDQ/Macros/fit_library/CB2Pdf.cxx
@@ -11,14 +11,16 @@
 
 /// \author Luca Micheletti <luca.micheletti@cern.ch>, CERN
 
+#include "CB2Pdf.h"
+
 #include "Riostream.h"
 
-#include "CB2Pdf.h"
-#include "RooAbsReal.h"
 #include "RooAbsCategory.h"
-#include <math.h>
+#include "RooAbsReal.h"
 #include "TMath.h"
 
+#include <math.h>
+
 ClassImp(CB2Pdf);
 
 CB2Pdf::CB2Pdf(const char* name, const char* title,
diff --git a/.conflict-side-1/PWGDQ/Macros/fit_library/CB2Pdf.h b/.conflict-side-1/PWGDQ/Macros/fit_library/CB2Pdf.h
index a9e3a87409e..2415631b03b 100644
--- a/.conflict-side-1/PWGDQ/Macros/fit_library/CB2Pdf.h
+++ b/.conflict-side-1/PWGDQ/Macros/fit_library/CB2Pdf.h
@@ -14,11 +14,11 @@
 #ifndef CB2PDF
 #define CB2PDF
 
+#include "RooAbsCategory.h"
 #include "RooAbsPdf.h"
-#include "RooRealProxy.h"
-#include "RooCategoryProxy.h"
 #include "RooAbsReal.h"
-#include "RooAbsCategory.h"
+#include "RooCategoryProxy.h"
+#include "RooRealProxy.h"
 
 class CB2Pdf : public RooAbsPdf
 {
diff --git a/.conflict-side-1/PWGDQ/Macros/fit_library/ExpPdf.cxx b/.conflict-side-1/PWGDQ/Macros/fit_library/ExpPdf.cxx
index 1841ccd7cbb..9f07c07e07a 100755
--- a/.conflict-side-1/PWGDQ/Macros/fit_library/ExpPdf.cxx
+++ b/.conflict-side-1/PWGDQ/Macros/fit_library/ExpPdf.cxx
@@ -11,14 +11,16 @@
 
 /// \author Luca Micheletti <luca.micheletti@cern.ch>, CERN
 
+#include "ExpPdf.h"
+
 #include "Riostream.h"
 
-#include "ExpPdf.h"
-#include "RooAbsReal.h"
 #include "RooAbsCategory.h"
-#include <math.h>
+#include "RooAbsReal.h"
 #include "TMath.h"
 
+#include <math.h>
+
 ClassImp(ExpPdf);
 
 ExpPdf::ExpPdf(const char* name, const char* title,
diff --git a/.conflict-side-1/PWGDQ/Macros/fit_library/ExpPdf.h b/.conflict-side-1/PWGDQ/Macros/fit_library/ExpPdf.h
index 394c73c52e6..4756e5a7ad8 100755
--- a/.conflict-side-1/PWGDQ/Macros/fit_library/ExpPdf.h
+++ b/.conflict-side-1/PWGDQ/Macros/fit_library/ExpPdf.h
@@ -14,11 +14,11 @@
 #ifndef EXPPDF
 #define EXPPDF
 
+#include "RooAbsCategory.h"
 #include "RooAbsPdf.h"
-#include "RooRealProxy.h"
-#include "RooCategoryProxy.h"
 #include "RooAbsReal.h"
-#include "RooAbsCategory.h"
+#include "RooCategoryProxy.h"
+#include "RooRealProxy.h"
 
 class ExpPdf : public RooAbsPdf
 {
diff --git a/.conflict-side-1/PWGDQ/Macros/fit_library/GausPdf.cxx b/.conflict-side-1/PWGDQ/Macros/fit_library/GausPdf.cxx
index 84d303e3a2b..bdf7f88aa2f 100755
--- a/.conflict-side-1/PWGDQ/Macros/fit_library/GausPdf.cxx
+++ b/.conflict-side-1/PWGDQ/Macros/fit_library/GausPdf.cxx
@@ -11,14 +11,16 @@
 
 /// \author Luca Micheletti <luca.micheletti@cern.ch>, CERN
 
+#include "GausPdf.h"
+
 #include "Riostream.h"
 
-#include "GausPdf.h"
-#include "RooAbsReal.h"
 #include "RooAbsCategory.h"
-#include <math.h>
+#include "RooAbsReal.h"
 #include "TMath.h"
 
+#include <math.h>
+
 ClassImp(GausPdf);
 
 GausPdf::GausPdf(const char* name, const char* title,
diff --git a/.conflict-side-1/PWGDQ/Macros/fit_library/GausPdf.h b/.conflict-side-1/PWGDQ/Macros/fit_library/GausPdf.h
index 4edb19ff47c..0cdda519651 100755
--- a/.conflict-side-1/PWGDQ/Macros/fit_library/GausPdf.h
+++ b/.conflict-side-1/PWGDQ/Macros/fit_library/GausPdf.h
@@ -14,11 +14,11 @@
 #ifndef GAUSPDF
 #define GAUSPDF
 
+#include "RooAbsCategory.h"
 #include "RooAbsPdf.h"
-#include "RooRealProxy.h"
-#include "RooCategoryProxy.h"
 #include "RooAbsReal.h"
-#include "RooAbsCategory.h"
+#include "RooCategoryProxy.h"
+#include "RooRealProxy.h"
 
 class GausPdf : public RooAbsPdf
 {
diff --git a/.conflict-side-1/PWGDQ/Macros/fit_library/Pol4ExpPdf.cxx b/.conflict-side-1/PWGDQ/Macros/fit_library/Pol4ExpPdf.cxx
index 912406a3b0b..6ef59d327ee 100755
--- a/.conflict-side-1/PWGDQ/Macros/fit_library/Pol4ExpPdf.cxx
+++ b/.conflict-side-1/PWGDQ/Macros/fit_library/Pol4ExpPdf.cxx
@@ -11,14 +11,16 @@
 
 /// \author Luca Micheletti <luca.micheletti@cern.ch>, CERN
 
+#include "Pol4ExpPdf.h"
+
 #include "Riostream.h"
 
-#include "Pol4ExpPdf.h"
-#include "RooAbsReal.h"
 #include "RooAbsCategory.h"
-#include <math.h>
+#include "RooAbsReal.h"
 #include "TMath.h"
 
+#include <math.h>
+
 ClassImp(Pol4ExpPdf);
 
 Pol4ExpPdf::Pol4ExpPdf(const char* name, const char* title,
diff --git a/.conflict-side-1/PWGDQ/Macros/fit_library/Pol4ExpPdf.h b/.conflict-side-1/PWGDQ/Macros/fit_library/Pol4ExpPdf.h
index 13cd8696c6c..42a898a0493 100755
--- a/.conflict-side-1/PWGDQ/Macros/fit_library/Pol4ExpPdf.h
+++ b/.conflict-side-1/PWGDQ/Macros/fit_library/Pol4ExpPdf.h
@@ -14,11 +14,11 @@
 #ifndef POL4EXPPDF
 #define POL4EXPPDF
 
+#include "RooAbsCategory.h"
 #include "RooAbsPdf.h"
-#include "RooRealProxy.h"
-#include "RooCategoryProxy.h"
 #include "RooAbsReal.h"
-#include "RooAbsCategory.h"
+#include "RooCategoryProxy.h"
+#include "RooRealProxy.h"
 
 TString nameParameters[] = {"p0", "p1", "p2", "p3", "p4", "p5", "N_bkg", "N_sig", "mean", "width"};
 
diff --git a/.conflict-side-1/PWGDQ/Macros/fit_library/VWGPdf.cxx b/.conflict-side-1/PWGDQ/Macros/fit_library/VWGPdf.cxx
index 8cebc90b2f4..8cbcdd9be83 100644
--- a/.conflict-side-1/PWGDQ/Macros/fit_library/VWGPdf.cxx
+++ b/.conflict-side-1/PWGDQ/Macros/fit_library/VWGPdf.cxx
@@ -11,14 +11,16 @@
 
 /// \author Luca Micheletti <luca.micheletti@cern.ch>, CERN
 
+#include "VWGPdf.h"
+
 #include "Riostream.h"
 
-#include "VWGPdf.h"
-#include "RooAbsReal.h"
 #include "RooAbsCategory.h"
-#include <math.h>
+#include "RooAbsReal.h"
 #include "TMath.h"
 
+#include <math.h>
+
 ClassImp(VWGPdf);
 
 VWGPdf::VWGPdf(const char* name, const char* title,
diff --git a/.conflict-side-1/PWGDQ/Macros/fit_library/VWGPdf.h b/.conflict-side-1/PWGDQ/Macros/fit_library/VWGPdf.h
index 9077d43be71..5014c924773 100644
--- a/.conflict-side-1/PWGDQ/Macros/fit_library/VWGPdf.h
+++ b/.conflict-side-1/PWGDQ/Macros/fit_library/VWGPdf.h
@@ -14,11 +14,11 @@
 #ifndef VWGPDF
 #define VWGPDF
 
+#include "RooAbsCategory.h"
 #include "RooAbsPdf.h"
-#include "RooRealProxy.h"
-#include "RooCategoryProxy.h"
 #include "RooAbsReal.h"
-#include "RooAbsCategory.h"
+#include "RooCategoryProxy.h"
+#include "RooRealProxy.h"
 
 class VWGPdf : public RooAbsPdf
 {
diff --git a/.conflict-side-1/PWGDQ/TableProducer/generatedQuarkoniaMC.cxx b/.conflict-side-1/PWGDQ/TableProducer/generatedQuarkoniaMC.cxx
index 737faaaa6b2..a820a167a32 100644
--- a/.conflict-side-1/PWGDQ/TableProducer/generatedQuarkoniaMC.cxx
+++ b/.conflict-side-1/PWGDQ/TableProducer/generatedQuarkoniaMC.cxx
@@ -16,40 +16,42 @@
 // It is meant to help with providing auxiliary information
 // when dealing with derived data.
 
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <map>
-#include <iterator>
-#include <utility>
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+#include "PWGLF/DataModel/EPCalibrationTables.h"
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
 #include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/McCollisionExtra.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/Qvectors.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+#include "Common/TableProducer/PID/pidTOFBase.h"
+
 #include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/PhysicsConstants.h"
-#include "Common/TableProducer/PID/pidTOFBase.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Qvectors.h"
+#include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StaticFor.h"
-#include "Common/DataModel/McCollisionExtra.h"
-#include "PWGLF/DataModel/EPCalibrationTables.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <iterator>
+#include <map>
+#include <utility>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGDQ/TableProducer/tableMaker.cxx b/.conflict-side-1/PWGDQ/TableProducer/tableMaker.cxx
index 87d1183d385..f0b74e47974 100644
--- a/.conflict-side-1/PWGDQ/TableProducer/tableMaker.cxx
+++ b/.conflict-side-1/PWGDQ/TableProducer/tableMaker.cxx
@@ -24,45 +24,48 @@
 #include <string>
 #include <vector>
 // other includes
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/DataTypes.h"
-#include "Framework/runDataProcessing.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
+#include "PWGDQ/Core/AnalysisCompositeCut.h"
+#include "PWGDQ/Core/AnalysisCut.h"
+#include "PWGDQ/Core/CutsLibrary.h"
+#include "PWGDQ/Core/HistogramManager.h"
+#include "PWGDQ/Core/HistogramsLibrary.h"
+#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+
 #include "Common/CCDB/TriggerAliases.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/CollisionAssociationTables.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/FwdTrackReAlignTables.h"
+#include "Common/DataModel/MftmchMatchingML.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/MftmchMatchingML.h"
-#include "Common/DataModel/FwdTrackReAlignTables.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "PWGDQ/Core/VarManager.h"
-#include "PWGDQ/Core/HistogramManager.h"
-#include "PWGDQ/Core/AnalysisCut.h"
-#include "PWGDQ/Core/AnalysisCompositeCut.h"
-#include "PWGDQ/Core/HistogramsLibrary.h"
-#include "PWGDQ/Core/CutsLibrary.h"
-#include "DataFormatsGlobalTracking/RecoContainerCreateTracksVariadic.h"
-#include "DetectorsVertexing/VertexTrackMatcher.h"
-#include "ReconstructionDataFormats/PrimaryVertex.h"
-#include "ReconstructionDataFormats/VtxTrackIndex.h"
-#include "ReconstructionDataFormats/VtxTrackRef.h"
-#include "DataFormatsITSMFT/ROFRecord.h"
+#include "EventFiltering/Zorro.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "CommonDataFormat/InteractionRecord.h"
-#include "DetectorsVertexing/PVertexerParams.h"
-#include "MathUtils/Primitive2D.h"
 #include "DataFormatsGlobalTracking/RecoContainer.h"
-#include "Common/DataModel/CollisionAssociationTables.h"
+#include "DataFormatsGlobalTracking/RecoContainerCreateTracksVariadic.h"
+#include "DataFormatsITSMFT/ROFRecord.h"
 #include "DataFormatsParameters/GRPMagField.h"
 #include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "DetectorsVertexing/PVertexerParams.h"
+#include "DetectorsVertexing/VertexTrackMatcher.h"
 #include "Field/MagneticField.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/DataTypes.h"
+#include "Framework/runDataProcessing.h"
+#include "MathUtils/Primitive2D.h"
+#include "ReconstructionDataFormats/PrimaryVertex.h"
+#include "ReconstructionDataFormats/VtxTrackIndex.h"
+#include "ReconstructionDataFormats/VtxTrackRef.h"
+
 #include "TGeoGlobalMagField.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "EventFiltering/Zorro.h"
 
 using std::cout;
 using std::endl;
diff --git a/.conflict-side-1/PWGDQ/TableProducer/tableMakerJpsiHf.cxx b/.conflict-side-1/PWGDQ/TableProducer/tableMakerJpsiHf.cxx
index 7ae949c40d1..4700ce4be4f 100644
--- a/.conflict-side-1/PWGDQ/TableProducer/tableMakerJpsiHf.cxx
+++ b/.conflict-side-1/PWGDQ/TableProducer/tableMakerJpsiHf.cxx
@@ -14,23 +14,23 @@
 /// \author Luca Micheletti <luca.micheletti@to.infn.it>, INFN
 /// \author Fabrizio Grosa <fabrizio.grosa@cern.ch>, CERN
 
-#include <string>
-
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
-
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/AnalysisCompositeCut.h"
+#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/CutsLibrary.h"
 #include "PWGDQ/Core/HistogramManager.h"
 #include "PWGDQ/Core/HistogramsLibrary.h"
 #include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+#include "PWGHF/Core/HfHelper.h"
 #include "PWGHF/DataModel/CandidateReconstructionTables.h"
 #include "PWGHF/DataModel/CandidateSelectionTables.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+
+#include <string>
 
 using namespace o2;
 using namespace o2::analysis;
diff --git a/.conflict-side-1/PWGDQ/TableProducer/tableMakerMC.cxx b/.conflict-side-1/PWGDQ/TableProducer/tableMakerMC.cxx
index 1d43d196f9d..2edcef5717f 100644
--- a/.conflict-side-1/PWGDQ/TableProducer/tableMakerMC.cxx
+++ b/.conflict-side-1/PWGDQ/TableProducer/tableMakerMC.cxx
@@ -16,41 +16,45 @@
 //   The skimmed MC stack includes the MC truth particles corresponding to the list of user specified MC signals (see MCsignal.h)
 //    and the MC truth particles corresponding to the reconstructed tracks selected by the specified track cuts on reconstructed data.
 
-#include <iostream>
-#include <string>
-#include <map>
-#include <memory>
-#include <vector>
-#include "TList.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/ASoA.h"
-#include "Framework/DataTypes.h"
-#include "Framework/runDataProcessing.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/CCDB/TriggerAliases.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "PWGDQ/Core/VarManager.h"
-#include "PWGDQ/Core/HistogramManager.h"
-#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/AnalysisCompositeCut.h"
-#include "PWGDQ/Core/HistogramsLibrary.h"
+#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/CutsLibrary.h"
+#include "PWGDQ/Core/HistogramManager.h"
+#include "PWGDQ/Core/HistogramsLibrary.h"
 #include "PWGDQ/Core/MCSignal.h"
 #include "PWGDQ/Core/MCSignalLibrary.h"
+#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+
+#include "Common/CCDB/TriggerAliases.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/CollisionAssociationTables.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/CollisionAssociationTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsParameters/GRPMagField.h"
 #include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
 #include "Field/MagneticField.h"
+#include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/DataTypes.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TGeoGlobalMagField.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "CCDB/BasicCCDBManager.h"
+#include "TList.h"
+
+#include <iostream>
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
 
 using std::cout;
 using std::endl;
@@ -653,7 +657,7 @@ struct TableMakerMC {
                            track.c1PtY(), track.c1PtZ(), track.c1PtSnp(), track.c1PtTgl(), track.c1Pt21Pt2());
           }
         } // end loop over reconstructed tracks
-      }   // end if constexpr (static_cast<bool>(TTrackFillMap))
+      } // end if constexpr (static_cast<bool>(TTrackFillMap))
 
       // Maps for the MFT-muon matching index
       std::map<int, int> newMFTTableSize; // key : oldMFTIndex, value: size of the table-1 at step key
@@ -864,9 +868,9 @@ struct TableMakerMC {
               newMatchIndex[muon.index()] = newEntryNb[matchIdx];                                  // update the match for this muon to the updated entry of the match
               newMatchIndex[muon.index()] += muonBasic.lastIndex() + 1 - newEntryNb[muon.index()]; // adding the offset of muons, muonBasic.lastIndex() start at -1
 
-              if (static_cast<int>(muon.trackType()) == 0) {                                       // for now only do this to global tracks
-                newMatchIndex[matchIdx] = newEntryNb[muon.index()];                                // add the  updated index of this muon as a match to mch track
-                newMatchIndex[matchIdx] += muonBasic.lastIndex() + 1 - newEntryNb[muon.index()];   // adding the offset, muonBasic.lastIndex() start at -1
+              if (static_cast<int>(muon.trackType()) == 0) {                                     // for now only do this to global tracks
+                newMatchIndex[matchIdx] = newEntryNb[muon.index()];                              // add the  updated index of this muon as a match to mch track
+                newMatchIndex[matchIdx] += muonBasic.lastIndex() + 1 - newEntryNb[muon.index()]; // adding the offset, muonBasic.lastIndex() start at -1
               }
             } else {
               newMatchIndex[muon.index()] = -1;
@@ -915,7 +919,7 @@ struct TableMakerMC {
           muonLabels(fNewLabels.find(mctrack.index())->second, muon.mcMask(), mcflags);
         }
       } // end if constexpr (static_cast<bool>(TMuonFillMap))
-    }   // end loop over collisions
+    } // end loop over collisions
 
     // Loop over the label map, create the mother/daughter relationships if these exist and write the skimmed MC stack
     for (const auto& [newLabel, oldLabel] : fNewLabelsReversed) {
@@ -1276,7 +1280,7 @@ struct TableMakerMC {
                            track.c1PtY(), track.c1PtZ(), track.c1PtSnp(), track.c1PtTgl(), track.c1Pt21Pt2());
           }
         } // end loop over reconstructed tracks
-      }   // end if constexpr (static_cast<bool>(TTrackFillMap))
+      } // end if constexpr (static_cast<bool>(TTrackFillMap))
 
       if constexpr (static_cast<bool>(TMuonFillMap)) {
         // build the muon tables
@@ -1454,7 +1458,7 @@ struct TableMakerMC {
           muonLabels(fNewLabels.find(mctrack.index())->second, muon.mcMask(), mcflags);
         }
       } // end if constexpr (static_cast<bool>(TMuonFillMap))
-    }   // end loop over collisions
+    } // end loop over collisions
 
     // Loop over the label map, create the mother/daughter relationships if these exist and write the skimmed MC stack
     for (const auto& [newLabel, oldLabel] : fNewLabelsReversed) {
diff --git a/.conflict-side-1/PWGDQ/TableProducer/tableMakerMC_withAssoc.cxx b/.conflict-side-1/PWGDQ/TableProducer/tableMakerMC_withAssoc.cxx
index 7dc49516e8a..8fe5f479131 100644
--- a/.conflict-side-1/PWGDQ/TableProducer/tableMakerMC_withAssoc.cxx
+++ b/.conflict-side-1/PWGDQ/TableProducer/tableMakerMC_withAssoc.cxx
@@ -16,45 +16,49 @@
 //   The skimmed MC stack includes the MC truth particles corresponding to the list of user specified MC signals (see MCsignal.h)
 //    and the MC truth particles corresponding to the reconstructed tracks selected by the specified track cuts on reconstructed data.
 
-#include <cstdint>
-#include <iostream>
-#include <map>
-#include <string>
-#include <memory>
-#include <vector>
-#include <utility>
-#include <unordered_map>
-#include "TList.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/ASoA.h"
-#include "Framework/DataTypes.h"
-#include "Framework/runDataProcessing.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/CCDB/TriggerAliases.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "PWGDQ/Core/VarManager.h"
-#include "PWGDQ/Core/HistogramManager.h"
-#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/AnalysisCompositeCut.h"
-#include "PWGDQ/Core/HistogramsLibrary.h"
+#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/CutsLibrary.h"
+#include "PWGDQ/Core/HistogramManager.h"
+#include "PWGDQ/Core/HistogramsLibrary.h"
 #include "PWGDQ/Core/MCSignal.h"
 #include "PWGDQ/Core/MCSignalLibrary.h"
+#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+
+#include "Common/CCDB/TriggerAliases.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/CollisionAssociationTables.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/FwdTrackReAlignTables.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/FwdTrackReAlignTables.h"
-#include "Common/DataModel/CollisionAssociationTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsParameters/GRPMagField.h"
 #include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
 #include "Field/MagneticField.h"
+#include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/DataTypes.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TGeoGlobalMagField.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "CCDB/BasicCCDBManager.h"
+#include "TList.h"
+
+#include <cstdint>
+#include <iostream>
+#include <map>
+#include <memory>
+#include <string>
+#include <unordered_map>
+#include <utility>
+#include <vector>
 
 using std::cout;
 using std::endl;
diff --git a/.conflict-side-1/PWGDQ/TableProducer/tableMakerMuonMchTrkEfficiency.cxx b/.conflict-side-1/PWGDQ/TableProducer/tableMakerMuonMchTrkEfficiency.cxx
index 11634be2e0d..7474dd1740f 100644
--- a/.conflict-side-1/PWGDQ/TableProducer/tableMakerMuonMchTrkEfficiency.cxx
+++ b/.conflict-side-1/PWGDQ/TableProducer/tableMakerMuonMchTrkEfficiency.cxx
@@ -19,34 +19,35 @@
 /// \author Zaida Conesa del Valle <zaida.conesa.del.valle@cern.ch>
 ///
 
-#include <vector>
-#include <memory>
-#include <string>
-#include <algorithm>
+#include "TDatabasePDG.h"
 #include <TH1F.h>
 #include <TH3F.h>
 #include <THashList.h>
 #include <TList.h>
-#include <TString.h>
 #include <TLorentzVector.h>
-#include "TDatabasePDG.h"
+#include <TString.h>
+
+#include <algorithm>
+#include <memory>
+#include <string>
+#include <vector>
 //
 #include "Common/DataModel/TrackSelectionTables.h"
 //
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/ASoA.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/Logger.h"
 #include "Framework/runDataProcessing.h"
 //
-#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/AnalysisCompositeCut.h"
+#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/CutsLibrary.h"
 #include "PWGDQ/Core/VarManager.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
 #include "PWGDQ/DataModel/MchTrkEffTables.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-side-1/PWGDQ/TableProducer/tableMaker_withAssoc.cxx b/.conflict-side-1/PWGDQ/TableProducer/tableMaker_withAssoc.cxx
index 3b3d4c4e0af..7b35a84bd87 100644
--- a/.conflict-side-1/PWGDQ/TableProducer/tableMaker_withAssoc.cxx
+++ b/.conflict-side-1/PWGDQ/TableProducer/tableMaker_withAssoc.cxx
@@ -23,46 +23,49 @@
 #include <string>
 #include <vector>
 // other includes
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/DataTypes.h"
-#include "Framework/runDataProcessing.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
+#include "PWGDQ/Core/AnalysisCompositeCut.h"
+#include "PWGDQ/Core/AnalysisCut.h"
+#include "PWGDQ/Core/CutsLibrary.h"
+#include "PWGDQ/Core/HistogramManager.h"
+#include "PWGDQ/Core/HistogramsLibrary.h"
+#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+
 #include "Common/CCDB/TriggerAliases.h"
+#include "Common/Core/TableHelper.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/CollisionAssociationTables.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/FwdTrackReAlignTables.h"
+#include "Common/DataModel/MftmchMatchingML.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/MftmchMatchingML.h"
-#include "Common/DataModel/FwdTrackReAlignTables.h"
-#include "Common/Core/TableHelper.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "PWGDQ/Core/VarManager.h"
-#include "PWGDQ/Core/HistogramManager.h"
-#include "PWGDQ/Core/AnalysisCut.h"
-#include "PWGDQ/Core/AnalysisCompositeCut.h"
-#include "PWGDQ/Core/HistogramsLibrary.h"
-#include "PWGDQ/Core/CutsLibrary.h"
-#include "DataFormatsGlobalTracking/RecoContainerCreateTracksVariadic.h"
-#include "DetectorsVertexing/VertexTrackMatcher.h"
-#include "ReconstructionDataFormats/PrimaryVertex.h"
-#include "ReconstructionDataFormats/VtxTrackIndex.h"
-#include "ReconstructionDataFormats/VtxTrackRef.h"
-#include "DataFormatsITSMFT/ROFRecord.h"
+#include "EventFiltering/Zorro.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "CommonDataFormat/InteractionRecord.h"
-#include "DetectorsVertexing/PVertexerParams.h"
-#include "MathUtils/Primitive2D.h"
 #include "DataFormatsGlobalTracking/RecoContainer.h"
-#include "Common/DataModel/CollisionAssociationTables.h"
+#include "DataFormatsGlobalTracking/RecoContainerCreateTracksVariadic.h"
+#include "DataFormatsITSMFT/ROFRecord.h"
 #include "DataFormatsParameters/GRPMagField.h"
 #include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "DetectorsVertexing/PVertexerParams.h"
+#include "DetectorsVertexing/VertexTrackMatcher.h"
 #include "Field/MagneticField.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/DataTypes.h"
+#include "Framework/runDataProcessing.h"
+#include "MathUtils/Primitive2D.h"
+#include "ReconstructionDataFormats/PrimaryVertex.h"
+#include "ReconstructionDataFormats/VtxTrackIndex.h"
+#include "ReconstructionDataFormats/VtxTrackRef.h"
+
 #include "TGeoGlobalMagField.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "EventFiltering/Zorro.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGDQ/Tasks/DalitzSelection.cxx b/.conflict-side-1/PWGDQ/Tasks/DalitzSelection.cxx
index 6b285d4e04a..a19ab82ae65 100755
--- a/.conflict-side-1/PWGDQ/Tasks/DalitzSelection.cxx
+++ b/.conflict-side-1/PWGDQ/Tasks/DalitzSelection.cxx
@@ -13,26 +13,28 @@
 //        It can produce track and pair histograms for selected tracks
 //      It creates a bitmap with selections to be stored during skimming
 //
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/DataTypes.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
+#include "PWGDQ/Core/AnalysisCompositeCut.h"
+#include "PWGDQ/Core/AnalysisCut.h"
+#include "PWGDQ/Core/CutsLibrary.h"
+#include "PWGDQ/Core/HistogramManager.h"
+#include "PWGDQ/Core/HistogramsLibrary.h"
+#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+
 #include "Common/CCDB/TriggerAliases.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "PWGDQ/Core/VarManager.h"
-#include "PWGDQ/Core/HistogramManager.h"
-#include "PWGDQ/Core/AnalysisCut.h"
-#include "PWGDQ/Core/AnalysisCompositeCut.h"
-#include "PWGDQ/Core/HistogramsLibrary.h"
-#include "PWGDQ/Core/CutsLibrary.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsParameters/GRPMagField.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/DataTypes.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGDQ/Tasks/MIDefficiency.cxx b/.conflict-side-1/PWGDQ/Tasks/MIDefficiency.cxx
index 3dcbcc4d595..219489d9ab9 100644
--- a/.conflict-side-1/PWGDQ/Tasks/MIDefficiency.cxx
+++ b/.conflict-side-1/PWGDQ/Tasks/MIDefficiency.cxx
@@ -18,11 +18,12 @@
 ///
 /// \author Luca Quaglia <luca.quaglia@cern.ch
 
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/CallbackService.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
-#include "Framework/CallbackService.h"
-#include "Framework/ASoAHelpers.h"
+
 #include <iostream>
 
 // O2 physics classes
@@ -30,13 +31,12 @@
 
 // O2
 #include "DataFormatsMID/Track.h" //MID track from O2
-#include "Framework/Variant.h"
-#include "Framework/ConfigParamSpec.h"
 #include "Framework/CompletionPolicyHelpers.h"
-
-#include "MIDEfficiency/Efficiency.h"
+#include "Framework/ConfigParamSpec.h"
+#include "Framework/Variant.h"
 #include "MIDBase/DetectorParameters.h"
 #include "MIDBase/Mapping.h"
+#include "MIDEfficiency/Efficiency.h"
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-side-1/PWGDQ/Tasks/ModelConverterMultPv.cxx b/.conflict-side-1/PWGDQ/Tasks/ModelConverterMultPv.cxx
index 088590435b8..42b19de5191 100644
--- a/.conflict-side-1/PWGDQ/Tasks/ModelConverterMultPv.cxx
+++ b/.conflict-side-1/PWGDQ/Tasks/ModelConverterMultPv.cxx
@@ -15,15 +15,17 @@
 // the conflict with the old data model.
 
 // other includes
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 #include <THashList.h>
 #include <TList.h>
 #include <TString.h>
-#include "DataFormatsParameters/GRPObject.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGDQ/Tasks/dqCorrelation.cxx b/.conflict-side-1/PWGDQ/Tasks/dqCorrelation.cxx
index 950e82364cb..f3aed01c057 100644
--- a/.conflict-side-1/PWGDQ/Tasks/dqCorrelation.cxx
+++ b/.conflict-side-1/PWGDQ/Tasks/dqCorrelation.cxx
@@ -11,44 +11,45 @@
 /// @author  Victor Valencia
 // Contact: iarsene@cern.ch, i.c.arsene@fys.uio.no
 //
-#include <iostream>
-#include <vector>
-#include <algorithm>
-#include <TH1F.h>
-#include <TH3F.h>
-#include <THashList.h>
-#include <TList.h>
-#include <TString.h>
-#include <TRandom3.h>
-#include <cmath>
-
-#include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
 #include "PWGCF/GenericFramework/Core/FlowContainer.h"
-#include "PWGCF/GenericFramework/Core/GFWCumulant.h"
 #include "PWGCF/GenericFramework/Core/GFW.h"
+#include "PWGCF/GenericFramework/Core/GFWCumulant.h"
+#include "PWGCF/GenericFramework/Core/GFWPowerArray.h"
 #include "PWGCF/GenericFramework/Core/GFWWeights.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "PWGDQ/Core/VarManager.h"
-#include "PWGDQ/Core/HistogramManager.h"
-#include "PWGDQ/Core/MixingHandler.h"
-#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/AnalysisCompositeCut.h"
-#include "PWGDQ/Core/HistogramsLibrary.h"
+#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/CutsLibrary.h"
+#include "PWGDQ/Core/HistogramManager.h"
+#include "PWGDQ/Core/HistogramsLibrary.h"
+#include "PWGDQ/Core/MixingHandler.h"
 #include "PWGDQ/Core/MixingLibrary.h"
+#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include "Field/MagneticField.h"
-#include "TGeoGlobalMagField.h"
-#include "DetectorsBase/Propagator.h"
+#include "DataFormatsParameters/GRPObject.h"
 #include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Field/MagneticField.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
-#include "PWGCF/GenericFramework/Core/GFWPowerArray.h"
+#include "TGeoGlobalMagField.h"
 #include "TProfile.h"
+#include <TH1F.h>
+#include <TH3F.h>
+#include <THashList.h>
+#include <TList.h>
+#include <TRandom3.h>
+#include <TString.h>
+
+#include <algorithm>
+#include <cmath>
+#include <iostream>
+#include <vector>
 
 using std::cout;
 using std::endl;
diff --git a/.conflict-side-1/PWGDQ/Tasks/dqEfficiency.cxx b/.conflict-side-1/PWGDQ/Tasks/dqEfficiency.cxx
index 29f7b79392b..6083aa610c8 100644
--- a/.conflict-side-1/PWGDQ/Tasks/dqEfficiency.cxx
+++ b/.conflict-side-1/PWGDQ/Tasks/dqEfficiency.cxx
@@ -13,30 +13,33 @@
 //
 // Analysis task for processing O2::DQ MC skimmed AODs
 //
-#include <iostream>
-#include <vector>
-#include <TMath.h>
-#include <TH1F.h>
-#include <THashList.h>
-#include <TString.h>
-#include <cstdio>
-#include <string>
-#include <memory>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "PWGDQ/Core/VarManager.h"
-#include "PWGDQ/Core/HistogramManager.h"
-#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/AnalysisCompositeCut.h"
-#include "PWGDQ/Core/HistogramsLibrary.h"
+#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/CutsLibrary.h"
+#include "PWGDQ/Core/HistogramManager.h"
+#include "PWGDQ/Core/HistogramsLibrary.h"
 #include "PWGDQ/Core/MCSignal.h"
 #include "PWGDQ/Core/MCSignalLibrary.h"
+#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsParameters/GRPMagField.h"
 #include "DetectorsBase/GeometryManager.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include <TH1F.h>
+#include <THashList.h>
+#include <TMath.h>
+#include <TString.h>
+
+#include <cstdio>
+#include <iostream>
+#include <memory>
+#include <string>
+#include <vector>
 
 using std::cout;
 using std::endl;
diff --git a/.conflict-side-1/PWGDQ/Tasks/dqEfficiency_withAssoc.cxx b/.conflict-side-1/PWGDQ/Tasks/dqEfficiency_withAssoc.cxx
index e2a58ff5bf2..3d7e1613f44 100644
--- a/.conflict-side-1/PWGDQ/Tasks/dqEfficiency_withAssoc.cxx
+++ b/.conflict-side-1/PWGDQ/Tasks/dqEfficiency_withAssoc.cxx
@@ -12,43 +12,47 @@
 // Contact: iarsene@cern.ch, i.c.arsene@fys.uio.no
 //   Configurable workflow for running several DQ or other PWG analyses
 
-#include <iostream>
-#include <vector>
-#include <algorithm>
-#include <map>
-#include <string>
-#include <memory>
-#include <utility>
-#include <TH1F.h>
-#include <TH3F.h>
-#include <THashList.h>
-#include <TList.h>
-#include <TString.h>
-#include <TObjString.h>
-#include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/AnalysisHelpers.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "PWGDQ/Core/VarManager.h"
-#include "PWGDQ/Core/HistogramManager.h"
-#include "PWGDQ/Core/MixingHandler.h"
-#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/AnalysisCompositeCut.h"
-#include "PWGDQ/Core/HistogramsLibrary.h"
+#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/CutsLibrary.h"
-#include "PWGDQ/Core/MixingLibrary.h"
+#include "PWGDQ/Core/HistogramManager.h"
+#include "PWGDQ/Core/HistogramsLibrary.h"
 #include "PWGDQ/Core/MCSignal.h"
 #include "PWGDQ/Core/MCSignalLibrary.h"
+#include "PWGDQ/Core/MixingHandler.h"
+#include "PWGDQ/Core/MixingLibrary.h"
+#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+
+#include "Common/Core/TableHelper.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
 #include "Field/MagneticField.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TGeoGlobalMagField.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "Common/Core/TableHelper.h"
+#include <TH1F.h>
+#include <TH3F.h>
+#include <THashList.h>
+#include <TList.h>
+#include <TObjString.h>
+#include <TString.h>
+
+#include <algorithm>
+#include <iostream>
+#include <map>
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
 
 using std::cout;
 using std::endl;
@@ -534,7 +538,7 @@ struct AnalysisTrackSelection {
         DefineHistograms(fHistMan, "TrackBarrel_AmbiguityInBunch;TrackBarrel_AmbiguityOutOfBunch;", "ambiguity");
       }
       dqhistograms::AddHistogramsFromJSON(fHistMan, fConfigAddJSONHistograms.value.c_str()); // ad-hoc histograms via JSON
-      VarManager::SetUseVars(fHistMan->GetUsedVars()); // provide the list of required variables so that VarManager knows what to fill
+      VarManager::SetUseVars(fHistMan->GetUsedVars());                                       // provide the list of required variables so that VarManager knows what to fill
       fOutputList.setObject(fHistMan->GetMainHistogramList());
     }
 
@@ -856,9 +860,9 @@ struct AnalysisMuonSelection {
         histClasses += "Muon_AmbiguityInBunch;Muon_AmbiguityOutOfBunch;";
       }
 
-      DefineHistograms(fHistMan, histClasses.Data(), fConfigAddMuonHistogram.value.data()); // define all histograms
+      DefineHistograms(fHistMan, histClasses.Data(), fConfigAddMuonHistogram.value.data());  // define all histograms
       dqhistograms::AddHistogramsFromJSON(fHistMan, fConfigAddJSONHistograms.value.c_str()); // ad-hoc histograms via JSON
-      VarManager::SetUseVars(fHistMan->GetUsedVars());                                      // provide the list of required variables so that VarManager knows what to fill
+      VarManager::SetUseVars(fHistMan->GetUsedVars());                                       // provide the list of required variables so that VarManager knows what to fill
       fOutputList.setObject(fHistMan->GetMainHistogramList());
     }
 
@@ -1638,9 +1642,9 @@ struct AnalysisSameEventPairing {
 
     VarManager::SetCollisionSystem((TString)fConfigOptions.collisionSystem, fConfigOptions.centerMassEnergy); // set collision system and center of mass energy
 
-    DefineHistograms(fHistMan, histNames.Data(), fConfigAddSEPHistogram.value.data()); // define all histograms
+    DefineHistograms(fHistMan, histNames.Data(), fConfigAddSEPHistogram.value.data());     // define all histograms
     dqhistograms::AddHistogramsFromJSON(fHistMan, fConfigAddJSONHistograms.value.c_str()); // ad-hoc histograms via JSON
-    VarManager::SetUseVars(fHistMan->GetUsedVars());                                   // provide the list of required variables so that VarManager knows what to fill
+    VarManager::SetUseVars(fHistMan->GetUsedVars());                                       // provide the list of required variables so that VarManager knows what to fill
     fOutputList.setObject(fHistMan->GetMainHistogramList());
   }
 
@@ -2642,7 +2646,7 @@ struct AnalysisAsymmetricPairing {
     VarManager::SetupMatLUTFwdDCAFitter(fLUT);
 
     dqhistograms::AddHistogramsFromJSON(fHistMan, fConfigAddJSONHistograms.value.c_str()); // ad-hoc histograms via JSON
-    VarManager::SetUseVars(fHistMan->GetUsedVars());                                      // provide the list of required variables so that VarManager knows what to fill
+    VarManager::SetUseVars(fHistMan->GetUsedVars());                                       // provide the list of required variables so that VarManager knows what to fill
     fOutputList.setObject(fHistMan->GetMainHistogramList());
   }
 
@@ -2802,7 +2806,7 @@ struct AnalysisAsymmetricPairing {
         for (int icut = 0; icut < fNLegCuts; icut++) {
           if (twoTrackFilter & (static_cast<uint32_t>(1) << icut)) {
             isAmbi = (twoTrackFilter & (static_cast<uint32_t>(1) << 30)) || (twoTrackFilter & (static_cast<uint32_t>(1) << 31));
-            if (sign1 * sign2 < 0) {                                                    // +- pairs
+            if (sign1 * sign2 < 0) {                                                                                // +- pairs
               fHistMan->FillHistClass(Form("PairsBarrelSEPM_%s", fLegCutNames[icut].Data()), VarManager::fgValues); // reconstructed, unmatched
               if (isAmbi && fConfigQA) {
                 fHistMan->FillHistClass(Form("PairsBarrelSEPM_ambiguous_%s", fLegCutNames[icut].Data()), VarManager::fgValues);
diff --git a/.conflict-side-1/PWGDQ/Tasks/dqFlow.cxx b/.conflict-side-1/PWGDQ/Tasks/dqFlow.cxx
index 52e3ca8c29c..c3c0820030d 100644
--- a/.conflict-side-1/PWGDQ/Tasks/dqFlow.cxx
+++ b/.conflict-side-1/PWGDQ/Tasks/dqFlow.cxx
@@ -16,38 +16,42 @@
 ///       o2-analysis-timestamp --aod-file AO2D.root -b | o2-analysis-event-selection -b | o2-analysis-multiplicity-table -b | o2-analysis-centrality-table -b | o2-analysis-fdd-converter -b | o2-analysis-trackselection -b | o2-analysis-trackextension -b | o2-analysis-pid-tpc-full -b | o2-analysis-pid-tof-full -b | o2-analysis-pid-tof-base -b | o2-analysis-pid-tof-beta -b | o2-analysis-dq-flow -b
 ///       tested (June 2, 2022) on AO2D.root files from train production 242
 
-#include <iostream>
-#include <vector>
-#include <string>
-#include <memory>
-#include <TH1F.h>
-#include <THashList.h>
-#include <TString.h>
-#include <TRandom3.h>
-#include "CCDB/BasicCCDBManager.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "PWGDQ/Core/VarManager.h"
-#include "PWGDQ/Core/HistogramManager.h"
-#include "PWGDQ/Core/MixingHandler.h"
-#include "PWGDQ/Core/AnalysisCut.h"
-#include "PWGDQ/Core/AnalysisCompositeCut.h"
-#include "PWGDQ/Core/HistogramsLibrary.h"
-#include "PWGDQ/Core/CutsLibrary.h"
-#include "PWGDQ/Core/MixingLibrary.h"
+#include "PWGCF/GenericFramework/Core/FlowContainer.h"
 #include "PWGCF/GenericFramework/Core/GFW.h"
+#include "PWGCF/GenericFramework/Core/GFWConfig.h"
 #include "PWGCF/GenericFramework/Core/GFWCumulant.h"
-#include "PWGCF/GenericFramework/Core/FlowContainer.h"
 #include "PWGCF/GenericFramework/Core/GFWWeights.h"
-#include "PWGCF/GenericFramework/Core/GFWConfig.h"
-#include "Common/DataModel/EventSelection.h"
+#include "PWGDQ/Core/AnalysisCompositeCut.h"
+#include "PWGDQ/Core/AnalysisCut.h"
+#include "PWGDQ/Core/CutsLibrary.h"
+#include "PWGDQ/Core/HistogramManager.h"
+#include "PWGDQ/Core/HistogramsLibrary.h"
+#include "PWGDQ/Core/MixingHandler.h"
+#include "PWGDQ/Core/MixingLibrary.h"
+#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Qvectors.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include <TH1F.h>
+#include <THashList.h>
+#include <TRandom3.h>
+#include <TString.h>
+
+#include <iostream>
+#include <memory>
+#include <string>
+#include <vector>
 
 using std::complex;
 using std::cout;
diff --git a/.conflict-side-1/PWGDQ/Tasks/filterPP.cxx b/.conflict-side-1/PWGDQ/Tasks/filterPP.cxx
index c9239f8366d..0f5fd7b1b74 100644
--- a/.conflict-side-1/PWGDQ/Tasks/filterPP.cxx
+++ b/.conflict-side-1/PWGDQ/Tasks/filterPP.cxx
@@ -11,35 +11,39 @@
 //
 // Contact: iarsene@cern.ch, i.c.arsene@fys.uio.no
 //
-#include <iostream>
-#include <vector>
-#include <map>
-#include <string>
-#include <memory>
-#include <cstring>
-#include <TH1.h>
-#include <THashList.h>
-#include <TString.h>
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/DataTypes.h"
-#include "Framework/runDataProcessing.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
+#include "PWGDQ/Core/AnalysisCompositeCut.h"
+#include "PWGDQ/Core/AnalysisCut.h"
+#include "PWGDQ/Core/CutsLibrary.h"
+#include "PWGDQ/Core/HistogramManager.h"
+#include "PWGDQ/Core/HistogramsLibrary.h"
+#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+
 #include "Common/CCDB/TriggerAliases.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 #include "EventFiltering/filterTables.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "PWGDQ/Core/VarManager.h"
-#include "PWGDQ/Core/HistogramManager.h"
-#include "PWGDQ/Core/AnalysisCut.h"
-#include "PWGDQ/Core/AnalysisCompositeCut.h"
-#include "PWGDQ/Core/HistogramsLibrary.h"
-#include "PWGDQ/Core/CutsLibrary.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/DataTypes.h"
+#include "Framework/runDataProcessing.h"
+
+#include <TH1.h>
+#include <THashList.h>
+#include <TString.h>
+
+#include <cstring>
+#include <iostream>
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
 
 using std::cout;
 using std::endl;
diff --git a/.conflict-side-1/PWGDQ/Tasks/filterPPwithAssociation.cxx b/.conflict-side-1/PWGDQ/Tasks/filterPPwithAssociation.cxx
index 532482e641b..be139e0344b 100644
--- a/.conflict-side-1/PWGDQ/Tasks/filterPPwithAssociation.cxx
+++ b/.conflict-side-1/PWGDQ/Tasks/filterPPwithAssociation.cxx
@@ -11,44 +11,48 @@
 //
 // Contact: iarsene@cern.ch, i.c.arsene@fys.uio.no
 //
-#include <iostream>
-#include <vector>
-#include <map>
-#include <string>
-#include <memory>
-#include <cstring>
-#include <TH1.h>
-#include <THashList.h>
-#include <TString.h>
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/DataTypes.h"
-#include "Framework/runDataProcessing.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
+#include "PWGDQ/Core/AnalysisCompositeCut.h"
+#include "PWGDQ/Core/AnalysisCut.h"
+#include "PWGDQ/Core/CutsLibrary.h"
+#include "PWGDQ/Core/HistogramManager.h"
+#include "PWGDQ/Core/HistogramsLibrary.h"
+#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+
 #include "Common/CCDB/TriggerAliases.h"
+#include "Common/Core/CollisionAssociation.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/CollisionAssociationTables.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 #include "EventFiltering/filterTables.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "PWGDQ/Core/VarManager.h"
-#include "PWGDQ/Core/HistogramManager.h"
-#include "PWGDQ/Core/AnalysisCut.h"
-#include "PWGDQ/Core/AnalysisCompositeCut.h"
-#include "PWGDQ/Core/HistogramsLibrary.h"
-#include "PWGDQ/Core/CutsLibrary.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/LHCConstants.h"
-#include "Common/Core/CollisionAssociation.h"
-#include "Common/DataModel/CollisionAssociationTables.h"
 #include "DataFormatsParameters/GRPMagField.h"
 #include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
 #include "Field/MagneticField.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/DataTypes.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TGeoGlobalMagField.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
+#include <TH1.h>
+#include <THashList.h>
+#include <TString.h>
+
+#include <cstring>
+#include <iostream>
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
 
 using std::cout;
 using std::endl;
@@ -83,9 +87,9 @@ DECLARE_SOA_COLUMN(IsDQBarrelSelected, isDQBarrelSelected, uint32_t);
 DECLARE_SOA_COLUMN(IsDQMuonSelected, isDQMuonSelected, uint32_t);
 DECLARE_SOA_COLUMN(IsDQEMuBarrelSelected, isDQEMuBarrelSelected, uint32_t); // for electron-muon pair
 DECLARE_SOA_COLUMN(IsDQEMuMuonSelected, isDQEMuMuonSelected, uint32_t);     // for electron-muon pair
-DECLARE_SOA_INDEX_COLUMN(Collision, collision); //! Collision index
-DECLARE_SOA_INDEX_COLUMN(Track, track);         //! Track index
-DECLARE_SOA_INDEX_COLUMN(FwdTrack, fwdtrack);   //! FwdTrack index
+DECLARE_SOA_INDEX_COLUMN(Collision, collision);                             //! Collision index
+DECLARE_SOA_INDEX_COLUMN(Track, track);                                     //! Track index
+DECLARE_SOA_INDEX_COLUMN(FwdTrack, fwdtrack);                               //! FwdTrack index
 } // namespace dqppfilter
 
 DECLARE_SOA_TABLE(DQEventCuts, "AOD", "DQEVENTCUTS", dqppfilter::IsDQEventSelected);
@@ -160,7 +164,7 @@ struct DQEventSelectionTask {
       fHistMan->SetDefaultVarNames(VarManager::fgVariableNames, VarManager::fgVariableUnits);
 
       DefineHistograms(fHistMan, "Event_BeforeCuts;Event_AfterCuts;", fConfigHistClasses.value); // define all histograms
-      VarManager::SetUseVars(fHistMan->GetUsedVars());                 // provide the list of required variables so that VarManager knows what to fill
+      VarManager::SetUseVars(fHistMan->GetUsedVars());                                           // provide the list of required variables so that VarManager knows what to fill
       fOutputList.setObject(fHistMan->GetMainHistogramList());
     }
   }
@@ -266,7 +270,7 @@ struct DQBarrelTrackSelection {
       }
 
       DefineHistograms(fHistMan, cutNames.Data(), fConfigHistClasses.value); // define all histograms
-      VarManager::SetUseVars(fHistMan->GetUsedVars()); // provide the list of required variables so that VarManager knows what to fill
+      VarManager::SetUseVars(fHistMan->GetUsedVars());                       // provide the list of required variables so that VarManager knows what to fill
       fOutputList.setObject(fHistMan->GetMainHistogramList());
 
       // CCDB configuration
@@ -441,7 +445,7 @@ struct DQMuonsSelection {
       }
 
       DefineHistograms(fHistMan, cutNames.Data(), fConfigHistClasses.value); // define all histograms
-      VarManager::SetUseVars(fHistMan->GetUsedVars()); // provide the list of required variables so that VarManager knows what to fill
+      VarManager::SetUseVars(fHistMan->GetUsedVars());                       // provide the list of required variables so that VarManager knows what to fill
       fOutputList.setObject(fHistMan->GetMainHistogramList());
     }
   }
@@ -539,21 +543,21 @@ struct DQFilterPPTask {
 
   int fCurrentRun; // needed to detect if the run changed and trigger update of calibrations etc.
 
-  int fNBarrelCuts;                                    // number of barrel selections
-  int fNMuonCuts;                                      // number of muon selections
-  int fNElectronMuonCuts;                              // number of electron-muon selections
-  std::vector<bool> fBarrelRunPairing;                 // bit map on whether the selections require pairing (barrel)
-  std::vector<bool> fMuonRunPairing;                   // bit map on whether the selections require pairing (muon)
-  std::vector<bool> fElectronMuonRunPairing;           // bit map on whether the selections require pairing (e-mu)
-  std::vector<int> fBarrelNreqObjs;                    // minimal number of tracks/pairs required (barrel)
-  std::vector<int> fMuonNreqObjs;                      // minimal number of tracks/pairs required (muon)
-  std::vector<int> fElectronMuonNreqObjs;              // minimal number of electron-muon pairs required
-  std::map<int, AnalysisCompositeCut> fBarrelPairCuts; // map of barrel pair cuts
-  std::map<int, AnalysisCompositeCut> fMuonPairCuts;   // map of muon pair cuts
+  int fNBarrelCuts;                                          // number of barrel selections
+  int fNMuonCuts;                                            // number of muon selections
+  int fNElectronMuonCuts;                                    // number of electron-muon selections
+  std::vector<bool> fBarrelRunPairing;                       // bit map on whether the selections require pairing (barrel)
+  std::vector<bool> fMuonRunPairing;                         // bit map on whether the selections require pairing (muon)
+  std::vector<bool> fElectronMuonRunPairing;                 // bit map on whether the selections require pairing (e-mu)
+  std::vector<int> fBarrelNreqObjs;                          // minimal number of tracks/pairs required (barrel)
+  std::vector<int> fMuonNreqObjs;                            // minimal number of tracks/pairs required (muon)
+  std::vector<int> fElectronMuonNreqObjs;                    // minimal number of electron-muon pairs required
+  std::map<int, AnalysisCompositeCut> fBarrelPairCuts;       // map of barrel pair cuts
+  std::map<int, AnalysisCompositeCut> fMuonPairCuts;         // map of muon pair cuts
   std::map<int, AnalysisCompositeCut> fElectronMuonPairCuts; // map of electron-muon pair cuts
-  std::map<int, TString> fBarrelPairHistNames;         // map with names of the barrel pairing histogram directories
-  std::map<int, TString> fMuonPairHistNames;           // map with names of the muon pairing histogram directories
-  std::map<int, TString> fElectronMuonPairHistNames;   // map with names of the electron-muon pairing histogram directories
+  std::map<int, TString> fBarrelPairHistNames;               // map with names of the barrel pairing histogram directories
+  std::map<int, TString> fMuonPairHistNames;                 // map with names of the muon pairing histogram directories
+  std::map<int, TString> fElectronMuonPairHistNames;         // map with names of the electron-muon pairing histogram directories
 
   std::map<uint64_t, uint64_t> fFiltersMap;           // map of filters for events that passed at least one filter
   std::map<uint64_t, std::vector<bool>> fCEFPfilters; // map of CEFP filters for events that passed at least one filter
@@ -771,7 +775,7 @@ struct DQFilterPPTask {
           if (objCountersBarrel[i] > 1) { // pairing has to be enabled and at least two tracks are needed
             pairingMask |= (static_cast<uint32_t>(1) << i);
           }
-          objCountersBarrel[i] = 0; // reset counters for selections where pairing is needed (count pairs instead)
+          objCountersBarrel[i] = 0;    // reset counters for selections where pairing is needed (count pairs instead)
           taggedCollisions[i].clear(); // empty the list of tagged collisions if pairing is needed (so we count just events with pairs or containing selected pair legs)
         }
       }
@@ -848,7 +852,7 @@ struct DQFilterPPTask {
           if (objCountersMuon[i] > 1) {
             pairingMask |= (static_cast<uint32_t>(1) << i);
           }
-          objCountersMuon[i] = 0; // reset counters for selections where pairing is needed (count pairs instead)
+          objCountersMuon[i] = 0;                     // reset counters for selections where pairing is needed (count pairs instead)
           taggedCollisions[i + fNBarrelCuts].clear(); // empty the list of tagged collisions if pairing is needed (so we count just events with pairs or containing selected pair legs)
         }
       }
diff --git a/.conflict-side-1/PWGDQ/Tasks/filterPbPb.cxx b/.conflict-side-1/PWGDQ/Tasks/filterPbPb.cxx
index 1544ea14f21..155f7a0610b 100644
--- a/.conflict-side-1/PWGDQ/Tasks/filterPbPb.cxx
+++ b/.conflict-side-1/PWGDQ/Tasks/filterPbPb.cxx
@@ -9,16 +9,19 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 //
-#include <Framework/AnalysisDataModel.h>
-#include <fairlogger/Logger.h>
-#include <cstdint>
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
 #include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+#include "PWGUD/Core/SGSelector.h"
+
 #include "CommonConstants/LHCConstants.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Vertex.h"
-#include "PWGUD/Core/SGSelector.h"
+#include <Framework/AnalysisDataModel.h>
+
+#include <fairlogger/Logger.h>
+
+#include <cstdint>
 
 using namespace std;
 
diff --git a/.conflict-side-1/PWGDQ/Tasks/mchAlignRecord.cxx b/.conflict-side-1/PWGDQ/Tasks/mchAlignRecord.cxx
index 2f612493b6e..bd34e08496b 100644
--- a/.conflict-side-1/PWGDQ/Tasks/mchAlignRecord.cxx
+++ b/.conflict-side-1/PWGDQ/Tasks/mchAlignRecord.cxx
@@ -14,63 +14,61 @@
 ///
 /// \author Chi ZHANG, CEA-Saclay, chi.zhang@cern.ch
 
-#include <gsl/span>
-#include <cmath>
-#include <string>
-#include <unordered_map>
-#include <vector>
-#include <iostream>
-#include <memory>
+#include "PWGDQ/Core/VarManager.h"
+
+#include "Common/DataModel/EventSelection.h"
 
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonConstants/LHCConstants.h"
+#include "CommonUtils/NameConf.h"
+#include "DataFormatsMCH/Cluster.h"
+#include "DataFormatsMCH/TrackMCH.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GRPGeomHelper.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "DetectorsCommonDataFormats/AlignParam.h"
+#include "DetectorsCommonDataFormats/DetID.h"
+#include "DetectorsCommonDataFormats/DetectorNameConf.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/CallbackService.h"
+#include "Framework/Logger.h"
 #include "Framework/runDataProcessing.h"
+#include "MCHAlign/Aligner.h"
+#include "MCHBase/TrackerParam.h"
+#include "MCHGeometryTransformer/Transformations.h"
+#include "MCHTracking/Track.h"
+#include "MCHTracking/TrackExtrap.h"
+#include "MCHTracking/TrackFitter.h"
+#include "MCHTracking/TrackParam.h"
+#include "ReconstructionDataFormats/TrackMCHMID.h"
 
 #include <TCanvas.h>
+#include <TChain.h>
 #include <TDatabasePDG.h>
 #include <TF1.h>
 #include <TFile.h>
+#include <TGraph.h>
+#include <TGraphErrors.h>
 #include <TH1F.h>
 #include <TH2F.h>
 #include <TLegend.h>
+#include <TLine.h>
 #include <TMatrixD.h>
 #include <TParameter.h>
 #include <TSystem.h>
 #include <TTree.h>
 #include <TTreeReader.h>
 #include <TTreeReaderValue.h>
-#include <TChain.h>
-#include <TGraph.h>
-#include <TGraphErrors.h>
-#include <TLine.h>
-#include <TSystem.h>
-
-#include "CommonConstants/LHCConstants.h"
-#include "CommonUtils/NameConf.h"
-#include "Common/DataModel/EventSelection.h"
-#include "PWGDQ/Core/VarManager.h"
 
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DetectorsBase/GRPGeomHelper.h"
-#include "DetectorsBase/Propagator.h"
-#include "Framework/Logger.h"
-#include "Framework/CallbackService.h"
-#include "CCDB/BasicCCDBManager.h"
-
-#include "MCHGeometryTransformer/Transformations.h"
-#include "DataFormatsMCH/Cluster.h"
-#include "DataFormatsMCH/TrackMCH.h"
-#include "MCHTracking/Track.h"
-#include "MCHTracking/TrackExtrap.h"
-#include "MCHTracking/TrackParam.h"
-#include "MCHTracking/TrackFitter.h"
-#include "MCHBase/TrackerParam.h"
-#include "ReconstructionDataFormats/TrackMCHMID.h"
-#include "MCHAlign/Aligner.h"
-#include "DetectorsCommonDataFormats/AlignParam.h"
-#include "DetectorsCommonDataFormats/DetID.h"
-#include "DetectorsCommonDataFormats/DetectorNameConf.h"
+#include <cmath>
+#include <gsl/span>
+#include <iostream>
+#include <memory>
+#include <string>
+#include <unordered_map>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGDQ/Tasks/muonDCA.cxx b/.conflict-side-1/PWGDQ/Tasks/muonDCA.cxx
index b2031418d5c..9581efe62b5 100644
--- a/.conflict-side-1/PWGDQ/Tasks/muonDCA.cxx
+++ b/.conflict-side-1/PWGDQ/Tasks/muonDCA.cxx
@@ -13,14 +13,15 @@
 /// \brief Task to compute and evaluate DCA quantities
 /// \author Nicolas Bizé <nicolas.bize@cern.ch>, SUBATECH
 //
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "GlobalTracking/MatchGlobalFwd.h"
+#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "PWGDQ/Core/VarManager.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "GlobalTracking/MatchGlobalFwd.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGDQ/Tasks/quarkoniaToHyperons.cxx b/.conflict-side-1/PWGDQ/Tasks/quarkoniaToHyperons.cxx
index 6133ee4e090..accdde13a9d 100644
--- a/.conflict-side-1/PWGDQ/Tasks/quarkoniaToHyperons.cxx
+++ b/.conflict-side-1/PWGDQ/Tasks/quarkoniaToHyperons.cxx
@@ -29,44 +29,45 @@
 //    david.dobrigkeit.chinellato@cern.ch
 //
 
-#include <Math/Vector4D.h>
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <map>
-#include <string>
-#include <vector>
-
-#include <TFile.h>
-#include <TH2F.h>
-#include <TProfile.h>
-#include <TLorentzVector.h>
-#include <TPDGCode.h>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "PWGLF/DataModel/LFStrangenessMLTables.h"
 #include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGUD/Core/SGSelector.h"
+
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/Core/SGSelector.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+#include "EventFiltering/Zorro.h"
+#include "EventFiltering/ZorroSummary.h"
 #include "Tools/ML/MlResponse.h"
 #include "Tools/ML/model.h"
 
-#include "EventFiltering/Zorro.h"
-#include "EventFiltering/ZorroSummary.h"
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <Math/Vector4D.h>
+#include <TFile.h>
+#include <TH2F.h>
+#include <TLorentzVector.h>
+#include <TPDGCode.h>
+#include <TProfile.h>
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <map>
+#include <string>
+#include <vector>
 
 // constants
 const float ctauXiPDG = 4.91;     // Xi PDG lifetime
diff --git a/.conflict-side-1/PWGDQ/Tasks/tableReader.cxx b/.conflict-side-1/PWGDQ/Tasks/tableReader.cxx
index 22a8d82e2d8..a51d54c48f8 100644
--- a/.conflict-side-1/PWGDQ/Tasks/tableReader.cxx
+++ b/.conflict-side-1/PWGDQ/Tasks/tableReader.cxx
@@ -11,39 +11,43 @@
 //
 // Contact: iarsene@cern.ch, i.c.arsene@fys.uio.no
 //
-#include <iostream>
-#include <vector>
-#include <algorithm>
-#include <map>
-#include <string>
-#include <memory>
-#include <TH1F.h>
-#include <TH3F.h>
-#include <THashList.h>
-#include <TList.h>
-#include <TString.h>
-#include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "PWGDQ/Core/VarManager.h"
-#include "PWGDQ/Core/HistogramManager.h"
-#include "PWGDQ/Core/MixingHandler.h"
-#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/AnalysisCompositeCut.h"
-#include "PWGDQ/Core/HistogramsLibrary.h"
+#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/CutsLibrary.h"
+#include "PWGDQ/Core/HistogramManager.h"
+#include "PWGDQ/Core/HistogramsLibrary.h"
+#include "PWGDQ/Core/MixingHandler.h"
 #include "PWGDQ/Core/MixingLibrary.h"
+#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+
+#include "Common/CCDB/EventSelectionParams.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include "Field/MagneticField.h"
-#include "TGeoGlobalMagField.h"
-#include "DetectorsBase/Propagator.h"
+#include "DataFormatsParameters/GRPObject.h"
 #include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Field/MagneticField.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 #include "ITSMFTBase/DPLAlpideParam.h"
-#include "Common/CCDB/EventSelectionParams.h"
+
+#include "TGeoGlobalMagField.h"
+#include <TH1F.h>
+#include <TH3F.h>
+#include <THashList.h>
+#include <TList.h>
+#include <TString.h>
+
+#include <algorithm>
+#include <iostream>
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
 
 using std::cout;
 using std::endl;
diff --git a/.conflict-side-1/PWGDQ/Tasks/tableReader_withAssoc.cxx b/.conflict-side-1/PWGDQ/Tasks/tableReader_withAssoc.cxx
index d6b29b461d2..b08729dabdb 100644
--- a/.conflict-side-1/PWGDQ/Tasks/tableReader_withAssoc.cxx
+++ b/.conflict-side-1/PWGDQ/Tasks/tableReader_withAssoc.cxx
@@ -12,51 +12,54 @@
 // Contact: iarsene@cern.ch, i.c.arsene@fys.uio.no
 //   Configurable workflow for running several DQ or other PWG analyses
 
+#include "PWGDQ/Core/AnalysisCompositeCut.h"
+#include "PWGDQ/Core/AnalysisCut.h"
+#include "PWGDQ/Core/CutsLibrary.h"
+#include "PWGDQ/Core/HistogramManager.h"
+#include "PWGDQ/Core/HistogramsLibrary.h"
+#include "PWGDQ/Core/MixingHandler.h"
+#include "PWGDQ/Core/MixingLibrary.h"
+#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+
+#include "Common/CCDB/EventSelectionParams.h"
+#include "Common/Core/TableHelper.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Field/MagneticField.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/Configurable.h"
+#include "Framework/OutputObjHeader.h"
+#include "Framework/runDataProcessing.h"
+#include "ITSMFTBase/DPLAlpideParam.h"
+
+#include "TGeoGlobalMagField.h"
+#include <TH1F.h>
+#include <TH3F.h>
+#include <THashList.h>
+#include <TList.h>
+#include <TObjString.h>
+#include <TString.h>
+
+#include <algorithm>
 #include <cstdint>
 #include <cstdio>
 #include <cstring>
 #include <iostream>
+#include <map>
+#include <memory>
 #include <numeric>
-#include <vector>
-#include <algorithm>
-#include <utility>
 #include <set>
-#include <map>
 #include <string>
-#include <memory>
 #include <utility>
-#include <TH1F.h>
-#include <TH3F.h>
-#include <THashList.h>
-#include <TList.h>
-#include <TString.h>
-#include <TObjString.h>
-#include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "Framework/AnalysisHelpers.h"
-#include "Framework/Configurable.h"
-#include "Framework/OutputObjHeader.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "PWGDQ/Core/VarManager.h"
-#include "PWGDQ/Core/HistogramManager.h"
-#include "PWGDQ/Core/MixingHandler.h"
-#include "PWGDQ/Core/AnalysisCut.h"
-#include "PWGDQ/Core/AnalysisCompositeCut.h"
-#include "PWGDQ/Core/HistogramsLibrary.h"
-#include "PWGDQ/Core/CutsLibrary.h"
-#include "PWGDQ/Core/MixingLibrary.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "Field/MagneticField.h"
-#include "TGeoGlobalMagField.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "Common/Core/TableHelper.h"
-#include "ITSMFTBase/DPLAlpideParam.h"
-#include "Common/CCDB/EventSelectionParams.h"
+#include <vector>
 
 using std::cout;
 using std::endl;
diff --git a/.conflict-side-1/PWGDQ/Tasks/taskFwdTrackPid.cxx b/.conflict-side-1/PWGDQ/Tasks/taskFwdTrackPid.cxx
index cbe6e233630..52c2c3b908a 100644
--- a/.conflict-side-1/PWGDQ/Tasks/taskFwdTrackPid.cxx
+++ b/.conflict-side-1/PWGDQ/Tasks/taskFwdTrackPid.cxx
@@ -13,38 +13,42 @@
 /// \brief Task for the analysis of forward PID with MFT
 /// \author Luca Micheletti <luca.micheletti@to.infn.it>, INFN
 
-#include <iostream>
-#include <vector>
-#include <algorithm>
-#include <TH1F.h>
-#include <TH3F.h>
-#include <THashList.h>
-#include <TList.h>
-#include <TString.h>
-#include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/Core/AnalysisCompositeCut.h"
+#include "PWGDQ/Core/AnalysisCut.h"
+#include "PWGDQ/Core/CutsLibrary.h"
 #include "PWGDQ/Core/HistogramManager.h"
-#include "PWGDQ/Core/MixingHandler.h"
+#include "PWGDQ/Core/HistogramsLibrary.h"
 #include "PWGDQ/Core/MCSignal.h"
 #include "PWGDQ/Core/MCSignalLibrary.h"
-#include "PWGDQ/Core/AnalysisCut.h"
-#include "PWGDQ/Core/AnalysisCompositeCut.h"
-#include "PWGDQ/Core/HistogramsLibrary.h"
-#include "PWGDQ/Core/CutsLibrary.h"
+#include "PWGDQ/Core/MixingHandler.h"
 #include "PWGDQ/Core/MixingLibrary.h"
+#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+
+#include "Common/CCDB/EventSelectionParams.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include "Field/MagneticField.h"
-#include "TGeoGlobalMagField.h"
-#include "DetectorsBase/Propagator.h"
+#include "DataFormatsParameters/GRPObject.h"
 #include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Field/MagneticField.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 #include "ITSMFTBase/DPLAlpideParam.h"
-#include "Common/CCDB/EventSelectionParams.h"
+
+#include "TGeoGlobalMagField.h"
+#include <TH1F.h>
+#include <TH3F.h>
+#include <THashList.h>
+#include <TList.h>
+#include <TString.h>
+
+#include <algorithm>
+#include <iostream>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGDQ/Tasks/taskJpsiHf.cxx b/.conflict-side-1/PWGDQ/Tasks/taskJpsiHf.cxx
index 79d9348940a..d9cd1133472 100644
--- a/.conflict-side-1/PWGDQ/Tasks/taskJpsiHf.cxx
+++ b/.conflict-side-1/PWGDQ/Tasks/taskJpsiHf.cxx
@@ -14,20 +14,20 @@
 /// \author Luca Micheletti <luca.micheletti@to.infn.it>, INFN
 /// \author Fabrizio Grosa <fabrizio.grosa@cern.ch>, CERN
 
-#include <string>
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
+#include "PWGHF/Utils/utilsAnalysis.h"
+
+#include "Common/Core/RecoDecay.h"
 
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
 
-#include "Common/Core/RecoDecay.h"
-
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
-#include "PWGHF/Utils/utilsAnalysis.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
+#include <string>
 
 using namespace o2;
 using namespace o2::analysis;
diff --git a/.conflict-side-1/PWGDQ/Tasks/taskMuonMchTrkEfficiency.cxx b/.conflict-side-1/PWGDQ/Tasks/taskMuonMchTrkEfficiency.cxx
index 4914658ae81..7ff72350bd7 100644
--- a/.conflict-side-1/PWGDQ/Tasks/taskMuonMchTrkEfficiency.cxx
+++ b/.conflict-side-1/PWGDQ/Tasks/taskMuonMchTrkEfficiency.cxx
@@ -19,12 +19,12 @@
 /// \author Zaida Conesa del Valle <zaida.conesa.del.valle@cern.ch>
 ///
 
+#include "PWGDQ/DataModel/MchTrkEffTables.h"
+
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
 
-#include "PWGDQ/DataModel/MchTrkEffTables.h"
-
 using namespace o2;
 using namespace o2::aod;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGDQ/Tasks/v0selector.cxx b/.conflict-side-1/PWGDQ/Tasks/v0selector.cxx
index 0c970d80c91..378c2332b15 100644
--- a/.conflict-side-1/PWGDQ/Tasks/v0selector.cxx
+++ b/.conflict-side-1/PWGDQ/Tasks/v0selector.cxx
@@ -17,35 +17,39 @@
 //    Comments, questions, complaints, suggestions?
 //    Please write to: daiki.sekihata@cern.ch
 //
-#include <array>
-#include <map>
-#include <string>
-#include <memory>
-#include <vector>
-#include "Math/Vector4D.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/trackUtilities.h"
+#include "PWGDQ/Core/HistogramManager.h"
+#include "PWGDQ/Core/HistogramsLibrary.h"
+#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/RecoDecay.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "DCAFitter/DCAFitterN.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "PWGDQ/Core/VarManager.h"
-#include "PWGDQ/Core/HistogramManager.h"
-#include "PWGDQ/Core/HistogramsLibrary.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include "Math/Vector4D.h"
+
+#include <array>
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
@@ -574,7 +578,7 @@ struct trackPIDQA {
       }
 
     } // end of track loop
-  }   // end of process
+  } // end of process
 
   void DefineHistograms(TString histClasses)
   {
diff --git a/.conflict-side-1/PWGEM/Dilepton/TableProducer/eventSelection.cxx b/.conflict-side-1/PWGEM/Dilepton/TableProducer/eventSelection.cxx
index 65eb1a93d53..d5420a13225 100644
--- a/.conflict-side-1/PWGEM/Dilepton/TableProducer/eventSelection.cxx
+++ b/.conflict-side-1/PWGEM/Dilepton/TableProducer/eventSelection.cxx
@@ -14,14 +14,17 @@
 // This code produces event selection table for PWG-EM.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include <string>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/CCDB/RCTSelectionFlags.h"
 #include "PWGEM/Dilepton/DataModel/dileptonTables.h"
 
+#include "Common/CCDB/RCTSelectionFlags.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include <string>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-1/PWGEM/Dilepton/Tasks/Converters/electronConverter2.cxx b/.conflict-side-1/PWGEM/Dilepton/Tasks/Converters/electronConverter2.cxx
index 785272dcf3a..cde46f9cf7d 100644
--- a/.conflict-side-1/PWGEM/Dilepton/Tasks/Converters/electronConverter2.cxx
+++ b/.conflict-side-1/PWGEM/Dilepton/Tasks/Converters/electronConverter2.cxx
@@ -14,11 +14,12 @@
 // This code runs loop over ULS ee pars for virtual photon QC.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
 #include "PWGEM/Dilepton/DataModel/dileptonTables.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::aod;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGEM/Dilepton/Tasks/Converters/eventConverter2.cxx b/.conflict-side-1/PWGEM/Dilepton/Tasks/Converters/eventConverter2.cxx
index 568cb741d08..944f92e699f 100644
--- a/.conflict-side-1/PWGEM/Dilepton/Tasks/Converters/eventConverter2.cxx
+++ b/.conflict-side-1/PWGEM/Dilepton/Tasks/Converters/eventConverter2.cxx
@@ -14,11 +14,12 @@
 // This code runs loop over ULS ee pars for virtual photon QC.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
 #include "PWGEM/Dilepton/DataModel/dileptonTables.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::aod;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGEM/Dilepton/Tasks/MCtemplates.cxx b/.conflict-side-1/PWGEM/Dilepton/Tasks/MCtemplates.cxx
index 3288bd2745e..c7bf193aa61 100644
--- a/.conflict-side-1/PWGEM/Dilepton/Tasks/MCtemplates.cxx
+++ b/.conflict-side-1/PWGEM/Dilepton/Tasks/MCtemplates.cxx
@@ -13,27 +13,31 @@
 //
 // Analysis task to generate Monte Carlo templates of different heavy-flavour dielectron sources
 //
-#include <iostream>
-#include <vector>
-#include <TMath.h>
-#include <TH1F.h>
-#include <THashList.h>
-#include <TString.h>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "PWGDQ/Core/VarManager.h"
-#include "PWGDQ/Core/HistogramManager.h"
-#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/AnalysisCompositeCut.h"
-#include "PWGDQ/Core/HistogramsLibrary.h"
+#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/CutsLibrary.h"
+#include "PWGDQ/Core/HistogramManager.h"
+#include "PWGDQ/Core/HistogramsLibrary.h"
 #include "PWGDQ/Core/MCSignal.h"
 #include "PWGDQ/Core/MCSignalLibrary.h"
+#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+
 #include "Common/DataModel/TrackSelectionTables.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include <TH1F.h>
+#include <THashList.h>
+#include <TMath.h>
+#include <TString.h>
+
+#include <iostream>
+#include <vector>
+
 using std::cout;
 using std::endl;
 using std::string;
@@ -480,8 +484,8 @@ struct AnalysisSameEventPairing {
           }
           fBarrelHistNamesMCmatched.emplace_back(mcSigClasses);
         } // end loop over cuts
-      }   // end if(cutNames.IsNull())
-    }     // end if processBarrel
+      } // end if(cutNames.IsNull())
+    } // end if processBarrel
 
     // Add histogram classes for each specified MCsignal at the generator level
     // TODO: create a std::vector of hist classes to be used at Fill time, to avoid using Form in the process function
@@ -577,7 +581,7 @@ struct AnalysisSameEventPairing {
         }
       }
     } // end loop over barrel track pairs
-  }   // end runPairing
+  } // end runPairing
 
   template <typename TTracksMC>
   void runMCGenPair(TTracksMC const& groupedMCTracks)
@@ -609,7 +613,7 @@ struct AnalysisSameEventPairing {
         }
       }
     } // end of true pairing loop
-  }   // end runMCGen
+  } // end runMCGen
 
   // skimmed
   PresliceUnsorted<ReducedMCTracks> perReducedMcEvent = aod::reducedtrackMC::reducedMCeventId;
diff --git a/.conflict-side-1/PWGEM/Dilepton/Tasks/PhotonHBTEEEE.cxx b/.conflict-side-1/PWGEM/Dilepton/Tasks/PhotonHBTEEEE.cxx
index b26a40af6fc..59002430983 100644
--- a/.conflict-side-1/PWGEM/Dilepton/Tasks/PhotonHBTEEEE.cxx
+++ b/.conflict-side-1/PWGEM/Dilepton/Tasks/PhotonHBTEEEE.cxx
@@ -14,25 +14,25 @@
 // This code loops over v0 photons and makes pairs for photon HBT analysis.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include <cstring>
-#include <iterator>
+#include "PWGEM/Dilepton/Core/PhotonHBT.h"
 
-#include "TString.h"
-#include "Math/Vector4D.h"
-#include "Math/Vector3D.h"
-#include "Math/LorentzRotation.h"
-#include "Math/GenVector/Boost.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
+#include "Math/GenVector/Boost.h"
+#include "Math/LorentzRotation.h"
+#include "Math/Vector3D.h"
+#include "Math/Vector4D.h"
+#include "TString.h"
 
-#include "PWGEM/Dilepton/Core/PhotonHBT.h"
+#include <cstring>
+#include <iterator>
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-side-1/PWGEM/Dilepton/Tasks/PhotonHBTPCMEE.cxx b/.conflict-side-1/PWGEM/Dilepton/Tasks/PhotonHBTPCMEE.cxx
index 3e792f9d27a..bd8392fd75a 100644
--- a/.conflict-side-1/PWGEM/Dilepton/Tasks/PhotonHBTPCMEE.cxx
+++ b/.conflict-side-1/PWGEM/Dilepton/Tasks/PhotonHBTPCMEE.cxx
@@ -14,25 +14,25 @@
 // This code loops over v0 photons and makes pairs for photon HBT analysis.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include <cstring>
-#include <iterator>
+#include "PWGEM/Dilepton/Core/PhotonHBT.h"
 
-#include "TString.h"
-#include "Math/Vector4D.h"
-#include "Math/Vector3D.h"
-#include "Math/LorentzRotation.h"
-#include "Math/GenVector/Boost.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
+#include "Math/GenVector/Boost.h"
+#include "Math/LorentzRotation.h"
+#include "Math/Vector3D.h"
+#include "Math/Vector4D.h"
+#include "TString.h"
 
-#include "PWGEM/Dilepton/Core/PhotonHBT.h"
+#include <cstring>
+#include <iterator>
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-side-1/PWGEM/Dilepton/Tasks/PhotonHBTPCMPCM.cxx b/.conflict-side-1/PWGEM/Dilepton/Tasks/PhotonHBTPCMPCM.cxx
index ddcbe423eae..7c3abcd362d 100644
--- a/.conflict-side-1/PWGEM/Dilepton/Tasks/PhotonHBTPCMPCM.cxx
+++ b/.conflict-side-1/PWGEM/Dilepton/Tasks/PhotonHBTPCMPCM.cxx
@@ -14,25 +14,25 @@
 // This code loops over v0 photons and makes pairs for photon HBT analysis.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include <cstring>
-#include <iterator>
+#include "PWGEM/Dilepton/Core/PhotonHBT.h"
 
-#include "TString.h"
-#include "Math/Vector4D.h"
-#include "Math/Vector3D.h"
-#include "Math/LorentzRotation.h"
-#include "Math/GenVector/Boost.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
+#include "Math/GenVector/Boost.h"
+#include "Math/LorentzRotation.h"
+#include "Math/Vector3D.h"
+#include "Math/Vector4D.h"
+#include "TString.h"
 
-#include "PWGEM/Dilepton/Core/PhotonHBT.h"
+#include <cstring>
+#include <iterator>
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-side-1/PWGEM/Dilepton/Tasks/associateMCcollision.cxx b/.conflict-side-1/PWGEM/Dilepton/Tasks/associateMCcollision.cxx
index eb0e7d3bf5c..7f3c860e526 100644
--- a/.conflict-side-1/PWGEM/Dilepton/Tasks/associateMCcollision.cxx
+++ b/.conflict-side-1/PWGEM/Dilepton/Tasks/associateMCcollision.cxx
@@ -14,11 +14,12 @@
 // This code produces a table with an index between mc collision and rec. collision.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
 #include "PWGEM/Dilepton/DataModel/dileptonTables.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::aod;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGEM/Dilepton/Tasks/bcCounter.cxx b/.conflict-side-1/PWGEM/Dilepton/Tasks/bcCounter.cxx
index 1b16c88e89b..da462851aef 100644
--- a/.conflict-side-1/PWGEM/Dilepton/Tasks/bcCounter.cxx
+++ b/.conflict-side-1/PWGEM/Dilepton/Tasks/bcCounter.cxx
@@ -14,29 +14,32 @@
 // This code is for bc counter.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include <string>
-#include <vector>
-#include <algorithm>
-#include <type_traits>
-#include <optional>
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "TString.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
 #include "Common/Core/RecoDecay.h"
-#include "MathUtils/Utils.h"
-#include "Framework/AnalysisDataModel.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Qvectors.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/PIDResponseITS.h"
+#include "Common/DataModel/Qvectors.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "MathUtils/Utils.h"
+
+#include "TString.h"
+
+#include <algorithm>
+#include <optional>
+#include <string>
+#include <type_traits>
+#include <vector>
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-side-1/PWGEM/Dilepton/Tasks/dielectron.cxx b/.conflict-side-1/PWGEM/Dilepton/Tasks/dielectron.cxx
index c8fa31b0e3b..494d50b49b1 100644
--- a/.conflict-side-1/PWGEM/Dilepton/Tasks/dielectron.cxx
+++ b/.conflict-side-1/PWGEM/Dilepton/Tasks/dielectron.cxx
@@ -14,12 +14,12 @@
 // This code is for dielectron analyses.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-
 #include "PWGEM/Dilepton/Core/Dilepton.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
   return WorkflowSpec{
diff --git a/.conflict-side-1/PWGEM/Dilepton/Tasks/dielectronMC.cxx b/.conflict-side-1/PWGEM/Dilepton/Tasks/dielectronMC.cxx
index 3c525c29c6e..ff8e2f1bdca 100644
--- a/.conflict-side-1/PWGEM/Dilepton/Tasks/dielectronMC.cxx
+++ b/.conflict-side-1/PWGEM/Dilepton/Tasks/dielectronMC.cxx
@@ -14,12 +14,12 @@
 // This code runs loop over dalitz ee table for dalitz QC.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-
 #include "PWGEM/Dilepton/Core/DileptonMC.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
   return WorkflowSpec{
diff --git a/.conflict-side-1/PWGEM/Dilepton/Tasks/dimuon.cxx b/.conflict-side-1/PWGEM/Dilepton/Tasks/dimuon.cxx
index 51b92ab81b7..8cfa155b422 100644
--- a/.conflict-side-1/PWGEM/Dilepton/Tasks/dimuon.cxx
+++ b/.conflict-side-1/PWGEM/Dilepton/Tasks/dimuon.cxx
@@ -14,12 +14,12 @@
 // This code is for dimuon analyses.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-
 #include "PWGEM/Dilepton/Core/Dilepton.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
   return WorkflowSpec{
diff --git a/.conflict-side-1/PWGEM/Dilepton/Tasks/dimuonMC.cxx b/.conflict-side-1/PWGEM/Dilepton/Tasks/dimuonMC.cxx
index f505c073dc3..9c203ff4461 100644
--- a/.conflict-side-1/PWGEM/Dilepton/Tasks/dimuonMC.cxx
+++ b/.conflict-side-1/PWGEM/Dilepton/Tasks/dimuonMC.cxx
@@ -14,12 +14,12 @@
 // This code runs loop over dalitz ee table for dalitz QC.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-
 #include "PWGEM/Dilepton/Core/DileptonMC.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
   return WorkflowSpec{
diff --git a/.conflict-side-1/PWGEM/Dilepton/Tasks/emEfficiencyEE.cxx b/.conflict-side-1/PWGEM/Dilepton/Tasks/emEfficiencyEE.cxx
index 7cc41a190d2..a29cfc62359 100644
--- a/.conflict-side-1/PWGEM/Dilepton/Tasks/emEfficiencyEE.cxx
+++ b/.conflict-side-1/PWGEM/Dilepton/Tasks/emEfficiencyEE.cxx
@@ -12,41 +12,45 @@
 //
 // Analysis task for calculating single electron and dielectron efficiency
 //
-#include <iostream>
-#include <vector>
-#include <TMath.h>
-#include <TH1F.h>
-#include <THashList.h>
-#include <TLorentzVector.h>
-#include <TString.h>
-#include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/ASoA.h"
-#include "Framework/DataTypes.h"
-#include "Framework/HistogramRegistry.h"
-#include "PWGDQ/Core/VarManager.h"
-#include "PWGDQ/Core/HistogramManager.h"
-#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/AnalysisCompositeCut.h"
-#include "PWGDQ/Core/HistogramsLibrary.h"
+#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/CutsLibrary.h"
+#include "PWGDQ/Core/HistogramManager.h"
+#include "PWGDQ/Core/HistogramsLibrary.h"
 #include "PWGDQ/Core/MCSignal.h"
 #include "PWGDQ/Core/MCSignalLibrary.h"
+#include "PWGDQ/Core/VarManager.h"
 #include "PWGDQ/DataModel/ReducedInfoTables.h"
+#include "PWGEM/Dilepton/DataModel/dileptonTables.h"
+
+#include "Common/CCDB/TriggerAliases.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/CCDB/TriggerAliases.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
 #include "Field/MagneticField.h"
+#include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/DataTypes.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TGeoGlobalMagField.h"
-#include "PWGEM/Dilepton/DataModel/dileptonTables.h"
+#include <TH1F.h>
+#include <THashList.h>
+#include <TLorentzVector.h>
+#include <TMath.h>
+#include <TString.h>
+
+#include <iostream>
+#include <vector>
 
 using std::cout;
 using std::endl;
@@ -1027,8 +1031,8 @@ struct AnalysisTrackSelection {
               fHistManQA->FillHistClass(fHistNamesMCMatchedQA[j][i].Data(), VarManager::fgValues);
           }
         } // end loop over cuts
-      }   // end loop over MC signals
-    }     // end loop over reconstructed track belonging to the events
+      } // end loop over MC signals
+    } // end loop over reconstructed track belonging to the events
   }
 
   template <uint32_t TEventFillMap, uint32_t TTrackFillMap, typename TEvents, typename TEventsMC, typename TTracks, typename TTracksMC, typename TAmbigTracks>
@@ -1275,8 +1279,8 @@ struct AnalysisTrackSelection {
               fHistManQA->FillHistClass(fHistNamesMCMatchedQA[j][i].Data(), VarManager::fgValues);
           }
         } // end loop over cuts
-      }   // end loop over MC signals
-    }     // end loop over reconstructed track belonging to the events
+      } // end loop over MC signals
+    } // end loop over reconstructed track belonging to the events
   }
 
   void processSkimmed(soa::Filtered<MyEventsSelected> const& events, MyBarrelTracks const& tracks, ReducedMCEvents const& eventsMC, ReducedMCTracks const& tracksMC)
@@ -1601,7 +1605,7 @@ struct AnalysisSameEventPairing {
         runRecPair<TTrackFillMap>(groupedTracks, tracksMC);
       }
     } // end loop over reconstructed event
-  }   // end loop pairing function
+  } // end loop pairing function
 
   template <uint32_t TEventMCFillMap, uint32_t TTrackFillMap, typename TEventMC, typename TTracksMC>
   void runMCPairing(TEventMC const& /*eventMC*/, TTracksMC const& tracksMC)
@@ -1716,7 +1720,7 @@ struct AnalysisSameEventPairing {
         }
       }
     } // end of true pairing loop
-  }   // end runMCGen
+  } // end runMCGen
 
   template <uint32_t TTrackFillMap, typename TTracks, typename TTracksMC>
   void runRecPair(TTracks const& tracks, TTracksMC const& /*tracksMC*/)
diff --git a/.conflict-side-1/PWGEM/Dilepton/Tasks/lmeeHFCocktail.cxx b/.conflict-side-1/PWGEM/Dilepton/Tasks/lmeeHFCocktail.cxx
index d3bb410813f..776e51cffa5 100644
--- a/.conflict-side-1/PWGEM/Dilepton/Tasks/lmeeHFCocktail.cxx
+++ b/.conflict-side-1/PWGEM/Dilepton/Tasks/lmeeHFCocktail.cxx
@@ -15,16 +15,18 @@
 /// \author Daniel Samitz, <daniel.samitz@cern.ch>, SMI Vienna
 ///         Elisa Meninno, <elisa.meninno@cern.ch>, SMI Vienna
 
-#include <vector>
+#include "PWGEM/Dilepton/DataModel/dileptonTables.h"
+#include "PWGEM/Dilepton/Utils/MCUtilities.h"
 
-#include "Math/Vector4D.h"
-#include "MathUtils/Utils.h"
-#include "Framework/Task.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "PWGEM/Dilepton/Utils/MCUtilities.h"
-#include "PWGEM/Dilepton/DataModel/dileptonTables.h"
+#include "Framework/Task.h"
+#include "Framework/runDataProcessing.h"
+#include "MathUtils/Utils.h"
+
+#include "Math/Vector4D.h"
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGEM/Dilepton/Tasks/lmeeLFCocktail.cxx b/.conflict-side-1/PWGEM/Dilepton/Tasks/lmeeLFCocktail.cxx
index 1cac2727e98..a4120a48b03 100644
--- a/.conflict-side-1/PWGEM/Dilepton/Tasks/lmeeLFCocktail.cxx
+++ b/.conflict-side-1/PWGEM/Dilepton/Tasks/lmeeLFCocktail.cxx
@@ -14,16 +14,18 @@
 /// \analysis task for lmee light flavour cocktail
 /// \author Daniel Samitz, <daniel.samitz@cern.ch>, SMI Vienna
 
-#include <map>
-#include <vector>
-#include <string>
+#include "PWGEM/Dilepton/DataModel/dileptonTables.h"
+#include "PWGEM/Dilepton/Utils/PairUtilities.h"
 
-#include "Math/Vector4D.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "PWGEM/Dilepton/DataModel/dileptonTables.h"
-#include "PWGEM/Dilepton/Utils/PairUtilities.h"
+#include "Framework/runDataProcessing.h"
+
+#include "Math/Vector4D.h"
+
+#include <map>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGEM/Dilepton/Tasks/prefilterDielectron.cxx b/.conflict-side-1/PWGEM/Dilepton/Tasks/prefilterDielectron.cxx
index 75a92e03c9a..a407547ddbd 100644
--- a/.conflict-side-1/PWGEM/Dilepton/Tasks/prefilterDielectron.cxx
+++ b/.conflict-side-1/PWGEM/Dilepton/Tasks/prefilterDielectron.cxx
@@ -14,32 +14,33 @@
 // This code produces information on prefilter for dielectron.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include <string>
-#include <vector>
-#include <unordered_map>
-#include <map>
-#include <tuple>
+#include "PWGEM/Dilepton/Core/DielectronCut.h"
+#include "PWGEM/Dilepton/Core/EMEventCut.h"
+#include "PWGEM/Dilepton/DataModel/dileptonTables.h"
+#include "PWGEM/Dilepton/Utils/EMTrack.h"
+#include "PWGEM/Dilepton/Utils/EventHistograms.h"
+#include "PWGEM/Dilepton/Utils/PairUtilities.h"
 
-#include "TString.h"
-#include "Math/Vector4D.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
 #include "Common/Core/RecoDecay.h"
 #include "Common/Core/trackUtilities.h"
 
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
 #include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
-#include "PWGEM/Dilepton/DataModel/dileptonTables.h"
-#include "PWGEM/Dilepton/Core/DielectronCut.h"
-#include "PWGEM/Dilepton/Core/EMEventCut.h"
-#include "PWGEM/Dilepton/Utils/EMTrack.h"
-#include "PWGEM/Dilepton/Utils/EventHistograms.h"
-#include "PWGEM/Dilepton/Utils/PairUtilities.h"
+#include "Math/Vector4D.h"
+#include "TString.h"
+
+#include <map>
+#include <string>
+#include <tuple>
+#include <unordered_map>
+#include <vector>
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-side-1/PWGEM/Dilepton/Tasks/singleElectronQC.cxx b/.conflict-side-1/PWGEM/Dilepton/Tasks/singleElectronQC.cxx
index 4a687e82217..21d45ac9a8c 100644
--- a/.conflict-side-1/PWGEM/Dilepton/Tasks/singleElectronQC.cxx
+++ b/.conflict-side-1/PWGEM/Dilepton/Tasks/singleElectronQC.cxx
@@ -14,12 +14,12 @@
 // Analysis task for single electron QC
 //    Please write to: daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-
 #include "PWGEM/Dilepton/Core/SingleTrackQC.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
   return WorkflowSpec{
diff --git a/.conflict-side-1/PWGEM/Dilepton/Tasks/singleElectronQCMC.cxx b/.conflict-side-1/PWGEM/Dilepton/Tasks/singleElectronQCMC.cxx
index da2617158ec..3c9d030d50c 100644
--- a/.conflict-side-1/PWGEM/Dilepton/Tasks/singleElectronQCMC.cxx
+++ b/.conflict-side-1/PWGEM/Dilepton/Tasks/singleElectronQCMC.cxx
@@ -14,12 +14,12 @@
 // Analysis task for single electron QC in MC
 //    Please write to: daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-
 #include "PWGEM/Dilepton/Core/SingleTrackQCMC.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
   return WorkflowSpec{
diff --git a/.conflict-side-1/PWGEM/Dilepton/Tasks/singleMuonQC.cxx b/.conflict-side-1/PWGEM/Dilepton/Tasks/singleMuonQC.cxx
index b9ccb722ea3..a42d68f3d18 100644
--- a/.conflict-side-1/PWGEM/Dilepton/Tasks/singleMuonQC.cxx
+++ b/.conflict-side-1/PWGEM/Dilepton/Tasks/singleMuonQC.cxx
@@ -14,12 +14,12 @@
 // Analysis task for single muon QC
 //    Please write to: daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-
 #include "PWGEM/Dilepton/Core/SingleTrackQC.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
   return WorkflowSpec{
diff --git a/.conflict-side-1/PWGEM/Dilepton/Tasks/singleMuonQCMC.cxx b/.conflict-side-1/PWGEM/Dilepton/Tasks/singleMuonQCMC.cxx
index 7b7176238c1..51d70c187c2 100644
--- a/.conflict-side-1/PWGEM/Dilepton/Tasks/singleMuonQCMC.cxx
+++ b/.conflict-side-1/PWGEM/Dilepton/Tasks/singleMuonQCMC.cxx
@@ -14,12 +14,12 @@
 // Analysis task for single muon QC in MC
 //    Please write to: daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-
 #include "PWGEM/Dilepton/Core/SingleTrackQCMC.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
   return WorkflowSpec{
diff --git a/.conflict-side-1/PWGEM/Dilepton/Tasks/smearing.cxx b/.conflict-side-1/PWGEM/Dilepton/Tasks/smearing.cxx
index 7d2404645ca..59dbf6cc885 100644
--- a/.conflict-side-1/PWGEM/Dilepton/Tasks/smearing.cxx
+++ b/.conflict-side-1/PWGEM/Dilepton/Tasks/smearing.cxx
@@ -13,21 +13,21 @@
 // Analysis task to produce smeared pt, eta, phi for electrons/muons in dilepton analysis
 //    Please write to: daiki.sekihata@cern.ch
 
-#include <array>
-#include <string>
-#include <chrono>
-
 #include "CCDB/BasicCCDBManager.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/DataTypes.h"
 #include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+
+#include <array>
+#include <chrono>
+#include <string>
 // #include "PWGDQ/DataModel/ReducedInfoTables.h" // remove this later, because 2 data tables (covariant matrix) in this header confilict against EM tables.
-#include "PWGEM/Dilepton/Utils/MomentumSmearer.h"
 #include "PWGEM/Dilepton/DataModel/dileptonTables.h"
+#include "PWGEM/Dilepton/Utils/MomentumSmearer.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGEM/Dilepton/Tasks/studyMCTruth.cxx b/.conflict-side-1/PWGEM/Dilepton/Tasks/studyMCTruth.cxx
index 4204a95a9c4..17561e1c023 100644
--- a/.conflict-side-1/PWGEM/Dilepton/Tasks/studyMCTruth.cxx
+++ b/.conflict-side-1/PWGEM/Dilepton/Tasks/studyMCTruth.cxx
@@ -14,19 +14,22 @@
 // This code is to study MC truth. e.g. evet selection bias
 //    Please write to: daiki.sekihata@cern.ch
 
-#include <string>
-#include "Math/Vector4D.h"
+#include "PWGEM/Dilepton/DataModel/dileptonTables.h"
+#include "PWGEM/Dilepton/Utils/MCUtilities.h"
 
+#include "Common/Core/TableHelper.h"
+#include "Common/DataModel/EventSelection.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/StaticFor.h"
 #include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/TableHelper.h"
-#include "Common/DataModel/EventSelection.h"
-#include "PWGEM/Dilepton/DataModel/dileptonTables.h"
-#include "PWGEM/Dilepton/Utils/MCUtilities.h"
+
+#include "Math/Vector4D.h"
+
+#include <string>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGEM/Dilepton/Tasks/tableReaderBarrel.cxx b/.conflict-side-1/PWGEM/Dilepton/Tasks/tableReaderBarrel.cxx
index 819a85efe65..a2d5a465621 100644
--- a/.conflict-side-1/PWGEM/Dilepton/Tasks/tableReaderBarrel.cxx
+++ b/.conflict-side-1/PWGEM/Dilepton/Tasks/tableReaderBarrel.cxx
@@ -12,39 +12,43 @@
 // Contact: iarsene@cern.ch, i.c.arsene@fys.uio.no
 //
 
-#include <map>
-#include <string>
-#include <memory>
-#include <iostream>
-#include <vector>
-#include <algorithm>
-#include <TH1F.h>
-#include <TH3F.h>
-#include <THashList.h>
-#include <TList.h>
-#include <TString.h>
-#include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "PWGDQ/Core/VarManager.h"
-#include "PWGDQ/Core/HistogramManager.h"
-#include "PWGDQ/Core/MixingHandler.h"
-#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/AnalysisCompositeCut.h"
-#include "PWGDQ/Core/HistogramsLibrary.h"
+#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/CutsLibrary.h"
+#include "PWGDQ/Core/HistogramManager.h"
+#include "PWGDQ/Core/HistogramsLibrary.h"
+#include "PWGDQ/Core/MixingHandler.h"
 #include "PWGDQ/Core/MixingLibrary.h"
+#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+
+#include "Common/CCDB/EventSelectionParams.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include "Field/MagneticField.h"
-#include "TGeoGlobalMagField.h"
-#include "DetectorsBase/Propagator.h"
+#include "DataFormatsParameters/GRPObject.h"
 #include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Field/MagneticField.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 #include "ITSMFTBase/DPLAlpideParam.h"
-#include "Common/CCDB/EventSelectionParams.h"
+
+#include "TGeoGlobalMagField.h"
+#include <TH1F.h>
+#include <TH3F.h>
+#include <THashList.h>
+#include <TList.h>
+#include <TString.h>
+
+#include <algorithm>
+#include <iostream>
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
 
 using std::cout;
 using std::endl;
@@ -1072,7 +1076,7 @@ struct AnalysisSameEventPairing {
       }
     }
 
-    if (fConfigNbTrackCut > 0 && fConfigNbTrackCut < 31) {   // if track cuts
+    if (fConfigNbTrackCut > 0 && fConfigNbTrackCut < 31) {           // if track cuts
       for (std::size_t icut = 0; icut < fConfigNbTrackCut; ++icut) { // loop over track cuts
         fTwoTrackFilterMask |= (static_cast<uint32_t>(1) << icut);
         // no pair cuts
diff --git a/.conflict-side-1/PWGEM/Dilepton/Tasks/taggingHFE.cxx b/.conflict-side-1/PWGEM/Dilepton/Tasks/taggingHFE.cxx
index f843b20819a..cc1988e8f47 100644
--- a/.conflict-side-1/PWGEM/Dilepton/Tasks/taggingHFE.cxx
+++ b/.conflict-side-1/PWGEM/Dilepton/Tasks/taggingHFE.cxx
@@ -13,36 +13,38 @@
 /// \brief a task to study tagging e from charm hadron decays in MC
 /// \author daiki.sekihata@cern.ch
 
-#include <vector>
-#include <string>
-#include <array>
-#include <utility>
-#include <iostream>
-
-#include "Math/Vector4D.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "DataFormatsCalibration/MeanVertexObject.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "Common/Core/trackUtilities.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/TableHelper.h"
-#include "Common/Core/RecoDecay.h"
-#include "DCAFitter/DCAFitterN.h"
+#include "PWGEM/Dilepton/Utils/MCUtilities.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/TableHelper.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/CollisionAssociationTables.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGEM/Dilepton/Utils/MCUtilities.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsCalibration/MeanVertexObject.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "Math/Vector4D.h"
+
+#include <array>
+#include <iostream>
+#include <string>
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::soa;
diff --git a/.conflict-side-1/PWGEM/Dilepton/Utils/EMTrack.h b/.conflict-side-1/PWGEM/Dilepton/Utils/EMTrack.h
index 0f894d5b4dc..5042db6d622 100644
--- a/.conflict-side-1/PWGEM/Dilepton/Utils/EMTrack.h
+++ b/.conflict-side-1/PWGEM/Dilepton/Utils/EMTrack.h
@@ -15,9 +15,10 @@
 #ifndef PWGEM_DILEPTON_UTILS_EMTRACK_H_
 #define PWGEM_DILEPTON_UTILS_EMTRACK_H_
 
-#include <vector>
 #include "Math/Vector4D.h"
 
+#include <vector>
+
 namespace o2::aod::pwgem::dilepton::utils
 {
 class EMTrack
diff --git a/.conflict-side-1/PWGEM/Dilepton/Utils/MomentumSmearer.h b/.conflict-side-1/PWGEM/Dilepton/Utils/MomentumSmearer.h
index 7e36dcfed0f..45f491956de 100644
--- a/.conflict-side-1/PWGEM/Dilepton/Utils/MomentumSmearer.h
+++ b/.conflict-side-1/PWGEM/Dilepton/Utils/MomentumSmearer.h
@@ -15,19 +15,19 @@
 #ifndef PWGEM_DILEPTON_UTILS_MOMENTUMSMEARER_H_
 #define PWGEM_DILEPTON_UTILS_MOMENTUMSMEARER_H_
 
-#include <vector>
+#include "CCDB/BasicCCDBManager.h"
+#include "Framework/Logger.h"
 
+#include <TFile.h>
+#include <TGrid.h>
 #include <TH1.h>
 #include <TH2.h>
 #include <TH3.h>
 #include <THnSparse.h>
-#include <TString.h>
-#include <TGrid.h>
-#include <TFile.h>
 #include <TKey.h>
+#include <TString.h>
 
-#include "CCDB/BasicCCDBManager.h"
-#include "Framework/Logger.h"
+#include <vector>
 
 using namespace o2::framework;
 using namespace o2;
diff --git a/.conflict-side-1/PWGEM/PhotonMeson/Core/CutsLibrary.cxx b/.conflict-side-1/PWGEM/PhotonMeson/Core/CutsLibrary.cxx
index c2f313e6e62..44dfae30898 100644
--- a/.conflict-side-1/PWGEM/PhotonMeson/Core/CutsLibrary.cxx
+++ b/.conflict-side-1/PWGEM/PhotonMeson/Core/CutsLibrary.cxx
@@ -11,10 +11,11 @@
 //
 // Contact: daiki.sekihata@cern.ch
 //
+#include "PWGEM/PhotonMeson/Core/CutsLibrary.h"
+
+#include <regex>
 #include <string>
 #include <vector>
-#include <regex>
-#include "PWGEM/PhotonMeson/Core/CutsLibrary.h"
 
 //_______________________________________________
 int customAtoi(const std::string& str)
diff --git a/.conflict-side-1/PWGEM/PhotonMeson/Core/CutsLibrary.h b/.conflict-side-1/PWGEM/PhotonMeson/Core/CutsLibrary.h
index bf4fcfe7037..376ad652b63 100644
--- a/.conflict-side-1/PWGEM/PhotonMeson/Core/CutsLibrary.h
+++ b/.conflict-side-1/PWGEM/PhotonMeson/Core/CutsLibrary.h
@@ -15,13 +15,14 @@
 #ifndef PWGEM_PHOTONMESON_CORE_CUTSLIBRARY_H_
 #define PWGEM_PHOTONMESON_CORE_CUTSLIBRARY_H_
 
-#include <string>
-#include "PWGEM/PhotonMeson/Core/EMPhotonEventCut.h"
-#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
 #include "PWGEM/PhotonMeson/Core/DalitzEECut.h"
-#include "PWGEM/PhotonMeson/Core/PHOSPhotonCut.h"
 #include "PWGEM/PhotonMeson/Core/EMCPhotonCut.h"
+#include "PWGEM/PhotonMeson/Core/EMPhotonEventCut.h"
+#include "PWGEM/PhotonMeson/Core/PHOSPhotonCut.h"
 #include "PWGEM/PhotonMeson/Core/PairCut.h"
+#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
+
+#include <string>
 
 namespace o2::aod
 {
diff --git a/.conflict-side-1/PWGEM/PhotonMeson/Core/EMCPhotonCut.cxx b/.conflict-side-1/PWGEM/PhotonMeson/Core/EMCPhotonCut.cxx
index 582b9754057..0761921b765 100644
--- a/.conflict-side-1/PWGEM/PhotonMeson/Core/EMCPhotonCut.cxx
+++ b/.conflict-side-1/PWGEM/PhotonMeson/Core/EMCPhotonCut.cxx
@@ -13,11 +13,14 @@
 // Class for EMCal cluster selection
 //
 
-#include <string>
-#include "Framework/Logger.h"
 #include "PWGEM/PhotonMeson/Core/EMCPhotonCut.h"
+
 #include "PWGJE/DataModel/EMCALClusters.h"
 
+#include "Framework/Logger.h"
+
+#include <string>
+
 ClassImp(EMCPhotonCut);
 
 const char* EMCPhotonCut::mCutNames[static_cast<int>(EMCPhotonCut::EMCPhotonCuts::kNCuts)] = {"Definition", "Energy", "NCell", "M02", "Timing", "TrackMatching", "Exotic"};
diff --git a/.conflict-side-1/PWGEM/PhotonMeson/Core/EMCPhotonCut.h b/.conflict-side-1/PWGEM/PhotonMeson/Core/EMCPhotonCut.h
index 8bfd8ca630f..372eff52061 100644
--- a/.conflict-side-1/PWGEM/PhotonMeson/Core/EMCPhotonCut.h
+++ b/.conflict-side-1/PWGEM/PhotonMeson/Core/EMCPhotonCut.h
@@ -16,16 +16,19 @@
 #ifndef PWGEM_PHOTONMESON_CORE_EMCPHOTONCUT_H_
 #define PWGEM_PHOTONMESON_CORE_EMCPHOTONCUT_H_
 
-#include <set>
-#include <vector>
-#include <utility>
-#include <string>
-#include <optional>
-#include "Framework/Logger.h"
-#include "Framework/DataTypes.h"
 #include "Rtypes.h"
+
+#include "Framework/DataTypes.h"
+#include "Framework/Logger.h"
+
 #include "TNamed.h"
 
+#include <optional>
+#include <set>
+#include <string>
+#include <utility>
+#include <vector>
+
 class EMCPhotonCut : public TNamed
 {
  public:
diff --git a/.conflict-side-1/PWGEM/PhotonMeson/Core/EMPhotonEventCut.cxx b/.conflict-side-1/PWGEM/PhotonMeson/Core/EMPhotonEventCut.cxx
index 285bf50eba4..6526daa47c9 100644
--- a/.conflict-side-1/PWGEM/PhotonMeson/Core/EMPhotonEventCut.cxx
+++ b/.conflict-side-1/PWGEM/PhotonMeson/Core/EMPhotonEventCut.cxx
@@ -13,9 +13,10 @@
 // Class for em photon event selection
 //
 
-#include "Framework/Logger.h"
 #include "PWGEM/PhotonMeson/Core/EMPhotonEventCut.h"
 
+#include "Framework/Logger.h"
+
 ClassImp(EMPhotonEventCut);
 
 void EMPhotonEventCut::SetRequireEMCReadoutInMB(bool flag)
diff --git a/.conflict-side-1/PWGEM/PhotonMeson/Core/HistogramsLibrary.cxx b/.conflict-side-1/PWGEM/PhotonMeson/Core/HistogramsLibrary.cxx
index 50174ab9e08..59700cbb215 100644
--- a/.conflict-side-1/PWGEM/PhotonMeson/Core/HistogramsLibrary.cxx
+++ b/.conflict-side-1/PWGEM/PhotonMeson/Core/HistogramsLibrary.cxx
@@ -11,26 +11,28 @@
 //
 // Contact: daiki.sekihata@cern.ch
 //
+#include <fstream>
 #include <iostream>
 #include <memory>
-#include <fstream>
 using namespace std;
 
-#include <TObject.h>
-#include <TObjArray.h>
-#include <THashList.h>
+#include "PWGEM/PhotonMeson/Core/HistogramsLibrary.h"
+
+#include "Framework/Logger.h"
+
+#include <TClass.h>
 #include <TH1F.h>
 #include <TH2F.h>
 #include <TH3F.h>
-#include <TProfile.h>
-#include <TProfile2D.h>
-#include <TProfile3D.h>
+#include <THashList.h>
 #include <THn.h>
 #include <THnSparse.h>
 #include <TIterator.h>
-#include <TClass.h>
-#include "Framework/Logger.h"
-#include "PWGEM/PhotonMeson/Core/HistogramsLibrary.h"
+#include <TObjArray.h>
+#include <TObject.h>
+#include <TProfile.h>
+#include <TProfile2D.h>
+#include <TProfile3D.h>
 
 void o2::aod::pwgem::photon::histogram::DefineHistograms(THashList* list, const char* histClass, const char* subGroup)
 {
@@ -184,7 +186,7 @@ void o2::aod::pwgem::photon::histogram::DefineHistograms(THashList* list, const
       list->Add(new TH2F("hEtaRec_DeltaEta", "photon #eta resolution;#eta^{rec} of conversion point;#eta^{rec} - #eta^{gen}", 400, -2, +2, 400, -1.0f, 1.0f));
       list->Add(new TH2F("hEtaRec_DeltaPhi", "photon #varphi resolution;#eta^{rec} of conversion point;#varphi^{rec} - #varphi^{gen} (rad.)", 400, -2, +2, 400, -1.0f, 1.0f));
     } // end of mc
-  }   // end of V0
+  } // end of V0
 
   if (TString(histClass).Contains("Dalitz")) {
     THnSparseF* hs_dilepton_uls_same = nullptr;
@@ -576,7 +578,7 @@ void o2::aod::pwgem::photon::histogram::DefineHistograms(THashList* list, const
       hs_conv_point_mix->Sumw2();
       list->Add(hs_conv_point_mix);
     } // end of pair
-  }   // end of material budget study
+  } // end of material budget study
 
   if (TString(histClass) == "Generated") {
     list->Add(new TH1F("hCollisionCounter", "hCollisionCounter", 5, 0.5f, 5.5f));
diff --git a/.conflict-side-1/PWGEM/PhotonMeson/Core/HistogramsLibrary.h b/.conflict-side-1/PWGEM/PhotonMeson/Core/HistogramsLibrary.h
index 324718a663e..5307f5608a5 100644
--- a/.conflict-side-1/PWGEM/PhotonMeson/Core/HistogramsLibrary.h
+++ b/.conflict-side-1/PWGEM/PhotonMeson/Core/HistogramsLibrary.h
@@ -15,26 +15,27 @@
 #ifndef PWGEM_PHOTONMESON_CORE_HISTOGRAMSLIBRARY_H_
 #define PWGEM_PHOTONMESON_CORE_HISTOGRAMSLIBRARY_H_
 
-#include <iostream>
-#include <array>
-#include <TString.h>
-#include <THashList.h>
-#include <TObject.h>
-#include <TObjArray.h>
-#include <THashList.h>
-#include <TMath.h>
+#include "Common/CCDB/EventSelectionParams.h"
+#include "Common/Core/RecoDecay.h"
+
+#include <TClass.h>
 #include <TH1F.h>
 #include <TH2F.h>
 #include <TH3F.h>
-#include <TProfile.h>
-#include <TProfile2D.h>
-#include <TProfile3D.h>
+#include <THashList.h>
 #include <THn.h>
 #include <THnSparse.h>
 #include <TIterator.h>
-#include <TClass.h>
-#include "Common/CCDB/EventSelectionParams.h"
-#include "Common/Core/RecoDecay.h"
+#include <TMath.h>
+#include <TObjArray.h>
+#include <TObject.h>
+#include <TProfile.h>
+#include <TProfile2D.h>
+#include <TProfile3D.h>
+#include <TString.h>
+
+#include <array>
+#include <iostream>
 
 enum EMHistType {
   kEvent = 0,
diff --git a/.conflict-side-1/PWGEM/PhotonMeson/Core/PHOSPhotonCut.cxx b/.conflict-side-1/PWGEM/PhotonMeson/Core/PHOSPhotonCut.cxx
index 96db9e331b3..083d68078cc 100644
--- a/.conflict-side-1/PWGEM/PhotonMeson/Core/PHOSPhotonCut.cxx
+++ b/.conflict-side-1/PWGEM/PhotonMeson/Core/PHOSPhotonCut.cxx
@@ -13,9 +13,10 @@
 // Class for track selection
 //
 
-#include "Framework/Logger.h"
 #include "PWGEM/PhotonMeson/Core/PHOSPhotonCut.h"
 
+#include "Framework/Logger.h"
+
 ClassImp(PHOSPhotonCut);
 
 const char* PHOSPhotonCut::mCutNames[static_cast<int>(PHOSPhotonCut::PHOSPhotonCuts::kNCuts)] = {"Energy", "Dispersion", "CPV"};
diff --git a/.conflict-side-1/PWGEM/PhotonMeson/Core/PHOSPhotonCut.h b/.conflict-side-1/PWGEM/PhotonMeson/Core/PHOSPhotonCut.h
index c60944dd52b..d7f6ee64805 100644
--- a/.conflict-side-1/PWGEM/PhotonMeson/Core/PHOSPhotonCut.h
+++ b/.conflict-side-1/PWGEM/PhotonMeson/Core/PHOSPhotonCut.h
@@ -16,15 +16,18 @@
 #ifndef PWGEM_PHOTONMESON_CORE_PHOSPHOTONCUT_H_
 #define PWGEM_PHOTONMESON_CORE_PHOSPHOTONCUT_H_
 
-#include <set>
-#include <vector>
-#include <utility>
-#include <string>
-#include "Framework/Logger.h"
-#include "Framework/DataTypes.h"
 #include "Rtypes.h"
+
+#include "Framework/DataTypes.h"
+#include "Framework/Logger.h"
+
 #include "TNamed.h"
 
+#include <set>
+#include <string>
+#include <utility>
+#include <vector>
+
 class PHOSPhotonCut : public TNamed
 {
  public:
diff --git a/.conflict-side-1/PWGEM/PhotonMeson/Core/PairCut.cxx b/.conflict-side-1/PWGEM/PhotonMeson/Core/PairCut.cxx
index be8bee172c7..10161ba3dd4 100644
--- a/.conflict-side-1/PWGEM/PhotonMeson/Core/PairCut.cxx
+++ b/.conflict-side-1/PWGEM/PhotonMeson/Core/PairCut.cxx
@@ -13,9 +13,10 @@
 // Class for track selection
 //
 
-#include "Framework/Logger.h"
 #include "PWGEM/PhotonMeson/Core/PairCut.h"
 
+#include "Framework/Logger.h"
+
 ClassImp(PairCut);
 
 const char* PairCut::mCutNames[static_cast<int>(PairCut::PairCuts::kNCuts)] = {"Asym"};
diff --git a/.conflict-side-1/PWGEM/PhotonMeson/Core/PairCut.h b/.conflict-side-1/PWGEM/PhotonMeson/Core/PairCut.h
index 19ba27c79bf..b9cf1fe5cf0 100644
--- a/.conflict-side-1/PWGEM/PhotonMeson/Core/PairCut.h
+++ b/.conflict-side-1/PWGEM/PhotonMeson/Core/PairCut.h
@@ -16,15 +16,18 @@
 #ifndef PWGEM_PHOTONMESON_CORE_PAIRCUT_H_
 #define PWGEM_PHOTONMESON_CORE_PAIRCUT_H_
 
-#include <set>
-#include <vector>
-#include <utility>
-#include <string>
-#include "Framework/Logger.h"
-#include "Framework/DataTypes.h"
 #include "Rtypes.h"
-#include "TNamed.h"
+
+#include "Framework/DataTypes.h"
+#include "Framework/Logger.h"
+
 #include "TMath.h"
+#include "TNamed.h"
+
+#include <set>
+#include <string>
+#include <utility>
+#include <vector>
 
 class PairCut : public TNamed
 {
diff --git a/.conflict-side-1/PWGEM/PhotonMeson/Core/TaggingPi0.h b/.conflict-side-1/PWGEM/PhotonMeson/Core/TaggingPi0.h
index d74af2ceb0c..7e80b3d466d 100644
--- a/.conflict-side-1/PWGEM/PhotonMeson/Core/TaggingPi0.h
+++ b/.conflict-side-1/PWGEM/PhotonMeson/Core/TaggingPi0.h
@@ -19,40 +19,41 @@
 #ifndef PWGEM_PHOTONMESON_CORE_TAGGINGPI0_H_
 #define PWGEM_PHOTONMESON_CORE_TAGGINGPI0_H_
 
+#include "PWGEM/Dilepton/Utils/EMTrack.h"
+#include "PWGEM/Dilepton/Utils/EMTrackUtilities.h"
+#include "PWGEM/Dilepton/Utils/EventMixingHandler.h"
+#include "PWGEM/PhotonMeson/Core/DalitzEECut.h"
+#include "PWGEM/PhotonMeson/Core/EMCPhotonCut.h"
+#include "PWGEM/PhotonMeson/Core/EMPhotonEventCut.h"
+#include "PWGEM/PhotonMeson/Core/PHOSPhotonCut.h"
+#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+#include "PWGEM/PhotonMeson/Utils/EventHistograms.h"
+#include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
+
+#include "Common/Core/RecoDecay.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "Math/Vector4D.h"
+#include "TString.h"
+
+#include <algorithm>
+#include <array>
 #include <cstring>
 #include <iterator>
-#include <string>
 #include <map>
-#include <vector>
+#include <string>
 #include <tuple>
 #include <utility>
-#include <array>
-#include <algorithm>
-
-#include "TString.h"
-#include "Math/Vector4D.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
-
-#include "Common/Core/RecoDecay.h"
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/DalitzEECut.h"
-#include "PWGEM/PhotonMeson/Core/PHOSPhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/EMCPhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/EMPhotonEventCut.h"
-#include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
-#include "PWGEM/Dilepton/Utils/EMTrack.h"
-#include "PWGEM/Dilepton/Utils/EventMixingHandler.h"
-#include "PWGEM/PhotonMeson/Utils/EventHistograms.h"
-#include "PWGEM/Dilepton/Utils/EMTrackUtilities.h"
+#include <vector>
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-side-1/PWGEM/PhotonMeson/Core/TaggingPi0MC.h b/.conflict-side-1/PWGEM/PhotonMeson/Core/TaggingPi0MC.h
index 56c6274a141..04fe0cadd9c 100644
--- a/.conflict-side-1/PWGEM/PhotonMeson/Core/TaggingPi0MC.h
+++ b/.conflict-side-1/PWGEM/PhotonMeson/Core/TaggingPi0MC.h
@@ -17,35 +17,36 @@
 #ifndef PWGEM_PHOTONMESON_CORE_TAGGINGPI0MC_H_
 #define PWGEM_PHOTONMESON_CORE_TAGGINGPI0MC_H_
 
-#include <string>
-#include <map>
-#include <vector>
+#include "PWGEM/Dilepton/Utils/MCUtilities.h"
+#include "PWGEM/PhotonMeson/Core/DalitzEECut.h"
+#include "PWGEM/PhotonMeson/Core/EMCPhotonCut.h"
+#include "PWGEM/PhotonMeson/Core/EMPhotonEventCut.h"
+#include "PWGEM/PhotonMeson/Core/PHOSPhotonCut.h"
+#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+#include "PWGEM/PhotonMeson/Utils/EventHistograms.h"
+#include "PWGEM/PhotonMeson/Utils/MCUtilities.h"
+#include "PWGEM/PhotonMeson/Utils/NMHistograms.h"
+#include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
 
-#include "TF1.h"
-#include "TString.h"
-#include "Math/Vector4D.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
+#include "Common/Core/RecoDecay.h"
 
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
 #include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
-#include "Common/Core/RecoDecay.h"
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
-#include "PWGEM/PhotonMeson/Utils/MCUtilities.h"
-#include "PWGEM/PhotonMeson/Utils/EventHistograms.h"
-#include "PWGEM/PhotonMeson/Utils/NMHistograms.h"
-#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/DalitzEECut.h"
-#include "PWGEM/PhotonMeson/Core/PHOSPhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/EMCPhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/EMPhotonEventCut.h"
-#include "PWGEM/Dilepton/Utils/MCUtilities.h"
+#include "Math/Vector4D.h"
+#include "TF1.h"
+#include "TString.h"
+
+#include <map>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-side-1/PWGEM/PhotonMeson/Core/V0PhotonCut.cxx b/.conflict-side-1/PWGEM/PhotonMeson/Core/V0PhotonCut.cxx
index 07d805fa291..493565011ff 100644
--- a/.conflict-side-1/PWGEM/PhotonMeson/Core/V0PhotonCut.cxx
+++ b/.conflict-side-1/PWGEM/PhotonMeson/Core/V0PhotonCut.cxx
@@ -13,11 +13,12 @@
 // Class for v0 photon selection
 //
 
-#include <set>
-#include <utility>
+#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
 
 #include "Framework/Logger.h"
-#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
+
+#include <set>
+#include <utility>
 
 ClassImp(V0PhotonCut);
 
diff --git a/.conflict-side-1/PWGEM/PhotonMeson/Core/V0PhotonCut.h b/.conflict-side-1/PWGEM/PhotonMeson/Core/V0PhotonCut.h
index d6064ab8786..c908acb5acd 100644
--- a/.conflict-side-1/PWGEM/PhotonMeson/Core/V0PhotonCut.h
+++ b/.conflict-side-1/PWGEM/PhotonMeson/Core/V0PhotonCut.h
@@ -16,16 +16,18 @@
 #ifndef PWGEM_PHOTONMESON_CORE_V0PHOTONCUT_H_
 #define PWGEM_PHOTONMESON_CORE_V0PHOTONCUT_H_
 
-#include <algorithm>
-#include <set>
-#include <vector>
-#include <utility>
-#include <string>
 #include "Rtypes.h"
-#include "TNamed.h"
-#include "TMath.h"
 
 #include "PWGEM/PhotonMeson/Utils/TrackSelection.h"
+
+#include "TMath.h"
+#include "TNamed.h"
+
+#include <algorithm>
+#include <set>
+#include <string>
+#include <utility>
+#include <vector>
 using namespace o2::pwgem::photonmeson;
 
 class V0PhotonCut : public TNamed
diff --git a/.conflict-side-1/PWGEM/PhotonMeson/DataModel/bcWiseTables.h b/.conflict-side-1/PWGEM/PhotonMeson/DataModel/bcWiseTables.h
index a306d5645ce..1ca1c78b683 100644
--- a/.conflict-side-1/PWGEM/PhotonMeson/DataModel/bcWiseTables.h
+++ b/.conflict-side-1/PWGEM/PhotonMeson/DataModel/bcWiseTables.h
@@ -73,9 +73,9 @@ DECLARE_SOA_COLUMN(StoredFT0MAmplitude, storedFT0MAmplitude, uint16_t); //! ft0a
 DECLARE_SOA_COLUMN(StoredMu, storedMu, uint16_t);                       //! probability of TVX collision per BC (x1000)
 DECLARE_SOA_COLUMN(StoredTimeSinceSOF, storedTimeSinceSOF, uint16_t);   //! time since decreation of ADJUST in seconds (x2)
 
-DECLARE_SOA_DYNAMIC_COLUMN(Centrality, centrality, [](uint8_t storedcentrality) -> float { return std::nextafter(storedcentrality / emdownscaling::downscalingFactors[emdownscaling::kFT0MCent], std::numeric_limits<float>::infinity()); });           //! Centrality (0-100)
-DECLARE_SOA_DYNAMIC_COLUMN(FT0MAmplitude, ft0Amplitude, [](uint16_t storedFT0MAmplitude) -> float { return std::nextafter(storedFT0MAmplitude / emdownscaling::downscalingFactors[emdownscaling::kFT0Amp], std::numeric_limits<float>::infinity()); }); //! FT0M amplitude
-DECLARE_SOA_DYNAMIC_COLUMN(Mu, mu, [](uint16_t storedMu) -> float { return std::nextafter(storedMu / emdownscaling::downscalingFactors[emdownscaling::kMu], std::numeric_limits<float>::infinity()); });                                                //! probability of TVX collision per BC
+DECLARE_SOA_DYNAMIC_COLUMN(Centrality, centrality, [](uint8_t storedcentrality) -> float { return std::nextafter(storedcentrality / emdownscaling::downscalingFactors[emdownscaling::kFT0MCent], std::numeric_limits<float>::infinity()); });              //! Centrality (0-100)
+DECLARE_SOA_DYNAMIC_COLUMN(FT0MAmplitude, ft0Amplitude, [](uint16_t storedFT0MAmplitude) -> float { return std::nextafter(storedFT0MAmplitude / emdownscaling::downscalingFactors[emdownscaling::kFT0Amp], std::numeric_limits<float>::infinity()); });    //! FT0M amplitude
+DECLARE_SOA_DYNAMIC_COLUMN(Mu, mu, [](uint16_t storedMu) -> float { return std::nextafter(storedMu / emdownscaling::downscalingFactors[emdownscaling::kMu], std::numeric_limits<float>::infinity()); });                                                   //! probability of TVX collision per BC
 DECLARE_SOA_DYNAMIC_COLUMN(TimeSinceSOF, timeSinceSOF, [](uint16_t storedTimeSinceSOF) -> float { return std::nextafter(storedTimeSinceSOF / emdownscaling::downscalingFactors[emdownscaling::kTimeSinceSOF], std::numeric_limits<float>::infinity()); }); //! probability of TVX collision per BC
 } // namespace bcwisebc
 DECLARE_SOA_TABLE(BCWiseBCs, "AOD", "BCWISEBC", //! table of bc wise centrality estimation and event selection input
diff --git a/.conflict-side-1/PWGEM/PhotonMeson/DataModel/gammaTables.h b/.conflict-side-1/PWGEM/PhotonMeson/DataModel/gammaTables.h
index 0abbc3bfe76..d73ddcc3f16 100644
--- a/.conflict-side-1/PWGEM/PhotonMeson/DataModel/gammaTables.h
+++ b/.conflict-side-1/PWGEM/PhotonMeson/DataModel/gammaTables.h
@@ -9,15 +9,15 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <vector>
-#include <TMath.h>
+#include "PWGEM/Dilepton/DataModel/dileptonTables.h"
+#include "PWGJE/DataModel/EMCALClusters.h"
 
 #include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/CaloClusters.h"
 
-#include "PWGEM/Dilepton/DataModel/dileptonTables.h"
+#include <TMath.h>
 
-#include "PWGJE/DataModel/EMCALClusters.h"
+#include <vector>
 
 #ifndef PWGEM_PHOTONMESON_DATAMODEL_GAMMATABLES_H_
 #define PWGEM_PHOTONMESON_DATAMODEL_GAMMATABLES_H_
diff --git a/.conflict-side-1/PWGEM/PhotonMeson/TableProducer/associateMCinfoPhoton.cxx b/.conflict-side-1/PWGEM/PhotonMeson/TableProducer/associateMCinfoPhoton.cxx
index 2fafc5118e3..90b97762131 100644
--- a/.conflict-side-1/PWGEM/PhotonMeson/TableProducer/associateMCinfoPhoton.cxx
+++ b/.conflict-side-1/PWGEM/PhotonMeson/TableProducer/associateMCinfoPhoton.cxx
@@ -16,16 +16,17 @@
 /// \author Daiki Sekihata (daiki.sekihata@cern.ch)
 ///
 
-#include <map>
-#include <vector>
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+#include "PWGEM/PhotonMeson/Utils/MCUtilities.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/PhotonMeson/Utils/MCUtilities.h"
+
+#include <map>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGEM/PhotonMeson/TableProducer/createEMEventPhoton.cxx b/.conflict-side-1/PWGEM/PhotonMeson/TableProducer/createEMEventPhoton.cxx
index fc155fe5502..3e08ed6e33f 100644
--- a/.conflict-side-1/PWGEM/PhotonMeson/TableProducer/createEMEventPhoton.cxx
+++ b/.conflict-side-1/PWGEM/PhotonMeson/TableProducer/createEMEventPhoton.cxx
@@ -14,23 +14,22 @@
 ///
 /// \author Daiki Sekihata, daiki.sekihata@cern.ch
 
-#include <string>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+#include "PWGJE/DataModel/Jet.h"
 
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
 #include "Common/CCDB/TriggerAliases.h"
 
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+#include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
-#include "PWGJE/DataModel/Jet.h"
+#include <string>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGEM/PhotonMeson/TableProducer/createPCM.cxx b/.conflict-side-1/PWGEM/PhotonMeson/TableProducer/createPCM.cxx
index 4ca74633e1b..4862ccba420 100644
--- a/.conflict-side-1/PWGEM/PhotonMeson/TableProducer/createPCM.cxx
+++ b/.conflict-side-1/PWGEM/PhotonMeson/TableProducer/createPCM.cxx
@@ -14,26 +14,29 @@
 // This code produces photon data tables.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include <array>
-#include <vector>
-#include <algorithm>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/Core/trackUtilities.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+#include "PWGEM/PhotonMeson/Utils/PCMUtilities.h"
+#include "PWGEM/PhotonMeson/Utils/TrackSelection.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "Common/Core/RecoDecay.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/CollisionAssociationTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "DCAFitter/DCAFitterN.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGEM/PhotonMeson/Utils/PCMUtilities.h"
-#include "PWGEM/PhotonMeson/Utils/TrackSelection.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include <algorithm>
+#include <array>
+#include <vector>
 
 using namespace o2;
 using namespace o2::soa;
@@ -443,9 +446,9 @@ struct createPCM {
               //     collision_in_sw.globalIndex(), ele.collisionId(), pos.collisionId(), ele.globalIndex(), pos.globalIndex());
               fillV0Table(collision_in_sw, ele, pos, false);
             } // end of searching window loop
-          }   // end of pairing loop
-        }     // end of pos track loop in sw
-      }       // end of pos track loop in sw
+          } // end of pairing loop
+        } // end of pos track loop in sw
+      } // end of pos track loop in sw
 
       // LOGF(info, "possible number of V0 = %d", cospa_map.size());
       std::map<std::pair<uint32_t, uint32_t>, bool> used_pair_map;
@@ -550,7 +553,7 @@ struct createPCM {
         }
       }
     } // end of collision loop
-  }   // end of process
+  } // end of process
   PROCESS_SWITCH(createPCM, processTrkCollAsso, "create V0s with track-to-collision associator", false);
 };
 
diff --git a/.conflict-side-1/PWGEM/PhotonMeson/TableProducer/gammaSelection.cxx b/.conflict-side-1/PWGEM/PhotonMeson/TableProducer/gammaSelection.cxx
index 7a3708d480b..ea98a8f255c 100644
--- a/.conflict-side-1/PWGEM/PhotonMeson/TableProducer/gammaSelection.cxx
+++ b/.conflict-side-1/PWGEM/PhotonMeson/TableProducer/gammaSelection.cxx
@@ -14,22 +14,22 @@
 /// \author marvin.hemmer@cern.ch
 
 // TODO: add PCM table
-#include <typeinfo>
-
 #include "PWGEM/PhotonMeson/Utils/gammaSelectionCuts.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
-// includes for the R recalculation
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "CCDB/BasicCCDBManager.h"
+#include <typeinfo>
 
+// includes for the R recalculation
 #include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
 #include "PWGEM/PhotonMeson/Utils/emcalHistoDefinitions.h"
 
+#include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-1/PWGEM/PhotonMeson/TableProducer/photonconversionbuilder.cxx b/.conflict-side-1/PWGEM/PhotonMeson/TableProducer/photonconversionbuilder.cxx
index 8f8e795edfb..67e11f24e16 100644
--- a/.conflict-side-1/PWGEM/PhotonMeson/TableProducer/photonconversionbuilder.cxx
+++ b/.conflict-side-1/PWGEM/PhotonMeson/TableProducer/photonconversionbuilder.cxx
@@ -15,43 +15,43 @@
 //
 // \author Daiki Sekihata <daiki.sekihata@cern.ch>, Tokyo
 
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <map>
-#include <iterator>
-#include <utility>
-#include <string>
-#include <set>
-#include <algorithm>
-#include <vector>
-#include <unordered_map>
-
-#include "Math/Vector4D.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+#include "PWGEM/PhotonMeson/Utils/PCMUtilities.h"
+#include "PWGEM/PhotonMeson/Utils/TrackSelection.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
+#include "Common/Core/TPCVDriftManager.h"
+#include "Common/Core/TableHelper.h"
 #include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+#include "Tools/KFparticle/KFUtilities.h"
+
 #include "CCDB/BasicCCDBManager.h"
-#include "Common/Core/TableHelper.h"
-#include "Common/Core/TPCVDriftManager.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
-#include "Tools/KFparticle/KFUtilities.h"
+#include "Math/Vector4D.h"
 
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/PhotonMeson/Utils/PCMUtilities.h"
-#include "PWGEM/PhotonMeson/Utils/TrackSelection.h"
+#include <algorithm>
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <iterator>
+#include <map>
+#include <set>
+#include <string>
+#include <unordered_map>
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::soa;
diff --git a/.conflict-side-1/PWGEM/PhotonMeson/TableProducer/produceMesonCalo.cxx b/.conflict-side-1/PWGEM/PhotonMeson/TableProducer/produceMesonCalo.cxx
index 7fd19416d3d..face43fb3e4 100644
--- a/.conflict-side-1/PWGEM/PhotonMeson/TableProducer/produceMesonCalo.cxx
+++ b/.conflict-side-1/PWGEM/PhotonMeson/TableProducer/produceMesonCalo.cxx
@@ -21,9 +21,9 @@
 #include "Framework/runDataProcessing.h"
 
 // includes for the R recalculation
+#include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsParameters/GRPObject.h"
 #include "DetectorsBase/GeometryManager.h"
-#include "CCDB/BasicCCDBManager.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGEM/PhotonMeson/TableProducer/skimmerDalitzEE.cxx b/.conflict-side-1/PWGEM/PhotonMeson/TableProducer/skimmerDalitzEE.cxx
index 5eb1bfeb069..b7e5049ebed 100644
--- a/.conflict-side-1/PWGEM/PhotonMeson/TableProducer/skimmerDalitzEE.cxx
+++ b/.conflict-side-1/PWGEM/PhotonMeson/TableProducer/skimmerDalitzEE.cxx
@@ -12,19 +12,19 @@
 /// \brief write relevant information for dalitz ee analysis to an AO2D.root file. This file is then the only necessary input to perform pcm analysis.
 /// \author daiki.sekihata@cern.ch
 
-#include "Math/Vector4D.h"
+#include "PWGEM/Dilepton/Utils/PairUtilities.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
 
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
 #include "CCDB/BasicCCDBManager.h"
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "CommonConstants/PhysicsConstants.h"
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/Dilepton/Utils/PairUtilities.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "Math/Vector4D.h"
 
 using namespace o2;
 using namespace o2::soa;
@@ -290,7 +290,7 @@ struct skimmerDalitzEE {
 
         fRegistry.fill(HIST("hNpairs"), static_cast<int>(pairtype));
         npair++;
-      }      // end of pairing loop
+      } // end of pairing loop
     } else { // LS
       for (auto& [t1, t2] : combinations(CombinationsStrictlyUpperIndexPolicy(tracks1, tracks2))) {
         if (!checkTrack(t1) || !checkTrack(t2)) {
diff --git a/.conflict-side-1/PWGEM/PhotonMeson/TableProducer/skimmerGammaConversion.cxx b/.conflict-side-1/PWGEM/PhotonMeson/TableProducer/skimmerGammaConversion.cxx
index 6a39aea8881..80572200a12 100644
--- a/.conflict-side-1/PWGEM/PhotonMeson/TableProducer/skimmerGammaConversion.cxx
+++ b/.conflict-side-1/PWGEM/PhotonMeson/TableProducer/skimmerGammaConversion.cxx
@@ -23,38 +23,37 @@
 
 // runme like: o2-analysis-trackselection -b --aod-file ${sourceFile} --aod-writer-json ${writerFile} | o2-analysis-timestamp -b | o2-analysis-trackextension -b | o2-analysis-lf-lambdakzerobuilder -b | o2-analysis-pid-tpc -b | o2-analysis-em-skimmermc -b
 
-#include <memory>
 #include <map>
+#include <memory>
 #include <string>
 #include <vector>
 
 // todo: remove reduantant information in GammaConversionsInfoTrue
 #include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/PhotonMeson/Utils/gammaConvDefinitions.h"
 #include "PWGEM/PhotonMeson/Utils/PCMUtilities.h"
+#include "PWGEM/PhotonMeson/Utils/gammaConvDefinitions.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 // includes for the R recalculation
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
+#include "Common/Core/trackUtilities.h"
+#include "Tools/KFparticle/KFUtilities.h"
 
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonConstants/PhysicsConstants.h"
 #include "DCAFitter/HelixHelper.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
 #include "ReconstructionDataFormats/TrackFwd.h"
-#include "Common/Core/trackUtilities.h"
-#include "CommonConstants/PhysicsConstants.h"
 
+#include "Math/Vector4D.h"
 #include <TMath.h>
 #include <TVector2.h>
-#include "Math/Vector4D.h"
-
-#include "Tools/KFparticle/KFUtilities.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGEM/PhotonMeson/TableProducer/skimmerGammaConversionTruthOnlyMc.cxx b/.conflict-side-1/PWGEM/PhotonMeson/TableProducer/skimmerGammaConversionTruthOnlyMc.cxx
index 509a949b0dd..08a90fcf351 100644
--- a/.conflict-side-1/PWGEM/PhotonMeson/TableProducer/skimmerGammaConversionTruthOnlyMc.cxx
+++ b/.conflict-side-1/PWGEM/PhotonMeson/TableProducer/skimmerGammaConversionTruthOnlyMc.cxx
@@ -20,11 +20,11 @@
 #include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
 #include "PWGEM/PhotonMeson/Utils/gammaConvDefinitions.h"
 
-#include "TVector3.h"
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TVector3.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGEM/PhotonMeson/TableProducer/skimmerPHOS.cxx b/.conflict-side-1/PWGEM/PhotonMeson/TableProducer/skimmerPHOS.cxx
index ef825ca5578..f205d74ec78 100644
--- a/.conflict-side-1/PWGEM/PhotonMeson/TableProducer/skimmerPHOS.cxx
+++ b/.conflict-side-1/PWGEM/PhotonMeson/TableProducer/skimmerPHOS.cxx
@@ -13,12 +13,14 @@
 /// dependencies: o2-analysis-calo-cluster
 /// \author daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+
 #include "Common/DataModel/CaloClusters.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 #include "PHOSBase/Geometry.h"
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGEM/PhotonMeson/Tasks/CheckMCV0.cxx b/.conflict-side-1/PWGEM/PhotonMeson/Tasks/CheckMCV0.cxx
index 912e2ffc07a..cfd83f6abe7 100644
--- a/.conflict-side-1/PWGEM/PhotonMeson/Tasks/CheckMCV0.cxx
+++ b/.conflict-side-1/PWGEM/PhotonMeson/Tasks/CheckMCV0.cxx
@@ -13,23 +13,25 @@
 /// \dependencies: o2-analysis-lf-lambdakzeromcfinder
 /// \author daiki.sekihata@cern.ch felix.schlepper@cern.ch
 
-#include "TDatabasePDG.h"
-#include "TMath.h"
+#include "PWGEM/PhotonMeson/DataModel/mcV0Tables.h"
+#include "PWGEM/PhotonMeson/Utils/TrackSelection.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonConstants/LHCConstants.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DetectorsBase/Propagator.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "DetectorsBase/Propagator.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "PWGEM/PhotonMeson/Utils/TrackSelection.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGEM/PhotonMeson/DataModel/mcV0Tables.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "CommonConstants/LHCConstants.h"
+
+#include "TDatabasePDG.h"
+#include "TMath.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGEM/PhotonMeson/Tasks/HeavyNeutralMeson.cxx b/.conflict-side-1/PWGEM/PhotonMeson/Tasks/HeavyNeutralMeson.cxx
index b416f173480..7e8f8250370 100644
--- a/.conflict-side-1/PWGEM/PhotonMeson/Tasks/HeavyNeutralMeson.cxx
+++ b/.conflict-side-1/PWGEM/PhotonMeson/Tasks/HeavyNeutralMeson.cxx
@@ -16,32 +16,34 @@
 /// \author Nicolas Strangmann (nicolas.strangmann@cern.ch) - Goethe University Frankfurt
 ///
 
-#include <vector>
-#include <iterator>
-#include <string>
-
-#include "Math/GenVector/Boost.h"
-#include "Math/Vector4D.h"
-#include "TMath.h"
-#include "TRandom3.h"
-
 #include "PWGEM/PhotonMeson/Utils/HNMUtilities.h"
 #include "PWGJE/DataModel/EMCALMatchedCollisions.h"
 
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/PIDResponseITS.h"
-#include "fairlogger/Logger.h"
-#include "Framework/Configurable.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonConstants/MathConstants.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/Configurable.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
-#include "CommonConstants/MathConstants.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
+
+#include "Math/GenVector/Boost.h"
+#include "Math/Vector4D.h"
+#include "TMath.h"
+#include "TRandom3.h"
+
+#include "fairlogger/Logger.h"
+
+#include <iterator>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGEM/PhotonMeson/Tasks/MaterialBudget.cxx b/.conflict-side-1/PWGEM/PhotonMeson/Tasks/MaterialBudget.cxx
index b5c1a5d8fde..d2f48e3e1ea 100644
--- a/.conflict-side-1/PWGEM/PhotonMeson/Tasks/MaterialBudget.cxx
+++ b/.conflict-side-1/PWGEM/PhotonMeson/Tasks/MaterialBudget.cxx
@@ -14,27 +14,30 @@
 // This code loops over v0 photons for studying material budget.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include <cstring>
-#include <iterator>
+#include "PWGEM/PhotonMeson/Core/CutsLibrary.h"
+#include "PWGEM/PhotonMeson/Core/HistogramsLibrary.h"
+#include "PWGEM/PhotonMeson/Core/PairCut.h"
+#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+#include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
 
-#include "TString.h"
-#include "Math/Vector4D.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/RecoDecay.h"
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
-#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/PairCut.h"
-#include "PWGEM/PhotonMeson/Core/CutsLibrary.h"
-#include "PWGEM/PhotonMeson/Core/HistogramsLibrary.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include "Math/Vector4D.h"
+#include "TString.h"
+
+#include <cstring>
+#include <iterator>
 
 using namespace o2;
 using namespace o2::aod;
@@ -112,8 +115,8 @@ struct MaterialBudget {
           THashList* list_pair_subsys_paircut = reinterpret_cast<THashList*>(list_pair_subsys_photoncut->FindObject(pair_cut_name.data()));
           o2::aod::pwgem::photon::histogram::DefineHistograms(list_pair_subsys_paircut, "material_budget_study", "Pair");
         } // end of cut3 loop pair cut
-      }   // end of cut2 loop
-    }     // end of cut1 loop
+      } // end of cut2 loop
+    } // end of cut1 loop
   }
 
   static constexpr std::string_view pairnames[9] = {"PCMPCM", "PHOSPHOS", "EMCEMC", "PCMPHOS", "PCMEMC", "PCMDalitzEE", "PCMDalitzMuMu", "PHOSEMC", "DalitzEEDalitzEE"};
@@ -245,7 +248,7 @@ struct MaterialBudget {
           reinterpret_cast<THnSparseF*>(list_v0->FindObject(cut.GetName())->FindObject("hs_conv_point"))->Fill(value);
 
         } // end of photon loop
-      }   // end of cut loop
+      } // end of cut loop
 
     } // end of collision loop
   }
@@ -298,11 +301,11 @@ struct MaterialBudget {
                 value[5] = eta_cp2;
                 reinterpret_cast<THnSparseF*>(list_pair_ss->FindObject(Form("%s_%s", tagcut.GetName(), probecut.GetName()))->FindObject(paircut.GetName())->FindObject("hs_conv_point_same"))->Fill(value);
               } // end of pair cut loop
-            }   // end of g2 loop
-          }     // end of g1 loop
-        }       // end of probecut loop
-      }         // end of tagcut loop
-    }           // end of collision loop
+            } // end of g2 loop
+          } // end of g1 loop
+        } // end of probecut loop
+      } // end of tagcut loop
+    } // end of collision loop
   }
 
   Configurable<int> ndepth{"ndepth", 10, "depth for event mixing"};
@@ -368,11 +371,11 @@ struct MaterialBudget {
                 reinterpret_cast<THnSparseF*>(list_pair_ss->FindObject(Form("%s_%s", tagcut.GetName(), probecut.GetName()))->FindObject(paircut.GetName())->FindObject("hs_conv_point_mix"))->Fill(value);
 
               } // end of pair cut loop
-            }   // end of g2 loop
-          }     // end of g1 loop
-        }       // end of probecut loop
-      }         // end of tagcut loop
-    }           // end of different collision combinations
+            } // end of g2 loop
+          } // end of g1 loop
+        } // end of probecut loop
+      } // end of tagcut loop
+    } // end of different collision combinations
   }
 
   Partition<MyCollisions> grouped_collisions = cfgCentMin < o2::aod::cent::centFT0M && o2::aod::cent::centFT0M < cfgCentMax; // this goes to same event.
diff --git a/.conflict-side-1/PWGEM/PhotonMeson/Tasks/MaterialBudgetMC.cxx b/.conflict-side-1/PWGEM/PhotonMeson/Tasks/MaterialBudgetMC.cxx
index 3fe51c1ff7c..57d34165ce8 100644
--- a/.conflict-side-1/PWGEM/PhotonMeson/Tasks/MaterialBudgetMC.cxx
+++ b/.conflict-side-1/PWGEM/PhotonMeson/Tasks/MaterialBudgetMC.cxx
@@ -14,29 +14,32 @@
 // This code loops over v0 photons for studying material budget.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include <cstring>
-#include <iterator>
+#include "PWGEM/Dilepton/Utils/MCUtilities.h"
+#include "PWGEM/PhotonMeson/Core/CutsLibrary.h"
+#include "PWGEM/PhotonMeson/Core/HistogramsLibrary.h"
+#include "PWGEM/PhotonMeson/Core/PairCut.h"
+#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+#include "PWGEM/PhotonMeson/Utils/MCUtilities.h"
+#include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
 
-#include "TString.h"
-#include "Math/Vector4D.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/RecoDecay.h"
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
-#include "PWGEM/PhotonMeson/Utils/MCUtilities.h"
-#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/PairCut.h"
-#include "PWGEM/PhotonMeson/Core/CutsLibrary.h"
-#include "PWGEM/PhotonMeson/Core/HistogramsLibrary.h"
-#include "PWGEM/Dilepton/Utils/MCUtilities.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include "Math/Vector4D.h"
+#include "TString.h"
+
+#include <cstring>
+#include <iterator>
 
 using namespace o2;
 using namespace o2::aod;
@@ -127,8 +130,8 @@ struct MaterialBudgetMC {
           THashList* list_pair_subsys_paircut = reinterpret_cast<THashList*>(list_pair_subsys_photoncut->FindObject(pair_cut_name.data()));
           o2::aod::pwgem::photon::histogram::DefineHistograms(list_pair_subsys_paircut, "material_budget_study", "Pair");
         } // end of cut3 loop pair cut
-      }   // end of probecut loop
-    }     // end of tagcut loop
+      } // end of probecut loop
+    } // end of tagcut loop
   }
 
   static constexpr std::string_view pairnames[9] = {"PCMPCM", "PHOSPHOS", "EMCEMC", "PCMPHOS", "PCMEMC", "PCMDalitzEE", "PCMDalitzMuMu", "PHOSEMC", "DalitzEEDalitzEE"};
@@ -280,7 +283,7 @@ struct MaterialBudgetMC {
           reinterpret_cast<THnSparseF*>(list_v0->FindObject(cut.GetName())->FindObject("hs_conv_point"))->Fill(value);
 
         } // end of photon loop
-      }   // end of cut loop
+      } // end of cut loop
 
     } // end of collision loop
   }
@@ -372,11 +375,11 @@ struct MaterialBudgetMC {
                 value[5] = eta_cp2;
                 reinterpret_cast<THnSparseF*>(list_pair_ss->FindObject(Form("%s_%s", tagcut.GetName(), probecut.GetName()))->FindObject(paircut.GetName())->FindObject("hs_conv_point_same"))->Fill(value);
               } // end of pair cut loop
-            }   // end of g2 loop
-          }     // end of g1 loop
-        }       // end of probecut loop
-      }         // end of tagcut loop
-    }           // end of collision loop
+            } // end of g2 loop
+          } // end of g1 loop
+        } // end of probecut loop
+      } // end of tagcut loop
+    } // end of collision loop
   }
 
   Partition<MyCollisions> grouped_collisions = cfgCentMin < o2::aod::cent::centFT0M && o2::aod::cent::centFT0M < cfgCentMax; // this goes to same event.
diff --git a/.conflict-side-1/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaEMCEMC.cxx b/.conflict-side-1/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaEMCEMC.cxx
index 3b7893f7373..3ea65c53fbd 100644
--- a/.conflict-side-1/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaEMCEMC.cxx
+++ b/.conflict-side-1/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaEMCEMC.cxx
@@ -14,14 +14,14 @@
 // This code loops over photons and makes pairs for neutral mesons analyses.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-
+#include "PWGEM/PhotonMeson/Core/Pi0EtaToGammaGamma.h"
 #include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
 #include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
-#include "PWGEM/PhotonMeson/Core/Pi0EtaToGammaGamma.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-side-1/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaMCEMCEMC.cxx b/.conflict-side-1/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaMCEMCEMC.cxx
index 7cd7ba3c492..cc91949c4a7 100644
--- a/.conflict-side-1/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaMCEMCEMC.cxx
+++ b/.conflict-side-1/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaMCEMCEMC.cxx
@@ -14,14 +14,14 @@
 // This code loops over photons and makes pairs for neutral mesons analyses.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-
+#include "PWGEM/PhotonMeson/Core/Pi0EtaToGammaGammaMC.h"
 #include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
 #include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
-#include "PWGEM/PhotonMeson/Core/Pi0EtaToGammaGammaMC.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-side-1/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaMCPCMDalitzEE.cxx b/.conflict-side-1/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaMCPCMDalitzEE.cxx
index 2d929f1a82a..d4d4e45cecc 100644
--- a/.conflict-side-1/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaMCPCMDalitzEE.cxx
+++ b/.conflict-side-1/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaMCPCMDalitzEE.cxx
@@ -14,14 +14,14 @@
 // This code loops over photons and makes pairs for neutral mesons analyses.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-
+#include "PWGEM/PhotonMeson/Core/Pi0EtaToGammaGammaMC.h"
 #include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
 #include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
-#include "PWGEM/PhotonMeson/Core/Pi0EtaToGammaGammaMC.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-side-1/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaMCPCMPCM.cxx b/.conflict-side-1/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaMCPCMPCM.cxx
index 9b79891739c..12fc3ea5067 100644
--- a/.conflict-side-1/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaMCPCMPCM.cxx
+++ b/.conflict-side-1/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaMCPCMPCM.cxx
@@ -14,14 +14,14 @@
 // This code loops over photons and makes pairs for neutral mesons analyses.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-
+#include "PWGEM/PhotonMeson/Core/Pi0EtaToGammaGammaMC.h"
 #include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
 #include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
-#include "PWGEM/PhotonMeson/Core/Pi0EtaToGammaGammaMC.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-side-1/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaPCMDalitzEE.cxx b/.conflict-side-1/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaPCMDalitzEE.cxx
index 15ccbe72bd4..bbe380442c5 100644
--- a/.conflict-side-1/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaPCMDalitzEE.cxx
+++ b/.conflict-side-1/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaPCMDalitzEE.cxx
@@ -14,15 +14,16 @@
 // This code loops over photons and makes pairs for neutral mesons analyses.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-
-#include "Common/Core/RecoDecay.h"
+#include "PWGEM/PhotonMeson/Core/Pi0EtaToGammaGamma.h"
 #include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
 #include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
-#include "PWGEM/PhotonMeson/Core/Pi0EtaToGammaGamma.h"
+
+#include "Common/Core/RecoDecay.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-side-1/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaPCMPCM.cxx b/.conflict-side-1/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaPCMPCM.cxx
index 24557c828a7..739beddd277 100644
--- a/.conflict-side-1/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaPCMPCM.cxx
+++ b/.conflict-side-1/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaPCMPCM.cxx
@@ -14,14 +14,14 @@
 // This code loops over photons and makes pairs for neutral mesons analyses.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-
+#include "PWGEM/PhotonMeson/Core/Pi0EtaToGammaGamma.h"
 #include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
 #include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
-#include "PWGEM/PhotonMeson/Core/Pi0EtaToGammaGamma.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-side-1/PWGEM/PhotonMeson/Tasks/SinglePhoton.cxx b/.conflict-side-1/PWGEM/PhotonMeson/Tasks/SinglePhoton.cxx
index 9c82fa7b09a..b0e127e5f7a 100644
--- a/.conflict-side-1/PWGEM/PhotonMeson/Tasks/SinglePhoton.cxx
+++ b/.conflict-side-1/PWGEM/PhotonMeson/Tasks/SinglePhoton.cxx
@@ -14,29 +14,32 @@
 // This code loops over photon candidate and fill histograms
 //    Please write to: daiki.sekihata@cern.ch
 
-#include <cstring>
-#include <iterator>
+#include "PWGEM/PhotonMeson/Core/CutsLibrary.h"
+#include "PWGEM/PhotonMeson/Core/EMCPhotonCut.h"
+#include "PWGEM/PhotonMeson/Core/HistogramsLibrary.h"
+#include "PWGEM/PhotonMeson/Core/PHOSPhotonCut.h"
+#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
 
-#include "TString.h"
-#include "Math/Vector4D.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/trackUtilities.h"
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/RecoDecay.h"
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/PHOSPhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/EMCPhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/CutsLibrary.h"
-#include "PWGEM/PhotonMeson/Core/HistogramsLibrary.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include "Math/Vector4D.h"
+#include "TString.h"
+
+#include <cstring>
+#include <iterator>
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-side-1/PWGEM/PhotonMeson/Tasks/SinglePhotonMC.cxx b/.conflict-side-1/PWGEM/PhotonMeson/Tasks/SinglePhotonMC.cxx
index ccb33db7f3a..5e6eded4e78 100644
--- a/.conflict-side-1/PWGEM/PhotonMeson/Tasks/SinglePhotonMC.cxx
+++ b/.conflict-side-1/PWGEM/PhotonMeson/Tasks/SinglePhotonMC.cxx
@@ -14,32 +14,35 @@
 // This code loops over photon candidate and fill histograms
 //    Please write to: daiki.sekihata@cern.ch
 
-#include <cstring>
-#include <iterator>
+#include "PWGEM/Dilepton/Utils/MCUtilities.h"
+#include "PWGEM/PhotonMeson/Core/CutsLibrary.h"
+#include "PWGEM/PhotonMeson/Core/EMCPhotonCut.h"
+#include "PWGEM/PhotonMeson/Core/HistogramsLibrary.h"
+#include "PWGEM/PhotonMeson/Core/PHOSPhotonCut.h"
+#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+#include "PWGEM/PhotonMeson/Utils/MCUtilities.h"
 
-#include "TString.h"
-#include "TMath.h"
-#include "Math/Vector4D.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/trackUtilities.h"
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/RecoDecay.h"
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/PhotonMeson/Utils/MCUtilities.h"
-#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/PHOSPhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/EMCPhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/CutsLibrary.h"
-#include "PWGEM/PhotonMeson/Core/HistogramsLibrary.h"
-#include "PWGEM/Dilepton/Utils/MCUtilities.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include "Math/Vector4D.h"
+#include "TMath.h"
+#include "TString.h"
+
+#include <cstring>
+#include <iterator>
 
 using namespace o2;
 using namespace o2::aod;
@@ -351,8 +354,8 @@ struct SinglePhotonMC {
           }
 
         } // end of photon loop
-      }   // end of cut loop
-    }     // end of collision loop
+      } // end of cut loop
+    } // end of collision loop
   }
 
   Partition<MyCollisions> grouped_collisions = (cfgCentMin < o2::aod::cent::centFT0M && o2::aod::cent::centFT0M < cfgCentMax) || (cfgCentMin < o2::aod::cent::centFT0A && o2::aod::cent::centFT0A < cfgCentMax) || (cfgCentMin < o2::aod::cent::centFT0C && o2::aod::cent::centFT0C < cfgCentMax); // this goes to same event.
diff --git a/.conflict-side-1/PWGEM/PhotonMeson/Tasks/TagAndProbe.cxx b/.conflict-side-1/PWGEM/PhotonMeson/Tasks/TagAndProbe.cxx
index 2f91a62dc43..b305a76228e 100644
--- a/.conflict-side-1/PWGEM/PhotonMeson/Tasks/TagAndProbe.cxx
+++ b/.conflict-side-1/PWGEM/PhotonMeson/Tasks/TagAndProbe.cxx
@@ -14,28 +14,31 @@
 // This code is for data-driven efficiency for photon analyses. tag and probe method
 //    Please write to: daiki.sekihata@cern.ch
 
-#include <cstring>
-#include <iterator>
+#include "PWGEM/PhotonMeson/Core/CutsLibrary.h"
+#include "PWGEM/PhotonMeson/Core/EMCPhotonCut.h"
+#include "PWGEM/PhotonMeson/Core/HistogramsLibrary.h"
+#include "PWGEM/PhotonMeson/Core/PHOSPhotonCut.h"
+#include "PWGEM/PhotonMeson/Core/PairCut.h"
+#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+#include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
 
-#include "TString.h"
-#include "Math/Vector4D.h"
-#include "Math/Vector3D.h"
+#include "Common/Core/RecoDecay.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "Math/AxisAngle.h"
 #include "Math/LorentzRotation.h"
 #include "Math/Rotation3D.h"
-#include "Math/AxisAngle.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/Core/RecoDecay.h"
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
-#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/PHOSPhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/EMCPhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/PairCut.h"
-#include "PWGEM/PhotonMeson/Core/CutsLibrary.h"
-#include "PWGEM/PhotonMeson/Core/HistogramsLibrary.h"
+#include "Math/Vector3D.h"
+#include "Math/Vector4D.h"
+#include "TString.h"
+
+#include <cstring>
+#include <iterator>
 
 using namespace o2;
 using namespace o2::aod;
@@ -126,7 +129,7 @@ struct TagAndProbe {
         THashList* list_pair_subsys_paircut = reinterpret_cast<THashList*>(list_pair_subsys_photoncut->FindObject(pair_cut_name.data()));
         o2::aod::pwgem::photon::histogram::DefineHistograms(list_pair_subsys_paircut, "tag_and_probe", pairname.data());
       } // end of cut3 loop pair cut
-    }   // end of cut2 loop
+    } // end of cut2 loop
   }
 
   static constexpr std::string_view pairnames[6] = {"PCMPCM", "PHOSPHOS", "EMCEMC", "PCMPHOS", "PCMEMC", "PHOSEMC"};
@@ -318,10 +321,10 @@ struct TagAndProbe {
                 RotationBackground<aod::SkimEMCClusters>(v12, v1, v2, photons2_coll, g1.globalIndex(), g2.globalIndex(), probecut, paircut, emcmatchedtracks);
               }
             } // end of probe cut loop
-          }   // end of pair cut loop
-        }     // end of g2 loop
-      }       // end of g1 loop
-    }         // end of collision loop
+          } // end of pair cut loop
+        } // end of g2 loop
+      } // end of g1 loop
+    } // end of collision loop
   }
 
   Configurable<int> ndepth{"ndepth", 10, "depth for event mixing"};
@@ -406,10 +409,10 @@ struct TagAndProbe {
               reinterpret_cast<TH2F*>(list_pair_ss->FindObject(Form("%s_%s", tagcut.GetName(), probecut.GetName()))->FindObject(paircut.GetName())->FindObject("hMggPt_PassingProbe_Mixed"))->Fill(v12.M(), v2.Pt());
 
             } // end of probe cut loop
-          }   // end of pair cut loop
-        }     // end of g2 loop
-      }       // end of g1 loop
-    }         // end of different collision combinations
+          } // end of pair cut loop
+        } // end of g2 loop
+      } // end of g1 loop
+    } // end of different collision combinations
   }
 
   /// \brief Calculate background (using rotation background method only for EMCal!)
diff --git a/.conflict-side-1/PWGEM/PhotonMeson/Tasks/TaggingPi0MCPCMDalitzEE.cxx b/.conflict-side-1/PWGEM/PhotonMeson/Tasks/TaggingPi0MCPCMDalitzEE.cxx
index ccdc4184568..22dfbe45376 100644
--- a/.conflict-side-1/PWGEM/PhotonMeson/Tasks/TaggingPi0MCPCMDalitzEE.cxx
+++ b/.conflict-side-1/PWGEM/PhotonMeson/Tasks/TaggingPi0MCPCMDalitzEE.cxx
@@ -14,10 +14,11 @@
 // This code loops over photons and makes pairs for neutral mesons analyses.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "PWGEM/PhotonMeson/Core/TaggingPi0MC.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::aod;
 
diff --git a/.conflict-side-1/PWGEM/PhotonMeson/Tasks/TaggingPi0PCMDalitzEE.cxx b/.conflict-side-1/PWGEM/PhotonMeson/Tasks/TaggingPi0PCMDalitzEE.cxx
index 2292faef120..ce583e23b5f 100644
--- a/.conflict-side-1/PWGEM/PhotonMeson/Tasks/TaggingPi0PCMDalitzEE.cxx
+++ b/.conflict-side-1/PWGEM/PhotonMeson/Tasks/TaggingPi0PCMDalitzEE.cxx
@@ -14,10 +14,11 @@
 // This code loops over photons and makes pairs for neutral mesons analyses.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "PWGEM/PhotonMeson/Core/TaggingPi0.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::aod;
 
diff --git a/.conflict-side-1/PWGEM/PhotonMeson/Tasks/emcalPi0QC.cxx b/.conflict-side-1/PWGEM/PhotonMeson/Tasks/emcalPi0QC.cxx
index 509e74402b5..743e4a67f25 100644
--- a/.conflict-side-1/PWGEM/PhotonMeson/Tasks/emcalPi0QC.cxx
+++ b/.conflict-side-1/PWGEM/PhotonMeson/Tasks/emcalPi0QC.cxx
@@ -9,36 +9,35 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <climits>
-#include <cstdlib>
-#include <map>
-#include <memory>
-#include <sstream>
-#include <string>
-#include <vector>
-#include <cmath>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoA.h"
-#include "Framework/HistogramRegistry.h"
+#include "PWGJE/DataModel/EMCALClusters.h"
+#include "PWGJE/DataModel/EMCALMatchedCollisions.h"
 
-#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 
-#include "EMCALBase/Geometry.h"
-#include "PWGJE/DataModel/EMCALClusters.h"
-#include "PWGJE/DataModel/EMCALMatchedCollisions.h"
+#include "CommonDataFormat/InteractionRecord.h"
+#include "DataFormatsEMCAL/AnalysisCluster.h"
 #include "DataFormatsEMCAL/Cell.h"
 #include "DataFormatsEMCAL/Constants.h"
-#include "DataFormatsEMCAL/AnalysisCluster.h"
-
-#include "CommonDataFormat/InteractionRecord.h"
+#include "EMCALBase/Geometry.h"
+#include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 
 #include "TLorentzVector.h"
 #include "TVector3.h"
 
+#include <climits>
+#include <cmath>
+#include <cstdlib>
+#include <map>
+#include <memory>
+#include <sstream>
+#include <string>
+#include <vector>
+
 // \struct Pi0QCTask
 /// \brief Simple monitoring task for EMCal clusters
 /// \author Joshua Koenig <joshua.konig@cern.ch>, Goethe University Frankfurt
diff --git a/.conflict-side-1/PWGEM/PhotonMeson/Tasks/emcalQC.cxx b/.conflict-side-1/PWGEM/PhotonMeson/Tasks/emcalQC.cxx
index 4173c26eccf..91b558cb609 100644
--- a/.conflict-side-1/PWGEM/PhotonMeson/Tasks/emcalQC.cxx
+++ b/.conflict-side-1/PWGEM/PhotonMeson/Tasks/emcalQC.cxx
@@ -18,28 +18,32 @@
 /// \author Nicolas Strangmann (nicolas.strangmann@cern.ch) Goethe University Frankfurt
 ///
 
-#include <string>
-#include <vector>
-#include <array>
-#include "TString.h"
-#include "THashList.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/trackUtilities.h"
+#include "PWGEM/PhotonMeson/Core/CutsLibrary.h"
+#include "PWGEM/PhotonMeson/Core/EMCPhotonCut.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+#include "PWGEM/PhotonMeson/Utils/ClusterHistograms.h"
+#include "PWGEM/PhotonMeson/Utils/EventHistograms.h"
+
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/RecoDecay.h"
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/PhotonMeson/Core/EMCPhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/CutsLibrary.h"
-#include "PWGEM/PhotonMeson/Utils/EventHistograms.h"
-#include "PWGEM/PhotonMeson/Utils/ClusterHistograms.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include "THashList.h"
+#include "TString.h"
+
+#include <array>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-side-1/PWGEM/PhotonMeson/Tasks/gammaConversions.cxx b/.conflict-side-1/PWGEM/PhotonMeson/Tasks/gammaConversions.cxx
index 37e4bf4dde1..933dd12944f 100644
--- a/.conflict-side-1/PWGEM/PhotonMeson/Tasks/gammaConversions.cxx
+++ b/.conflict-side-1/PWGEM/PhotonMeson/Tasks/gammaConversions.cxx
@@ -15,21 +15,22 @@
 
 #include "PWGEM/PhotonMeson/Tasks/gammaConversions.h"
 
-#include <map>
-#include <vector>
-#include <string>
-#include <memory>
-
 #include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
 #include "PWGEM/PhotonMeson/Utils/gammaConvDefinitions.h"
 
-#include "Framework/AnalysisTask.h"
+#include "Common/Core/RecoDecay.h"
+
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "Common/Core/RecoDecay.h"
 
-#include <TVector3.h>
 #include <TMath.h> // for ATan2, Cos, Sin, Sqrt
+#include <TVector3.h>
+
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGEM/PhotonMeson/Tasks/gammaConversions.h b/.conflict-side-1/PWGEM/PhotonMeson/Tasks/gammaConversions.h
index 9e1c9ebe7db..a09121baf36 100644
--- a/.conflict-side-1/PWGEM/PhotonMeson/Tasks/gammaConversions.h
+++ b/.conflict-side-1/PWGEM/PhotonMeson/Tasks/gammaConversions.h
@@ -162,4 +162,5 @@ struct tHistoRegistry {
   tHistoFolderCTV mCollision{mPath + "Collision/"};
   tHistoFolderCTV mTrack{mPath + "Track/"};
   tHistoFolderCTV mV0{mPath + "V0/"};
-};
\ No newline at end of file
+};
+  
\ No newline at end of file
diff --git a/.conflict-side-1/PWGEM/PhotonMeson/Tasks/gammaConversionsTruthOnlyMc.cxx b/.conflict-side-1/PWGEM/PhotonMeson/Tasks/gammaConversionsTruthOnlyMc.cxx
index 259a53cd037..89c094c530b 100644
--- a/.conflict-side-1/PWGEM/PhotonMeson/Tasks/gammaConversionsTruthOnlyMc.cxx
+++ b/.conflict-side-1/PWGEM/PhotonMeson/Tasks/gammaConversionsTruthOnlyMc.cxx
@@ -17,12 +17,12 @@
 #include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
 #include "PWGEM/PhotonMeson/Utils/gammaConvDefinitions.h"
 
-#include "TVector3.h"
-
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
 
+#include "TVector3.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
@@ -163,4 +163,5 @@ struct gammaConversionsTruthOnlyMc {
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
   return WorkflowSpec{adaptAnalysisTask<gammaConversionsTruthOnlyMc>(cfgc)};
-}
\ No newline at end of file
+}
+ 
\ No newline at end of file
diff --git a/.conflict-side-1/PWGEM/PhotonMeson/Tasks/mcGeneratorStudies.cxx b/.conflict-side-1/PWGEM/PhotonMeson/Tasks/mcGeneratorStudies.cxx
index 889858359ed..d7c5aafb298 100644
--- a/.conflict-side-1/PWGEM/PhotonMeson/Tasks/mcGeneratorStudies.cxx
+++ b/.conflict-side-1/PWGEM/PhotonMeson/Tasks/mcGeneratorStudies.cxx
@@ -16,11 +16,11 @@
 /// \author Nicolas Strangmann (nicolas.strangmann@cern.ch) - Goethe University Frankfurt
 ///
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 
 #include "TDatabasePDG.h"
 
diff --git a/.conflict-side-1/PWGEM/PhotonMeson/Tasks/pcmQC.cxx b/.conflict-side-1/PWGEM/PhotonMeson/Tasks/pcmQC.cxx
index 077a1be9f7d..9c621c62745 100644
--- a/.conflict-side-1/PWGEM/PhotonMeson/Tasks/pcmQC.cxx
+++ b/.conflict-side-1/PWGEM/PhotonMeson/Tasks/pcmQC.cxx
@@ -14,18 +14,18 @@
 // This code runs loop over v0 photons for PCM QC.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include <string>
-#include <vector>
+#include "PWGEM/PhotonMeson/Core/EMPhotonEventCut.h"
+#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+#include "PWGEM/PhotonMeson/Utils/PCMUtilities.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
-#include "PWGEM/PhotonMeson/Utils/PCMUtilities.h"
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/EMPhotonEventCut.h"
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-side-1/PWGEM/PhotonMeson/Tasks/pcmQCMC.cxx b/.conflict-side-1/PWGEM/PhotonMeson/Tasks/pcmQCMC.cxx
index 0587fe75138..694941112ba 100644
--- a/.conflict-side-1/PWGEM/PhotonMeson/Tasks/pcmQCMC.cxx
+++ b/.conflict-side-1/PWGEM/PhotonMeson/Tasks/pcmQCMC.cxx
@@ -14,20 +14,20 @@
 // This code runs loop over v0 photons for PCM QC.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include <string>
-#include <vector>
+#include "PWGEM/Dilepton/Utils/MCUtilities.h"
+#include "PWGEM/PhotonMeson/Core/EMPhotonEventCut.h"
+#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+#include "PWGEM/PhotonMeson/Utils/MCUtilities.h"
+#include "PWGEM/PhotonMeson/Utils/PCMUtilities.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/PhotonMeson/Utils/PCMUtilities.h"
-#include "PWGEM/PhotonMeson/Utils/MCUtilities.h"
-#include "PWGEM/Dilepton/Utils/MCUtilities.h"
-#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/EMPhotonEventCut.h"
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-side-1/PWGEM/PhotonMeson/Tasks/phosQC.cxx b/.conflict-side-1/PWGEM/PhotonMeson/Tasks/phosQC.cxx
index e7009b94f05..074a517122f 100644
--- a/.conflict-side-1/PWGEM/PhotonMeson/Tasks/phosQC.cxx
+++ b/.conflict-side-1/PWGEM/PhotonMeson/Tasks/phosQC.cxx
@@ -14,25 +14,29 @@
 // This code runs loop over PHOS clusters for PHOS QC.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include <array>
-#include "TString.h"
-#include "THashList.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/trackUtilities.h"
+#include "PWGEM/PhotonMeson/Core/CutsLibrary.h"
+#include "PWGEM/PhotonMeson/Core/HistogramsLibrary.h"
+#include "PWGEM/PhotonMeson/Core/PHOSPhotonCut.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/RecoDecay.h"
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/PhotonMeson/Core/PHOSPhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/CutsLibrary.h"
-#include "PWGEM/PhotonMeson/Core/HistogramsLibrary.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include "THashList.h"
+#include "TString.h"
+
+#include <array>
 
 using namespace o2;
 using namespace o2::aod;
@@ -148,8 +152,8 @@ struct phosQC {
         } // end of v0 loop
         reinterpret_cast<TH1F*>(fMainList->FindObject("Cluster")->FindObject(cut.GetName())->FindObject("hNgamma"))->Fill(ng);
       } // end of cut loop
-    }   // end of collision loop
-  }     // end of process
+    } // end of collision loop
+  } // end of process
 
   void processDummy(MyCollisions const&) {}
 
diff --git a/.conflict-side-1/PWGEM/PhotonMeson/Tasks/prefilterPhoton.cxx b/.conflict-side-1/PWGEM/PhotonMeson/Tasks/prefilterPhoton.cxx
index 4b0ce098f6c..41975a0a9c6 100644
--- a/.conflict-side-1/PWGEM/PhotonMeson/Tasks/prefilterPhoton.cxx
+++ b/.conflict-side-1/PWGEM/PhotonMeson/Tasks/prefilterPhoton.cxx
@@ -14,32 +14,33 @@
 // This code produces information on prefilter for photon.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include <string>
-#include <vector>
-#include <unordered_map>
 #include <map>
+#include <string>
 #include <tuple>
+#include <unordered_map>
+#include <vector>
 
 // #include "TString.h"
-#include "Math/Vector4D.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "Math/Vector4D.h"
 // #include "Common/Core/RecoDecay.h"
+#include "PWGEM/Dilepton/Utils/PairUtilities.h"
+#include "PWGEM/PhotonMeson/Core/DalitzEECut.h"
+#include "PWGEM/PhotonMeson/Core/EMPhotonEventCut.h"
+#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+#include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
+
 #include "Common/Core/trackUtilities.h"
 
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
 #include "CCDB/BasicCCDBManager.h"
-
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
-#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/EMPhotonEventCut.h"
-#include "PWGEM/PhotonMeson/Core/DalitzEECut.h"
-#include "PWGEM/Dilepton/Utils/PairUtilities.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-side-1/PWGEM/PhotonMeson/Tasks/taskPi0FlowEMC.cxx b/.conflict-side-1/PWGEM/PhotonMeson/Tasks/taskPi0FlowEMC.cxx
index 2e64bd6ebe2..b2eb97a3ac4 100644
--- a/.conflict-side-1/PWGEM/PhotonMeson/Tasks/taskPi0FlowEMC.cxx
+++ b/.conflict-side-1/PWGEM/PhotonMeson/Tasks/taskPi0FlowEMC.cxx
@@ -14,47 +14,46 @@
 ///
 /// \author M. Hemmer, marvin.hemmer@cern.ch
 
-#include <numbers>
-#include <iterator>
-#include <array>
-#include <string>
-#include <map>
-#include <algorithm>
-#include <vector>
-#include <tuple>
-#include <utility>
-#include <cmath>
-
-#include "Math/Vector4D.h"
-#include "Math/Vector3D.h"
-#include "Math/LorentzRotation.h"
-#include "Math/Rotation3D.h"
-#include "Math/AxisAngle.h"
-
-#include "CCDB/BasicCCDBManager.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
+#include "PWGEM/Dilepton/Utils/EMTrackUtilities.h"
+#include "PWGEM/PhotonMeson/Core/EMCPhotonCut.h"
+#include "PWGEM/PhotonMeson/Core/EMPhotonEventCut.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+#include "PWGEM/PhotonMeson/Utils/EventHistograms.h"
+#include "PWGEM/PhotonMeson/Utils/NMHistograms.h"
+#include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
+#include "PWGEM/PhotonMeson/Utils/emcalHistoDefinitions.h"
 
 #include "Common/Core/EventPlaneHelper.h"
 #include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/Qvectors.h"
-#include "CommonConstants/MathConstants.h"
 
-#include "DetectorsBase/GeometryManager.h"
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonConstants/MathConstants.h"
 #include "DataFormatsEMCAL/Constants.h"
+#include "DetectorsBase/GeometryManager.h"
 #include "EMCALBase/Geometry.h"
 #include "EMCALCalib/BadChannelMap.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 
-#include "PWGEM/Dilepton/Utils/EMTrackUtilities.h"
-#include "PWGEM/PhotonMeson/Core/EMCPhotonCut.h"
-#include "PWGEM/PhotonMeson/Core/EMPhotonEventCut.h"
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/PhotonMeson/Utils/emcalHistoDefinitions.h"
-#include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
-#include "PWGEM/PhotonMeson/Utils/EventHistograms.h"
-#include "PWGEM/PhotonMeson/Utils/NMHistograms.h"
+#include "Math/AxisAngle.h"
+#include "Math/LorentzRotation.h"
+#include "Math/Rotation3D.h"
+#include "Math/Vector3D.h"
+#include "Math/Vector4D.h"
+
+#include <algorithm>
+#include <array>
+#include <cmath>
+#include <iterator>
+#include <map>
+#include <numbers>
+#include <string>
+#include <tuple>
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-side-1/PWGEM/PhotonMeson/Utils/HNMUtilities.h b/.conflict-side-1/PWGEM/PhotonMeson/Utils/HNMUtilities.h
index bb985686285..24472e677d4 100644
--- a/.conflict-side-1/PWGEM/PhotonMeson/Utils/HNMUtilities.h
+++ b/.conflict-side-1/PWGEM/PhotonMeson/Utils/HNMUtilities.h
@@ -19,23 +19,26 @@
 #ifndef PWGEM_PHOTONMESON_UTILS_HNMUTILITIES_H_
 #define PWGEM_PHOTONMESON_UTILS_HNMUTILITIES_H_
 
-#include <CommonConstants/MathConstants.h>
-#include <CommonConstants/PhysicsConstants.h>
-#include <vector>
-#include "TVector3.h"
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Common/DataModel/EventSelection.h"
-#include "EMCALBase/Geometry.h"
-#include "PWGJE/DataModel/EMCALClusters.h"
 #include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
 #include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
+#include "PWGJE/DataModel/EMCALClusters.h"
+
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 #include "EventFiltering/filterTables.h"
 
+#include "EMCALBase/Geometry.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include <CommonConstants/MathConstants.h>
+#include <CommonConstants/PhysicsConstants.h>
+
+#include "TVector3.h"
+
+#include <vector>
+
 namespace o2::aod::pwgem::photonmeson::hnmutilities
 {
 // -------> Struct to store photons from EMC clusters or V0s
diff --git a/.conflict-side-1/PWGEM/PhotonMeson/Utils/PCMUtilities.h b/.conflict-side-1/PWGEM/PhotonMeson/Utils/PCMUtilities.h
index e82d580cfcd..03c3b366e58 100644
--- a/.conflict-side-1/PWGEM/PhotonMeson/Utils/PCMUtilities.h
+++ b/.conflict-side-1/PWGEM/PhotonMeson/Utils/PCMUtilities.h
@@ -15,11 +15,13 @@
 #ifndef PWGEM_PHOTONMESON_UTILS_PCMUTILITIES_H_
 #define PWGEM_PHOTONMESON_UTILS_PCMUTILITIES_H_
 
-#include <TVector2.h>
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/trackUtilities.h"
+
 #include "DCAFitter/HelixHelper.h"
 #include "DetectorsBase/Propagator.h"
-#include "Common/Core/trackUtilities.h"
-#include "Common/Core/RecoDecay.h"
+
+#include <TVector2.h>
 
 //_______________________________________________________________________
 inline bool checkAP(const float alpha, const float qt, const float alpha_max = 0.95, const float qt_max = 0.05)
diff --git a/.conflict-side-1/PWGEM/PhotonMeson/Utils/PairUtilities.h b/.conflict-side-1/PWGEM/PhotonMeson/Utils/PairUtilities.h
index 86ac4f0eb16..3fa44f1c735 100644
--- a/.conflict-side-1/PWGEM/PhotonMeson/Utils/PairUtilities.h
+++ b/.conflict-side-1/PWGEM/PhotonMeson/Utils/PairUtilities.h
@@ -16,6 +16,7 @@
 #define PWGEM_PHOTONMESON_UTILS_PAIRUTILITIES_H_
 
 #include <TVector2.h>
+
 #include <cmath>
 
 namespace o2::aod::pwgem::photonmeson::utils::pairutil
diff --git a/.conflict-side-1/PWGEM/PhotonMeson/Utils/emcalHistoDefinitions.h b/.conflict-side-1/PWGEM/PhotonMeson/Utils/emcalHistoDefinitions.h
index 6ce678e9c35..2540064309a 100644
--- a/.conflict-side-1/PWGEM/PhotonMeson/Utils/emcalHistoDefinitions.h
+++ b/.conflict-side-1/PWGEM/PhotonMeson/Utils/emcalHistoDefinitions.h
@@ -12,10 +12,10 @@
 /// \brief commonly used histogram (axis) definitions for emcal in PWGEM
 /// \author marvin.hemmer@cern.ch
 
-#include <vector>
-
 #include "Framework/AnalysisTask.h"
 
+#include <vector>
+
 #ifndef PWGEM_PHOTONMESON_UTILS_EMCALHISTODEFINITIONS_H_
 #define PWGEM_PHOTONMESON_UTILS_EMCALHISTODEFINITIONS_H_
 
diff --git a/.conflict-side-1/PWGEM/PhotonMeson/Utils/gammaSelectionCuts.h b/.conflict-side-1/PWGEM/PhotonMeson/Utils/gammaSelectionCuts.h
index 341a6c95e38..8fe140ef92d 100644
--- a/.conflict-side-1/PWGEM/PhotonMeson/Utils/gammaSelectionCuts.h
+++ b/.conflict-side-1/PWGEM/PhotonMeson/Utils/gammaSelectionCuts.h
@@ -12,10 +12,11 @@
 /// \brief cut selection and cut functions for photon candidates
 /// \author marvin.hemmer@cern.ch
 
-#include <vector>
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
 
 #include "Framework/AnalysisTask.h"
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+
+#include <vector>
 
 #ifndef PWGEM_PHOTONMESON_UTILS_GAMMASELECTIONCUTS_H_
 #define PWGEM_PHOTONMESON_UTILS_GAMMASELECTIONCUTS_H_
diff --git a/.conflict-side-1/PWGEM/Tasks/phosAlign.cxx b/.conflict-side-1/PWGEM/Tasks/phosAlign.cxx
index d63d77b84e5..e628250a670 100644
--- a/.conflict-side-1/PWGEM/Tasks/phosAlign.cxx
+++ b/.conflict-side-1/PWGEM/Tasks/phosAlign.cxx
@@ -9,35 +9,35 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <climits>
-#include <cstdlib>
-#include <map>
-#include <memory>
-#include <vector>
-#include "Common/Core/trackUtilities.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/CaloClusters.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "ReconstructionDataFormats/TrackParametrization.h"
 
-#include "Framework/ConfigParamSpec.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonDataFormat/InteractionRecord.h"
+#include "DataFormatsParameters/GRPLHCIFData.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DetectorsBase/Propagator.h"
 #include "Framework/ASoA.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/ConfigParamSpec.h"
 #include "Framework/HistogramRegistry.h"
-
+#include "Framework/runDataProcessing.h"
 #include "PHOSBase/Geometry.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CommonDataFormat/InteractionRecord.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPLHCIFData.h"
-#include "DetectorsBase/Propagator.h"
+#include "ReconstructionDataFormats/TrackParametrization.h"
+
+#include <climits>
+#include <cstdlib>
+#include <map>
+#include <memory>
+#include <vector>
 
 /// \struct PHOS pi0 analysis
 /// \brief Monitoring task for PHOS related quantities
diff --git a/.conflict-side-1/PWGEM/Tasks/phosCalibration.cxx b/.conflict-side-1/PWGEM/Tasks/phosCalibration.cxx
index 1116f47f0f2..59b6c295be2 100644
--- a/.conflict-side-1/PWGEM/Tasks/phosCalibration.cxx
+++ b/.conflict-side-1/PWGEM/Tasks/phosCalibration.cxx
@@ -9,35 +9,35 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <climits>
-#include <cstdlib>
-#include <map>
-#include <memory>
-#include <vector>
-#include "TFile.h"
-#include "TGrid.h"
-#include "TLorentzVector.h"
-
-#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/CaloClusters.h"
+#include "Common/DataModel/EventSelection.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonDataFormat/InteractionRecord.h"
+#include "CommonUtils/NameConf.h"
+#include "DataFormatsPHOS/BadChannelsMap.h"
+#include "DataFormatsPHOS/CalibParams.h"
 #include "DataFormatsPHOS/Cell.h"
 #include "DataFormatsPHOS/Cluster.h"
 #include "DataFormatsPHOS/TriggerRecord.h"
-#include "DataFormatsPHOS/BadChannelsMap.h"
-#include "DataFormatsPHOS/CalibParams.h"
+#include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/ConfigParamSpec.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 #include "PHOSBase/Geometry.h"
 #include "PHOSReconstruction/Clusterer.h"
 
-#include "Framework/ConfigParamSpec.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoA.h"
-#include "Framework/HistogramRegistry.h"
-#include "CommonUtils/NameConf.h"
-#include "CCDB/BasicCCDBManager.h"
+#include "TFile.h"
+#include "TGrid.h"
+#include "TLorentzVector.h"
 
-#include "CommonDataFormat/InteractionRecord.h"
+#include <climits>
+#include <cstdlib>
+#include <map>
+#include <memory>
+#include <vector>
 
 using namespace o2;
 using namespace o2::aod::evsel;
diff --git a/.conflict-side-1/PWGEM/Tasks/phosCellQA.cxx b/.conflict-side-1/PWGEM/Tasks/phosCellQA.cxx
index 710244c1a6d..26a627830ca 100644
--- a/.conflict-side-1/PWGEM/Tasks/phosCellQA.cxx
+++ b/.conflict-side-1/PWGEM/Tasks/phosCellQA.cxx
@@ -9,26 +9,26 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <climits>
-#include <cstdlib>
-#include <map>
-#include <memory>
-#include <vector>
-#include <string>
+#include "Common/DataModel/EventSelection.h"
 
 #include "CCDB/BasicCCDBManager.h"
-#include "Common/DataModel/EventSelection.h"
-#include "DataFormatsPHOS/Cell.h"
+#include "CommonDataFormat/InteractionRecord.h"
 #include "DataFormatsPHOS/CalibParams.h"
-#include "Framework/ConfigParamSpec.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "DataFormatsPHOS/Cell.h"
 #include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/ConfigParamSpec.h"
 #include "Framework/HistogramRegistry.h"
-
+#include "Framework/runDataProcessing.h"
 #include "PHOSBase/Geometry.h"
-#include "CommonDataFormat/InteractionRecord.h"
+
+#include <climits>
+#include <cstdlib>
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
 
 /// \struct PHOS QA
 /// \brief Monitoring task for PHOS related quantities
diff --git a/.conflict-side-1/PWGEM/Tasks/phosCluQA.cxx b/.conflict-side-1/PWGEM/Tasks/phosCluQA.cxx
index e563dc3aebe..6ccf4f2ed3c 100644
--- a/.conflict-side-1/PWGEM/Tasks/phosCluQA.cxx
+++ b/.conflict-side-1/PWGEM/Tasks/phosCluQA.cxx
@@ -9,26 +9,26 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <climits>
-#include <cstdlib>
-#include <map>
-#include <memory>
-#include <vector>
 #include "Common/DataModel/CaloClusters.h"
 #include "Common/DataModel/EventSelection.h"
 
-#include "Framework/ConfigParamSpec.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoA.h"
-#include "Framework/HistogramRegistry.h"
-#include "CommonUtils/NameConf.h"
 #include "CCDB/BasicCCDBManager.h"
+#include "CommonDataFormat/InteractionRecord.h"
+#include "CommonUtils/NameConf.h"
 #include "DataFormatsParameters/GRPLHCIFData.h"
-
+#include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/ConfigParamSpec.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 #include "PHOSBase/Geometry.h"
-#include "CommonDataFormat/InteractionRecord.h"
+
+#include <climits>
+#include <cstdlib>
+#include <map>
+#include <memory>
+#include <vector>
 
 /// \struct PHOS QA
 /// \brief Monitoring task for PHOS related quantities
diff --git a/.conflict-side-1/PWGEM/Tasks/phosElId.cxx b/.conflict-side-1/PWGEM/Tasks/phosElId.cxx
index 23e09da288f..2734e57e1dd 100644
--- a/.conflict-side-1/PWGEM/Tasks/phosElId.cxx
+++ b/.conflict-side-1/PWGEM/Tasks/phosElId.cxx
@@ -16,37 +16,40 @@
 /// \author Yeghishe Hambardzumyan, MIPT
 /// \since Apr, 2024
 
-#include <climits>
-#include <cstdlib>
-#include <map>
-#include <memory>
-#include <vector>
-#include "Common/Core/trackUtilities.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/CaloClusters.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/FT0Corrected.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "ReconstructionDataFormats/TrackParametrization.h"
-#include "Framework/ConfigParamSpec.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonDataFormat/InteractionRecord.h"
+#include "DataFormatsParameters/GRPLHCIFData.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DetectorsBase/Propagator.h"
 #include "Framework/ASoA.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/ConfigParamSpec.h"
 #include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 #include "PHOSBase/Geometry.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CommonDataFormat/InteractionRecord.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPLHCIFData.h"
-#include "DetectorsBase/Propagator.h"
+#include "ReconstructionDataFormats/TrackParametrization.h"
+
 #include "TF1.h"
 
+#include <climits>
+#include <cstdlib>
+#include <map>
+#include <memory>
+#include <vector>
+
 using namespace o2;
 using namespace o2::soa;
 using namespace o2::aod::evsel;
diff --git a/.conflict-side-1/PWGEM/Tasks/phosNbar.cxx b/.conflict-side-1/PWGEM/Tasks/phosNbar.cxx
index 7cd2e4387a7..31e35368a6b 100644
--- a/.conflict-side-1/PWGEM/Tasks/phosNbar.cxx
+++ b/.conflict-side-1/PWGEM/Tasks/phosNbar.cxx
@@ -8,30 +8,30 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include <queue>
-#include "TRandom.h"
-
 #include "Common/Core/trackUtilities.h"
-#include "Framework/ConfigParamSpec.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoA.h"
-#include "Framework/HistogramRegistry.h"
-#include "CommonUtils/NameConf.h"
+#include "Common/DataModel/CaloClusters.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "CommonDataFormat/InteractionRecord.h"
+#include "CommonUtils/NameConf.h"
 #include "DataFormatsParameters/GRPLHCIFData.h"
 #include "DataFormatsParameters/GRPMagField.h"
 #include "DetectorsBase/Propagator.h"
-
+#include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/ConfigParamSpec.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include "PHOSBase/Geometry.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/CaloClusters.h"
 
-#include "PHOSBase/Geometry.h"
-#include "CommonDataFormat/InteractionRecord.h"
+#include "TRandom.h"
+
+#include <queue>
 
 /// \struct phosNbar
 /// \brief account Nbar who's clusters appeared within PHOS
diff --git a/.conflict-side-1/PWGEM/Tasks/phosNonlin.cxx b/.conflict-side-1/PWGEM/Tasks/phosNonlin.cxx
index f25043c5f0c..4cbb9e11219 100644
--- a/.conflict-side-1/PWGEM/Tasks/phosNonlin.cxx
+++ b/.conflict-side-1/PWGEM/Tasks/phosNonlin.cxx
@@ -14,15 +14,6 @@
 /// \author Dmitri Peresunko <Dmitri.Peresunko@cern.ch>
 ///
 
-#include <array>
-#include <climits>
-#include <cstdlib>
-#include <map>
-#include <memory>
-#include <string>
-#include <vector>
-
-#include <TLorentzVector.h>
 #include "Common/DataModel/CaloClusters.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
@@ -30,18 +21,27 @@
 #include "EventFiltering/Zorro.h"
 #include "EventFiltering/ZorroSummary.h"
 
-#include "Framework/ConfigParamSpec.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonDataFormat/InteractionRecord.h"
+#include "DataFormatsParameters/GRPLHCIFData.h"
 #include "Framework/ASoA.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/ConfigParamSpec.h"
 #include "Framework/HistogramRegistry.h"
-
+#include "Framework/runDataProcessing.h"
 #include "PHOSBase/Geometry.h"
-#include "CommonDataFormat/InteractionRecord.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPLHCIFData.h"
+
+#include <TLorentzVector.h>
+
+#include <array>
+#include <climits>
+#include <cstdlib>
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::aod::evsel;
diff --git a/.conflict-side-1/PWGEM/Tasks/phosPi0.cxx b/.conflict-side-1/PWGEM/Tasks/phosPi0.cxx
index a47aaa0d485..cccae5045aa 100644
--- a/.conflict-side-1/PWGEM/Tasks/phosPi0.cxx
+++ b/.conflict-side-1/PWGEM/Tasks/phosPi0.cxx
@@ -14,34 +14,32 @@
 /// \author Dmitri Peresunko <Dmitri.Peresunko@cern.ch>
 ///
 
-#include <algorithm>
-#include <climits>
-#include <cstdlib>
-#include <map>
-#include <memory>
-#include <string>
-#include <vector>
-
 #include "Common/DataModel/CaloClusters.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-
-#include "Framework/ConfigParamSpec.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoA.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/HistogramRegistry.h"
-
 #include "EventFiltering/Zorro.h"
 #include "EventFiltering/ZorroSummary.h"
 
-#include "PHOSBase/Geometry.h"
-#include "CommonDataFormat/InteractionRecord.h"
 #include "CCDB/BasicCCDBManager.h"
+#include "CommonDataFormat/InteractionRecord.h"
 #include "DataFormatsParameters/GRPLHCIFData.h"
+#include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/ConfigParamSpec.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include "PHOSBase/Geometry.h"
+
+#include <algorithm>
+#include <climits>
+#include <cstdlib>
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::aod::evsel;
diff --git a/.conflict-side-1/PWGEM/Tasks/phosTrigQA.cxx b/.conflict-side-1/PWGEM/Tasks/phosTrigQA.cxx
index b0b0949cfb5..c7dab6e4e7a 100644
--- a/.conflict-side-1/PWGEM/Tasks/phosTrigQA.cxx
+++ b/.conflict-side-1/PWGEM/Tasks/phosTrigQA.cxx
@@ -9,28 +9,28 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <climits>
-#include <cstdlib>
-#include <map>
-#include <memory>
-#include <vector>
 #include "Common/DataModel/CaloClusters.h"
 #include "Common/DataModel/EventSelection.h"
+#include "EventFiltering/filterTables.h"
 
-#include "Framework/ConfigParamSpec.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonDataFormat/InteractionRecord.h"
+#include "CommonUtils/NameConf.h"
+#include "DataFormatsParameters/GRPLHCIFData.h"
 #include "Framework/ASoA.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/ConfigParamSpec.h"
 #include "Framework/HistogramRegistry.h"
-#include "CommonUtils/NameConf.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPLHCIFData.h"
-
+#include "Framework/runDataProcessing.h"
 #include "PHOSBase/Geometry.h"
-#include "CommonDataFormat/InteractionRecord.h"
-#include "EventFiltering/filterTables.h"
+
+#include <climits>
+#include <cstdlib>
+#include <map>
+#include <memory>
+#include <vector>
 
 /// \struct PHOS trigger QA
 /// \brief Monitoring task for PHOS related quantities
diff --git a/.conflict-side-1/PWGHF/ALICE3/TableProducer/candidateCreatorChic.cxx b/.conflict-side-1/PWGHF/ALICE3/TableProducer/candidateCreatorChic.cxx
index e01b4fe0a6a..e34932fcdea 100644
--- a/.conflict-side-1/PWGHF/ALICE3/TableProducer/candidateCreatorChic.cxx
+++ b/.conflict-side-1/PWGHF/ALICE3/TableProducer/candidateCreatorChic.cxx
@@ -15,8 +15,12 @@
 ///
 /// \author Alessandro De Falco <alessandro.de.falco@ca.infn.it>, Cagliari University
 
-#include <utility>
-#include <vector>
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
+
+#include "ALICE3/DataModel/ECAL.h"
+#include "Common/Core/trackUtilities.h"
 
 #include "CommonConstants/PhysicsConstants.h"
 #include "DCAFitter/DCAFitterN.h"
@@ -24,12 +28,8 @@
 #include "ReconstructionDataFormats/DCA.h"
 #include "ReconstructionDataFormats/V0.h"
 
-#include "ALICE3/DataModel/ECAL.h"
-#include "Common/Core/trackUtilities.h"
-
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis;
@@ -201,9 +201,9 @@ struct HfCandidateCreatorChic {
           hMassChicToJpsiToMuMuGamma->Fill(massJpsiGamma);
         }
       } // ecal loop
-    }   // Jpsi loop
-  }     // process
-};      // struct
+    } // Jpsi loop
+  } // process
+}; // struct
 
 /// Extends the base table with expression columns.
 struct HfCandidateCreatorChicExpressions {
@@ -299,8 +299,8 @@ struct HfCandidateCreatorChicMc {
 
       rowMcMatchGen(flag, origin, channel);
     } // candidate loop
-  }   // process
-};    // struct
+  } // process
+}; // struct
 
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
diff --git a/.conflict-side-1/PWGHF/ALICE3/TableProducer/candidateCreatorX.cxx b/.conflict-side-1/PWGHF/ALICE3/TableProducer/candidateCreatorX.cxx
index 2e3477dab99..02e5939ec32 100644
--- a/.conflict-side-1/PWGHF/ALICE3/TableProducer/candidateCreatorX.cxx
+++ b/.conflict-side-1/PWGHF/ALICE3/TableProducer/candidateCreatorX.cxx
@@ -16,8 +16,11 @@
 /// \author Rik Spijkers <r.spijkers@students.uu.nl>, Utrecht University
 /// \author Luca Micheletti <luca.micheletti@to.infn.it>, INFN
 
-#include <utility>
-#include <vector>
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
+
+#include "Common/Core/trackUtilities.h"
 
 #include "CommonConstants/PhysicsConstants.h"
 #include "DCAFitter/DCAFitterN.h"
@@ -25,11 +28,8 @@
 #include "ReconstructionDataFormats/DCA.h"
 #include "ReconstructionDataFormats/V0.h"
 
-#include "Common/Core/trackUtilities.h"
-
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis;
@@ -255,10 +255,10 @@ struct HfCandidateCreatorX {
             hMassXToJpsiToMuMuPiPi->Fill(massJpsiPiPi);
           }
         } // pi- loop
-      }   // pi+ loop
-    }     // Jpsi loop
-  }       // process
-};        // struct
+      } // pi+ loop
+    } // Jpsi loop
+  } // process
+}; // struct
 
 /// Extends the base table with expression columns.
 struct HfCandidateCreatorXExpressions {
@@ -363,8 +363,8 @@ struct HfCandidateCreatorXMc {
 
       rowMcMatchGen(flag, origin, channel);
     } // candidate loop
-  }   // process
-};    // struct
+  } // process
+}; // struct
 
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
diff --git a/.conflict-side-1/PWGHF/ALICE3/TableProducer/candidateSelectorChicToJpsiGamma.cxx b/.conflict-side-1/PWGHF/ALICE3/TableProducer/candidateSelectorChicToJpsiGamma.cxx
index 5160a2ba99c..bcd3c25cbe7 100644
--- a/.conflict-side-1/PWGHF/ALICE3/TableProducer/candidateSelectorChicToJpsiGamma.cxx
+++ b/.conflict-side-1/PWGHF/ALICE3/TableProducer/candidateSelectorChicToJpsiGamma.cxx
@@ -15,16 +15,16 @@
 ///
 /// \author Alessandro De Falco <alessandro.de.falco@ca.infn.it>, Università/INFN Cagliari
 
-#include <vector>
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/Core/SelectorCuts.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
 
 #include "CommonConstants/PhysicsConstants.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
 
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/Core/SelectorCuts.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
+#include <vector>
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-side-1/PWGHF/ALICE3/TableProducer/candidateSelectorD0Alice3Barrel.cxx b/.conflict-side-1/PWGHF/ALICE3/TableProducer/candidateSelectorD0Alice3Barrel.cxx
index 705deeeaff2..64a74907928 100644
--- a/.conflict-side-1/PWGHF/ALICE3/TableProducer/candidateSelectorD0Alice3Barrel.cxx
+++ b/.conflict-side-1/PWGHF/ALICE3/TableProducer/candidateSelectorD0Alice3Barrel.cxx
@@ -15,18 +15,18 @@
 /// \author Nima Zardoshti <nima.zardoshti@cern.ch>, CERN
 /// \author Vít Kučera <vit.kucera@cern.ch>, CERN
 
-#include <vector>
-#include <algorithm>
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
+
+#include "ALICE3/DataModel/RICH.h"
 
 #include "CommonConstants/PhysicsConstants.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
 
-#include "ALICE3/DataModel/RICH.h"
-
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
+#include <algorithm>
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis;
diff --git a/.conflict-side-1/PWGHF/ALICE3/TableProducer/candidateSelectorD0Alice3Forward.cxx b/.conflict-side-1/PWGHF/ALICE3/TableProducer/candidateSelectorD0Alice3Forward.cxx
index a213c3edd04..adc59d03ed9 100644
--- a/.conflict-side-1/PWGHF/ALICE3/TableProducer/candidateSelectorD0Alice3Forward.cxx
+++ b/.conflict-side-1/PWGHF/ALICE3/TableProducer/candidateSelectorD0Alice3Forward.cxx
@@ -15,18 +15,18 @@
 /// \author Nima Zardoshti <nima.zardoshti@cern.ch>, CERN
 /// \author Vít Kučera <vit.kucera@cern.ch>, CERN
 
-#include <vector>
-#include <algorithm>
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
+
+#include "ALICE3/DataModel/RICH.h"
 
 #include "CommonConstants/PhysicsConstants.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
 
-#include "ALICE3/DataModel/RICH.h"
-
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
+#include <algorithm>
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis;
diff --git a/.conflict-side-1/PWGHF/ALICE3/TableProducer/candidateSelectorD0ParametrizedPid.cxx b/.conflict-side-1/PWGHF/ALICE3/TableProducer/candidateSelectorD0ParametrizedPid.cxx
index 6a46231b0c2..1ae60aa64b9 100644
--- a/.conflict-side-1/PWGHF/ALICE3/TableProducer/candidateSelectorD0ParametrizedPid.cxx
+++ b/.conflict-side-1/PWGHF/ALICE3/TableProducer/candidateSelectorD0ParametrizedPid.cxx
@@ -15,18 +15,18 @@
 /// \author Nima Zardoshti <nima.zardoshti@cern.ch>, CERN
 /// \author Vít Kučera <vit.kucera@cern.ch>, CERN
 
-#include <vector>
-#include <algorithm>
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
+
+#include "ALICE3/DataModel/RICH.h"
 
 #include "CommonConstants/PhysicsConstants.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
 
-#include "ALICE3/DataModel/RICH.h"
-
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
+#include <algorithm>
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis;
diff --git a/.conflict-side-1/PWGHF/ALICE3/TableProducer/candidateSelectorJpsi.cxx b/.conflict-side-1/PWGHF/ALICE3/TableProducer/candidateSelectorJpsi.cxx
index 391aba49da0..a04b064b1b1 100644
--- a/.conflict-side-1/PWGHF/ALICE3/TableProducer/candidateSelectorJpsi.cxx
+++ b/.conflict-side-1/PWGHF/ALICE3/TableProducer/candidateSelectorJpsi.cxx
@@ -16,18 +16,18 @@
 /// \author Nima Zardoshti <nima.zardoshti@cern.ch>, CERN
 /// \author Vít Kučera <vit.kucera@cern.ch>, CERN
 
-#include <vector>
-
-#include "CommonConstants/PhysicsConstants.h"
-#include "Framework/AnalysisTask.h"
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
 
 #include "ALICE3/DataModel/MID.h"
 #include "ALICE3/DataModel/RICH.h"
 #include "Common/Core/TrackSelectorPID.h"
 
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/AnalysisTask.h"
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis;
diff --git a/.conflict-side-1/PWGHF/ALICE3/TableProducer/candidateSelectorLcAlice3.cxx b/.conflict-side-1/PWGHF/ALICE3/TableProducer/candidateSelectorLcAlice3.cxx
index c9abeedad39..0703dbcaf89 100644
--- a/.conflict-side-1/PWGHF/ALICE3/TableProducer/candidateSelectorLcAlice3.cxx
+++ b/.conflict-side-1/PWGHF/ALICE3/TableProducer/candidateSelectorLcAlice3.cxx
@@ -16,17 +16,17 @@
 /// \author Nima Zardoshti <nima.zardoshti@cern.ch>, CERN
 /// \author Vít Kučera <vit.kucera@cern.ch>, CERN
 
-#include <vector>
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
+
+#include "ALICE3/DataModel/RICH.h"
 
 #include "CommonConstants/PhysicsConstants.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
 
-#include "ALICE3/DataModel/RICH.h"
-
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis;
diff --git a/.conflict-side-1/PWGHF/ALICE3/TableProducer/candidateSelectorLcParametrizedPid.cxx b/.conflict-side-1/PWGHF/ALICE3/TableProducer/candidateSelectorLcParametrizedPid.cxx
index 0a3210a63f6..4b5ab4feaea 100644
--- a/.conflict-side-1/PWGHF/ALICE3/TableProducer/candidateSelectorLcParametrizedPid.cxx
+++ b/.conflict-side-1/PWGHF/ALICE3/TableProducer/candidateSelectorLcParametrizedPid.cxx
@@ -16,17 +16,17 @@
 /// \author Nima Zardoshti <nima.zardoshti@cern.ch>, CERN
 /// \author Vít Kučera <vit.kucera@cern.ch>, CERN
 
-#include <vector>
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
+
+#include "ALICE3/DataModel/RICH.h"
 
 #include "CommonConstants/PhysicsConstants.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
 
-#include "ALICE3/DataModel/RICH.h"
-
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis;
diff --git a/.conflict-side-1/PWGHF/ALICE3/TableProducer/candidateSelectorXToJpsiPiPi.cxx b/.conflict-side-1/PWGHF/ALICE3/TableProducer/candidateSelectorXToJpsiPiPi.cxx
index bff87d84e70..bc1f5da2f7a 100644
--- a/.conflict-side-1/PWGHF/ALICE3/TableProducer/candidateSelectorXToJpsiPiPi.cxx
+++ b/.conflict-side-1/PWGHF/ALICE3/TableProducer/candidateSelectorXToJpsiPiPi.cxx
@@ -16,16 +16,16 @@
 /// \author Rik Spijkers <r.spijkers@students.uu.nl>, Utrecht University
 /// \author Luca Micheletti <luca.micheletti@to.infn.it>, INFN
 
-#include <vector>
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/Core/SelectorCuts.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
 
 #include "CommonConstants/PhysicsConstants.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
 
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/Core/SelectorCuts.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
+#include <vector>
 
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-side-1/PWGHF/ALICE3/TableProducer/treeCreatorChicToJpsiGamma.cxx b/.conflict-side-1/PWGHF/ALICE3/TableProducer/treeCreatorChicToJpsiGamma.cxx
index 1b164a0fc0e..29019da1884 100644
--- a/.conflict-side-1/PWGHF/ALICE3/TableProducer/treeCreatorChicToJpsiGamma.cxx
+++ b/.conflict-side-1/PWGHF/ALICE3/TableProducer/treeCreatorChicToJpsiGamma.cxx
@@ -18,14 +18,14 @@
 /// \author Alessandro De Falco <alessandro.de.falco@ca.infn.it>, Università/INFN Cagliari
 /// \author Luca Micheletti <luca.micheletti@to.infn.it>, INFN
 
-#include "CommonConstants/PhysicsConstants.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-
 #include "PWGHF/Core/HfHelper.h"
 #include "PWGHF/DataModel/CandidateReconstructionTables.h"
 #include "PWGHF/DataModel/CandidateSelectionTables.h"
 
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::aod;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGHF/ALICE3/TableProducer/treeCreatorXToJpsiPiPi.cxx b/.conflict-side-1/PWGHF/ALICE3/TableProducer/treeCreatorXToJpsiPiPi.cxx
index 7a981b35798..d6cb0c8a83d 100644
--- a/.conflict-side-1/PWGHF/ALICE3/TableProducer/treeCreatorXToJpsiPiPi.cxx
+++ b/.conflict-side-1/PWGHF/ALICE3/TableProducer/treeCreatorXToJpsiPiPi.cxx
@@ -17,13 +17,13 @@
 ///
 /// \author Luca Micheletti <luca.micheletti@to.infn.it>, INFN
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-
 #include "PWGHF/Core/HfHelper.h"
 #include "PWGHF/DataModel/CandidateReconstructionTables.h"
 #include "PWGHF/DataModel/CandidateSelectionTables.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::aod;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGHF/ALICE3/Tasks/taskChic.cxx b/.conflict-side-1/PWGHF/ALICE3/Tasks/taskChic.cxx
index f8cb85454a1..5a7adab7404 100644
--- a/.conflict-side-1/PWGHF/ALICE3/Tasks/taskChic.cxx
+++ b/.conflict-side-1/PWGHF/ALICE3/Tasks/taskChic.cxx
@@ -15,16 +15,16 @@
 /// \author Gian Michele Innocenti <gian.michele.innocenti@cern.ch>, CERN
 /// \author Alessandro De Falco <alessandro.de.falco@ca.infn.it>, Cagliari University
 
-#include <vector>
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/Core/SelectorCuts.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
 
 #include "CommonConstants/PhysicsConstants.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/Core/SelectorCuts.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
+#include <vector>
 
 using namespace o2;
 using namespace o2::aod;
@@ -101,8 +101,8 @@ struct HfTaskChic {
       registry.fill(HIST("hDecLenXYErr"), candidate.errorDecayLengthXY(), candidate.pt());
       //      registry.fill(HIST("hEGamma"), candidate.prong1().e());
     } // candidate loop
-  }   // process
-};    // struct
+  } // process
+}; // struct
 
 struct HfTaskChicMc {
   Configurable<int> selectionFlagChic{"selectionFlagChic", 1, "Selection Flag for Chic"};
@@ -225,8 +225,8 @@ struct HfTaskChicMc {
         registry.fill(HIST("hPtProng1Gen"), ptProngs[1], particle.pt());
       }
     } // gen
-  }   // process
-};    // struct
+  } // process
+}; // struct
 
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
diff --git a/.conflict-side-1/PWGHF/ALICE3/Tasks/taskD0Alice3Barrel.cxx b/.conflict-side-1/PWGHF/ALICE3/Tasks/taskD0Alice3Barrel.cxx
index da86e77a06b..481c85248b0 100644
--- a/.conflict-side-1/PWGHF/ALICE3/Tasks/taskD0Alice3Barrel.cxx
+++ b/.conflict-side-1/PWGHF/ALICE3/Tasks/taskD0Alice3Barrel.cxx
@@ -15,15 +15,15 @@
 /// \author Gian Michele Innocenti <gian.michele.innocenti@cern.ch>, CERN
 /// \author Vít Kučera <vit.kucera@cern.ch>, CERN
 
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
+
 #include "CommonConstants/PhysicsConstants.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
 
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-1/PWGHF/ALICE3/Tasks/taskD0Alice3Forward.cxx b/.conflict-side-1/PWGHF/ALICE3/Tasks/taskD0Alice3Forward.cxx
index dea53a20d70..0b4afc24583 100644
--- a/.conflict-side-1/PWGHF/ALICE3/Tasks/taskD0Alice3Forward.cxx
+++ b/.conflict-side-1/PWGHF/ALICE3/Tasks/taskD0Alice3Forward.cxx
@@ -15,15 +15,15 @@
 /// \author Gian Michele Innocenti <gian.michele.innocenti@cern.ch>, CERN
 /// \author Vít Kučera <vit.kucera@cern.ch>, CERN
 
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
+
 #include "CommonConstants/PhysicsConstants.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
 
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-1/PWGHF/ALICE3/Tasks/taskD0ParametrizedPid.cxx b/.conflict-side-1/PWGHF/ALICE3/Tasks/taskD0ParametrizedPid.cxx
index 3fe2487b2f3..a0df06fd12c 100644
--- a/.conflict-side-1/PWGHF/ALICE3/Tasks/taskD0ParametrizedPid.cxx
+++ b/.conflict-side-1/PWGHF/ALICE3/Tasks/taskD0ParametrizedPid.cxx
@@ -15,15 +15,15 @@
 /// \author Gian Michele Innocenti <gian.michele.innocenti@cern.ch>, CERN
 /// \author Vít Kučera <vit.kucera@cern.ch>, CERN
 
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
+
 #include "CommonConstants/PhysicsConstants.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
 
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-1/PWGHF/ALICE3/Tasks/taskJpsi.cxx b/.conflict-side-1/PWGHF/ALICE3/Tasks/taskJpsi.cxx
index a9210ccca86..d231b55c3d4 100644
--- a/.conflict-side-1/PWGHF/ALICE3/Tasks/taskJpsi.cxx
+++ b/.conflict-side-1/PWGHF/ALICE3/Tasks/taskJpsi.cxx
@@ -16,15 +16,15 @@
 /// \author Vít Kučera <vit.kucera@cern.ch>, CERN
 /// \author Biao Zhang <biao.zhang@cern.ch>, CCNU
 
-#include <vector>
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
 
 #include "CommonConstants/PhysicsConstants.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis;
diff --git a/.conflict-side-1/PWGHF/ALICE3/Tasks/taskLcAlice3.cxx b/.conflict-side-1/PWGHF/ALICE3/Tasks/taskLcAlice3.cxx
index 9bbfdaf91e5..4889ac7d5b3 100644
--- a/.conflict-side-1/PWGHF/ALICE3/Tasks/taskLcAlice3.cxx
+++ b/.conflict-side-1/PWGHF/ALICE3/Tasks/taskLcAlice3.cxx
@@ -15,15 +15,15 @@
 /// \author Gian Michele Innocenti <gian.michele.innocenti@cern.ch>, CERN
 /// \author Vít Kučera <vit.kucera@cern.ch>, CERN
 
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
+
 #include "CommonConstants/PhysicsConstants.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
 
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-1/PWGHF/ALICE3/Tasks/taskLcParametrizedPid.cxx b/.conflict-side-1/PWGHF/ALICE3/Tasks/taskLcParametrizedPid.cxx
index 8936c56e2c1..2457f7a6e88 100644
--- a/.conflict-side-1/PWGHF/ALICE3/Tasks/taskLcParametrizedPid.cxx
+++ b/.conflict-side-1/PWGHF/ALICE3/Tasks/taskLcParametrizedPid.cxx
@@ -15,15 +15,15 @@
 /// \author Gian Michele Innocenti <gian.michele.innocenti@cern.ch>, CERN
 /// \author Vít Kučera <vit.kucera@cern.ch>, CERN
 
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
+
 #include "CommonConstants/PhysicsConstants.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
 
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-1/PWGHF/ALICE3/Tasks/taskQaPidRejection.cxx b/.conflict-side-1/PWGHF/ALICE3/Tasks/taskQaPidRejection.cxx
index f0e819e3086..82156ed8e3f 100644
--- a/.conflict-side-1/PWGHF/ALICE3/Tasks/taskQaPidRejection.cxx
+++ b/.conflict-side-1/PWGHF/ALICE3/Tasks/taskQaPidRejection.cxx
@@ -16,16 +16,7 @@
 /// \author Henrique J C Zanoli <henrique.zanoli@cern.ch>, Utrecht University
 /// \author Nicolo' Jacazio <nicolo.jacazio@cern.ch>, CERN
 
-#include <utility>
-#include <vector>
-
-#include <TEfficiency.h>
-#include <TList.h>
-#include <TPDGCode.h>
-
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "ReconstructionDataFormats/DCA.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
 
 #include "ALICE3/DataModel/MID.h"
 #include "ALICE3/DataModel/RICH.h"
@@ -33,7 +24,16 @@
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "ReconstructionDataFormats/DCA.h"
+
+#include <TEfficiency.h>
+#include <TList.h>
+#include <TPDGCode.h>
+
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGHF/ALICE3/Tasks/taskX.cxx b/.conflict-side-1/PWGHF/ALICE3/Tasks/taskX.cxx
index f090eb57876..295d7517787 100644
--- a/.conflict-side-1/PWGHF/ALICE3/Tasks/taskX.cxx
+++ b/.conflict-side-1/PWGHF/ALICE3/Tasks/taskX.cxx
@@ -16,16 +16,16 @@
 /// \author Rik Spijkers <r.spijkers@students.uu.nl>, Utrecht University
 /// \author Luca Micheletti <luca.micheletti@to.infn.it>, INFN
 
-#include <vector>
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/Core/SelectorCuts.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
 
 #include "CommonConstants/PhysicsConstants.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/Core/SelectorCuts.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
+#include <vector>
 
 using namespace o2;
 using namespace o2::aod;
@@ -102,8 +102,8 @@ struct HfTaskX {
       registry.fill(HIST("hDecLenErr"), candidate.errorDecayLength(), candidate.pt());
       registry.fill(HIST("hDecLenXYErr"), candidate.errorDecayLengthXY(), candidate.pt());
     } // candidate loop
-  }   // process
-};    // struct
+  } // process
+}; // struct
 
 struct HfTaskXMc {
   Configurable<int> selectionFlagX{"selectionFlagX", 1, "Selection Flag for X"};
@@ -230,8 +230,8 @@ struct HfTaskXMc {
         registry.fill(HIST("hPtGenProng2"), ptProngs[2], particle.pt());
       }
     } // gen
-  }   // process
-};    // struct
+  } // process
+}; // struct
 
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
diff --git a/.conflict-side-1/PWGHF/D2H/DataModel/ReducedDataModel.h b/.conflict-side-1/PWGHF/D2H/DataModel/ReducedDataModel.h
index e5a776c02c4..34f844cdc3e 100644
--- a/.conflict-side-1/PWGHF/D2H/DataModel/ReducedDataModel.h
+++ b/.conflict-side-1/PWGHF/D2H/DataModel/ReducedDataModel.h
@@ -1165,7 +1165,7 @@ DECLARE_SOA_COLUMN(Sign, sign, int8_t);                                      //!
 DECLARE_SOA_COLUMN(ItsNClsSoftPi, itsNClsSoftPi, int);                       //! minimum value of number of ITS clusters for the decay daughter tracks
 DECLARE_SOA_COLUMN(TpcNClsCrossedRowsSoftPi, tpcNClsCrossedRowsSoftPi, int); //! minimum value of number of TPC crossed rows for the decay daughter tracks
 DECLARE_SOA_COLUMN(TpcChi2NClSoftPi, tpcChi2NClSoftPi, float);               //! maximum value of TPC chi2 for the decay daughter tracks
-DECLARE_SOA_DYNAMIC_COLUMN(Px, px, //!
+DECLARE_SOA_DYNAMIC_COLUMN(Px, px,                                           //!
                            [](float pxProng0, float pxProng1, float pxProng2) -> float { return 1.f * pxProng0 + 1.f * pxProng1 + 1.f * pxProng2; });
 DECLARE_SOA_DYNAMIC_COLUMN(Py, py, //!
                            [](float pyProng0, float pyProng1, float pyProng2) -> float { return 1.f * pyProng0 + 1.f * pyProng1 + 1.f * pyProng2; });
@@ -1376,16 +1376,16 @@ DECLARE_SOA_COLUMN(InvMassProng1, invMassProng1, float); //! Invariant Mass of V
 DECLARE_SOA_COLUMN(Sign, sign, int8_t);                  //! Sign of the Resonance candidate
 DECLARE_SOA_COLUMN(IsWrongSign, isWrongSign, int8_t);    //! Flag for wrong sign of the Resonance candidate, 1 = wrong sign, 0 = right sign
 
-DECLARE_SOA_COLUMN(FlagMcMatchRec, flagMcMatchRec, int8_t);               // flag for resonance decay channel classification reconstruction level
-DECLARE_SOA_COLUMN(FlagMcMatchRecD, flagMcMatchRecD, int8_t);             // flag for D meson bachelor decay channel classification reconstruction level
-DECLARE_SOA_COLUMN(FlagMcMatchChanD, flagMcMatchChanD, int8_t);           // flag for D meson resonant channel classification reconstruction level
-DECLARE_SOA_COLUMN(FlagMcMatchGen, flagMcMatchGen, int8_t);               // flag for decay channel classification generator level
-DECLARE_SOA_COLUMN(DebugMcRec, debugMcRec, uint16_t);                     // debug flag for mis-association at reconstruction level
-DECLARE_SOA_COLUMN(Origin, origin, int8_t);                               // Flag for origin of MC particle 1=promt, 2=FD
-DECLARE_SOA_COLUMN(SignD0, signD0, int8_t);                               // Sign of the D0 in the channels with D* -> D0 pi, needed in case of non-matched D*
-DECLARE_SOA_COLUMN(PtGen, ptGen, float);                                  // Pt at generation level in GeV/c
-DECLARE_SOA_COLUMN(InvMassGen, invMassGen, float);                        //! Invariant mass at generation level in GeV/c2
-DECLARE_SOA_DYNAMIC_COLUMN(Pt, pt,                                        //!
+DECLARE_SOA_COLUMN(FlagMcMatchRec, flagMcMatchRec, int8_t);     // flag for resonance decay channel classification reconstruction level
+DECLARE_SOA_COLUMN(FlagMcMatchRecD, flagMcMatchRecD, int8_t);   // flag for D meson bachelor decay channel classification reconstruction level
+DECLARE_SOA_COLUMN(FlagMcMatchChanD, flagMcMatchChanD, int8_t); // flag for D meson resonant channel classification reconstruction level
+DECLARE_SOA_COLUMN(FlagMcMatchGen, flagMcMatchGen, int8_t);     // flag for decay channel classification generator level
+DECLARE_SOA_COLUMN(DebugMcRec, debugMcRec, uint16_t);           // debug flag for mis-association at reconstruction level
+DECLARE_SOA_COLUMN(Origin, origin, int8_t);                     // Flag for origin of MC particle 1=promt, 2=FD
+DECLARE_SOA_COLUMN(SignD0, signD0, int8_t);                     // Sign of the D0 in the channels with D* -> D0 pi, needed in case of non-matched D*
+DECLARE_SOA_COLUMN(PtGen, ptGen, float);                        // Pt at generation level in GeV/c
+DECLARE_SOA_COLUMN(InvMassGen, invMassGen, float);              //! Invariant mass at generation level in GeV/c2
+DECLARE_SOA_DYNAMIC_COLUMN(Pt, pt,                              //!
                            [](float pxProng0, float pxProng1, float pyProng0, float pyProng1) -> float { return RecoDecay::pt((1.f * pxProng0 + 1.f * pxProng1), (1.f * pyProng0 + 1.f * pyProng1)); });
 DECLARE_SOA_DYNAMIC_COLUMN(PtProng0, ptProng0, //!
                            [](float pxProng0, float pyProng0) -> float { return RecoDecay::pt(pxProng0, pyProng0); });
diff --git a/.conflict-side-1/PWGHF/HFC/Macros/DhCorrelationExtraction.h b/.conflict-side-1/PWGHF/HFC/Macros/DhCorrelationExtraction.h
index 73b07c61e83..ddfe205372c 100644
--- a/.conflict-side-1/PWGHF/HFC/Macros/DhCorrelationExtraction.h
+++ b/.conflict-side-1/PWGHF/HFC/Macros/DhCorrelationExtraction.h
@@ -17,8 +17,6 @@
 #ifndef PWGHF_HFC_MACROS_DHCORRELATIONEXTRACTION_H_
 #define PWGHF_HFC_MACROS_DHCORRELATIONEXTRACTION_H_
 
-#include <Rtypes.h>
-#include <RtypesCore.h>
 #include <TAttMarker.h>
 #include <TDirectoryFile.h>
 #include <TFile.h>
@@ -28,6 +26,9 @@
 #include <TObject.h>
 #include <TString.h>
 
+#include <Rtypes.h>
+#include <RtypesCore.h>
+
 class DhCorrelationExtraction : public TObject
 {
 
diff --git a/.conflict-side-1/PWGHF/HFC/Macros/DhCorrelationFitter.h b/.conflict-side-1/PWGHF/HFC/Macros/DhCorrelationFitter.h
index a4bdf3c3bb1..e2354624bf2 100644
--- a/.conflict-side-1/PWGHF/HFC/Macros/DhCorrelationFitter.h
+++ b/.conflict-side-1/PWGHF/HFC/Macros/DhCorrelationFitter.h
@@ -17,12 +17,13 @@
 #ifndef PWGHF_HFC_MACROS_DHCORRELATIONFITTER_H_
 #define PWGHF_HFC_MACROS_DHCORRELATIONFITTER_H_
 
-#include <cstdio>
-
-#include <RtypesCore.h>
 #include <TF1.h>
 #include <TH1.h>
 
+#include <RtypesCore.h>
+
+#include <cstdio>
+
 class DhCorrelationFitter
 {
 
diff --git a/.conflict-side-1/PWGHF/HFC/Macros/ExtractOutputCorrel.C b/.conflict-side-1/PWGHF/HFC/Macros/ExtractOutputCorrel.C
index 301434f66e2..872093701ff 100644
--- a/.conflict-side-1/PWGHF/HFC/Macros/ExtractOutputCorrel.C
+++ b/.conflict-side-1/PWGHF/HFC/Macros/ExtractOutputCorrel.C
@@ -16,12 +16,14 @@
 /// \author Samuele Cattaruzzi <samuele.cattaruzzi@cern.ch>
 /// \author Swapnesh Santosh Khade <swapnesh.santosh.khade@cern.ch>
 
+#include "DhCorrelationExtraction.h"
 #include "Riostream.h"
+
 #include <TROOT.h>
 #include <TStyle.h>
+
 #include <rapidjson/document.h>
 #include <rapidjson/filereadstream.h>
-#include "DhCorrelationExtraction.h"
 
 using namespace rapidjson;
 
diff --git a/.conflict-side-1/PWGHF/HFC/Macros/FitCorrel.C b/.conflict-side-1/PWGHF/HFC/Macros/FitCorrel.C
index 37b36a5e1b3..3e15eda604a 100644
--- a/.conflict-side-1/PWGHF/HFC/Macros/FitCorrel.C
+++ b/.conflict-side-1/PWGHF/HFC/Macros/FitCorrel.C
@@ -16,17 +16,19 @@
 /// \author Samuele Cattaruzzi <samuele.cattaruzzi@cern.ch>
 /// \author Swapnesh Santosh Khade <swapnesh.santosh.khade@cern.ch>
 
+#include "DhCorrelationFitter.h"
 #include "Riostream.h"
-#include <TROOT.h>
+
 #include <TF1.h>
 #include <TH1D.h>
 #include <TMath.h>
 #include <TPaveText.h>
-#include <TSystem.h>
+#include <TROOT.h>
 #include <TStyle.h>
+#include <TSystem.h>
+
 #include <rapidjson/document.h>
 #include <rapidjson/filereadstream.h>
-#include "DhCorrelationFitter.h"
 
 using namespace rapidjson;
 
diff --git a/.conflict-side-1/PWGJE/Core/MlResponseHfTagging.h b/.conflict-side-1/PWGJE/Core/MlResponseHfTagging.h
index 2b07e1c1c25..186575205b9 100644
--- a/.conflict-side-1/PWGJE/Core/MlResponseHfTagging.h
+++ b/.conflict-side-1/PWGJE/Core/MlResponseHfTagging.h
@@ -18,11 +18,10 @@
 
 #include "Tools/ML/MlResponse.h"
 
-#include <onnxruntime_cxx_api.h>
-
 #include <Framework/Logger.h>
 
 #include <onnxruntime_c_api.h>
+#include <onnxruntime_cxx_api.h>
 
 #include <cstddef>
 #include <cstdint>
@@ -330,6 +329,7 @@ class TensorAllocator
 {
  protected:
   Ort::MemoryInfo memInfo;
+
  public:
   TensorAllocator()
     : memInfo(Ort::MemoryInfo::CreateCpu(OrtAllocatorType::OrtArenaAllocator, OrtMemType::OrtMemTypeDefault))
diff --git a/.conflict-side-1/PWGJE/DataModel/PhotonChargedTriggerCorrelation.h b/.conflict-side-1/PWGJE/DataModel/PhotonChargedTriggerCorrelation.h
index 53f5e581d82..36806e1f4c0 100644
--- a/.conflict-side-1/PWGJE/DataModel/PhotonChargedTriggerCorrelation.h
+++ b/.conflict-side-1/PWGJE/DataModel/PhotonChargedTriggerCorrelation.h
@@ -18,11 +18,12 @@
 #ifndef PWGJE_DATAMODEL_PHOTONCHARGEDTRIGGERCORRELATION_H_
 #define PWGJE_DATAMODEL_PHOTONCHARGEDTRIGGERCORRELATION_H_
 
-#include "Framework/AnalysisDataModel.h"
-#include "PWGJE/Core/JetDerivedDataUtilities.h"
-#include "PWGJE/DataModel/Jet.h"
 #include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
 #include "PWGEM/PhotonMeson/Utils/PCMUtilities.h"
+#include "PWGJE/Core/JetDerivedDataUtilities.h"
+#include "PWGJE/DataModel/Jet.h"
+
+#include "Framework/AnalysisDataModel.h"
 
 namespace o2::aod
 {
diff --git a/.conflict-side-1/PWGJE/Tasks/photonChargedTriggerCorrelation.cxx b/.conflict-side-1/PWGJE/Tasks/photonChargedTriggerCorrelation.cxx
index 8c62845a145..57d72df74ab 100644
--- a/.conflict-side-1/PWGJE/Tasks/photonChargedTriggerCorrelation.cxx
+++ b/.conflict-side-1/PWGJE/Tasks/photonChargedTriggerCorrelation.cxx
@@ -18,36 +18,37 @@
 /// Also contains checks and monte-carlo (efficiency, purity, mc-true correlation,...)
 /// End goal of studying correlations between direct photons and jets
 
-#include <cmath>
-#include <deque>
-#include <string>
-#include <vector>
-#include <algorithm>
-#include <chrono>
-#include <memory>
-#include <random>
+#include "PWGJE/DataModel/PhotonChargedTriggerCorrelation.h"
 
-#include "TMath.h"
-#include "Math/Vector4D.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+#include "PWGEM/PhotonMeson/Utils/PCMUtilities.h"
+#include "PWGJE/DataModel/Jet.h"
+
+#include "Common/Core/TableHelper.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
 #include "CCDB/BasicCCDBManager.h"
 #include "Framework/ASoAHelpers.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/TableHelper.h"
+#include "Framework/runDataProcessing.h"
 
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/PhotonMeson/Utils/PCMUtilities.h"
+#include "Math/Vector4D.h"
+#include "TMath.h"
 
-#include "PWGJE/DataModel/Jet.h"
-#include "PWGJE/DataModel/PhotonChargedTriggerCorrelation.h"
+#include <algorithm>
+#include <chrono>
+#include <cmath>
+#include <deque>
+#include <memory>
+#include <random>
+#include <string>
+#include <vector>
 
 const double absEtaMax = 0.8;
 #define DPHI_SCALE constants::math::TwoPI - constants::math::PIHalf
diff --git a/.conflict-side-1/PWGJE/Tasks/statPromptPhoton.cxx b/.conflict-side-1/PWGJE/Tasks/statPromptPhoton.cxx
index 977b94741c5..f23bb34df88 100644
--- a/.conflict-side-1/PWGJE/Tasks/statPromptPhoton.cxx
+++ b/.conflict-side-1/PWGJE/Tasks/statPromptPhoton.cxx
@@ -1114,9 +1114,9 @@ struct statPromptPhoton {
 
     histos.fill(HIST("DATA_nEvents"), 2.5);
 
-      if (!jetderiveddatautilities::selectTrigger(collision, triggerMaskBits)) {
-        return;
-      }
+    if (!jetderiveddatautilities::selectTrigger(collision, triggerMaskBits)) {
+      return;
+    }
 
     histos.fill(HIST("DATA_nEvents"), 3.5);
 
diff --git a/.conflict-side-1/PWGJE/Tasks/trackEfficiency.cxx b/.conflict-side-1/PWGJE/Tasks/trackEfficiency.cxx
index bb2683b0918..564e3bf10d0 100644
--- a/.conflict-side-1/PWGJE/Tasks/trackEfficiency.cxx
+++ b/.conflict-side-1/PWGJE/Tasks/trackEfficiency.cxx
@@ -554,7 +554,7 @@ struct TrackEfficiency {
 
       registry.fill(HIST("h3_particle_pt_high_particle_eta_particle_phi_mcpartofinterest"), jMcParticle.pt(), jMcParticle.eta(), jMcParticle.phi(), mcCollEventWeight);
 
-      if ((std::abs(jMcParticle.eta()) < trackEtaAcceptanceCountQA)) { // removed from actual cuts for now because all the histograms have an eta axis
+      if ((std::abs(jMcParticle.eta()) < trackEtaAcceptanceCountQA)) {       // removed from actual cuts for now because all the histograms have an eta axis
         registry.fill(HIST("hMcPartCutsCounts"), 3.5, mcCollision.weight()); // etaAccept // not actually applied here but it will give an idea of what will be done in the post processing
       }
     }
diff --git a/.conflict-side-1/PWGLF/DataModel/EPCalibrationTables.h b/.conflict-side-1/PWGLF/DataModel/EPCalibrationTables.h
index 8954ccd1c9e..a00acd94353 100644
--- a/.conflict-side-1/PWGLF/DataModel/EPCalibrationTables.h
+++ b/.conflict-side-1/PWGLF/DataModel/EPCalibrationTables.h
@@ -16,13 +16,14 @@
 #ifndef PWGLF_DATAMODEL_EPCALIBRATIONTABLES_H_
 #define PWGLF_DATAMODEL_EPCALIBRATIONTABLES_H_
 
-#include <cmath>
-
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/Core/RecoDecay.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/AnalysisDataModel.h"
 
+#include <cmath>
+
 namespace o2::aod
 {
 namespace epcalibrationtable
diff --git a/.conflict-side-1/PWGLF/DataModel/FilterF1ProtonTables.h b/.conflict-side-1/PWGLF/DataModel/FilterF1ProtonTables.h
index 0475e7cebb5..dff0c1c0d00 100644
--- a/.conflict-side-1/PWGLF/DataModel/FilterF1ProtonTables.h
+++ b/.conflict-side-1/PWGLF/DataModel/FilterF1ProtonTables.h
@@ -16,13 +16,14 @@
 #ifndef PWGLF_DATAMODEL_FILTERF1PROTONTABLES_H_
 #define PWGLF_DATAMODEL_FILTERF1PROTONTABLES_H_
 
-#include <cmath>
-
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/Core/RecoDecay.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/AnalysisDataModel.h"
 
+#include <cmath>
+
 namespace o2::aod
 {
 namespace filtering
diff --git a/.conflict-side-1/PWGLF/DataModel/LFClusterStudiesTable.h b/.conflict-side-1/PWGLF/DataModel/LFClusterStudiesTable.h
index 88ca35a85d3..edb9d77edf5 100644
--- a/.conflict-side-1/PWGLF/DataModel/LFClusterStudiesTable.h
+++ b/.conflict-side-1/PWGLF/DataModel/LFClusterStudiesTable.h
@@ -11,8 +11,8 @@
 //
 // Author: Giorgio Alberto Lucia
 
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
 
 #ifndef PWGLF_DATAMODEL_LFCLUSTERSTUDIESTABLE_H_
 #define PWGLF_DATAMODEL_LFCLUSTERSTUDIESTABLE_H_
diff --git a/.conflict-side-1/PWGLF/DataModel/LFDoubleCascTables.h b/.conflict-side-1/PWGLF/DataModel/LFDoubleCascTables.h
index 49e3b6604de..ec17c6a9864 100644
--- a/.conflict-side-1/PWGLF/DataModel/LFDoubleCascTables.h
+++ b/.conflict-side-1/PWGLF/DataModel/LFDoubleCascTables.h
@@ -9,8 +9,8 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
 
 #ifndef PWGLF_DATAMODEL_LFDOUBLECASCTABLES_H_
 #define PWGLF_DATAMODEL_LFDOUBLECASCTABLES_H_
diff --git a/.conflict-side-1/PWGLF/DataModel/LFEbyeTables.h b/.conflict-side-1/PWGLF/DataModel/LFEbyeTables.h
index 59876ae59c1..16d1982f69c 100644
--- a/.conflict-side-1/PWGLF/DataModel/LFEbyeTables.h
+++ b/.conflict-side-1/PWGLF/DataModel/LFEbyeTables.h
@@ -9,8 +9,8 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
 
 #ifndef PWGLF_DATAMODEL_LFEBYETABLES_H_
 #define PWGLF_DATAMODEL_LFEBYETABLES_H_
diff --git a/.conflict-side-1/PWGLF/DataModel/LFF1Tables.h b/.conflict-side-1/PWGLF/DataModel/LFF1Tables.h
index 947e9f0c3a8..a38dc30ea97 100644
--- a/.conflict-side-1/PWGLF/DataModel/LFF1Tables.h
+++ b/.conflict-side-1/PWGLF/DataModel/LFF1Tables.h
@@ -16,13 +16,14 @@
 #ifndef PWGLF_DATAMODEL_LFF1TABLES_H_
 #define PWGLF_DATAMODEL_LFF1TABLES_H_
 
-#include <cmath>
-
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/Core/RecoDecay.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/AnalysisDataModel.h"
 
+#include <cmath>
+
 namespace o2::aod
 {
 /// F1 Collisions
diff --git a/.conflict-side-1/PWGLF/DataModel/LFHyperhelium4Tables.h b/.conflict-side-1/PWGLF/DataModel/LFHyperhelium4Tables.h
index 8d7d5f4d379..256229876ce 100644
--- a/.conflict-side-1/PWGLF/DataModel/LFHyperhelium4Tables.h
+++ b/.conflict-side-1/PWGLF/DataModel/LFHyperhelium4Tables.h
@@ -11,10 +11,12 @@
 #ifndef PWGLF_DATAMODEL_LFHYHEFOURTABLES_H_
 #define PWGLF_DATAMODEL_LFHYHEFOURTABLES_H_
 
-#include <cmath>
-#include "Framework/AnalysisDataModel.h"
 #include "Common/Core/RecoDecay.h"
+
 #include "CommonConstants/PhysicsConstants.h"
+#include "Framework/AnalysisDataModel.h"
+
+#include <cmath>
 
 //===========================================================================
 // For aiding in building: tag those candidates that are interesting
diff --git a/.conflict-side-1/PWGLF/DataModel/LFHypernucleiKfTables.h b/.conflict-side-1/PWGLF/DataModel/LFHypernucleiKfTables.h
index 0e2424f3bb5..5e8ab65ce91 100644
--- a/.conflict-side-1/PWGLF/DataModel/LFHypernucleiKfTables.h
+++ b/.conflict-side-1/PWGLF/DataModel/LFHypernucleiKfTables.h
@@ -16,11 +16,13 @@
 #ifndef PWGLF_DATAMODEL_LFHYPERNUCLEIKFTABLES_H_
 #define PWGLF_DATAMODEL_LFHYPERNUCLEIKFTABLES_H_
 
-#include <cmath>
+#include "Common/Core/RecoDecay.h"
+#include "Common/DataModel/Centrality.h"
+
 #include "Framework/ASoA.h"
 #include "Framework/AnalysisDataModel.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/Core/RecoDecay.h"
+
+#include <cmath>
 
 namespace o2::aod
 {
diff --git a/.conflict-side-1/PWGLF/DataModel/LFHypernucleiTables.h b/.conflict-side-1/PWGLF/DataModel/LFHypernucleiTables.h
index f144daccba6..b04e24a26a2 100644
--- a/.conflict-side-1/PWGLF/DataModel/LFHypernucleiTables.h
+++ b/.conflict-side-1/PWGLF/DataModel/LFHypernucleiTables.h
@@ -14,8 +14,8 @@
 /// \brief Slim hypernuclei tables
 ///
 
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
 
 #ifndef PWGLF_DATAMODEL_LFHYPERNUCLEITABLES_H_
 #define PWGLF_DATAMODEL_LFHYPERNUCLEITABLES_H_
diff --git a/.conflict-side-1/PWGLF/DataModel/LFLithium4Tables.h b/.conflict-side-1/PWGLF/DataModel/LFLithium4Tables.h
index 486e44575ee..95d8a26ef05 100644
--- a/.conflict-side-1/PWGLF/DataModel/LFLithium4Tables.h
+++ b/.conflict-side-1/PWGLF/DataModel/LFLithium4Tables.h
@@ -14,8 +14,8 @@
 /// \brief Slim tables for Lithium4
 ///
 
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
 
 #ifndef PWGLF_DATAMODEL_LFLITHIUM4TABLES_H_
 #define PWGLF_DATAMODEL_LFLITHIUM4TABLES_H_
diff --git a/.conflict-side-1/PWGLF/DataModel/LFLnnTables.h b/.conflict-side-1/PWGLF/DataModel/LFLnnTables.h
index f9ab7fe3989..613d37931d4 100644
--- a/.conflict-side-1/PWGLF/DataModel/LFLnnTables.h
+++ b/.conflict-side-1/PWGLF/DataModel/LFLnnTables.h
@@ -14,8 +14,8 @@
 /// \brief Slim lnn tables
 ///
 
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
 
 #ifndef PWGLF_DATAMODEL_LFLNNTABLES_H_
 #define PWGLF_DATAMODEL_LFLNNTABLES_H_
diff --git a/.conflict-side-1/PWGLF/DataModel/LFNonPromptCascadeTables.h b/.conflict-side-1/PWGLF/DataModel/LFNonPromptCascadeTables.h
index b698164abd4..0651a38eb68 100644
--- a/.conflict-side-1/PWGLF/DataModel/LFNonPromptCascadeTables.h
+++ b/.conflict-side-1/PWGLF/DataModel/LFNonPromptCascadeTables.h
@@ -14,8 +14,8 @@
 /// \brief Non prompt cascade tables
 ///
 
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
 
 #ifndef PWGLF_DATAMODEL_LFNONPROMPTCASCADETABLES_H_
 #define PWGLF_DATAMODEL_LFNONPROMPTCASCADETABLES_H_
diff --git a/.conflict-side-1/PWGLF/DataModel/LFNucleiTables.h b/.conflict-side-1/PWGLF/DataModel/LFNucleiTables.h
index 1cd9ba76c93..be19614fc9b 100644
--- a/.conflict-side-1/PWGLF/DataModel/LFNucleiTables.h
+++ b/.conflict-side-1/PWGLF/DataModel/LFNucleiTables.h
@@ -16,8 +16,9 @@
 ///
 
 #include "Common/CCDB/EventSelectionParams.h"
-#include "Framework/AnalysisDataModel.h"
+
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
 
 #ifndef PWGLF_DATAMODEL_LFNUCLEITABLES_H_
 #define PWGLF_DATAMODEL_LFNUCLEITABLES_H_
diff --git a/.conflict-side-1/PWGLF/DataModel/LFParticleIdentification.h b/.conflict-side-1/PWGLF/DataModel/LFParticleIdentification.h
index 5a688e4c97c..a3c6cf52581 100644
--- a/.conflict-side-1/PWGLF/DataModel/LFParticleIdentification.h
+++ b/.conflict-side-1/PWGLF/DataModel/LFParticleIdentification.h
@@ -20,11 +20,12 @@
 #define PWGLF_DATAMODEL_LFPARTICLEIDENTIFICATION_H_
 
 // O2 includes
+#include "Common/DataModel/PIDResponse.h"
+
 #include "Framework/ASoA.h"
 #include "Framework/AnalysisDataModel.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "ReconstructionDataFormats/PID.h"
 #include "Framework/Logger.h"
+#include "ReconstructionDataFormats/PID.h"
 
 namespace o2::aod
 {
diff --git a/.conflict-side-1/PWGLF/DataModel/LFResonanceTables.h b/.conflict-side-1/PWGLF/DataModel/LFResonanceTables.h
index 67e1fb013c5..fd8cd3b938b 100644
--- a/.conflict-side-1/PWGLF/DataModel/LFResonanceTables.h
+++ b/.conflict-side-1/PWGLF/DataModel/LFResonanceTables.h
@@ -22,15 +22,17 @@
 #ifndef PWGLF_DATAMODEL_LFRESONANCETABLES_H_
 #define PWGLF_DATAMODEL_LFRESONANCETABLES_H_
 
-#include <cmath>
-#include <algorithm>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/Core/RecoDecay.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/AnalysisDataModel.h"
-#include "Common/DataModel/Multiplicity.h"
+
+#include <algorithm>
+#include <cmath>
 
 namespace o2::aod
 {
diff --git a/.conflict-side-1/PWGLF/DataModel/LFSigmaTables.h b/.conflict-side-1/PWGLF/DataModel/LFSigmaTables.h
index bd808cef106..8eb7706f563 100644
--- a/.conflict-side-1/PWGLF/DataModel/LFSigmaTables.h
+++ b/.conflict-side-1/PWGLF/DataModel/LFSigmaTables.h
@@ -9,15 +9,17 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <cmath>
-#include <vector>
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/Qvectors.h"
+
 #include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+
+#include <cmath>
+#include <vector>
 
 #ifndef PWGLF_DATAMODEL_LFSIGMATABLES_H_
 #define PWGLF_DATAMODEL_LFSIGMATABLES_H_
diff --git a/.conflict-side-1/PWGLF/DataModel/LFSlimHeLambda.h b/.conflict-side-1/PWGLF/DataModel/LFSlimHeLambda.h
index 4cab4cf8305..fc0178907df 100644
--- a/.conflict-side-1/PWGLF/DataModel/LFSlimHeLambda.h
+++ b/.conflict-side-1/PWGLF/DataModel/LFSlimHeLambda.h
@@ -57,7 +57,7 @@ DECLARE_SOA_TABLE(LFLambda, "AOD", "LFLAMBDA", lfv0he3::LFEventId, lfv0he3::Pt,
 
 struct he3Candidate {
   ROOT::Math::LorentzVector<ROOT::Math::PtEtaPhiM4D<double>> momentum; // 4-momentum of the He3 candidate
-  float nSigmaTPC = -999.f;                                                     // TPC nSigma for He3
+  float nSigmaTPC = -999.f;                                            // TPC nSigma for He3
   float dcaXY = -999.f;
   float dcaZ = -999.f;
   int tpcNClsFound = 0;         // Number of TPC clusters found
@@ -68,12 +68,12 @@ struct he3Candidate {
 
 struct lambdaCandidate {
   ROOT::Math::LorentzVector<ROOT::Math::PtEtaPhiM4D<double>> momentum;
-  float mass = -1.f;       // Lambda mass
-  float cosPA = -2.f;          // Cosine of pointing angle
-  float dcaV0Daughters = -999.f; // DCA between V0 daughters
-  float dcaProtonToPV = -999.f;  // DCA of the proton to primary vertex
-  float dcaPionToPV = -999.f;    // DCA of the pion to primary vertex
-  float v0Radius = -1.f; // V0 radius
+  float mass = -1.f;              // Lambda mass
+  float cosPA = -2.f;             // Cosine of pointing angle
+  float dcaV0Daughters = -999.f;  // DCA between V0 daughters
+  float dcaProtonToPV = -999.f;   // DCA of the proton to primary vertex
+  float dcaPionToPV = -999.f;     // DCA of the pion to primary vertex
+  float v0Radius = -1.f;          // V0 radius
   float protonNSigmaTPC = -999.f; // Proton TPC nSigma
   float pionNSigmaTPC = -999.f;
   int8_t sign = 0; // Charge sign of the Lambda candidate
diff --git a/.conflict-side-1/PWGLF/DataModel/LFSlimStrangeTables.h b/.conflict-side-1/PWGLF/DataModel/LFSlimStrangeTables.h
index 423a412bb6d..87d5d53957a 100644
--- a/.conflict-side-1/PWGLF/DataModel/LFSlimStrangeTables.h
+++ b/.conflict-side-1/PWGLF/DataModel/LFSlimStrangeTables.h
@@ -9,8 +9,8 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
 
 #ifndef PWGLF_DATAMODEL_LFSLIMSTRANGETABLES_H_
 #define PWGLF_DATAMODEL_LFSLIMSTRANGETABLES_H_
diff --git a/.conflict-side-1/PWGLF/DataModel/LFStrangenessFinderTables.h b/.conflict-side-1/PWGLF/DataModel/LFStrangenessFinderTables.h
index 6bff37f12fd..b0a8325c25e 100644
--- a/.conflict-side-1/PWGLF/DataModel/LFStrangenessFinderTables.h
+++ b/.conflict-side-1/PWGLF/DataModel/LFStrangenessFinderTables.h
@@ -16,9 +16,11 @@
 #ifndef O2_ANALYSIS_STRANGENESSFINDERTABLES_H_
 #define O2_ANALYSIS_STRANGENESSFINDERTABLES_H_
 
-#include "Framework/AnalysisDataModel.h"
 #include "Common/Core/RecoDecay.h"
+
 #include "CommonConstants/PhysicsConstants.h"
+#include "Framework/AnalysisDataModel.h"
+
 #include <cmath>
 
 // V0 auxiliary tables
diff --git a/.conflict-side-1/PWGLF/DataModel/LFStrangenessMLTables.h b/.conflict-side-1/PWGLF/DataModel/LFStrangenessMLTables.h
index abae8814856..c3a1b8a83b7 100644
--- a/.conflict-side-1/PWGLF/DataModel/LFStrangenessMLTables.h
+++ b/.conflict-side-1/PWGLF/DataModel/LFStrangenessMLTables.h
@@ -9,11 +9,13 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <cmath>
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
 #include "Common/Core/RecoDecay.h"
+
 #include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+
+#include <cmath>
 
 #ifndef PWGLF_DATAMODEL_LFSTRANGENESSMLTABLES_H_
 #define PWGLF_DATAMODEL_LFSTRANGENESSMLTABLES_H_
diff --git a/.conflict-side-1/PWGLF/DataModel/LFStrangenessPIDTables.h b/.conflict-side-1/PWGLF/DataModel/LFStrangenessPIDTables.h
index e689dc28141..8dc320d8b55 100644
--- a/.conflict-side-1/PWGLF/DataModel/LFStrangenessPIDTables.h
+++ b/.conflict-side-1/PWGLF/DataModel/LFStrangenessPIDTables.h
@@ -15,10 +15,12 @@
 #ifndef PWGLF_DATAMODEL_LFSTRANGENESSPIDTABLES_H_
 #define PWGLF_DATAMODEL_LFSTRANGENESSPIDTABLES_H_
 
-#include <cmath>
-#include "Framework/AnalysisDataModel.h"
 #include "Common/Core/RecoDecay.h"
+
 #include "CommonConstants/PhysicsConstants.h"
+#include "Framework/AnalysisDataModel.h"
+
+#include <cmath>
 
 namespace o2::aod
 {
@@ -55,8 +57,8 @@ DECLARE_SOA_COLUMN(PosTOFSignal, posTOFSignal, float);         //! positive trac
 DECLARE_SOA_COLUMN(NegTOFSignal, negTOFSignal, float);         //! negative track signal
 DECLARE_SOA_COLUMN(PosTOFEventTime, posTOFEventTime, float);   //! positive track event time
 DECLARE_SOA_COLUMN(NegTOFEventTime, negTOFEventTime, float);   //! negative track event time
-DECLARE_SOA_COLUMN(PosTOFLength, posTOFLength, float); //! positive track length, recalculated
-DECLARE_SOA_COLUMN(NegTOFLength, negTOFLength, float); //! negative track length, recalculated
+DECLARE_SOA_COLUMN(PosTOFLength, posTOFLength, float);         //! positive track length, recalculated
+DECLARE_SOA_COLUMN(NegTOFLength, negTOFLength, float);         //! negative track length, recalculated
 
 // delta-times
 DECLARE_SOA_COLUMN(PosTOFDeltaTLaPi, posTOFDeltaTLaPi, float); //! positive track TOFDeltaT from pion <- lambda expectation
diff --git a/.conflict-side-1/PWGLF/DataModel/LFhe3HadronTables.h b/.conflict-side-1/PWGLF/DataModel/LFhe3HadronTables.h
index f0dbc5cc3dd..ba37e73eba2 100644
--- a/.conflict-side-1/PWGLF/DataModel/LFhe3HadronTables.h
+++ b/.conflict-side-1/PWGLF/DataModel/LFhe3HadronTables.h
@@ -14,8 +14,8 @@
 /// \brief Slim tables for he3Hadron
 ///
 
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
 
 #ifndef PWGLF_DATAMODEL_LFHE3HADRONTABLES_H_
 #define PWGLF_DATAMODEL_LFHE3HADRONTABLES_H_
diff --git a/.conflict-side-1/PWGLF/DataModel/LFzdcSPtables.h b/.conflict-side-1/PWGLF/DataModel/LFzdcSPtables.h
index d5e09d5f9b7..0cdd6234e97 100644
--- a/.conflict-side-1/PWGLF/DataModel/LFzdcSPtables.h
+++ b/.conflict-side-1/PWGLF/DataModel/LFzdcSPtables.h
@@ -12,10 +12,11 @@
 #ifndef PWGLF_DATAMODEL_LFZDCSPTABLES_H_
 #define PWGLF_DATAMODEL_LFZDCSPTABLES_H_
 
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
 #include "Common/DataModel/Centrality.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+
 namespace o2::aod
 {
 namespace ZdcSPTableNS
diff --git a/.conflict-side-1/PWGLF/DataModel/QC/strangenessTablesQC.h b/.conflict-side-1/PWGLF/DataModel/QC/strangenessTablesQC.h
index ccf1724dc4b..e1b2bede6fa 100644
--- a/.conflict-side-1/PWGLF/DataModel/QC/strangenessTablesQC.h
+++ b/.conflict-side-1/PWGLF/DataModel/QC/strangenessTablesQC.h
@@ -16,8 +16,8 @@
 #ifndef PWGLF_DATAMODEL_QC_STRANGENESSTABLESQC_H_
 #define PWGLF_DATAMODEL_QC_STRANGENESSTABLESQC_H_
 
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
 
 namespace o2::aod
 {
diff --git a/.conflict-side-1/PWGLF/DataModel/Reduced3BodyTables.h b/.conflict-side-1/PWGLF/DataModel/Reduced3BodyTables.h
index 3b221d17539..0837e1d72f6 100644
--- a/.conflict-side-1/PWGLF/DataModel/Reduced3BodyTables.h
+++ b/.conflict-side-1/PWGLF/DataModel/Reduced3BodyTables.h
@@ -17,13 +17,16 @@
 #ifndef PWGLF_DATAMODEL_REDUCED3BODYTABLES_H_
 #define PWGLF_DATAMODEL_REDUCED3BODYTABLES_H_
 
-#include <cmath>
-#include "Framework/AnalysisDataModel.h"
+#include "PWGLF/DataModel/Vtx3BodyTables.h"
+
 #include "Common/Core/RecoDecay.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/Centrality.h"
-#include "PWGLF/DataModel/Vtx3BodyTables.h"
+#include "Common/DataModel/Multiplicity.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/AnalysisDataModel.h"
+
+#include <cmath>
 
 namespace o2::aod
 {
diff --git a/.conflict-side-1/PWGLF/DataModel/ReducedDoublePhiTables.h b/.conflict-side-1/PWGLF/DataModel/ReducedDoublePhiTables.h
index 76cc65312a7..cd858b2da95 100644
--- a/.conflict-side-1/PWGLF/DataModel/ReducedDoublePhiTables.h
+++ b/.conflict-side-1/PWGLF/DataModel/ReducedDoublePhiTables.h
@@ -15,15 +15,16 @@
 #ifndef PWGLF_DATAMODEL_REDUCEDDOUBLEPHITABLES_H_
 #define PWGLF_DATAMODEL_REDUCEDDOUBLEPHITABLES_H_
 
-#include <cmath>
-
+#include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Framework/AnalysisDataModel.h"
+
 #include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+
+#include <cmath>
 
 namespace o2::aod
 {
diff --git a/.conflict-side-1/PWGLF/DataModel/ReducedF1ProtonTables.h b/.conflict-side-1/PWGLF/DataModel/ReducedF1ProtonTables.h
index 2f806c4bd1b..bb79ffb87c0 100644
--- a/.conflict-side-1/PWGLF/DataModel/ReducedF1ProtonTables.h
+++ b/.conflict-side-1/PWGLF/DataModel/ReducedF1ProtonTables.h
@@ -16,15 +16,16 @@
 #ifndef PWGLF_DATAMODEL_REDUCEDF1PROTONTABLES_H_
 #define PWGLF_DATAMODEL_REDUCEDF1PROTONTABLES_H_
 
-#include <cmath>
-
+#include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Framework/AnalysisDataModel.h"
+
 #include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+
+#include <cmath>
 
 namespace o2::aod
 {
diff --git a/.conflict-side-1/PWGLF/DataModel/ReducedHeptaQuarkTables.h b/.conflict-side-1/PWGLF/DataModel/ReducedHeptaQuarkTables.h
index a8dd487fe9c..f35d088f71c 100644
--- a/.conflict-side-1/PWGLF/DataModel/ReducedHeptaQuarkTables.h
+++ b/.conflict-side-1/PWGLF/DataModel/ReducedHeptaQuarkTables.h
@@ -15,22 +15,23 @@
 #ifndef PWGLF_DATAMODEL_REDUCEDHEPTAQUARKTABLES_H_
 #define PWGLF_DATAMODEL_REDUCEDHEPTAQUARKTABLES_H_
 
-#include <cmath>
-
+#include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Framework/AnalysisDataModel.h"
+
 #include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+
+#include <cmath>
 
 namespace o2::aod
 {
 namespace redhqevent
 {
-DECLARE_SOA_COLUMN(NumPhi, numPhi, int);       //! Number of negative K
-DECLARE_SOA_COLUMN(NumLambda, numLambda, int); //! Number of lambda
+DECLARE_SOA_COLUMN(NumPhi, numPhi, int);           //! Number of negative K
+DECLARE_SOA_COLUMN(NumLambda, numLambda, int);     //! Number of lambda
 DECLARE_SOA_COLUMN(Centrality, centrality, float); //!
 } // namespace redhqevent
 DECLARE_SOA_TABLE(RedHQEvents, "AOD", "REDHQEVENT",
diff --git a/.conflict-side-1/PWGLF/DataModel/ReducedLambdaLambdaTables.h b/.conflict-side-1/PWGLF/DataModel/ReducedLambdaLambdaTables.h
index 88ea8fb0530..ec2d0b27098 100644
--- a/.conflict-side-1/PWGLF/DataModel/ReducedLambdaLambdaTables.h
+++ b/.conflict-side-1/PWGLF/DataModel/ReducedLambdaLambdaTables.h
@@ -15,15 +15,16 @@
 #ifndef PWGLF_DATAMODEL_REDUCEDLAMBDALAMBDATABLES_H_
 #define PWGLF_DATAMODEL_REDUCEDLAMBDALAMBDATABLES_H_
 
-#include <cmath>
-
+#include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Framework/AnalysisDataModel.h"
+
 #include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+
+#include <cmath>
 
 namespace o2::aod
 {
diff --git a/.conflict-side-1/PWGLF/DataModel/SPCalibrationTables.h b/.conflict-side-1/PWGLF/DataModel/SPCalibrationTables.h
index 2b417ce8758..07bef14d8f8 100644
--- a/.conflict-side-1/PWGLF/DataModel/SPCalibrationTables.h
+++ b/.conflict-side-1/PWGLF/DataModel/SPCalibrationTables.h
@@ -17,13 +17,14 @@
 #ifndef PWGLF_DATAMODEL_SPCALIBRATIONTABLES_H_
 #define PWGLF_DATAMODEL_SPCALIBRATIONTABLES_H_
 
-#include <cmath>
-
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/Core/RecoDecay.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/AnalysisDataModel.h"
 
+#include <cmath>
+
 namespace o2::aod
 {
 namespace spcalibrationtable
diff --git a/.conflict-side-1/PWGLF/DataModel/V0SelectorTables.h b/.conflict-side-1/PWGLF/DataModel/V0SelectorTables.h
index 1283c754819..d47b0bf3462 100644
--- a/.conflict-side-1/PWGLF/DataModel/V0SelectorTables.h
+++ b/.conflict-side-1/PWGLF/DataModel/V0SelectorTables.h
@@ -11,8 +11,9 @@
 #ifndef PWGLF_DATAMODEL_V0SELECTORTABLES_H_
 #define PWGLF_DATAMODEL_V0SELECTORTABLES_H_
 
-#include <cstdint>
 #include <Framework/ASoA.h>
+
+#include <cstdint>
 namespace o2::aod
 {
 
diff --git a/.conflict-side-1/PWGLF/DataModel/cascqaanalysis.h b/.conflict-side-1/PWGLF/DataModel/cascqaanalysis.h
index efe98908517..e734afd3ba1 100644
--- a/.conflict-side-1/PWGLF/DataModel/cascqaanalysis.h
+++ b/.conflict-side-1/PWGLF/DataModel/cascqaanalysis.h
@@ -16,17 +16,20 @@
 #ifndef PWGLF_DATAMODEL_CASCQAANALYSIS_H_
 #define PWGLF_DATAMODEL_CASCQAANALYSIS_H_
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "TRandom.h"
-#include "Math/Vector4D.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 #include "Math/Boost.h"
+#include "Math/Vector4D.h"
+#include "TRandom.h"
 
 namespace o2::aod
 {
diff --git a/.conflict-side-1/PWGLF/DataModel/kfStrangenessStudy.h b/.conflict-side-1/PWGLF/DataModel/kfStrangenessStudy.h
index 120b3cf62f1..5f27acfe89b 100755
--- a/.conflict-side-1/PWGLF/DataModel/kfStrangenessStudy.h
+++ b/.conflict-side-1/PWGLF/DataModel/kfStrangenessStudy.h
@@ -14,10 +14,11 @@
 #ifndef PWGLF_DATAMODEL_KFSTRANGENESSSTUDY_H_
 #define PWGLF_DATAMODEL_KFSTRANGENESSSTUDY_H_
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Common/Core/trackUtilities.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+
 namespace o2::aod
 {
 namespace kfStrangenessStudy
diff --git a/.conflict-side-1/PWGLF/DataModel/lambdaJetpolarization.h b/.conflict-side-1/PWGLF/DataModel/lambdaJetpolarization.h
index 41bd7e26b15..cd1f4b96449 100644
--- a/.conflict-side-1/PWGLF/DataModel/lambdaJetpolarization.h
+++ b/.conflict-side-1/PWGLF/DataModel/lambdaJetpolarization.h
@@ -16,17 +16,20 @@
 #ifndef PWGLF_DATAMODEL_LAMBDAJETPOLARIZATION_H_
 #define PWGLF_DATAMODEL_LAMBDAJETPOLARIZATION_H_
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "TRandom.h"
-#include "Math/Vector4D.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 #include "Math/Boost.h"
+#include "Math/Vector4D.h"
+#include "TRandom.h"
 
 namespace o2::aod
 {
diff --git a/.conflict-side-1/PWGLF/DataModel/mcCentrality.h b/.conflict-side-1/PWGLF/DataModel/mcCentrality.h
index 86e97eb8c33..fdbe1426e52 100644
--- a/.conflict-side-1/PWGLF/DataModel/mcCentrality.h
+++ b/.conflict-side-1/PWGLF/DataModel/mcCentrality.h
@@ -21,9 +21,10 @@
 #define PWGLF_DATAMODEL_MCCENTRALITY_H_
 
 // O2 includes
+#include "Common/DataModel/Centrality.h"
+
 #include "Framework/ASoA.h"
 #include "Framework/AnalysisDataModel.h"
-#include "Common/DataModel/Centrality.h"
 #include "Framework/Logger.h"
 
 namespace o2::aod
diff --git a/.conflict-side-1/PWGLF/DataModel/pidTOFGeneric.h b/.conflict-side-1/PWGLF/DataModel/pidTOFGeneric.h
index a0d287a7643..1942dbecd3d 100644
--- a/.conflict-side-1/PWGLF/DataModel/pidTOFGeneric.h
+++ b/.conflict-side-1/PWGLF/DataModel/pidTOFGeneric.h
@@ -11,9 +11,10 @@
 
 #ifndef PWGLF_DATAMODEL_PIDTOFGENERIC_H_
 #define PWGLF_DATAMODEL_PIDTOFGENERIC_H_
-#include "CommonDataFormat/InteractionRecord.h"
 #include "Common/Core/PID/PIDTOF.h"
 
+#include "CommonDataFormat/InteractionRecord.h"
+
 namespace o2::aod
 {
 namespace evtime
diff --git a/.conflict-side-1/PWGLF/DataModel/spectraTOF.h b/.conflict-side-1/PWGLF/DataModel/spectraTOF.h
index 9cf4b789295..4ae259d171f 100644
--- a/.conflict-side-1/PWGLF/DataModel/spectraTOF.h
+++ b/.conflict-side-1/PWGLF/DataModel/spectraTOF.h
@@ -22,21 +22,23 @@
 #include <memory>
 
 // O2 includes
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/runDataProcessing.h"
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/FT0Corrected.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/StaticFor.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/FT0Corrected.h"
-#include "Common/Core/TrackSelectionDefaults.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
 #include "TPDGCode.h"
 
diff --git a/.conflict-side-1/PWGLF/TableProducer/Common/epvector.cxx b/.conflict-side-1/PWGLF/TableProducer/Common/epvector.cxx
index a662b20bd0b..61996521fdd 100644
--- a/.conflict-side-1/PWGLF/TableProducer/Common/epvector.cxx
+++ b/.conflict-side-1/PWGLF/TableProducer/Common/epvector.cxx
@@ -19,42 +19,46 @@
 ///
 
 // C++/ROOT includes.
+#include <TComplex.h>
 #include <TH1F.h>
+#include <TMath.h>
+
 #include <chrono>
+#include <cstdio>
 #include <string>
 #include <vector>
-#include <TComplex.h>
-#include <TMath.h>
-#include <cstdio>
 
 // o2Physics includes.
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/StepTHn.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
+#include "PWGLF/DataModel/EPCalibrationTables.h"
+
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/Core/trackUtilities.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/TrackSelection.h"
-#include "Framework/ASoAHelpers.h"
 #include "Common/DataModel/FT0Corrected.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonConstants/PhysicsConstants.h"
 #include "FT0Base/Geometry.h"
 #include "FV0Base/Geometry.h"
-#include "PWGLF/DataModel/EPCalibrationTables.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
 #include "TF1.h"
 
 // #include "Common/Core/EventPlaneHelper.h"
 // #include "Common/DataModel/Qvectors.h"
 
 // o2 includes.
-#include "CCDB/CcdbApi.h"
 #include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
 #include "DetectorsCommonDataFormats/AlignParam.h"
 
 using namespace o2;
diff --git a/.conflict-side-1/PWGLF/TableProducer/Common/lfTPCPID.cxx b/.conflict-side-1/PWGLF/TableProducer/Common/lfTPCPID.cxx
index e812633a604..74d0d56c257 100644
--- a/.conflict-side-1/PWGLF/TableProducer/Common/lfTPCPID.cxx
+++ b/.conflict-side-1/PWGLF/TableProducer/Common/lfTPCPID.cxx
@@ -17,26 +17,29 @@
 ///
 
 // ROOT includes
-#include "TFile.h"
-#include "TSystem.h"
 #include "TF1.h"
+#include "TFile.h"
 #include "TGraph.h"
 #include "TList.h"
+#include "TSystem.h"
 
 // O2 includes
-#include "CCDB/BasicCCDBManager.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "CCDB/CcdbApi.h"
+#include "TableHelper.h"
+
 #include "PWGLF/DataModel/LFParticleIdentification.h"
+
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Framework/AnalysisTask.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
+#include "DataFormatsTPC/BetheBlochAleph.h"
 #include "Framework/AnalysisDataModel.h"
-#include "Framework/runDataProcessing.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StaticFor.h"
-#include "DataFormatsTPC/BetheBlochAleph.h"
-#include "TableHelper.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/TableProducer/Common/mcCentrality.cxx b/.conflict-side-1/PWGLF/TableProducer/Common/mcCentrality.cxx
index 690d049af4d..4a55503ada8 100644
--- a/.conflict-side-1/PWGLF/TableProducer/Common/mcCentrality.cxx
+++ b/.conflict-side-1/PWGLF/TableProducer/Common/mcCentrality.cxx
@@ -18,21 +18,25 @@
 ///
 
 // O2 includes
+#include "PWGLF/DataModel/mcCentrality.h"
+
+#include "TableHelper.h"
+
+#include "PWGLF/Utils/inelGt.h"
+
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "CCDB/CcdbApi.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
-#include "Framework/runDataProcessing.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StaticFor.h"
-#include "TableHelper.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "Common/DataModel/Centrality.h"
-#include "PWGLF/DataModel/mcCentrality.h"
-#include "PWGLF/Utils/inelGt.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/TableProducer/Common/zdcSP.cxx b/.conflict-side-1/PWGLF/TableProducer/Common/zdcSP.cxx
index 783526e1400..c10ac4804d0 100644
--- a/.conflict-side-1/PWGLF/TableProducer/Common/zdcSP.cxx
+++ b/.conflict-side-1/PWGLF/TableProducer/Common/zdcSP.cxx
@@ -12,43 +12,39 @@
 // Minimal example to run this task:
 // o2-analysis-centrality-table -b --configuration json://configuration.json | o2-analysis-timestamp -b --configuration json://configuration.json | o2-analysis-event-selection -b --configuration json://configuration.json | o2-analysis-multiplicity-table -b --configuration json://configuration.json | o2-analysis-lf-zdcsp -b --configuration json://configuration.json --aod-file @input_data.txt --aod-writer-json OutputDirector.json
 
-#include <array>
-#include <cmath>
-
-#include "Math/Vector4D.h"
-
-#include "CCDB/BasicCCDBManager.h"
+#include "PWGLF/DataModel/LFzdcSPtables.h"
 
+#include "Common/CCDB/ctpRateFetcher.h"
+#include "Common/Core/EventPlaneHelper.h"
+#include "Common/Core/PID/PIDTOF.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/Qvectors.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/Core/PID/PIDTOF.h"
 #include "Common/TableProducer/PID/pidTOFBase.h"
-#include "Common/Core/EventPlaneHelper.h"
-#include "Common/DataModel/Qvectors.h"
-#include "Common/CCDB/ctpRateFetcher.h"
 
+#include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsParameters/GRPMagField.h"
 #include "DataFormatsParameters/GRPObject.h"
 #include "DataFormatsTPC/BetheBlochAleph.h"
 #include "DetectorsBase/GeometryManager.h"
 #include "DetectorsBase/Propagator.h"
-
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
-
 #include "ReconstructionDataFormats/Track.h"
 
-#include "PWGLF/DataModel/LFzdcSPtables.h"
-
+#include "Math/Vector4D.h"
 #include "TRandom3.h"
 
+#include <array>
+#include <cmath>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-1/PWGLF/TableProducer/Nuspex/LFTreeCreatorClusterStudies.cxx b/.conflict-side-1/PWGLF/TableProducer/Nuspex/LFTreeCreatorClusterStudies.cxx
index d8df6f0bbf6..c05fcddfb61 100644
--- a/.conflict-side-1/PWGLF/TableProducer/Nuspex/LFTreeCreatorClusterStudies.cxx
+++ b/.conflict-side-1/PWGLF/TableProducer/Nuspex/LFTreeCreatorClusterStudies.cxx
@@ -14,45 +14,45 @@
 //
 // Author: Giorgio Alberto Lucia
 
-#include <vector>
-#include <utility>
-#include <random>
-#include <cstdint>
-#include <cstring>
-#include <unordered_map>
-#include <numeric>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "Common/DataModel/EventSelection.h"
+#include "PWGLF/DataModel/LFClusterStudiesTable.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
 
 #include "Common/Core/PID/PIDTOF.h"
-#include "Common/TableProducer/PID/pidTOFBase.h"
 #include "Common/Core/PID/TPCPIDResponse.h"
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/PIDResponseITS.h"
-#include "DCAFitter/DCAFitterN.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/TableProducer/PID/pidTOFBase.h"
 
-#include "PWGLF/DataModel/LFClusterStudiesTable.h"
+#include "CCDB/BasicCCDBManager.h"
+#include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
 #include "TDatabasePDG.h"
 #include "TPDGCode.h"
 
+#include <cstdint>
+#include <cstring>
+#include <numeric>
+#include <random>
+#include <unordered_map>
+#include <utility>
+#include <vector>
+
 using namespace ::o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-1/PWGLF/TableProducer/Nuspex/he3HadronFemto.cxx b/.conflict-side-1/PWGLF/TableProducer/Nuspex/he3HadronFemto.cxx
index 547d4b08c3b..1afb97fe35c 100644
--- a/.conflict-side-1/PWGLF/TableProducer/Nuspex/he3HadronFemto.cxx
+++ b/.conflict-side-1/PWGLF/TableProducer/Nuspex/he3HadronFemto.cxx
@@ -15,30 +15,9 @@
 /// \author Your Name (your.email@cern.ch)
 /// \since April 2025
 
-#include <TH1F.h>
-#include <TDirectory.h>
-#include <THn.h>
-#include <TMath.h>
-#include <TObjArray.h>
-#include <TFile.h>
-#include <TH2F.h>
-#include <TPDGCode.h>
-#include <TDatabasePDG.h>
-
-#include <cmath>
-#include <string>
-#include <algorithm>
-#include <vector>
-#include <array>
-#include <cstdlib>
-#include <iterator> // std::prev
-
-#include "Framework/ASoAHelpers.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/StepTHn.h"
+#include "PWGLF/DataModel/EPCalibrationTables.h"
+#include "PWGLF/DataModel/LFhe3HadronTables.h"
+#include "PWGLF/Utils/svPoolCreator.h"
 
 #include "Common/Core/PID/PIDTOF.h"
 #include "Common/Core/PID/TPCPIDResponse.h"
@@ -52,21 +31,40 @@
 #include "Common/DataModel/PIDResponseITS.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/TableProducer/PID/pidTOFBase.h"
-
 #include "EventFiltering/Zorro.h"
 #include "EventFiltering/ZorroSummary.h"
 
 #include "CCDB/BasicCCDBManager.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsTPC/BetheBlochAleph.h"
-#include "DataFormatsParameters/GRPObject.h"
 #include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DataFormatsTPC/BetheBlochAleph.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
 
-#include "PWGLF/DataModel/EPCalibrationTables.h"
-#include "PWGLF/DataModel/LFhe3HadronTables.h"
-#include "PWGLF/Utils/svPoolCreator.h"
+#include <TDatabasePDG.h>
+#include <TDirectory.h>
+#include <TFile.h>
+#include <TH1F.h>
+#include <TH2F.h>
+#include <THn.h>
+#include <TMath.h>
+#include <TObjArray.h>
+#include <TPDGCode.h>
+
+#include <algorithm>
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <iterator> // std::prev
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/TableProducer/Nuspex/hyhe4builder.cxx b/.conflict-side-1/PWGLF/TableProducer/Nuspex/hyhe4builder.cxx
index 66fe812f7a2..1c56cff15dd 100644
--- a/.conflict-side-1/PWGLF/TableProducer/Nuspex/hyhe4builder.cxx
+++ b/.conflict-side-1/PWGLF/TableProducer/Nuspex/hyhe4builder.cxx
@@ -19,32 +19,34 @@
 // --- kumar.lokesh@cern.ch
 // --- david.dobrigkeit.chinellato@cern.ch
 
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <map>
-#include <iterator>
-#include <utility>
+#include "PWGLF/DataModel/LFHyperhelium4Tables.h"
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
 #include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+
 #include "CCDB/BasicCCDBManager.h"
-#include "PWGLF/DataModel/LFHyperhelium4Tables.h"
+#include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <iterator>
+#include <map>
+#include <utility>
 
 using namespace std;
 using namespace o2;
diff --git a/.conflict-side-1/PWGLF/TableProducer/Nuspex/hypKfRecoTask.cxx b/.conflict-side-1/PWGLF/TableProducer/Nuspex/hypKfRecoTask.cxx
index 160310d5bd8..f36a2c7b362 100644
--- a/.conflict-side-1/PWGLF/TableProducer/Nuspex/hypKfRecoTask.cxx
+++ b/.conflict-side-1/PWGLF/TableProducer/Nuspex/hypKfRecoTask.cxx
@@ -13,45 +13,50 @@
 /// \brief Hypernuclei rconstruction using KFParticle package
 /// \author Janik Ditzel <jditzel@cern.ch> and Michael Hartung <mhartung@cern.ch>
 
-#include <limits>
-#include <vector>
-#include <string>
-#include <map>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
+#include "MetadataHelper.h"
+
+#include "PWGLF/DataModel/LFHypernucleiKfTables.h"
+
+#include "Common/Core/PID/TPCPIDResponse.h"
 #include "Common/Core/RecoDecay.h"
 #include "Common/Core/trackUtilities.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Centrality.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+#include "Common/DataModel/CollisionAssociationTables.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/PIDResponseTPC.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/TableProducer/PID/pidTPCBase.h"
+
 #include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/PID/TPCPIDResponse.h"
-#include "DataFormatsTPC/BetheBlochAleph.h"
 #include "DCAFitter/DCAFitterN.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGLF/DataModel/LFHypernucleiKfTables.h"
-#include "TRandom3.h"
-#include "Common/DataModel/CollisionAssociationTables.h"
-#include "Common/TableProducer/PID/pidTPCBase.h"
-#include "Common/DataModel/PIDResponseTPC.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DataFormatsTPC/BetheBlochAleph.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/PID.h"
-#include "MetadataHelper.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include "TRandom3.h"
+
+#include <limits>
+#include <map>
+#include <string>
+#include <vector>
 
 // KFParticle
 #ifndef HomogeneousField
 #define HomogeneousField // o2-linter: disable=name/macro (Name is defined in KFParticle package)
 #endif
-#include "KFParticle.h"
 #include "KFPTrack.h"
 #include "KFPVertex.h"
+#include "KFParticle.h"
 #include "KFParticleBase.h"
 #include "KFVertex.h"
 
diff --git a/.conflict-side-1/PWGLF/TableProducer/Nuspex/hypKfTreeCreator.cxx b/.conflict-side-1/PWGLF/TableProducer/Nuspex/hypKfTreeCreator.cxx
index 246a67f57d6..90295290025 100644
--- a/.conflict-side-1/PWGLF/TableProducer/Nuspex/hypKfTreeCreator.cxx
+++ b/.conflict-side-1/PWGLF/TableProducer/Nuspex/hypKfTreeCreator.cxx
@@ -13,28 +13,31 @@
 /// \brief Creates flat tree for ML analysis
 /// \author Janik Ditzel <jditzel@cern.ch> and Michael Hartung <mhartung@cern.ch>
 
-#include <vector>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
+#include "PWGLF/DataModel/LFHypernucleiKfTables.h"
+
+#include "Common/Core/PID/TPCPIDResponse.h"
 #include "Common/Core/RecoDecay.h"
 #include "Common/Core/trackUtilities.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Centrality.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/PID/TPCPIDResponse.h"
-#include "DataFormatsTPC/BetheBlochAleph.h"
 #include "DCAFitter/DCAFitterN.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGLF/DataModel/LFHypernucleiKfTables.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DataFormatsTPC/BetheBlochAleph.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/TableProducer/Nuspex/lnnRecoTask.cxx b/.conflict-side-1/PWGLF/TableProducer/Nuspex/lnnRecoTask.cxx
index e607057e5c6..88db18c376f 100644
--- a/.conflict-side-1/PWGLF/TableProducer/Nuspex/lnnRecoTask.cxx
+++ b/.conflict-side-1/PWGLF/TableProducer/Nuspex/lnnRecoTask.cxx
@@ -11,43 +11,40 @@
 //
 // Build \Lambda-n-n candidates from V0s and tracks
 // ==============================================================================
-#include <array>
-#include <memory>
-#include <string>
-#include <vector>
-#include <algorithm>
-
-#include <TLorentzVector.h>
+#include "PWGLF/DataModel/EPCalibrationTables.h"
+#include "PWGLF/DataModel/LFLnnTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
+#include "Common/Core/PID/PIDTOF.h"
+#include "Common/Core/PID/TPCPIDResponse.h"
 #include "Common/Core/RecoDecay.h"
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "PWGLF/DataModel/EPCalibrationTables.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
-
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/TableProducer/PID/pidTOFBase.h"
 
-#include "Common/Core/PID/TPCPIDResponse.h"
-#include "DataFormatsTPC/BetheBlochAleph.h"
+#include "CCDB/BasicCCDBManager.h"
 #include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DataFormatsTPC/BetheBlochAleph.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
-#include "Common/DataModel/TrackSelectionTables.h"
-
-#include "Common/Core/PID/PIDTOF.h"
-#include "Common/TableProducer/PID/pidTOFBase.h"
+#include <TLorentzVector.h>
 
-#include "PWGLF/DataModel/LFLnnTables.h"
+#include <algorithm>
+#include <array>
+#include <memory>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/TableProducer/Nuspex/nucleiFlowTree.cxx b/.conflict-side-1/PWGLF/TableProducer/Nuspex/nucleiFlowTree.cxx
index 14192166fae..238cf021cfd 100644
--- a/.conflict-side-1/PWGLF/TableProducer/Nuspex/nucleiFlowTree.cxx
+++ b/.conflict-side-1/PWGLF/TableProducer/Nuspex/nucleiFlowTree.cxx
@@ -19,54 +19,49 @@
 // o2-analysis-pid-tof-base, o2-analysis-multiplicity-table, o2-analysis-event-selection
 // (to add flow: o2-analysis-qvector-table, o2-analysis-centrality-table)
 
-#include <algorithm>
-#include <cmath>
-#include <memory>
-#include <string>
-#include <vector>
-
-#include "Math/Vector4D.h"
+#include "nucleiUtils.h"
 
-#include "CCDB/BasicCCDBManager.h"
+#include "PWGLF/DataModel/EPCalibrationTables.h"
+#include "PWGLF/DataModel/LFSlimNucleiTables.h"
 
+#include "Common/Core/EventPlaneHelper.h"
+#include "Common/Core/PID/PIDTOF.h"
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/PIDResponseITS.h"
+#include "Common/DataModel/Qvectors.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/Core/PID/PIDTOF.h"
 #include "Common/TableProducer/PID/pidTOFBase.h"
-#include "Common/Core/EventPlaneHelper.h"
-#include "Common/DataModel/Qvectors.h"
 #include "Common/Tools/TrackTuner.h"
-#include "Common/Core/RecoDecay.h"
+#include "EventFiltering/Zorro.h"
+#include "EventFiltering/ZorroSummary.h"
 
+#include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsParameters/GRPMagField.h"
 #include "DataFormatsParameters/GRPObject.h"
 #include "DataFormatsTPC/BetheBlochAleph.h"
 #include "DetectorsBase/GeometryManager.h"
 #include "DetectorsBase/Propagator.h"
-
-#include "EventFiltering/Zorro.h"
-#include "EventFiltering/ZorroSummary.h"
-
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
-
 #include "ReconstructionDataFormats/Track.h"
 
-#include "PWGLF/DataModel/EPCalibrationTables.h"
-#include "PWGLF/DataModel/LFSlimNucleiTables.h"
-
+#include "Math/Vector4D.h"
 #include "TRandom3.h"
 
-#include "nucleiUtils.h"
+#include <algorithm>
+#include <cmath>
+#include <memory>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/TableProducer/Nuspex/pidTOFGeneric.cxx b/.conflict-side-1/PWGLF/TableProducer/Nuspex/pidTOFGeneric.cxx
index 9997d4d27c8..5e934fec44e 100644
--- a/.conflict-side-1/PWGLF/TableProducer/Nuspex/pidTOFGeneric.cxx
+++ b/.conflict-side-1/PWGLF/TableProducer/Nuspex/pidTOFGeneric.cxx
@@ -16,28 +16,30 @@
 ///         In order to redo TOF PID for tracks which are linked to wrong collisions
 ///
 
+#include <string>
 #include <utility>
 #include <vector>
-#include <string>
 
 // O2 includes
 #include "CCDB/BasicCCDBManager.h"
-#include "TOFBase/EventTimeMaker.h"
 #include "Framework/AnalysisTask.h"
 #include "ReconstructionDataFormats/Track.h"
+#include "TOFBase/EventTimeMaker.h"
 
 // O2Physics includes
+#include "PWGLF/DataModel/pidTOFGeneric.h"
+
 #include "Common/Core/TableHelper.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/FT0Corrected.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
-#include "PID/ParamBase.h"
 #include "PID/PIDTOF.h"
-#include "PWGLF/DataModel/pidTOFGeneric.h"
+#include "PID/ParamBase.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/TableProducer/Nuspex/spectraDerivedMaker.cxx b/.conflict-side-1/PWGLF/TableProducer/Nuspex/spectraDerivedMaker.cxx
index bce0c9153d1..4e7de3c2821 100644
--- a/.conflict-side-1/PWGLF/TableProducer/Nuspex/spectraDerivedMaker.cxx
+++ b/.conflict-side-1/PWGLF/TableProducer/Nuspex/spectraDerivedMaker.cxx
@@ -18,20 +18,22 @@
 ///
 
 // O2 includes
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/spectraTOF.h"
+
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
 #include "Framework/StaticFor.h"
-#include "Common/Core/TrackSelectionDefaults.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
-#include "PWGLF/DataModel/spectraTOF.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
 #include "TPDGCode.h"
 
diff --git a/.conflict-side-1/PWGLF/TableProducer/Nuspex/threebodymcfinder.cxx b/.conflict-side-1/PWGLF/TableProducer/Nuspex/threebodymcfinder.cxx
index 875128758b8..a10510153bc 100644
--- a/.conflict-side-1/PWGLF/TableProducer/Nuspex/threebodymcfinder.cxx
+++ b/.conflict-side-1/PWGLF/TableProducer/Nuspex/threebodymcfinder.cxx
@@ -25,36 +25,38 @@
 //    david.dobrigkeit.chinellato@cern.ch
 //
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "ReconstructionDataFormats/Track.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/McCollisionExtra.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "Common/Core/TrackSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
+#include <Math/Vector4D.h>
+#include <TDatabasePDG.h>
 #include <TFile.h>
-#include <TLorentzVector.h>
 #include <TH1F.h>
 #include <TH2F.h>
-#include <TProfile.h>
-#include <Math/Vector4D.h>
+#include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
-#include <cmath>
+#include <TProfile.h>
+
 #include <array>
+#include <cmath>
 #include <cstdlib>
 
 using namespace o2;
diff --git a/.conflict-side-1/PWGLF/TableProducer/Nuspex/trHeAnalysis.cxx b/.conflict-side-1/PWGLF/TableProducer/Nuspex/trHeAnalysis.cxx
index 40378ba6df4..2f06f165046 100644
--- a/.conflict-side-1/PWGLF/TableProducer/Nuspex/trHeAnalysis.cxx
+++ b/.conflict-side-1/PWGLF/TableProducer/Nuspex/trHeAnalysis.cxx
@@ -16,8 +16,10 @@
 ///
 /// \author Matthias Herzer <matthias.herzer@cern.ch>, Goethe University Frankfurt
 ///
-#include <string>
-#include <vector>
+#include "PWGLF/DataModel/LFNucleiTables.h"
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/pidTOFGeneric.h"
+
 #include "Common/CCDB/EventSelectionParams.h"
 #include "Common/Core/PID/TPCPIDResponse.h"
 #include "Common/Core/trackUtilities.h"
@@ -26,18 +28,20 @@
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFNucleiTables.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
 #include "ReconstructionDataFormats/PID.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "PWGLF/DataModel/pidTOFGeneric.h"
+
 #include <TF1.h>
 
+#include <string>
+#include <vector>
+
 namespace o2::aod
 {
 namespace h3_data
diff --git a/.conflict-side-1/PWGLF/TableProducer/QC/strangenessQC.cxx b/.conflict-side-1/PWGLF/TableProducer/QC/strangenessQC.cxx
index f35ad82899c..9452899f913 100644
--- a/.conflict-side-1/PWGLF/TableProducer/QC/strangenessQC.cxx
+++ b/.conflict-side-1/PWGLF/TableProducer/QC/strangenessQC.cxx
@@ -14,15 +14,17 @@
 /// In case of questions please write to:
 /// \author Roman Nepeivoda (roman.nepeivoda@cern.ch)
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "PWGLF/DataModel/QC/strangenessTablesQC.h"
 
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-1/PWGLF/TableProducer/Resonances/HeptaQuarktable.cxx b/.conflict-side-1/PWGLF/TableProducer/Resonances/HeptaQuarktable.cxx
index ccb0c61465f..36765795b05 100644
--- a/.conflict-side-1/PWGLF/TableProducer/Resonances/HeptaQuarktable.cxx
+++ b/.conflict-side-1/PWGLF/TableProducer/Resonances/HeptaQuarktable.cxx
@@ -14,39 +14,38 @@
 ///
 /// \author Junlee Kim, (junlee.kim@cern.ch)
 
-#include <Framework/Configurable.h>
-#include <Math/GenVector/Boost.h>
-#include <Math/Vector4D.h>
-#include <TMath.h>
-#include <fairlogger/Logger.h>
-
-#include <iostream>
-#include <iterator>
-#include <string>
-#include <vector>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/DataModel/ReducedHeptaQuarkTables.h"
 
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/PIDResponseITS.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 #include "EventFiltering/Zorro.h"
 #include "EventFiltering/ZorroSummary.h"
 
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
+#include "CommonConstants/MathConstants.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
+#include <Framework/Configurable.h>
 
-#include "CommonConstants/MathConstants.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/PIDResponseITS.h"
+#include <Math/GenVector/Boost.h>
+#include <Math/Vector4D.h>
+#include <TMath.h>
 
-#include "CCDB/BasicCCDBManager.h"
-#include "CCDB/CcdbApi.h"
+#include <fairlogger/Logger.h>
 
-#include "PWGLF/DataModel/ReducedHeptaQuarkTables.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include <iostream>
+#include <iterator>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/TableProducer/Resonances/doublephitable.cxx b/.conflict-side-1/PWGLF/TableProducer/Resonances/doublephitable.cxx
index d02ab3d3734..4279cff1c02 100644
--- a/.conflict-side-1/PWGLF/TableProducer/Resonances/doublephitable.cxx
+++ b/.conflict-side-1/PWGLF/TableProducer/Resonances/doublephitable.cxx
@@ -14,39 +14,41 @@
 ///
 /// \author Sourav Kundu, sourav.kundu@cern.ch
 
+#include "PWGLF/DataModel/ReducedDoublePhiTables.h"
+
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/PIDResponseITS.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+#include "EventFiltering/Zorro.h"
+#include "EventFiltering/ZorroSummary.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
+#include "CommonConstants/MathConstants.h"
+#include "DataFormatsTPC/BetheBlochAleph.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 #include <Framework/Configurable.h>
+
 #include <Math/GenVector/Boost.h>
 #include <Math/Vector4D.h>
+#include <TDatabasePDG.h> // FIXME
 #include <TMath.h>
+#include <TPDGCode.h> // FIXME
+
 #include <fairlogger/Logger.h>
-#include <TDatabasePDG.h> // FIXME
-#include <TPDGCode.h>     // FIXME
 
 #include <iostream>
 #include <iterator>
 #include <string>
 #include <vector>
 
-#include "EventFiltering/Zorro.h"
-#include "EventFiltering/ZorroSummary.h"
-
-#include "PWGLF/DataModel/ReducedDoublePhiTables.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
-#include "CommonConstants/MathConstants.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "DataFormatsTPC/BetheBlochAleph.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "CCDB/CcdbApi.h"
-#include "Common/DataModel/PIDResponseITS.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-1/PWGLF/TableProducer/Resonances/f1protonInitializer.cxx b/.conflict-side-1/PWGLF/TableProducer/Resonances/f1protonInitializer.cxx
index e7240c72f90..a6db6759a68 100644
--- a/.conflict-side-1/PWGLF/TableProducer/Resonances/f1protonInitializer.cxx
+++ b/.conflict-side-1/PWGLF/TableProducer/Resonances/f1protonInitializer.cxx
@@ -12,39 +12,40 @@
 /// \file f1protonInitializer.cxx
 /// check if the event have f1-p candidate
 /// \author Sourav Kundu <sourav.kundu@cern.ch>
-#include <TH1F.h>
-#include <TDirectory.h>
-#include <THn.h>
-#include <TLorentzVector.h>
-#include <TMath.h>
-#include <TObjArray.h>
-#include <TFile.h>
-#include <TH2F.h>
-#include <TLorentzVector.h>
-#include <TPDGCode.h>
-#include <TDatabasePDG.h>
-
-#include <cmath>
-#include <array>
-#include <cstdlib>
+#include "PWGLF/DataModel/LFF1Tables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/Utils/collisionCuts.h"
 
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Multiplicity.h"
 #include "Common/Core/trackUtilities.h"
-#include "CommonConstants/PhysicsConstants.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonConstants/PhysicsConstants.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFF1Tables.h"
-#include "PWGLF/Utils/collisionCuts.h"
 #include "ReconstructionDataFormats/Track.h"
 
+#include <TDatabasePDG.h>
+#include <TDirectory.h>
+#include <TFile.h>
+#include <TH1F.h>
+#include <TH2F.h>
+#include <THn.h>
+#include <TLorentzVector.h>
+#include <TMath.h>
+#include <TObjArray.h>
+#include <TPDGCode.h>
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-1/PWGLF/TableProducer/Resonances/f1protonreducedtable.cxx b/.conflict-side-1/PWGLF/TableProducer/Resonances/f1protonreducedtable.cxx
index ce0cdcf3af5..4a3959ab776 100644
--- a/.conflict-side-1/PWGLF/TableProducer/Resonances/f1protonreducedtable.cxx
+++ b/.conflict-side-1/PWGLF/TableProducer/Resonances/f1protonreducedtable.cxx
@@ -14,40 +14,42 @@
 ///
 /// \author Sourav Kundu, sourav.kundu@cern.ch
 
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/DataModel/ReducedF1ProtonTables.h"
+
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/PIDResponseITS.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+#include "EventFiltering/Zorro.h"
+#include "EventFiltering/ZorroSummary.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
+#include "CommonConstants/MathConstants.h"
+#include "DataFormatsTPC/BetheBlochAleph.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 #include <Framework/Configurable.h>
+
 #include <Math/GenVector/Boost.h>
 #include <Math/Vector4D.h>
+#include <TDatabasePDG.h> // FIXME
 #include <TMath.h>
+#include <TPDGCode.h> // FIXME
+
 #include <fairlogger/Logger.h>
-#include <TDatabasePDG.h> // FIXME
-#include <TPDGCode.h>     // FIXME
 
 #include <iostream>
 #include <iterator>
 #include <string>
 #include <vector>
 
-#include "EventFiltering/Zorro.h"
-#include "EventFiltering/ZorroSummary.h"
-
-#include "PWGLF/DataModel/ReducedF1ProtonTables.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
-#include "CommonConstants/MathConstants.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "DataFormatsTPC/BetheBlochAleph.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "CCDB/CcdbApi.h"
-#include "Common/DataModel/PIDResponseITS.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
@@ -767,10 +769,10 @@ struct f1protonreducedtable {
                 F1KaonIndex.push_back(KaonIndex.at(i2));
                 F1KshortDaughterPositiveIndex.push_back(KshortPosDaughIndex.at(i3));
                 F1KshortDaughterNegativeIndex.push_back(KshortNegDaughIndex.at(i3));
-                PionTOFHitFinal.push_back(PionTOFHit.at(i1)); // Pion TOF Hit
-                KaonTOFHitFinal.push_back(KaonTOFHit.at(i2)); // Kaon TOF Hit
-                PionTPCFinal.push_back(PionTPC.at(i1));       // Pion TPC
-                KaonTPCFinal.push_back(KaonTPC.at(i2));       // Kaon TPC
+                PionTOFHitFinal.push_back(PionTOFHit.at(i1));           // Pion TOF Hit
+                KaonTOFHitFinal.push_back(KaonTOFHit.at(i2));           // Kaon TOF Hit
+                PionTPCFinal.push_back(PionTPC.at(i1));                 // Pion TPC
+                KaonTPCFinal.push_back(KaonTPC.at(i2));                 // Kaon TPC
                 KaonTPCPionHypoFinal.push_back(KaonTPCPionHypo.at(i2)); // Kaon TPC
                 if (pairsign == 1) {
                   qaRegistry.fill(HIST("hInvMassf1"), F1Vector.M(), F1Vector.Pt());
diff --git a/.conflict-side-1/PWGLF/TableProducer/Resonances/filterf1proton.cxx b/.conflict-side-1/PWGLF/TableProducer/Resonances/filterf1proton.cxx
index 831209b0905..df684770709 100644
--- a/.conflict-side-1/PWGLF/TableProducer/Resonances/filterf1proton.cxx
+++ b/.conflict-side-1/PWGLF/TableProducer/Resonances/filterf1proton.cxx
@@ -14,32 +14,36 @@
 ///
 /// \author Sourav Kundu, sourav.kundu@cern.ch
 
-#include <Framework/Configurable.h>
-#include <Math/GenVector/Boost.h>
-#include <Math/Vector4D.h>
-#include <TMath.h>
-#include <fairlogger/Logger.h>
-#include <iostream>
-#include <iterator>
-#include <string>
-
 #include "PWGLF/DataModel/FilterF1ProtonTables.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
-#include "CommonConstants/MathConstants.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "DataFormatsTPC/BetheBlochAleph.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
 #include "CCDB/CcdbApi.h"
+#include "CommonConstants/MathConstants.h"
 #include "CommonConstants/PhysicsConstants.h"
+#include "DataFormatsTPC/BetheBlochAleph.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include <Framework/Configurable.h>
+
+#include <Math/GenVector/Boost.h>
+#include <Math/Vector4D.h>
+#include <TMath.h>
+
+#include <fairlogger/Logger.h>
+
+#include <iostream>
+#include <iterator>
+#include <string>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/TableProducer/Resonances/resonanceInitializer.cxx b/.conflict-side-1/PWGLF/TableProducer/Resonances/resonanceInitializer.cxx
index c318d1d57d9..23d4b0df3ae 100644
--- a/.conflict-side-1/PWGLF/TableProducer/Resonances/resonanceInitializer.cxx
+++ b/.conflict-side-1/PWGLF/TableProducer/Resonances/resonanceInitializer.cxx
@@ -14,32 +14,35 @@
 /// \author Bong-Hwi Lim <bong-hwi.lim@cern.ch>
 ///
 
-#include <string>
-#include <vector>
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/Centrality.h"
+#include "PWGLF/DataModel/LFResonanceTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/Utils/collisionCuts.h"
+
+#include "Common/Core/EventPlaneHelper.h"
 #include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/Qvectors.h"
-#include "Common/Core/EventPlaneHelper.h"
-#include "Framework/ASoAHelpers.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonConstants/MathConstants.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
 #include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
-#include "PWGLF/Utils/collisionCuts.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "CommonConstants/MathConstants.h"
+
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/TableProducer/Resonances/resonanceMergeDF.cxx b/.conflict-side-1/PWGLF/TableProducer/Resonances/resonanceMergeDF.cxx
index 99ba4ec391d..c94d5940ff2 100644
--- a/.conflict-side-1/PWGLF/TableProducer/Resonances/resonanceMergeDF.cxx
+++ b/.conflict-side-1/PWGLF/TableProducer/Resonances/resonanceMergeDF.cxx
@@ -26,31 +26,33 @@
 /// \author Bong-Hwi Lim <bong-hwi.lim@cern.ch>
 ///         Nasir Mehdi Malik <nasir.mehdi.malik@cern.ch>
 ///         Min-jae Kim <minjae.kim@cern.ch>
-#include <vector>
+#include "PWGLF/DataModel/LFResonanceTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/Utils/collisionCuts.h"
 
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Multiplicity.h"
+#include "Common/Core/EventPlaneHelper.h"
 #include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/Qvectors.h"
-#include "Common/Core/EventPlaneHelper.h"
-#include "Framework/ASoAHelpers.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
 #include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
-#include "PWGLF/Utils/collisionCuts.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/TableProducer/Resonances/resonanceModuleInitializer.cxx b/.conflict-side-1/PWGLF/TableProducer/Resonances/resonanceModuleInitializer.cxx
index 54d2533b05a..d369995d3fd 100644
--- a/.conflict-side-1/PWGLF/TableProducer/Resonances/resonanceModuleInitializer.cxx
+++ b/.conflict-side-1/PWGLF/TableProducer/Resonances/resonanceModuleInitializer.cxx
@@ -14,34 +14,37 @@
 ///
 /// \author Bong-Hwi Lim <bong-hwi.lim@cern.ch>
 
-#include <string>
-#include <vector>
-#include "CCDB/BasicCCDBManager.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/Centrality.h"
+#include "PWGLF/DataModel/LFResonanceTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/DataModel/mcCentrality.h"
+#include "PWGLF/Utils/collisionCuts.h"
+
+#include "Common/Core/EventPlaneHelper.h"
 #include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/Qvectors.h"
-#include "Common/Core/EventPlaneHelper.h"
-#include "CommonConstants/PhysicsConstants.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/MathConstants.h"
-#include "DataFormatsParameters/GRPObject.h"
+#include "CommonConstants/PhysicsConstants.h"
 #include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
 #include "DetectorsBase/Propagator.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
-#include "PWGLF/DataModel/mcCentrality.h"
-#include "PWGLF/Utils/collisionCuts.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
 
+#include <string>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-1/PWGLF/TableProducer/Strangeness/Converters/stracentconverter.cxx b/.conflict-side-1/PWGLF/TableProducer/Strangeness/Converters/stracentconverter.cxx
index 74a786101e9..150b3734301 100644
--- a/.conflict-side-1/PWGLF/TableProducer/Strangeness/Converters/stracentconverter.cxx
+++ b/.conflict-side-1/PWGLF/TableProducer/Strangeness/Converters/stracentconverter.cxx
@@ -8,11 +8,12 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-side-1/PWGLF/TableProducer/Strangeness/Converters/stradautracksconverter.cxx b/.conflict-side-1/PWGLF/TableProducer/Strangeness/Converters/stradautracksconverter.cxx
index 5fe25abb572..e5b4533350e 100644
--- a/.conflict-side-1/PWGLF/TableProducer/Strangeness/Converters/stradautracksconverter.cxx
+++ b/.conflict-side-1/PWGLF/TableProducer/Strangeness/Converters/stradautracksconverter.cxx
@@ -8,11 +8,12 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/TableProducer/Strangeness/Converters/stradautracksextraconverter.cxx b/.conflict-side-1/PWGLF/TableProducer/Strangeness/Converters/stradautracksextraconverter.cxx
index ad436f4dfee..e40250a1ab3 100644
--- a/.conflict-side-1/PWGLF/TableProducer/Strangeness/Converters/stradautracksextraconverter.cxx
+++ b/.conflict-side-1/PWGLF/TableProducer/Strangeness/Converters/stradautracksextraconverter.cxx
@@ -8,11 +8,12 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
@@ -37,4 +38,5 @@ WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
   return WorkflowSpec{
     adaptAnalysisTask<stradautracksextraconverter>(cfgc)};
-}
\ No newline at end of file
+}
+ 
\ No newline at end of file
diff --git a/.conflict-side-1/PWGLF/TableProducer/Strangeness/Converters/stradautracksextraconverter2.cxx b/.conflict-side-1/PWGLF/TableProducer/Strangeness/Converters/stradautracksextraconverter2.cxx
index 22c9fc7eea4..e9c2f78c407 100644
--- a/.conflict-side-1/PWGLF/TableProducer/Strangeness/Converters/stradautracksextraconverter2.cxx
+++ b/.conflict-side-1/PWGLF/TableProducer/Strangeness/Converters/stradautracksextraconverter2.cxx
@@ -8,11 +8,12 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/TableProducer/Strangeness/Converters/stradautracksextraconverter3.cxx b/.conflict-side-1/PWGLF/TableProducer/Strangeness/Converters/stradautracksextraconverter3.cxx
index a4144c1ee9a..9f4d341ff39 100644
--- a/.conflict-side-1/PWGLF/TableProducer/Strangeness/Converters/stradautracksextraconverter3.cxx
+++ b/.conflict-side-1/PWGLF/TableProducer/Strangeness/Converters/stradautracksextraconverter3.cxx
@@ -8,11 +8,12 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/TableProducer/Strangeness/Converters/stradautrackstofpidconverter.cxx b/.conflict-side-1/PWGLF/TableProducer/Strangeness/Converters/stradautrackstofpidconverter.cxx
index 8731939ca53..063b318657f 100644
--- a/.conflict-side-1/PWGLF/TableProducer/Strangeness/Converters/stradautrackstofpidconverter.cxx
+++ b/.conflict-side-1/PWGLF/TableProducer/Strangeness/Converters/stradautrackstofpidconverter.cxx
@@ -8,11 +8,12 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
@@ -62,4 +63,5 @@ WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
   return WorkflowSpec{
     adaptAnalysisTask<stradautrackstofpidconverter>(cfgc)};
-}
\ No newline at end of file
+}
+ 
\ No newline at end of file
diff --git a/.conflict-side-1/PWGLF/TableProducer/Strangeness/Converters/straevselsconverter.cxx b/.conflict-side-1/PWGLF/TableProducer/Strangeness/Converters/straevselsconverter.cxx
index 9806e15abfc..8cadcdacd2a 100644
--- a/.conflict-side-1/PWGLF/TableProducer/Strangeness/Converters/straevselsconverter.cxx
+++ b/.conflict-side-1/PWGLF/TableProducer/Strangeness/Converters/straevselsconverter.cxx
@@ -8,11 +8,12 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-side-1/PWGLF/TableProducer/Strangeness/Converters/straevselsconverter2rawcents.cxx b/.conflict-side-1/PWGLF/TableProducer/Strangeness/Converters/straevselsconverter2rawcents.cxx
index deeafa8eeca..90ce25774c7 100644
--- a/.conflict-side-1/PWGLF/TableProducer/Strangeness/Converters/straevselsconverter2rawcents.cxx
+++ b/.conflict-side-1/PWGLF/TableProducer/Strangeness/Converters/straevselsconverter2rawcents.cxx
@@ -8,11 +8,12 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-side-1/PWGLF/TableProducer/Strangeness/Converters/straevselsconverter2rawcents2.cxx b/.conflict-side-1/PWGLF/TableProducer/Strangeness/Converters/straevselsconverter2rawcents2.cxx
index ffed58e9072..fa3a2ba8e48 100644
--- a/.conflict-side-1/PWGLF/TableProducer/Strangeness/Converters/straevselsconverter2rawcents2.cxx
+++ b/.conflict-side-1/PWGLF/TableProducer/Strangeness/Converters/straevselsconverter2rawcents2.cxx
@@ -8,11 +8,12 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-side-1/PWGLF/TableProducer/Strangeness/Converters/straevselsconverter2rawcents3.cxx b/.conflict-side-1/PWGLF/TableProducer/Strangeness/Converters/straevselsconverter2rawcents3.cxx
index 8d92146d6f7..0a5e98462ce 100644
--- a/.conflict-side-1/PWGLF/TableProducer/Strangeness/Converters/straevselsconverter2rawcents3.cxx
+++ b/.conflict-side-1/PWGLF/TableProducer/Strangeness/Converters/straevselsconverter2rawcents3.cxx
@@ -8,11 +8,12 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-side-1/PWGLF/TableProducer/Strangeness/Converters/stramccollisionconverter.cxx b/.conflict-side-1/PWGLF/TableProducer/Strangeness/Converters/stramccollisionconverter.cxx
index 8c7950dc4fd..c29ad673dbc 100644
--- a/.conflict-side-1/PWGLF/TableProducer/Strangeness/Converters/stramccollisionconverter.cxx
+++ b/.conflict-side-1/PWGLF/TableProducer/Strangeness/Converters/stramccollisionconverter.cxx
@@ -8,11 +8,12 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-side-1/PWGLF/TableProducer/Strangeness/Converters/stramccollisionconverter2.cxx b/.conflict-side-1/PWGLF/TableProducer/Strangeness/Converters/stramccollisionconverter2.cxx
index c821c6fb5fe..2f330820509 100644
--- a/.conflict-side-1/PWGLF/TableProducer/Strangeness/Converters/stramccollisionconverter2.cxx
+++ b/.conflict-side-1/PWGLF/TableProducer/Strangeness/Converters/stramccollisionconverter2.cxx
@@ -16,11 +16,12 @@
 /// \author Romain Schotter <romain.schotter@cern.ch>, Austrian Academy of Sciences & SMI
 //
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-side-1/PWGLF/TableProducer/Strangeness/Converters/stramccollmultconverter.cxx b/.conflict-side-1/PWGLF/TableProducer/Strangeness/Converters/stramccollmultconverter.cxx
index 411e3c15da5..2b25192cce1 100644
--- a/.conflict-side-1/PWGLF/TableProducer/Strangeness/Converters/stramccollmultconverter.cxx
+++ b/.conflict-side-1/PWGLF/TableProducer/Strangeness/Converters/stramccollmultconverter.cxx
@@ -8,11 +8,12 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-side-1/PWGLF/TableProducer/Strangeness/Converters/strarawcentsconverter.cxx b/.conflict-side-1/PWGLF/TableProducer/Strangeness/Converters/strarawcentsconverter.cxx
index e912c724870..7986a02ca1e 100644
--- a/.conflict-side-1/PWGLF/TableProducer/Strangeness/Converters/strarawcentsconverter.cxx
+++ b/.conflict-side-1/PWGLF/TableProducer/Strangeness/Converters/strarawcentsconverter.cxx
@@ -8,11 +8,12 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-side-1/PWGLF/TableProducer/Strangeness/Converters/strarawcentsconverter2v4.cxx b/.conflict-side-1/PWGLF/TableProducer/Strangeness/Converters/strarawcentsconverter2v4.cxx
index c94227e31cd..1eeb4b20ec9 100644
--- a/.conflict-side-1/PWGLF/TableProducer/Strangeness/Converters/strarawcentsconverter2v4.cxx
+++ b/.conflict-side-1/PWGLF/TableProducer/Strangeness/Converters/strarawcentsconverter2v4.cxx
@@ -8,11 +8,12 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-side-1/PWGLF/TableProducer/Strangeness/Converters/strastampsconverter.cxx b/.conflict-side-1/PWGLF/TableProducer/Strangeness/Converters/strastampsconverter.cxx
index 7f5f129d623..8a6ee0c52d0 100644
--- a/.conflict-side-1/PWGLF/TableProducer/Strangeness/Converters/strastampsconverter.cxx
+++ b/.conflict-side-1/PWGLF/TableProducer/Strangeness/Converters/strastampsconverter.cxx
@@ -8,11 +8,12 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-side-1/PWGLF/TableProducer/Strangeness/Converters/v0coresconverter.cxx b/.conflict-side-1/PWGLF/TableProducer/Strangeness/Converters/v0coresconverter.cxx
index 06fafc1cc1a..9fa5142bc6d 100644
--- a/.conflict-side-1/PWGLF/TableProducer/Strangeness/Converters/v0coresconverter.cxx
+++ b/.conflict-side-1/PWGLF/TableProducer/Strangeness/Converters/v0coresconverter.cxx
@@ -8,11 +8,12 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-side-1/PWGLF/TableProducer/Strangeness/Converters/v0coresconverter2.cxx b/.conflict-side-1/PWGLF/TableProducer/Strangeness/Converters/v0coresconverter2.cxx
index c918f227525..66cafa8eeb6 100644
--- a/.conflict-side-1/PWGLF/TableProducer/Strangeness/Converters/v0coresconverter2.cxx
+++ b/.conflict-side-1/PWGLF/TableProducer/Strangeness/Converters/v0coresconverter2.cxx
@@ -8,11 +8,12 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-side-1/PWGLF/TableProducer/Strangeness/Converters/v0mlscoresconverter.cxx b/.conflict-side-1/PWGLF/TableProducer/Strangeness/Converters/v0mlscoresconverter.cxx
index 9f2020bf20d..6cc3f4536fb 100644
--- a/.conflict-side-1/PWGLF/TableProducer/Strangeness/Converters/v0mlscoresconverter.cxx
+++ b/.conflict-side-1/PWGLF/TableProducer/Strangeness/Converters/v0mlscoresconverter.cxx
@@ -8,11 +8,12 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "PWGLF/DataModel/LFStrangenessMLTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/TableProducer/Strangeness/Converters/zdcneutronsconverter.cxx b/.conflict-side-1/PWGLF/TableProducer/Strangeness/Converters/zdcneutronsconverter.cxx
index ad081a43052..7ee0c368480 100644
--- a/.conflict-side-1/PWGLF/TableProducer/Strangeness/Converters/zdcneutronsconverter.cxx
+++ b/.conflict-side-1/PWGLF/TableProducer/Strangeness/Converters/zdcneutronsconverter.cxx
@@ -8,11 +8,12 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "PWGLF/DataModel/LFStrangenessMLTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/TableProducer/Strangeness/LambdaLambdatable.cxx b/.conflict-side-1/PWGLF/TableProducer/Strangeness/LambdaLambdatable.cxx
index 778f39ed442..bb7c517e1e7 100644
--- a/.conflict-side-1/PWGLF/TableProducer/Strangeness/LambdaLambdatable.cxx
+++ b/.conflict-side-1/PWGLF/TableProducer/Strangeness/LambdaLambdatable.cxx
@@ -11,38 +11,37 @@
 ///
 /// \author Junlee Kim, (junlee.kim@cern.ch)
 
-#include <Framework/Configurable.h>
-#include <Math/GenVector/Boost.h>
-#include <Math/Vector4D.h>
-#include <TMath.h>
-#include <fairlogger/Logger.h>
-
-#include <iostream>
-#include <iterator>
-#include <string>
-#include <vector>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/DataModel/ReducedLambdaLambdaTables.h"
 
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 #include "EventFiltering/Zorro.h"
 #include "EventFiltering/ZorroSummary.h"
 
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
+#include "CommonConstants/MathConstants.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
+#include <Framework/Configurable.h>
 
-#include "CommonConstants/MathConstants.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/PIDResponse.h"
+#include <Math/GenVector/Boost.h>
+#include <Math/Vector4D.h>
+#include <TMath.h>
 
-#include "CCDB/BasicCCDBManager.h"
-#include "CCDB/CcdbApi.h"
+#include <fairlogger/Logger.h>
 
-#include "PWGLF/DataModel/ReducedLambdaLambdaTables.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include <iostream>
+#include <iterator>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/TableProducer/Strangeness/cascadeMLSelectionTreeCreator.cxx b/.conflict-side-1/PWGLF/TableProducer/Strangeness/cascadeMLSelectionTreeCreator.cxx
index f3bfc813c89..9eefdea0c8a 100644
--- a/.conflict-side-1/PWGLF/TableProducer/Strangeness/cascadeMLSelectionTreeCreator.cxx
+++ b/.conflict-side-1/PWGLF/TableProducer/Strangeness/cascadeMLSelectionTreeCreator.cxx
@@ -23,37 +23,40 @@
 //    david.dobrigkeit.chinellato@cern.ch
 //
 
-#include <Math/Vector4D.h> // C system
-#include <cmath>           // C++ system
-#include <array>           // C++ system
-#include <cstdlib>         // C++ system
+#include "PWGLF/DataModel/LFStrangenessMLTables.h"
+#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/ASoA.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
-#include "PWGLF/DataModel/LFStrangenessMLTables.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/TableProducer/PID/pidTOFBase.h"
+
 #include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/PhysicsConstants.h"
-#include "Common/TableProducer/PID/pidTOFBase.h"
+#include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <Math/Vector4D.h> // C system
+#include <TDatabasePDG.h>
 #include <TFile.h>
 #include <TH2F.h>
-#include <TProfile.h>
 #include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
+#include <TProfile.h>
+
+#include <array>   // C++ system
+#include <cmath>   // C++ system
+#include <cstdlib> // C++ system
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/TableProducer/Strangeness/cascadebuilder.cxx b/.conflict-side-1/PWGLF/TableProducer/Strangeness/cascadebuilder.cxx
index b4a19e6660b..607445f0fda 100644
--- a/.conflict-side-1/PWGLF/TableProducer/Strangeness/cascadebuilder.cxx
+++ b/.conflict-side-1/PWGLF/TableProducer/Strangeness/cascadebuilder.cxx
@@ -36,47 +36,47 @@
 //    david.dobrigkeit.chinellato@cern.ch
 //
 
-#include <string>
-#include <vector>
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <map>
-#include <iterator>
-#include <utility>
-#include <string>
-#include <vector>
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/LFStrangenessMLTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFStrangenessMLTables.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
 #include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
 #include "Tools/ML/MlResponse.h"
 #include "Tools/ML/model.h"
 
+#include "CCDB/BasicCCDBManager.h"
+#include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <iterator>
+#include <map>
+#include <string>
+#include <utility>
+#include <vector>
+
 #ifndef HomogeneousField
 #define HomogeneousField
 #endif
 
 /// includes KFParticle
-#include "KFParticle.h"
 #include "KFPTrack.h"
 #include "KFPVertex.h"
+#include "KFParticle.h"
 #include "KFParticleBase.h"
 #include "KFVertex.h"
 
@@ -2202,11 +2202,11 @@ struct cascadePreselector {
                   }
                 }
               } // end conditional V0-bach pair
-            }   // end neg = pos mother conditional
+            } // end neg = pos mother conditional
           }
         } // end loop neg/pos mothers
-      }   // end conditional of mothers existing
-    }     // end association check
+      } // end conditional of mothers existing
+    } // end association check
     // Construct tag table (note: this will be joinable with CascDatas)
     if (lPDG == 3312)
       bitset(maskElement, bitTrueXiMinus);
diff --git a/.conflict-side-1/PWGLF/TableProducer/Strangeness/cascadefinder.cxx b/.conflict-side-1/PWGLF/TableProducer/Strangeness/cascadefinder.cxx
index 3901d3f14c3..4d6de573b2a 100644
--- a/.conflict-side-1/PWGLF/TableProducer/Strangeness/cascadefinder.cxx
+++ b/.conflict-side-1/PWGLF/TableProducer/Strangeness/cascadefinder.cxx
@@ -28,33 +28,36 @@
 //    david.dobrigkeit.chinellato@cern.ch
 //
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
 #include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "ReconstructionDataFormats/Track.h"
+#include "PWGLF/DataModel/LFStrangenessFinderTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFStrangenessFinderTables.h"
-#include "Common/Core/TrackSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
 
+#include "DCAFitter/DCAFitterN.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <Math/Vector4D.h>
+#include <TDatabasePDG.h>
 #include <TFile.h>
-#include <TLorentzVector.h>
 #include <TH1F.h>
 #include <TH2F.h>
-#include <TProfile.h>
-#include <Math/Vector4D.h>
+#include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
-#include <cmath>
+#include <TProfile.h>
+
 #include <array>
+#include <cmath>
 #include <cstdlib>
 
 using namespace o2;
@@ -270,9 +273,9 @@ struct cascadefinder {
                      t0id.dcaXY(),
                      dcaInfo[0], dcaInfo[1]);
           } // end if cascade recoed
-        }   // end loop over bachelor
-      }     // end if v0 recoed
-    }       // end loop over cascades
+        } // end loop over bachelor
+      } // end if v0 recoed
+    } // end loop over cascades
 
     // Anticascades
     for (auto& v0id : antiLambdas) {
@@ -361,9 +364,9 @@ struct cascadefinder {
                      t0id.dcaXY(),
                      dcaInfo[0], dcaInfo[1]);
           } // end if cascade recoed
-        }   // end loop over bachelor
-      }     // end if v0 recoed
-    }       // end loop over anticascades
+        } // end loop over bachelor
+      } // end if v0 recoed
+    } // end loop over anticascades
 
     hCandPerEvent->Fill(lNCand);
   }
diff --git a/.conflict-side-1/PWGLF/TableProducer/Strangeness/cascadeflow.cxx b/.conflict-side-1/PWGLF/TableProducer/Strangeness/cascadeflow.cxx
index c66a1db16fd..a8135e5c1b5 100644
--- a/.conflict-side-1/PWGLF/TableProducer/Strangeness/cascadeflow.cxx
+++ b/.conflict-side-1/PWGLF/TableProducer/Strangeness/cascadeflow.cxx
@@ -12,25 +12,29 @@
 /// \brief Task to create derived data for cascade flow analyses
 /// \authors: Chiara De Martin (chiara.de.martin@cern.ch), Maximiliano Puccio (maximiliano.puccio@cern.ch)
 
-#include <vector>
-#include <string>
-#include <memory>
-#include "Math/Vector3D.h"
-#include "TRandom3.h"
+#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/DataModel/cascqaanalysis.h"
+
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Framework/AnalysisTask.h"
+#include "Tools/ML/MlResponse.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/cascqaanalysis.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
-#include "Tools/ML/MlResponse.h"
-#include "CCDB/BasicCCDBManager.h"
+
+#include "Math/Vector3D.h"
+#include "TRandom3.h"
+
+#include <memory>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/TableProducer/Strangeness/cascademcbuilder.cxx b/.conflict-side-1/PWGLF/TableProducer/Strangeness/cascademcbuilder.cxx
index 3d4a5642004..384707d3d57 100644
--- a/.conflict-side-1/PWGLF/TableProducer/Strangeness/cascademcbuilder.cxx
+++ b/.conflict-side-1/PWGLF/TableProducer/Strangeness/cascademcbuilder.cxx
@@ -18,23 +18,25 @@
 //    david.dobrigkeit.chinellato@cern.ch
 //
 
-#include <cmath>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/trackUtilities.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
 #include <array>
+#include <cmath>
 #include <cstdlib>
-#include <map>
 #include <iterator>
+#include <map>
 #include <utility>
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
@@ -45,11 +47,11 @@ using LabeledTracks = soa::Join<aod::Tracks, aod::McTrackLabels>;
 
 //*+-+*+-+*+-+*+-+*+-+*+-+*+-+*+-+*+-+*+-+*
 struct cascademcbuilder {
-  Produces<aod::McCascLabels> casclabels;       // MC labels for cascades
-  Produces<aod::McKFCascLabels> kfcasclabels;   // MC labels for tracked cascades
-  Produces<aod::McTraCascLabels> tracasclabels; // MC labels for tracked cascades
-  Produces<aod::McCascBBTags> bbtags;           // bb tags (inv structure tagging)
-  Produces<aod::CascMCCores> cascmccores;       // optionally aggregate information from MC side for posterior analysis (derived data)
+  Produces<aod::McCascLabels> casclabels;           // MC labels for cascades
+  Produces<aod::McKFCascLabels> kfcasclabels;       // MC labels for tracked cascades
+  Produces<aod::McTraCascLabels> tracasclabels;     // MC labels for tracked cascades
+  Produces<aod::McCascBBTags> bbtags;               // bb tags (inv structure tagging)
+  Produces<aod::CascMCCores> cascmccores;           // optionally aggregate information from MC side for posterior analysis (derived data)
   Produces<aod::CascCoreMCLabels> cascCoreMClabels; // optionally aggregate information from MC side for posterior analysis (derived data)
   Produces<aod::CascMCCollRefs> cascmccollrefs;     // references MC collisions from MC cascades
 
@@ -225,7 +227,7 @@ struct cascademcbuilder {
             } // end v0 mother loop
           } // end has_mothers check for V0
         } // end conditional of pos/neg originating being the same
-      }     // end association check
+      } // end association check
       // Construct label table (note: this will be joinable with CascDatas)
       casclabels(
         thisInfo.label, thisInfo.motherLabel);
@@ -421,11 +423,11 @@ struct cascademcbuilder {
                     }
                   }
                 } // end conditional V0-bach pair
-              }   // end neg = pos mother conditional
+              } // end neg = pos mother conditional
             }
           } // end loop neg/pos mothers
-        }   // end conditional of mothers existing
-      }     // end association check
+        } // end conditional of mothers existing
+      } // end association check
       // Construct label table (note: this will be joinable with CascDatas)
       kfcasclabels(
         lLabel);
@@ -464,11 +466,11 @@ struct cascademcbuilder {
                     }
                   }
                 } // end conditional V0-bach pair
-              }   // end neg = pos mother conditional
+              } // end neg = pos mother conditional
             }
           } // end loop neg/pos mothers
-        }   // end conditional of mothers existing
-      }     // end association check
+        } // end conditional of mothers existing
+      } // end association check
       // Construct label table (note: this will be joinable with CascDatas)
       tracasclabels(
         lLabel);
@@ -505,7 +507,7 @@ struct cascademcbuilder {
               }
             }
           }
-        }                                         // end if-pion
+        } // end if-pion
         if (bachelorParticle.pdgCode() == -211) { // pi-, look for proton in positive prong
           if (lNegTrack.has_mcParticle()) {
             auto baryonParticle = lPosTrack.mcParticle_as<aod::McParticles>();
@@ -520,7 +522,7 @@ struct cascademcbuilder {
             }
           }
         } // end if-pion
-      }   // end bachelor has mcparticle
+      } // end bachelor has mcparticle
       // Construct label table (note: this will be joinable with CascDatas)
       bbtags(bbTag);
     } // end casctable loop
diff --git a/.conflict-side-1/PWGLF/TableProducer/Strangeness/cascademcfinder.cxx b/.conflict-side-1/PWGLF/TableProducer/Strangeness/cascademcfinder.cxx
index 8d26f0ea33c..41bb2863a47 100644
--- a/.conflict-side-1/PWGLF/TableProducer/Strangeness/cascademcfinder.cxx
+++ b/.conflict-side-1/PWGLF/TableProducer/Strangeness/cascademcfinder.cxx
@@ -24,37 +24,39 @@
 //    david.dobrigkeit.chinellato@cern.ch
 //
 
-#include <Math/Vector4D.h>
-#include <cmath>
-#include <array>
-#include <cstdlib>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/McCollisionExtra.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "Common/Core/TrackSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
+#include <Math/Vector4D.h>
+#include <TDatabasePDG.h>
 #include <TFile.h>
-#include <TLorentzVector.h>
 #include <TH1F.h>
 #include <TH2F.h>
-#include <TProfile.h>
+#include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
+#include <TProfile.h>
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/TableProducer/Strangeness/cascademlselection.cxx b/.conflict-side-1/PWGLF/TableProducer/Strangeness/cascademlselection.cxx
index 6da4bc669e4..f8710e5e3ff 100644
--- a/.conflict-side-1/PWGLF/TableProducer/Strangeness/cascademlselection.cxx
+++ b/.conflict-side-1/PWGLF/TableProducer/Strangeness/cascademlselection.cxx
@@ -20,37 +20,40 @@
 //    david.dobrigkeit.chinellato@cern.ch
 //
 
-#include <Math/Vector4D.h>
-#include <cmath>
-#include <array>
-#include <cstdlib>
+#include "PWGLF/DataModel/LFStrangenessMLTables.h"
+#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/ASoA.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
-#include "PWGLF/DataModel/LFStrangenessMLTables.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+#include "Tools/ML/MlResponse.h"
+#include "Tools/ML/model.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <Math/Vector4D.h>
+#include <TDatabasePDG.h>
 #include <TFile.h>
 #include <TH2F.h>
-#include <TProfile.h>
 #include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
-#include "Tools/ML/MlResponse.h"
-#include "Tools/ML/model.h"
+#include <TProfile.h>
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
 
 using namespace o2;
 using namespace o2::analysis;
diff --git a/.conflict-side-1/PWGLF/TableProducer/Strangeness/cascadepid.cxx b/.conflict-side-1/PWGLF/TableProducer/Strangeness/cascadepid.cxx
index 3c7c82dacdd..830d5ca1577 100644
--- a/.conflict-side-1/PWGLF/TableProducer/Strangeness/cascadepid.cxx
+++ b/.conflict-side-1/PWGLF/TableProducer/Strangeness/cascadepid.cxx
@@ -23,35 +23,37 @@
 // (strange, weakly-decaying) particle. This task is meant to be a test, as
 // it hasn't been fully tested yet! Use at your own peril for now :-)
 
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <map>
-#include <iterator>
-#include <utility>
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
 #include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+#include "Common/TableProducer/PID/pidTOFBase.h"
+
 #include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/PhysicsConstants.h"
-#include "Common/TableProducer/PID/pidTOFBase.h"
-#include "Common/DataModel/PIDResponse.h"
+#include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <iterator>
+#include <map>
+#include <utility>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/TableProducer/Strangeness/cascadespawner.cxx b/.conflict-side-1/PWGLF/TableProducer/Strangeness/cascadespawner.cxx
index ab3f4cb7c3d..3b10901349b 100644
--- a/.conflict-side-1/PWGLF/TableProducer/Strangeness/cascadespawner.cxx
+++ b/.conflict-side-1/PWGLF/TableProducer/Strangeness/cascadespawner.cxx
@@ -16,19 +16,20 @@
 //  Creates Cascade extension tables for derived data.
 //  A minimal task that saves a lot of disk space.
 
-#include <cmath>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+
 #include <array>
+#include <cmath>
 #include <cstdlib>
 #include <iterator>
 #include <utility>
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-1/PWGLF/TableProducer/Strangeness/cascqaanalysis.cxx b/.conflict-side-1/PWGLF/TableProducer/Strangeness/cascqaanalysis.cxx
index 6a3310d316f..e051501d18f 100644
--- a/.conflict-side-1/PWGLF/TableProducer/Strangeness/cascqaanalysis.cxx
+++ b/.conflict-side-1/PWGLF/TableProducer/Strangeness/cascqaanalysis.cxx
@@ -13,23 +13,27 @@
 /// \brief Analysis of cascades in pp collisions
 /// \author Roman Nepeivoda (roman.nepeivoda@cern.ch)
 
-#include <algorithm>
-#include <vector>
-#include <TPDGCode.h>
+#include "PWGLF/DataModel/cascqaanalysis.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/DataModel/mcCentrality.h"
+#include "PWGLF/Utils/inelGt.h"
+
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "PWGLF/DataModel/cascqaanalysis.h"
-#include "TRandom2.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "PWGLF/Utils/inelGt.h"
-#include "PWGLF/DataModel/mcCentrality.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TRandom2.h"
+#include <TPDGCode.h>
+
+#include <algorithm>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/TableProducer/Strangeness/doubleCascTreeCreator.cxx b/.conflict-side-1/PWGLF/TableProducer/Strangeness/doubleCascTreeCreator.cxx
index 5ecffca742f..80b95b1c34a 100644
--- a/.conflict-side-1/PWGLF/TableProducer/Strangeness/doubleCascTreeCreator.cxx
+++ b/.conflict-side-1/PWGLF/TableProducer/Strangeness/doubleCascTreeCreator.cxx
@@ -9,38 +9,38 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <vector>
-#include <utility>
-#include <random>
+#include "PWGLF/DataModel/LFDoubleCascTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Multiplicity.h"
+#include "Common/Core/PID/TPCPIDResponse.h"
 #include "Common/Core/RecoDecay.h"
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
-
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 #include "EventFiltering/Zorro.h"
 #include "EventFiltering/ZorroSummary.h"
 
-#include "Common/Core/PID/TPCPIDResponse.h"
-#include "Common/DataModel/PIDResponse.h"
+#include "CCDB/BasicCCDBManager.h"
 #include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
-#include "PWGLF/DataModel/LFDoubleCascTables.h"
 #include "TDatabasePDG.h"
 
+#include <random>
+#include <utility>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-1/PWGLF/TableProducer/Strangeness/hStrangeCorrelationFilter.cxx b/.conflict-side-1/PWGLF/TableProducer/Strangeness/hStrangeCorrelationFilter.cxx
index 61f9e2f5086..6bb0ac92517 100644
--- a/.conflict-side-1/PWGLF/TableProducer/Strangeness/hStrangeCorrelationFilter.cxx
+++ b/.conflict-side-1/PWGLF/TableProducer/Strangeness/hStrangeCorrelationFilter.cxx
@@ -18,23 +18,26 @@
 /// \author David Dobrigkeit Chinellato (david.dobrigkeit.chinellato@cern.ch)
 /// \author Zhongbao Yin (Zhong-Bao.Yin@cern.ch)
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "PWGLF/DataModel/LFHStrangeCorrelationTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Framework/ASoAHelpers.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+#include "EventFiltering/Zorro.h"
+#include "EventFiltering/ZorroSummary.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TF1.h"
-#include <string>
 #include <TPDGCode.h>
 
-#include "EventFiltering/Zorro.h"
-#include "EventFiltering/ZorroSummary.h"
+#include <string>
 
 using namespace o2;
 using namespace o2::constants::math;
diff --git a/.conflict-side-1/PWGLF/TableProducer/Strangeness/lambdaJetpolarizationbuilder.cxx b/.conflict-side-1/PWGLF/TableProducer/Strangeness/lambdaJetpolarizationbuilder.cxx
index cc21c8def05..579177eecf2 100644
--- a/.conflict-side-1/PWGLF/TableProducer/Strangeness/lambdaJetpolarizationbuilder.cxx
+++ b/.conflict-side-1/PWGLF/TableProducer/Strangeness/lambdaJetpolarizationbuilder.cxx
@@ -12,25 +12,29 @@
 
 /// \author Youpeng Su (yousu@cern.ch)
 
-#include <iostream>
-#include <string>
-#include <vector>
-#include <cmath>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/EventSelection.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Framework/O2DatabasePDGPlugin.h"
 #include "PWGJE/Core/JetDerivedDataUtilities.h"
 #include "PWGJE/DataModel/Jet.h"
-#include <TLorentzVector.h>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/DataModel/lambdaJetpolarization.h"
+
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+
 #include "Framework/ASoA.h"
 #include "Framework/AnalysisDataModel.h"
-#include <TTree.h>
+#include "Framework/AnalysisTask.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
 #include <TFile.h>
+#include <TLorentzVector.h>
 #include <TMatrixD.h>
-#include "PWGLF/DataModel/lambdaJetpolarization.h"
+#include <TTree.h>
+
+#include <cmath>
+#include <iostream>
+#include <string>
+#include <vector>
 
 using std::cout;
 using std::endl;
diff --git a/.conflict-side-1/PWGLF/TableProducer/Strangeness/lambdakzeroMLSelectionTreeCreator.cxx b/.conflict-side-1/PWGLF/TableProducer/Strangeness/lambdakzeroMLSelectionTreeCreator.cxx
index d70552c4c71..d965f6490b9 100644
--- a/.conflict-side-1/PWGLF/TableProducer/Strangeness/lambdakzeroMLSelectionTreeCreator.cxx
+++ b/.conflict-side-1/PWGLF/TableProducer/Strangeness/lambdakzeroMLSelectionTreeCreator.cxx
@@ -24,37 +24,40 @@
 //    david.dobrigkeit.chinellato@cern.ch
 //
 
-#include <Math/Vector4D.h> // C system
-#include <cmath>           // C++ system
-#include <array>           // C++ system
-#include <cstdlib>         // C++ system
+#include "PWGLF/DataModel/LFStrangenessMLTables.h"
+#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/ASoA.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
-#include "PWGLF/DataModel/LFStrangenessMLTables.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/TableProducer/PID/pidTOFBase.h"
+
 #include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/PhysicsConstants.h"
-#include "Common/TableProducer/PID/pidTOFBase.h"
+#include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <Math/Vector4D.h> // C system
+#include <TDatabasePDG.h>
 #include <TFile.h>
 #include <TH2F.h>
-#include <TProfile.h>
 #include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
+#include <TProfile.h>
+
+#include <array>   // C++ system
+#include <cmath>   // C++ system
+#include <cstdlib> // C++ system
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/TableProducer/Strangeness/lambdakzerobuilder.cxx b/.conflict-side-1/PWGLF/TableProducer/Strangeness/lambdakzerobuilder.cxx
index 7b898bfa98e..912a64e6176 100644
--- a/.conflict-side-1/PWGLF/TableProducer/Strangeness/lambdakzerobuilder.cxx
+++ b/.conflict-side-1/PWGLF/TableProducer/Strangeness/lambdakzerobuilder.cxx
@@ -36,40 +36,44 @@
 //    david.dobrigkeit.chinellato@cern.ch
 //
 
-#include <string>
-#include <vector>
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <map>
-#include <iterator>
-#include <utility>
+#include "TableHelper.h"
 
-#include "TRandom3.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFStrangenessMLTables.h"
 #include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/LFStrangenessMLTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsCalibration/MeanVertexObject.h"
-#include "TableHelper.h"
 #include "Tools/ML/MlResponse.h"
 #include "Tools/ML/model.h"
 
+#include "CCDB/BasicCCDBManager.h"
+#include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsCalibration/MeanVertexObject.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include "TRandom3.h"
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <iterator>
+#include <map>
+#include <string>
+#include <utility>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-1/PWGLF/TableProducer/Strangeness/lambdakzerofinder.cxx b/.conflict-side-1/PWGLF/TableProducer/Strangeness/lambdakzerofinder.cxx
index e75c72c77f4..9be2f0238ae 100644
--- a/.conflict-side-1/PWGLF/TableProducer/Strangeness/lambdakzerofinder.cxx
+++ b/.conflict-side-1/PWGLF/TableProducer/Strangeness/lambdakzerofinder.cxx
@@ -28,37 +28,39 @@
 //    david.dobrigkeit.chinellato@cern.ch
 //
 
-#include <Math/Vector4D.h>
-#include <cmath>
-#include <array>
-#include <cstdlib>
-
-#include <TFile.h>
-#include <TLorentzVector.h>
-#include <TH1F.h>
-#include <TH2F.h>
-#include <TProfile.h>
-#include <TPDGCode.h>
-#include <TDatabasePDG.h>
+#include "PWGLF/DataModel/LFStrangenessFinderTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFStrangenessFinderTables.h"
-#include "Common/Core/TrackSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <Math/Vector4D.h>
+#include <TDatabasePDG.h>
+#include <TFile.h>
+#include <TH1F.h>
+#include <TH2F.h>
+#include <TLorentzVector.h>
+#include <TPDGCode.h>
+#include <TProfile.h>
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/TableProducer/Strangeness/lambdakzeromcbuilder.cxx b/.conflict-side-1/PWGLF/TableProducer/Strangeness/lambdakzeromcbuilder.cxx
index 1d7b1c29490..51c3045cca2 100644
--- a/.conflict-side-1/PWGLF/TableProducer/Strangeness/lambdakzeromcbuilder.cxx
+++ b/.conflict-side-1/PWGLF/TableProducer/Strangeness/lambdakzeromcbuilder.cxx
@@ -18,23 +18,25 @@
 //    david.dobrigkeit.chinellato@cern.ch
 //
 
-#include <cmath>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/trackUtilities.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
 #include <array>
+#include <cmath>
 #include <cstdlib>
-#include <map>
 #include <iterator>
+#include <map>
 #include <utility>
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
@@ -42,8 +44,8 @@ using std::array;
 
 //*+-+*+-+*+-+*+-+*+-+*+-+*+-+*+-+*+-+*+-+*
 struct lambdakzeromcbuilder {
-  Produces<aod::McV0Labels> v0labels; // MC labels for V0s
-  Produces<aod::V0MCCores> v0mccores; // optionally aggregate information from MC side for posterior analysis (derived data)
+  Produces<aod::McV0Labels> v0labels;           // MC labels for V0s
+  Produces<aod::V0MCCores> v0mccores;           // optionally aggregate information from MC side for posterior analysis (derived data)
   Produces<aod::V0CoreMCLabels> v0CoreMCLabels; // interlink V0Cores -> V0MCCores in asymmetric mode
   Produces<aod::V0MCCollRefs> v0mccollref;      // references collisions from V0MCCores
 
@@ -152,7 +154,7 @@ struct lambdakzeromcbuilder {
   void process(aod::V0Datas const& v0table, aod::McTrackLabels const&, aod::McParticles const& mcParticles)
   {
     // to be used if using the populateV0MCCoresAsymmetric mode, kept empty otherwise
-    std::vector<mcV0info> mcV0infos; // V0MCCore information
+    std::vector<mcV0info> mcV0infos;                               // V0MCCore information
     std::vector<bool> mcParticleIsReco(mcParticles.size(), false); // mc Particle not recoed by V0s
 
     for (auto& v0 : v0table) {
diff --git a/.conflict-side-1/PWGLF/TableProducer/Strangeness/lambdakzeromcfinder.cxx b/.conflict-side-1/PWGLF/TableProducer/Strangeness/lambdakzeromcfinder.cxx
index 0a0db73ea6d..db38d03437a 100644
--- a/.conflict-side-1/PWGLF/TableProducer/Strangeness/lambdakzeromcfinder.cxx
+++ b/.conflict-side-1/PWGLF/TableProducer/Strangeness/lambdakzeromcfinder.cxx
@@ -24,39 +24,41 @@
 //    david.dobrigkeit.chinellato@cern.ch
 //
 
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <vector>
-
-#include "Math/Vector4D.h"
-#include <TFile.h>
-#include <TLorentzVector.h>
-#include <TH1F.h>
-#include <TH2F.h>
-#include <TProfile.h>
-#include <TPDGCode.h>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGMM/Mult/DataModel/Index.h" // for Particles2Tracks table
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/McCollisionExtra.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "Common/Core/TrackSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+
 #include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/PhysicsConstants.h"
-#include "PWGMM/Mult/DataModel/Index.h" // for Particles2Tracks table
+#include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include "Math/Vector4D.h"
+#include <TFile.h>
+#include <TH1F.h>
+#include <TH2F.h>
+#include <TLorentzVector.h>
+#include <TPDGCode.h>
+#include <TProfile.h>
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
@@ -228,7 +230,7 @@ struct lambdakzeromcfinder {
                 nPosReco++;
               }
             } // end track list loop
-          }   // end positive pdg check
+          } // end positive pdg check
           if (daughter.pdgCode() == negativePdg) {
             auto const& thisDaughterTracks = daughter.template tracks_as<LabeledTracks>();
             bool tpcOnlyFound = false;
@@ -245,7 +247,7 @@ struct lambdakzeromcfinder {
                 nNegReco++;
               }
             } // end track list loop
-          }   // end negative pdg check
+          } // end negative pdg check
         }
       }
     }
diff --git a/.conflict-side-1/PWGLF/TableProducer/Strangeness/lambdakzeromlselection.cxx b/.conflict-side-1/PWGLF/TableProducer/Strangeness/lambdakzeromlselection.cxx
index 412161ebe52..ff52e6918c4 100644
--- a/.conflict-side-1/PWGLF/TableProducer/Strangeness/lambdakzeromlselection.cxx
+++ b/.conflict-side-1/PWGLF/TableProducer/Strangeness/lambdakzeromlselection.cxx
@@ -20,37 +20,40 @@
 //    david.dobrigkeit.chinellato@cern.ch
 //
 
-#include <Math/Vector4D.h>
-#include <cmath>
-#include <array>
-#include <cstdlib>
+#include "PWGLF/DataModel/LFStrangenessMLTables.h"
+#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/ASoA.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
-#include "PWGLF/DataModel/LFStrangenessMLTables.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+#include "Tools/ML/MlResponse.h"
+#include "Tools/ML/model.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <Math/Vector4D.h>
+#include <TDatabasePDG.h>
 #include <TFile.h>
 #include <TH2F.h>
-#include <TProfile.h>
 #include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
-#include "Tools/ML/MlResponse.h"
-#include "Tools/ML/model.h"
+#include <TProfile.h>
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
 
 using namespace o2;
 using namespace o2::analysis;
@@ -75,8 +78,8 @@ struct lambdakzeromlselection {
 
   std::map<std::string, std::string> metadata;
 
-  Produces<aod::V0GammaMLScores> gammaMLSelections;   // optionally aggregate information from ML output for posterior analysis (derived data)
-  Produces<aod::V0LambdaMLScores> lambdaMLSelections; // optionally aggregate information from ML output for posterior analysis (derived data)
+  Produces<aod::V0GammaMLScores> gammaMLSelections;           // optionally aggregate information from ML output for posterior analysis (derived data)
+  Produces<aod::V0LambdaMLScores> lambdaMLSelections;         // optionally aggregate information from ML output for posterior analysis (derived data)
   Produces<aod::V0AntiLambdaMLScores> antiLambdaMLSelections; // optionally aggregate information from ML output for posterior analysis (derived data)
   Produces<aod::V0K0ShortMLScores> kzeroShortMLSelections;    // optionally aggregate information from ML output for posterior analysis (derived data)
 
diff --git a/.conflict-side-1/PWGLF/TableProducer/Strangeness/lambdakzeropid.cxx b/.conflict-side-1/PWGLF/TableProducer/Strangeness/lambdakzeropid.cxx
index c6041aa0e02..5fa295cbd07 100644
--- a/.conflict-side-1/PWGLF/TableProducer/Strangeness/lambdakzeropid.cxx
+++ b/.conflict-side-1/PWGLF/TableProducer/Strangeness/lambdakzeropid.cxx
@@ -23,36 +23,38 @@
 // (strange, weakly-decaying) particle. This task is meant to be a test, as
 // it hasn't been fully tested yet! Use at your own peril for now :-)
 
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <map>
-#include <iterator>
-#include <utility>
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
 #include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+#include "Common/TableProducer/PID/pidTOFBase.h"
+
 #include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsCalibration/MeanVertexObject.h"
 #include "CommonConstants/PhysicsConstants.h"
-#include "Common/TableProducer/PID/pidTOFBase.h"
-#include "Common/DataModel/PIDResponse.h"
+#include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsCalibration/MeanVertexObject.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <iterator>
+#include <map>
+#include <utility>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/TableProducer/Strangeness/lambdakzerospawner.cxx b/.conflict-side-1/PWGLF/TableProducer/Strangeness/lambdakzerospawner.cxx
index 19c174aef7f..ae22362ace9 100644
--- a/.conflict-side-1/PWGLF/TableProducer/Strangeness/lambdakzerospawner.cxx
+++ b/.conflict-side-1/PWGLF/TableProducer/Strangeness/lambdakzerospawner.cxx
@@ -16,19 +16,20 @@
 //  Creates V0 extension tables for derived data.
 //  A minimal task that saves a lot of disk space.
 
-#include <cmath>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+
 #include <array>
+#include <cmath>
 #include <cstdlib>
 #include <iterator>
 #include <utility>
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-1/PWGLF/TableProducer/Strangeness/sigma0builder.cxx b/.conflict-side-1/PWGLF/TableProducer/Strangeness/sigma0builder.cxx
index 32ed292dddd..51e8386e96c 100644
--- a/.conflict-side-1/PWGLF/TableProducer/Strangeness/sigma0builder.cxx
+++ b/.conflict-side-1/PWGLF/TableProducer/Strangeness/sigma0builder.cxx
@@ -20,36 +20,39 @@
 //    gianni.shigeru.setoue.liveraro@cern.ch
 //
 
-#include <Math/Vector4D.h>
-#include <cmath>
-#include <array>
-#include <cstdlib>
+#include "PWGLF/DataModel/LFSigmaTables.h"
+#include "PWGLF/DataModel/LFStrangenessMLTables.h"
+#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/ASoA.h"
-#include "ReconstructionDataFormats/Track.h"
+#include "Common/CCDB/ctpRateFetcher.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "Common/CCDB/ctpRateFetcher.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
-#include "PWGLF/DataModel/LFStrangenessMLTables.h"
-#include "PWGLF/DataModel/LFSigmaTables.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <Math/Vector4D.h>
+#include <TDatabasePDG.h>
 #include <TFile.h>
 #include <TH2F.h>
-#include <TProfile.h>
 #include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
+#include <TProfile.h>
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
 
 using namespace o2;
 using namespace o2::framework;
@@ -1188,8 +1191,8 @@ struct sigma0builder {
         if (v0MC.pdgCode() == 22) {
           histos.fill(HIST("MC/h2dGammaXYConversion"), v0.x(), v0.y());
           float GammaY = TMath::Abs(RecoDecay::y(std::array{v0.px(), v0.py(), v0.pz()}, o2::constants::physics::MassGamma));
-          if (GammaY < 0.5) {                                                                                                                // rapidity selection
-            histos.fill(HIST("MC/h2dPtVsCentralityBeforeSel_MCAssocGamma"), centrality, v0.pt());                                            // isgamma
+          if (GammaY < 0.5) {                                                                     // rapidity selection
+            histos.fill(HIST("MC/h2dPtVsCentralityBeforeSel_MCAssocGamma"), centrality, v0.pt()); // isgamma
           }
         }
 
diff --git a/.conflict-side-1/PWGLF/TableProducer/Strangeness/stCollIds.cxx b/.conflict-side-1/PWGLF/TableProducer/Strangeness/stCollIds.cxx
index 3cc94389197..f08650fa3c4 100644
--- a/.conflict-side-1/PWGLF/TableProducer/Strangeness/stCollIds.cxx
+++ b/.conflict-side-1/PWGLF/TableProducer/Strangeness/stCollIds.cxx
@@ -14,11 +14,12 @@
 ///
 /// \author Jochen Klein
 
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Framework/ASoA.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/ASoA.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/TableProducer/Strangeness/stracents.cxx b/.conflict-side-1/PWGLF/TableProducer/Strangeness/stracents.cxx
index ce5597563da..9b58d541ddc 100644
--- a/.conflict-side-1/PWGLF/TableProducer/Strangeness/stracents.cxx
+++ b/.conflict-side-1/PWGLF/TableProducer/Strangeness/stracents.cxx
@@ -15,25 +15,29 @@
 /// \author ALICE
 //
 
-#include <string>
-#include <vector>
-#include <algorithm>
-#include <map>
+#include "MetadataHelper.h"
+#include "TableHelper.h"
 
-#include <CCDB/BasicCCDBManager.h>
-#include <TH1F.h>
-#include <TFormula.h>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/RunningWorkflowInfo.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "Framework/HistogramRegistry.h"
-#include "Common/DataModel/Multiplicity.h"
+
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "MetadataHelper.h"
-#include "TableHelper.h"
+#include "Common/DataModel/Multiplicity.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include <CCDB/BasicCCDBManager.h>
+
 #include "TList.h"
+#include <TFormula.h>
+#include <TH1F.h>
+
+#include <algorithm>
+#include <map>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/TableProducer/Strangeness/strangederivedbuilder.cxx b/.conflict-side-1/PWGLF/TableProducer/Strangeness/strangederivedbuilder.cxx
index 8140448576a..0d2f8a5cdce 100644
--- a/.conflict-side-1/PWGLF/TableProducer/Strangeness/strangederivedbuilder.cxx
+++ b/.conflict-side-1/PWGLF/TableProducer/Strangeness/strangederivedbuilder.cxx
@@ -15,42 +15,44 @@
 // It is meant to help with providing auxiliary information
 // when dealing with derived data.
 
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <map>
-#include <iterator>
-#include <utility>
-#include <string>
-#include <vector>
+#include "PWGLF/DataModel/EPCalibrationTables.h"
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
 #include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/McCollisionExtra.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/Qvectors.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+#include "Common/TableProducer/PID/pidTOFBase.h"
+
 #include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/PhysicsConstants.h"
-#include "Common/TableProducer/PID/pidTOFBase.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Qvectors.h"
-#include "Framework/StaticFor.h"
+#include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "Common/DataModel/McCollisionExtra.h"
-#include "PWGLF/DataModel/EPCalibrationTables.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <iterator>
+#include <map>
+#include <string>
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/TableProducer/Strangeness/strangenessbuilder.cxx b/.conflict-side-1/PWGLF/TableProducer/Strangeness/strangenessbuilder.cxx
index 800b1105732..38da9798864 100644
--- a/.conflict-side-1/PWGLF/TableProducer/Strangeness/strangenessbuilder.cxx
+++ b/.conflict-side-1/PWGLF/TableProducer/Strangeness/strangenessbuilder.cxx
@@ -32,22 +32,25 @@
 //  -- v0builderopts ......: V0-specific building options (topological, deduplication, etc)
 //  -- cascadebuilderopts .: cascade-specific building options (topological, etc)
 
-#include <string>
-#include <vector>
-
-#include "Framework/DataSpecUtils.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "TableHelper.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "PWGLF/Utils/strangenessBuilderHelper.h"
+
+#include "Common/Core/TPCVDriftManager.h"
+#include "Common/DataModel/PIDResponse.h"
+
 #include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPObject.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include "Common/Core/TPCVDriftManager.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/DataSpecUtils.h"
+#include "Framework/runDataProcessing.h"
+
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/TableProducer/Strangeness/v0qaanalysis.cxx b/.conflict-side-1/PWGLF/TableProducer/Strangeness/v0qaanalysis.cxx
index bafe557c237..547570ba7df 100644
--- a/.conflict-side-1/PWGLF/TableProducer/Strangeness/v0qaanalysis.cxx
+++ b/.conflict-side-1/PWGLF/TableProducer/Strangeness/v0qaanalysis.cxx
@@ -13,21 +13,24 @@
 ///
 /// \author Francesca Ercolessi (francesca.ercolessi@cern.ch)
 
-#include <vector>
-#include <utility>
+#include "PWGLF/DataModel/v0qaanalysis.h"
 
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/v0qaanalysis.h"
+#include "PWGLF/DataModel/mcCentrality.h"
+#include "PWGLF/Utils/inelGt.h"
+
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CommonConstants/PhysicsConstants.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "PWGLF/DataModel/mcCentrality.h"
-#include "PWGLF/Utils/inelGt.h"
+
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/TableProducer/Strangeness/v0selector.cxx b/.conflict-side-1/PWGLF/TableProducer/Strangeness/v0selector.cxx
index 7d06871d78c..3d6a227609d 100644
--- a/.conflict-side-1/PWGLF/TableProducer/Strangeness/v0selector.cxx
+++ b/.conflict-side-1/PWGLF/TableProducer/Strangeness/v0selector.cxx
@@ -13,21 +13,22 @@
 ///
 /// \author Gijs van Weelden <g.van.weelden@cern.ch>
 
-#include <vector>
-#include <string>
-#include <algorithm>
-#include <TRandom3.h>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/DataModel/V0SelectorTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoA.h"
+#include "Common/Core/RecoDecay.h"
 
 #include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/RecoDecay.h"
+#include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/V0SelectorTables.h"
+#include <TRandom3.h>
+
+#include <algorithm>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/Tasks/GlobalEventProperties/heavyionMultiplicity.cxx b/.conflict-side-1/PWGLF/Tasks/GlobalEventProperties/heavyionMultiplicity.cxx
index b91db8d09e0..be8a1a6e2d7 100644
--- a/.conflict-side-1/PWGLF/Tasks/GlobalEventProperties/heavyionMultiplicity.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/GlobalEventProperties/heavyionMultiplicity.cxx
@@ -15,20 +15,20 @@
 /// \author Abhi Modak (abhi.modak@cern.ch)
 /// \since September 15, 2023
 
-#include <cmath>
-#include <cstdlib>
-#include <TPDGCode.h>
-#include <vector>
-
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGMM/Mult/DataModel/Index.h"
 #include "PWGMM/Mult/DataModel/bestCollisionTable.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "Common/Core/trackUtilities.h"
+
 #include "Common/CCDB/EventSelectionParams.h"
 #include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/MathConstants.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
@@ -38,9 +38,12 @@
 #include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/GlobalTrackID.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "PWGMM/Mult/DataModel/Index.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include <TPDGCode.h>
+
+#include <cmath>
+#include <cstdlib>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/Tasks/Nuspex/AntimatterAbsorptionHMPID.cxx b/.conflict-side-1/PWGLF/Tasks/Nuspex/AntimatterAbsorptionHMPID.cxx
index b5a5a2c3ee4..68af7268e35 100644
--- a/.conflict-side-1/PWGLF/Tasks/Nuspex/AntimatterAbsorptionHMPID.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/Nuspex/AntimatterAbsorptionHMPID.cxx
@@ -12,33 +12,34 @@
 /// \author Alberto Caliva (alberto.caliva@cern.ch)
 /// \since June 27, 2023
 
-#include <TMath.h>
-#include <TPDGCode.h>
-#include <TRandom.h>
-#include <TDatabasePDG.h>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoA.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/DataTypes.h"
+#include "Common/Core/PID/PIDTOF.h"
 #include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/Core/PID/PIDTOF.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "ReconstructionDataFormats/TrackParametrization.h"
-#include "ReconstructionDataFormats/DCA.h"
-#include "DetectorsBase/Propagator.h"
-#include "Common/Core/trackUtilities.h"
-#include "ReconstructionDataFormats/PID.h"
+
 #include "CCDB/BasicCCDBManager.h"
 #include "CCDB/CcdbApi.h"
 #include "DataFormatsParameters/GRPMagField.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/DataTypes.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/DCA.h"
+#include "ReconstructionDataFormats/PID.h"
+#include "ReconstructionDataFormats/Track.h"
+#include "ReconstructionDataFormats/TrackParametrization.h"
+
+#include <TDatabasePDG.h>
+#include <TMath.h>
+#include <TPDGCode.h>
+#include <TRandom.h>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/Tasks/Nuspex/NucleiEfficiencyTask.cxx b/.conflict-side-1/PWGLF/Tasks/Nuspex/NucleiEfficiencyTask.cxx
index 4ca2bd51c6f..23f968e3fc9 100644
--- a/.conflict-side-1/PWGLF/Tasks/Nuspex/NucleiEfficiencyTask.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/Nuspex/NucleiEfficiencyTask.cxx
@@ -12,37 +12,40 @@
 // Authors: Rafael Manhart,
 // Date: 06.05.2024
 
-#include <cmath>
-#include <TLorentzVector.h>
-#include <TMath.h>
-#include <TObjArray.h>
-#include <vector>
-#include <TF1.h>
-#include <string>
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/mcCentrality.h"
+#include "PWGLF/DataModel/spectraTOF.h"
+#include "PWGLF/Utils/inelGt.h"
 
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/McCollisionExtra.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/McCollisionExtra.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "TPDGCode.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/Core/TrackSelection.h"
-#include "Framework/StaticFor.h"
-#include "Common/Core/TrackSelectionDefaults.h"
-#include "PWGLF/DataModel/spectraTOF.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "PWGLF/Utils/inelGt.h"
-#include "PWGLF/DataModel/mcCentrality.h"
-#include "Common/Core/RecoDecay.h"
+#include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include "TPDGCode.h"
+#include <TF1.h>
+#include <TLorentzVector.h>
+#include <TMath.h>
+#include <TObjArray.h>
+
+#include <cmath>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::track;
diff --git a/.conflict-side-1/PWGLF/Tasks/Nuspex/NucleiHistTask.cxx b/.conflict-side-1/PWGLF/Tasks/Nuspex/NucleiHistTask.cxx
index e3152c05cfb..b4f0ba70aed 100644
--- a/.conflict-side-1/PWGLF/Tasks/Nuspex/NucleiHistTask.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/Nuspex/NucleiHistTask.cxx
@@ -12,37 +12,40 @@
 // Authors: Rafael Manhart,
 // Date: 30.11.2022
 
-#include <cmath>
-#include <TLorentzVector.h>
-#include <TMath.h>
-#include <TObjArray.h>
-#include <vector>
-#include <TF1.h>
-#include <string>
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/mcCentrality.h"
+#include "PWGLF/DataModel/spectraTOF.h"
+#include "PWGLF/Utils/inelGt.h"
 
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/McCollisionExtra.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/McCollisionExtra.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "TPDGCode.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/Core/TrackSelection.h"
-#include "Framework/StaticFor.h"
-#include "Common/Core/TrackSelectionDefaults.h"
-#include "PWGLF/DataModel/spectraTOF.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "PWGLF/Utils/inelGt.h"
-#include "PWGLF/DataModel/mcCentrality.h"
-#include "Common/Core/RecoDecay.h"
+#include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include "TPDGCode.h"
+#include <TF1.h>
+#include <TLorentzVector.h>
+#include <TMath.h>
+#include <TObjArray.h>
+
+#include <cmath>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::track;
diff --git a/.conflict-side-1/PWGLF/Tasks/Nuspex/QAHistTask.cxx b/.conflict-side-1/PWGLF/Tasks/Nuspex/QAHistTask.cxx
index 2afc40a7261..ff902ace030 100644
--- a/.conflict-side-1/PWGLF/Tasks/Nuspex/QAHistTask.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/Nuspex/QAHistTask.cxx
@@ -12,30 +12,30 @@
 // Authors: Rafael Manhart,
 // Date: 05.10.2023
 
-#include <cmath>
-#include <TLorentzVector.h>
-#include <TMath.h>
-#include <TObjArray.h>
-#include <string>
-#include <vector>
-
-#include "ReconstructionDataFormats/Track.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+#include "PWGLF/DataModel/LFParticleIdentification.h"
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
 #include "TPDGCode.h"
 #include <TH1F.h>
-#include "Framework/runDataProcessing.h"
+#include <TLorentzVector.h>
+#include <TMath.h>
+#include <TObjArray.h>
+
+#include <cmath>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/Tasks/Nuspex/QCspectraTPC.cxx b/.conflict-side-1/PWGLF/Tasks/Nuspex/QCspectraTPC.cxx
index 079b0d44a31..afe0d07b608 100644
--- a/.conflict-side-1/PWGLF/Tasks/Nuspex/QCspectraTPC.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/Nuspex/QCspectraTPC.cxx
@@ -9,22 +9,24 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/runDataProcessing.h"
+#include "PWGLF/DataModel/LFParticleIdentification.h"
 
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/McCollisionExtra.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/StaticFor.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/McCollisionExtra.h"
-#include "Common/Core/TrackSelectionDefaults.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
 #include "TPDGCode.h"
 
 using namespace o2;
@@ -496,7 +498,7 @@ struct QCspectraTPC {
             histos.fill(HIST("MC/pr/neg/prm/pt/numtof"), track.pt(), multiplicity, track.dcaXY());
           }
         }
-      }                                      // primaries
+      } // primaries
       if (!mcParticle.isPhysicalPrimary()) { // secondaries loop start
         if (mcParticle.pdgCode() == 211) {
           if (std::abs(mcParticle.y()) > cfgCutY) {
diff --git a/.conflict-side-1/PWGLF/Tasks/Nuspex/angularCorrelationsInJets.cxx b/.conflict-side-1/PWGLF/Tasks/Nuspex/angularCorrelationsInJets.cxx
index 20e1604e206..a6fc4bf6032 100644
--- a/.conflict-side-1/PWGLF/Tasks/Nuspex/angularCorrelationsInJets.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/Nuspex/angularCorrelationsInJets.cxx
@@ -14,33 +14,36 @@
 /// \author Lars Jörgensen (lars.christian.joergensen@cern.ch)
 /// \brief task for analysis of angular correlations in jets using Fastjet
 
-#include <vector>
-#include <utility>
-#include <map>
-#include <string>
-#include <random>
-#include <algorithm>
+#include "PWGJE/Core/JetBkgSubUtils.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/Core/PID/PIDTOF.h"
+#include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/PID/PIDTOF.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/TableProducer/PID/pidTOFBase.h"
-#include "Common/Core/RecoDecay.h"
 
-#include "fastjet/PseudoJet.hh"
+#include "CCDB/BasicCCDBManager.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include "TPDGCode.h"
+#include "TVector3.h"
+
 #include "fastjet/AreaDefinition.hh"
 #include "fastjet/ClusterSequenceArea.hh"
 #include "fastjet/GhostedAreaSpec.hh"
-#include "PWGJE/Core/JetBkgSubUtils.h"
-#include "TVector3.h"
-#include "TPDGCode.h"
+#include "fastjet/PseudoJet.hh"
+
+#include <algorithm>
+#include <map>
+#include <random>
+#include <string>
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/Tasks/Nuspex/deutRtTask.cxx b/.conflict-side-1/PWGLF/Tasks/Nuspex/deutRtTask.cxx
index f0092793232..18e5b9cd5d3 100644
--- a/.conflict-side-1/PWGLF/Tasks/Nuspex/deutRtTask.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/Nuspex/deutRtTask.cxx
@@ -9,21 +9,23 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/runDataProcessing.h"
-#include "TVector2.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/Core/TrackSelection.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
-#include "Common/Core/TrackSelectionDefaults.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "TVector2.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/Tasks/Nuspex/he3LambdaDerivedAnalysis.cxx b/.conflict-side-1/PWGLF/Tasks/Nuspex/he3LambdaDerivedAnalysis.cxx
index 7ef071dde0b..6d8f95d4ba2 100644
--- a/.conflict-side-1/PWGLF/Tasks/Nuspex/he3LambdaDerivedAnalysis.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/Nuspex/he3LambdaDerivedAnalysis.cxx
@@ -118,7 +118,7 @@ struct he3LambdaDerivedAnalysis {
       }
       for (int iEta{0}; iEta <= cfgMirrorEta; ++iEta) {
         for (int iR{0}; iR <= cfgNrotations; ++iR) {
-          auto he3Momentum = ROOT::Math::LorentzVector<ROOT::Math::PtEtaPhiM4D<double>>(he3.momentum.Pt(), (1. - iEta * 2.) * he3.momentum.Eta(), he3.momentum.Phi() + TMath::Pi() * (0.75  + 0.5 * iR / cfgNrotations), he3.momentum.M());
+          auto he3Momentum = ROOT::Math::LorentzVector<ROOT::Math::PtEtaPhiM4D<double>>(he3.momentum.Pt(), (1. - iEta * 2.) * he3.momentum.Eta(), he3.momentum.Phi() + TMath::Pi() * (0.75 + 0.5 * iR / cfgNrotations), he3.momentum.M());
           for (const auto& lambda : lambdaCandidates) {
             auto pairMomentum = lambda.momentum + he3Momentum; // Calculate invariant mass
             (he3.sign * lambda.sign > 0 ? hRotationInvariantMassLS : hRotationInvariantMassUS)[he3.sign > 0]->Fill(pairMomentum.Pt(), pairMomentum.M());
diff --git a/.conflict-side-1/PWGLF/Tasks/Nuspex/helium_flow.cxx b/.conflict-side-1/PWGLF/Tasks/Nuspex/helium_flow.cxx
index cc791f7fb2f..380e820ff96 100644
--- a/.conflict-side-1/PWGLF/Tasks/Nuspex/helium_flow.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/Nuspex/helium_flow.cxx
@@ -12,30 +12,33 @@
 /// \author Alberto Caliva (alberto.caliva@cern.ch)
 /// \since November 27, 2023
 
-#include <vector>
-#include <TMath.h>
-#include <TPDGCode.h>
-#include <TRandom.h>
-#include <TVector2.h>
-#include <TVector3.h>
-#include <TDatabasePDG.h>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoA.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/DataTypes.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/RunningWorkflowInfo.h"
-#include "Framework/DataTypes.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "ReconstructionDataFormats/PID.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/DCA.h"
-#include "Common/Core/trackUtilities.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/PIDResponse.h"
+#include "ReconstructionDataFormats/PID.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <TDatabasePDG.h>
+#include <TMath.h>
+#include <TPDGCode.h>
+#include <TRandom.h>
+#include <TVector2.h>
+#include <TVector3.h>
+
+#include <vector>
 
 using namespace std;
 using namespace o2;
diff --git a/.conflict-side-1/PWGLF/Tasks/Nuspex/hyhe4analysis.cxx b/.conflict-side-1/PWGLF/Tasks/Nuspex/hyhe4analysis.cxx
index 3766e57a61b..5a180dacdac 100644
--- a/.conflict-side-1/PWGLF/Tasks/Nuspex/hyhe4analysis.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/Nuspex/hyhe4analysis.cxx
@@ -19,32 +19,34 @@
 // --- kumar.lokesh@cern.ch
 // --- david.dobrigkeit.chinellato@cern.ch
 
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <map>
-#include <iterator>
-#include <utility>
+#include "PWGLF/DataModel/LFHyperhelium4Tables.h"
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
 #include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+
 #include "CCDB/BasicCCDBManager.h"
-#include "PWGLF/DataModel/LFHyperhelium4Tables.h"
+#include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <iterator>
+#include <map>
+#include <utility>
 
 using namespace std;
 using namespace o2;
diff --git a/.conflict-side-1/PWGLF/Tasks/Nuspex/hypertritonAnalysis.cxx b/.conflict-side-1/PWGLF/Tasks/Nuspex/hypertritonAnalysis.cxx
index 42470a606b0..9290648a12e 100644
--- a/.conflict-side-1/PWGLF/Tasks/Nuspex/hypertritonAnalysis.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/Nuspex/hypertritonAnalysis.cxx
@@ -18,37 +18,39 @@
 //    Please write to:
 //    david.dobrigkeit.chinellato@cern.ch
 //
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
+#include <Math/Vector4D.h>
+#include <TDatabasePDG.h>
 #include <TFile.h>
 #include <TH2F.h>
-#include <TProfile.h>
 #include <TLorentzVector.h>
-#include <Math/Vector4D.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
-#include <cmath>
+#include <TProfile.h>
+
 #include <array>
+#include <cmath>
 #include <cstdlib>
-#include "Framework/ASoAHelpers.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/Tasks/Nuspex/identifiedraa.cxx b/.conflict-side-1/PWGLF/Tasks/Nuspex/identifiedraa.cxx
index 3086152d226..bbaff5350c5 100644
--- a/.conflict-side-1/PWGLF/Tasks/Nuspex/identifiedraa.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/Nuspex/identifiedraa.cxx
@@ -30,6 +30,7 @@
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/AnalysisTask.h"
 
 using namespace o2;
diff --git a/.conflict-side-1/PWGLF/Tasks/Nuspex/mcspectraefficiency.cxx b/.conflict-side-1/PWGLF/Tasks/Nuspex/mcspectraefficiency.cxx
index 3442b00ab33..0beffe622c5 100644
--- a/.conflict-side-1/PWGLF/Tasks/Nuspex/mcspectraefficiency.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/Nuspex/mcspectraefficiency.cxx
@@ -10,14 +10,15 @@
 // or submit itself to any jurisdiction.
 
 // O2 includes
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+
 // ROOT includes
-#include <TH1F.h>
 #include "TPDGCode.h"
+#include <TH1F.h>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/Tasks/Nuspex/nucleiEbye.cxx b/.conflict-side-1/PWGLF/Tasks/Nuspex/nucleiEbye.cxx
index 681d8b2892e..177454e57ec 100644
--- a/.conflict-side-1/PWGLF/Tasks/Nuspex/nucleiEbye.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/Nuspex/nucleiEbye.cxx
@@ -9,22 +9,22 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <vector>
-#include <utility>
-#include <random>
-#include <iostream>
-#include <memory>
-#include <algorithm>
+#include "PWGLF/DataModel/LFEbyeTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
-
-#include "PWGLF/DataModel/LFEbyeTables.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 #include "TDatabasePDG.h"
 
+#include <algorithm>
+#include <iostream>
+#include <memory>
+#include <random>
+#include <utility>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-1/PWGLF/Tasks/Nuspex/nucleiFromHypertritonMap.cxx b/.conflict-side-1/PWGLF/Tasks/Nuspex/nucleiFromHypertritonMap.cxx
index 2d959f9488d..1becfae15f4 100644
--- a/.conflict-side-1/PWGLF/Tasks/Nuspex/nucleiFromHypertritonMap.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/Nuspex/nucleiFromHypertritonMap.cxx
@@ -12,30 +12,33 @@
 /// \author Roberta Ferioli (roberta.ferioli@cern.ch)
 /// \since November, 2024
 
-#include <vector>
-#include <TMath.h>
-#include <TPDGCode.h>
-#include <TRandom.h>
-#include <TVector2.h>
-#include <TVector3.h>
-#include <TDatabasePDG.h>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoA.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/DataTypes.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/RunningWorkflowInfo.h"
-#include "Framework/DataTypes.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "ReconstructionDataFormats/PID.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/DCA.h"
-#include "Common/Core/trackUtilities.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/PIDResponse.h"
+#include "ReconstructionDataFormats/PID.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <TDatabasePDG.h>
+#include <TMath.h>
+#include <TPDGCode.h>
+#include <TRandom.h>
+#include <TVector2.h>
+#include <TVector3.h>
+
+#include <vector>
 
 using namespace std;
 using namespace o2;
diff --git a/.conflict-side-1/PWGLF/Tasks/Nuspex/nuclei_in_toward_transv_regions.cxx b/.conflict-side-1/PWGLF/Tasks/Nuspex/nuclei_in_toward_transv_regions.cxx
index a64ba6dc09c..103b2200f4a 100644
--- a/.conflict-side-1/PWGLF/Tasks/Nuspex/nuclei_in_toward_transv_regions.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/Nuspex/nuclei_in_toward_transv_regions.cxx
@@ -12,31 +12,34 @@
 /// \author Alberto Caliva (alberto.caliva@cern.ch)
 /// \since August 22, 2024
 
-#include <vector>
-#include <TMath.h>
-#include <TPDGCode.h>
-#include <TRandom.h>
-#include <TVector2.h>
-#include <TVector3.h>
-#include <TLorentzVector.h>
-#include <TDatabasePDG.h>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoA.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/DataTypes.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/RunningWorkflowInfo.h"
-#include "Framework/DataTypes.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "ReconstructionDataFormats/PID.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/DCA.h"
-#include "Common/Core/trackUtilities.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/PIDResponse.h"
+#include "ReconstructionDataFormats/PID.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <TDatabasePDG.h>
+#include <TLorentzVector.h>
+#include <TMath.h>
+#include <TPDGCode.h>
+#include <TRandom.h>
+#include <TVector2.h>
+#include <TVector3.h>
+
+#include <vector>
 
 using namespace std;
 using namespace o2;
diff --git a/.conflict-side-1/PWGLF/Tasks/Nuspex/spectraCharged.cxx b/.conflict-side-1/PWGLF/Tasks/Nuspex/spectraCharged.cxx
index 94e3b30dc4a..a7a0453c395 100644
--- a/.conflict-side-1/PWGLF/Tasks/Nuspex/spectraCharged.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/Nuspex/spectraCharged.cxx
@@ -12,14 +12,16 @@
 // task for charged particle pt spectra vs multiplicity analysis with 2d unfolding for run3+
 // mimics https://github.com/alisw/AliPhysics/blob/master/PWGLF/SPECTRA/ChargedHadrons/MultDepSpec/AliMultDepSpecAnalysisTask.cxx
 
-#include "Framework/HistogramRegistry.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
 #include "TDatabasePDG.h"
 
 using namespace o2;
diff --git a/.conflict-side-1/PWGLF/Tasks/Nuspex/spectraTOF.cxx b/.conflict-side-1/PWGLF/Tasks/Nuspex/spectraTOF.cxx
index f80b2870959..e8b29ba35ae 100644
--- a/.conflict-side-1/PWGLF/Tasks/Nuspex/spectraTOF.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/Nuspex/spectraTOF.cxx
@@ -19,28 +19,33 @@
 
 // O2 includes
 
-#include <string>
-#include <vector>
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/McCollisionExtra.h"
-#include "Common/Core/TrackSelection.h"
-#include "Framework/StaticFor.h"
-#include "Common/Core/TrackSelectionDefaults.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
 #include "PWGLF/DataModel/spectraTOF.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "PWGLF/Utils/inelGt.h"
+
+#include "PWGLF/DataModel/LFParticleIdentification.h"
 #include "PWGLF/DataModel/mcCentrality.h"
+#include "PWGLF/Utils/inelGt.h"
+
 #include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/McCollisionExtra.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
 #include "TPDGCode.h"
+
+#include <string>
+#include <vector>
 using namespace o2;
 using namespace o2::track;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/Tasks/Nuspex/spectraTOFRun2.cxx b/.conflict-side-1/PWGLF/Tasks/Nuspex/spectraTOFRun2.cxx
index 9c31160f0a1..cb287907b9e 100644
--- a/.conflict-side-1/PWGLF/Tasks/Nuspex/spectraTOFRun2.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/Nuspex/spectraTOFRun2.cxx
@@ -18,20 +18,22 @@
 ///
 
 // O2 includes
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/spectraTOF.h"
+
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
 #include "Framework/StaticFor.h"
-#include "Common/Core/TrackSelectionDefaults.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
-#include "PWGLF/DataModel/spectraTOF.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
 #include "TPDGCode.h"
 
diff --git a/.conflict-side-1/PWGLF/Tasks/Nuspex/spectraTPC.cxx b/.conflict-side-1/PWGLF/Tasks/Nuspex/spectraTPC.cxx
index fd929553fb6..5488378dc9f 100644
--- a/.conflict-side-1/PWGLF/Tasks/Nuspex/spectraTPC.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/Nuspex/spectraTPC.cxx
@@ -18,14 +18,15 @@
 ///
 
 // O2 includes
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "ReconstructionDataFormats/Track.h"
 
 using namespace o2;
 using namespace o2::track;
@@ -186,7 +187,7 @@ struct tpcSpectra {
       fillParticleHistos<PID::Alpha>(track);
     }
   } // end of the process function
-};  // end of spectra task
+}; // end of spectra task
 
 struct tpcPidQaSignalwTof {
   static constexpr int Np = 9;
diff --git a/.conflict-side-1/PWGLF/Tasks/Nuspex/spectraTPCPiKaPr.cxx b/.conflict-side-1/PWGLF/Tasks/Nuspex/spectraTPCPiKaPr.cxx
index 0b856a92e6b..6f1b0b21c7d 100644
--- a/.conflict-side-1/PWGLF/Tasks/Nuspex/spectraTPCPiKaPr.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/Nuspex/spectraTPCPiKaPr.cxx
@@ -17,13 +17,14 @@
 ///
 
 // O2 includes
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/HistogramRegistry.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-1/PWGLF/Tasks/Nuspex/spectraTPCtiny.cxx b/.conflict-side-1/PWGLF/Tasks/Nuspex/spectraTPCtiny.cxx
index d58a8777771..3a1249c48ae 100644
--- a/.conflict-side-1/PWGLF/Tasks/Nuspex/spectraTPCtiny.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/Nuspex/spectraTPCtiny.cxx
@@ -17,13 +17,14 @@
 ///
 
 // O2 includes
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-1/PWGLF/Tasks/Nuspex/spectraTPCtinyPiKaPr.cxx b/.conflict-side-1/PWGLF/Tasks/Nuspex/spectraTPCtinyPiKaPr.cxx
index 9c9a340bfcf..9b0fbe79352 100644
--- a/.conflict-side-1/PWGLF/Tasks/Nuspex/spectraTPCtinyPiKaPr.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/Nuspex/spectraTPCtinyPiKaPr.cxx
@@ -17,13 +17,14 @@
 ///
 
 // O2 includes
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/HistogramRegistry.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-1/PWGLF/Tasks/QC/efficiencyQA.cxx b/.conflict-side-1/PWGLF/Tasks/QC/efficiencyQA.cxx
index 4a0257bb6e5..969c71000ef 100644
--- a/.conflict-side-1/PWGLF/Tasks/QC/efficiencyQA.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/QC/efficiencyQA.cxx
@@ -9,27 +9,27 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <array>
-#include <vector>
-#include <random>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
+#include "Common/Core/PID/TPCPIDResponse.h"
 #include "Common/Core/RecoDecay.h"
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/EventSelection.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
-
-#include "Common/Core/PID/TPCPIDResponse.h"
 #include "Common/DataModel/PIDResponse.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <array>
+#include <random>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/Tasks/QC/findableStudy.cxx b/.conflict-side-1/PWGLF/Tasks/QC/findableStudy.cxx
index d8ca8cc8c80..51fd1efde22 100644
--- a/.conflict-side-1/PWGLF/Tasks/QC/findableStudy.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/QC/findableStudy.cxx
@@ -19,42 +19,44 @@
 //    david.dobrigkeit.chinellato@cern.ch
 //
 
-#include <Math/Vector4D.h>
-#include <cmath>
-#include <array>
-#include <cstdlib>
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/Utils/v0SelectionBits.h"
+#include "PWGLF/Utils/v0SelectionGroup.h"
+#include "PWGLF/Utils/v0SelectionTools.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/McCollisionExtra.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/McCollisionExtra.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
-#include "PWGLF/Utils/v0SelectionBits.h"
-#include "PWGLF/Utils/v0SelectionGroup.h"
-#include "PWGLF/Utils/v0SelectionTools.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
+#include <Math/Vector4D.h>
+#include <TDatabasePDG.h>
 #include <TFile.h>
 #include <TH2F.h>
-#include <TProfile.h>
 #include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
+#include <TProfile.h>
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/Tasks/QC/kfPerformanceStudy.cxx b/.conflict-side-1/PWGLF/Tasks/QC/kfPerformanceStudy.cxx
index 5a9f49ecabf..5a26c7d1f36 100644
--- a/.conflict-side-1/PWGLF/Tasks/QC/kfPerformanceStudy.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/QC/kfPerformanceStudy.cxx
@@ -13,22 +13,24 @@
 //         cascades computed with standard DCAFitter methods and the KFparticle
 //         package. It is meant for the purposes of larger-scale QA of KF reco.
 
-#include <cmath>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <cmath>
 
 using namespace o2;
 using namespace o2::framework;
@@ -151,8 +153,8 @@ struct kfPerformanceStudy {
       }
 
       histos.fill(HIST("hPtCorrelation"), pt, ptKF);
-      histos.fill(HIST("h3dMassLambda"), pt, massLambda, massLambdaKF); // <- implicit pT choice, beware
-      histos.fill(HIST("h3dDCAxy"), pt, dcaXY, dcaXYKF);                // <- implicit pT choice, beware
+      histos.fill(HIST("h3dMassLambda"), pt, massLambda, massLambdaKF);          // <- implicit pT choice, beware
+      histos.fill(HIST("h3dDCAxy"), pt, dcaXY, dcaXYKF);                         // <- implicit pT choice, beware
       histos.fill(HIST("h3dPointingAngle"), pt, pointingAngle, pointingAngleKF); // <- implicit pT choice, beware
 
       histos.fill(HIST("hPointingAngle"), pointingAngle);
diff --git a/.conflict-side-1/PWGLF/Tasks/QC/kfStrangenessStudy.cxx b/.conflict-side-1/PWGLF/Tasks/QC/kfStrangenessStudy.cxx
index 24c5621e948..ecf18910f5e 100644
--- a/.conflict-side-1/PWGLF/Tasks/QC/kfStrangenessStudy.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/QC/kfStrangenessStudy.cxx
@@ -15,26 +15,29 @@
 
 /// \brief cascadebuilder.cxx and lambdakzerobuilder.cxx tasks need to be added to the workflow. Flag createCascCovMats needs to be enabled!
 
-#include <cmath>
-#include <iostream>
+#include "PWGLF/DataModel/kfStrangenessStudy.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/kfStrangenessStudy.h"
+
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/EventSelection.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <cmath>
+#include <iostream>
 
 using namespace o2;
 using namespace o2::framework;
@@ -462,9 +465,9 @@ struct kfStrangenessStudy {
           } else {
             LOG(debug) << "Daughter is no Lambda and/or has no daughters. V0 PDG code: " << MCv0.pdgCode();
           } // end v0 has daughters and is Lambda
-        }   // end loop cascade daughters
-      }     // end cascade has daughters
-    }       // end cascade has MC particle
+        } // end loop cascade daughters
+      } // end cascade has daughters
+    } // end cascade has MC particle
   }
 
   template <typename TCollision>
@@ -699,7 +702,7 @@ struct kfStrangenessStudy {
         fillCascDataTable(collision);
       }
     } // end cascade loop
-  }   // end process
+  } // end process
   PROCESS_SWITCH(kfStrangenessStudy, processData, "process data", false);
 
   void processMC(soa::Filtered<soa::Join<aod::Collisions, aod::EvSels>>::iterator const& collision,
@@ -801,7 +804,7 @@ struct kfStrangenessStudy {
       }
 
     } // end cascade loop
-  }   // end process
+  } // end process
   PROCESS_SWITCH(kfStrangenessStudy, processMC, "process MC", true);
 };
 
diff --git a/.conflict-side-1/PWGLF/Tasks/QC/lfITSTPCMatchingQA.cxx b/.conflict-side-1/PWGLF/Tasks/QC/lfITSTPCMatchingQA.cxx
index c31258d51ae..311db578caa 100644
--- a/.conflict-side-1/PWGLF/Tasks/QC/lfITSTPCMatchingQA.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/QC/lfITSTPCMatchingQA.cxx
@@ -9,26 +9,27 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <vector>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
+#include "Common/Core/PID/PIDTOF.h"
+#include "Common/Core/PID/TPCPIDResponse.h"
 #include "Common/Core/RecoDecay.h"
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "DataFormatsTPC/BetheBlochAleph.h"
-#include "Common/Core/PID/PIDTOF.h"
 #include "Common/TableProducer/PID/pidTOFBase.h"
+
+#include "DataFormatsTPC/BetheBlochAleph.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "Common/Core/PID/TPCPIDResponse.h"
-#include "Common/DataModel/PIDResponse.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
 #include "TDatabasePDG.h"
 
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-1/PWGLF/Tasks/QC/lfITSTPCMatchingSecondaryTracksQA.cxx b/.conflict-side-1/PWGLF/Tasks/QC/lfITSTPCMatchingSecondaryTracksQA.cxx
index 14aebdb354a..803d3ccfb4d 100644
--- a/.conflict-side-1/PWGLF/Tasks/QC/lfITSTPCMatchingSecondaryTracksQA.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/QC/lfITSTPCMatchingSecondaryTracksQA.cxx
@@ -15,28 +15,32 @@
 /// \author Alberto Caliva (alberto.caliva@cern.ch), Francesca Ercolessi (francesca.ercolessi@cern.ch), Nicolò Jacazio (nicolo.jacazio@cern.ch)
 /// \since Feb 11, 2025
 
-#include <TLorentzVector.h>
-#include <TMath.h>
-#include <TObjArray.h>
-#include <TPDGCode.h>
-#include <TVector2.h>
-#include <TVector3.h>
-#include <cmath>
-#include <vector>
-#include <string>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "Common/Core/RecoDecay.h"
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "ReconstructionDataFormats/Track.h"
 
+#include <TLorentzVector.h>
+#include <TMath.h>
+#include <TObjArray.h>
+#include <TPDGCode.h>
+#include <TVector2.h>
+#include <TVector3.h>
+
+#include <cmath>
+#include <string>
+#include <vector>
+
 using namespace std;
 using namespace o2;
 using namespace o2::soa;
diff --git a/.conflict-side-1/PWGLF/Tasks/QC/lfpidqa.cxx b/.conflict-side-1/PWGLF/Tasks/QC/lfpidqa.cxx
index 746473fd0a7..b82bdb2cd85 100644
--- a/.conflict-side-1/PWGLF/Tasks/QC/lfpidqa.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/QC/lfpidqa.cxx
@@ -17,21 +17,23 @@
 /// \brief  Task to produce the PID QA information for the TPC for the purpose of the Light flavor PWG
 ///
 
-#include <string_view>
+#include "PWGLF/DataModel/LFParticleIdentification.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/StaticFor.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
+#include "Common/Core/TrackSelection.h"
 #include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/Core/TrackSelection.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
+
+#include <string_view>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/Tasks/QC/lfpropStudy.cxx b/.conflict-side-1/PWGLF/Tasks/QC/lfpropStudy.cxx
index ab3c88ebbb3..b3995b496f8 100644
--- a/.conflict-side-1/PWGLF/Tasks/QC/lfpropStudy.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/QC/lfpropStudy.cxx
@@ -14,20 +14,22 @@
 /// \author Carolina Reetz <c.reetz@cern.ch>
 /// \brief QA task to study properties of propagated tracks
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "ReconstructionDataFormats/DCA.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/DCA.h"
+#include "ReconstructionDataFormats/Track.h"
+
 #include "TPDGCode.h"
 
 using namespace o2;
diff --git a/.conflict-side-1/PWGLF/Tasks/QC/mcParticlePrediction.cxx b/.conflict-side-1/PWGLF/Tasks/QC/mcParticlePrediction.cxx
index 0c1fca899f3..958773e0412 100644
--- a/.conflict-side-1/PWGLF/Tasks/QC/mcParticlePrediction.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/QC/mcParticlePrediction.cxx
@@ -16,18 +16,20 @@
 /// \brief Task to build the predictions from the models based on the generated particles
 ///
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/StaticFor.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "Common/DataModel/FT0Corrected.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/Utils/inelGt.h"
+#include "PWGLF/Utils/mcParticle.h"
+
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/FT0Corrected.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "PWGLF/Utils/mcParticle.h"
-#include "PWGLF/Utils/inelGt.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "CommonConstants/LHCConstants.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
 
 #include "TPDGCode.h"
 
@@ -60,9 +62,9 @@ struct Estimators {
   static constexpr estID ITSIB = 13;
   static constexpr estID ETA05 = 14;
   static constexpr estID ETA08 = 15;
-  static constexpr estID V0A = 16;  // (Run2)
-  static constexpr estID V0C = 17;  // (Run2)
-  static constexpr estID V0AC = 18; // (Run2 V0M)
+  static constexpr estID V0A = 16;             // (Run2)
+  static constexpr estID V0C = 17;             // (Run2)
+  static constexpr estID V0AC = 18;            // (Run2 V0M)
   static constexpr estID ImpactParameter = 19; // (Run2 V0M)
   static constexpr estID nEstimators = 20;
 
diff --git a/.conflict-side-1/PWGLF/Tasks/QC/mcSignalLoss.cxx b/.conflict-side-1/PWGLF/Tasks/QC/mcSignalLoss.cxx
index aefb6c98c1b..68909d4f610 100644
--- a/.conflict-side-1/PWGLF/Tasks/QC/mcSignalLoss.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/QC/mcSignalLoss.cxx
@@ -24,25 +24,27 @@
 //
 // Build hypertriton candidates from V0s and tracks
 
-#include <vector>
+#include "PWGLF/Utils/inelGt.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
+#include "Common/Core/PID/PIDTOF.h"
+#include "Common/Core/PID/TPCPIDResponse.h"
 #include "Common/Core/RecoDecay.h"
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "DataFormatsTPC/BetheBlochAleph.h"
-#include "Common/Core/PID/PIDTOF.h"
 #include "Common/TableProducer/PID/pidTOFBase.h"
+
+#include "DataFormatsTPC/BetheBlochAleph.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "Common/Core/PID/TPCPIDResponse.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "PWGLF/Utils/inelGt.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/Tasks/QC/mcinelgt0.cxx b/.conflict-side-1/PWGLF/Tasks/QC/mcinelgt0.cxx
index 40acd66a67f..63c2287abd1 100644
--- a/.conflict-side-1/PWGLF/Tasks/QC/mcinelgt0.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/QC/mcinelgt0.cxx
@@ -9,11 +9,12 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
+#include "PWGLF/Utils/inelGt.h"
+
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "PWGLF/Utils/inelGt.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/Tasks/QC/resonanceqa.cxx b/.conflict-side-1/PWGLF/Tasks/QC/resonanceqa.cxx
index 21c17a6e31b..7e102359590 100644
--- a/.conflict-side-1/PWGLF/Tasks/QC/resonanceqa.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/QC/resonanceqa.cxx
@@ -16,38 +16,38 @@
 // (5) particle = 2 --> lambdastar
 // (6) 4 process function (a) Data same event (b) Data mixed event (c) MC generated (d) MC reconstructed
 
-#include <TH1F.h>
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <TDatabasePDG.h>
 #include <TDirectory.h>
+#include <TFile.h>
+#include <TH1F.h>
+#include <TH2F.h>
 #include <THn.h>
 #include <TLorentzVector.h>
 #include <TMath.h>
 #include <TObjArray.h>
-#include <TFile.h>
-#include <TH2F.h>
-#include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
 
-#include <cmath>
 #include <array>
+#include <cmath>
 #include <cstdlib>
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/StepTHn.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/Core/trackUtilities.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/TrackSelection.h"
-#include "Framework/ASoAHelpers.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-1/PWGLF/Tasks/QC/stqa.cxx b/.conflict-side-1/PWGLF/Tasks/QC/stqa.cxx
index 0ab354233ff..fac64b91e1c 100644
--- a/.conflict-side-1/PWGLF/Tasks/QC/stqa.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/QC/stqa.cxx
@@ -9,14 +9,16 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/Core/trackUtilities.h"
 #include "ReconstructionDataFormats/DCA.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/Tasks/QC/straRecoStudy.cxx b/.conflict-side-1/PWGLF/Tasks/QC/straRecoStudy.cxx
index 1f7851cdbef..6caa238aea0 100644
--- a/.conflict-side-1/PWGLF/Tasks/QC/straRecoStudy.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/QC/straRecoStudy.cxx
@@ -20,38 +20,40 @@
 //    Please write to:
 //    david.dobrigkeit.chinellato@cern.ch
 //
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/McCollisionExtra.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/McCollisionExtra.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
+#include <Math/Vector4D.h>
+#include <TDatabasePDG.h>
 #include <TFile.h>
 #include <TH2F.h>
-#include <TProfile.h>
 #include <TLorentzVector.h>
-#include <Math/Vector4D.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
-#include <cmath>
+#include <TProfile.h>
+
 #include <array>
+#include <cmath>
 #include <cstdlib>
-#include "Framework/ASoAHelpers.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/Tasks/QC/strangederivedqa.cxx b/.conflict-side-1/PWGLF/Tasks/QC/strangederivedqa.cxx
index 2e709e07338..0c252538858 100644
--- a/.conflict-side-1/PWGLF/Tasks/QC/strangederivedqa.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/QC/strangederivedqa.cxx
@@ -14,26 +14,28 @@
 //
 // This code does basic QA of strangeness derived data
 
-#include <Math/Vector4D.h>
-#include <cmath>
-#include <array>
-#include <cstdlib>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/Core/trackUtilities.h"
 
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <Math/Vector4D.h>
+#include <TDatabasePDG.h>
 #include <TFile.h>
 #include <TH2F.h>
-#include <TProfile.h>
 #include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
+#include <TProfile.h>
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include <array>
+#include <cmath>
+#include <cstdlib>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/Tasks/QC/strangenessQCPP.cxx b/.conflict-side-1/PWGLF/Tasks/QC/strangenessQCPP.cxx
index 6dab146b363..b9e3990149c 100644
--- a/.conflict-side-1/PWGLF/Tasks/QC/strangenessQCPP.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/QC/strangenessQCPP.cxx
@@ -14,13 +14,15 @@
 /// In case of questions please write to:
 /// \author Roman Nepeivoda (roman.nepeivoda@cern.ch)
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
+#include "PWGLF/DataModel/QC/strangenessTablesQC.h"
+
 #include "Common/DataModel/EventSelection.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGLF/DataModel/QC/strangenessTablesQC.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
@@ -454,4 +456,5 @@ WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
   return WorkflowSpec{
     adaptAnalysisTask<strangenessQCPP>(cfgc, TaskName{"lf-strangenessqcpp"})};
-}
\ No newline at end of file
+}
+ 
\ No newline at end of file
diff --git a/.conflict-side-1/PWGLF/Tasks/QC/strangenessTrackingQC.cxx b/.conflict-side-1/PWGLF/Tasks/QC/strangenessTrackingQC.cxx
index 09c5698fd92..2458a769496 100644
--- a/.conflict-side-1/PWGLF/Tasks/QC/strangenessTrackingQC.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/QC/strangenessTrackingQC.cxx
@@ -9,29 +9,31 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "CCDB/BasicCCDBManager.h"
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "DCAFitter/DCAFitterN.h"
 #include "DataFormatsParameters/GRPMagField.h"
 #include "DataFormatsParameters/GRPObject.h"
 #include "DataFormatsTPC/BetheBlochAleph.h"
-#include "DCAFitter/DCAFitterN.h"
 #include "DetectorsBase/Propagator.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoA.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
 // #include "PWGHF/Core/PDG.h"
+#include "PWGLF/DataModel/LFNonPromptCascadeTables.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "ReconstructionDataFormats/DCA.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "PWGLF/DataModel/LFNonPromptCascadeTables.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/Tasks/QC/strangepidqa.cxx b/.conflict-side-1/PWGLF/Tasks/QC/strangepidqa.cxx
index c2bd9d89774..838b5bfc6b0 100644
--- a/.conflict-side-1/PWGLF/Tasks/QC/strangepidqa.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/QC/strangepidqa.cxx
@@ -12,32 +12,34 @@
 // This task is designed to do QA to the TOF PID applied to strangeness
 // in the regular framework
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <Math/Vector4D.h>
+#include <TDatabasePDG.h>
 #include <TFile.h>
 #include <TH2F.h>
-#include <TProfile.h>
 #include <TLorentzVector.h>
-#include <Math/Vector4D.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
-#include <cmath>
+#include <TProfile.h>
+
 #include <array>
+#include <cmath>
 #include <cstdlib>
-#include "Framework/ASoAHelpers.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/Tasks/QC/strderivedGenQA.cxx b/.conflict-side-1/PWGLF/Tasks/QC/strderivedGenQA.cxx
index 201dcd99ac2..73e6a214363 100644
--- a/.conflict-side-1/PWGLF/Tasks/QC/strderivedGenQA.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/QC/strderivedGenQA.cxx
@@ -19,36 +19,38 @@
 //    gianni.shigeru.setoue.liveraro@cern.ch
 //
 
-#include <Math/Vector4D.h>
-#include <cmath>
-#include <array>
-#include <vector>
-#include <cstdlib>
-
-#include <TFile.h>
-#include <TH2F.h>
-#include <TProfile.h>
-#include <TLorentzVector.h>
-#include <TPDGCode.h>
-#include <TDatabasePDG.h>
+#include "PWGLF/DataModel/LFStrangenessMLTables.h"
+#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/trackUtilities.h"
 #include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
-#include "PWGLF/DataModel/LFStrangenessMLTables.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <Math/Vector4D.h>
+#include <TDatabasePDG.h>
+#include <TFile.h>
+#include <TH2F.h>
+#include <TLorentzVector.h>
+#include <TPDGCode.h>
+#include <TProfile.h>
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/Tasks/QC/tpc_dEdx_postcalibration.cxx b/.conflict-side-1/PWGLF/Tasks/QC/tpc_dEdx_postcalibration.cxx
index 1e9fbd43851..c92c7f20251 100644
--- a/.conflict-side-1/PWGLF/Tasks/QC/tpc_dEdx_postcalibration.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/QC/tpc_dEdx_postcalibration.cxx
@@ -12,17 +12,19 @@
 /// \author Alberto Caliva (alberto.caliva@cern.ch)
 /// \since June 27, 2023
 
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "ReconstructionDataFormats/Track.h"
 
 using namespace o2;
diff --git a/.conflict-side-1/PWGLF/Tasks/QC/tpc_dedx_qa.cxx b/.conflict-side-1/PWGLF/Tasks/QC/tpc_dedx_qa.cxx
index 38f73b8edcb..6d2da6aa5d8 100644
--- a/.conflict-side-1/PWGLF/Tasks/QC/tpc_dedx_qa.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/QC/tpc_dedx_qa.cxx
@@ -12,19 +12,21 @@
 /// \author Alberto Caliva (alberto.caliva@cern.ch)
 /// \since September 19, 2023
 
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Multiplicity.h"
+
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "ReconstructionDataFormats/Track.h"
 
 using namespace o2;
diff --git a/.conflict-side-1/PWGLF/Tasks/QC/trackchecks.cxx b/.conflict-side-1/PWGLF/Tasks/QC/trackchecks.cxx
index 70eaa28dd3b..fb318965662 100644
--- a/.conflict-side-1/PWGLF/Tasks/QC/trackchecks.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/QC/trackchecks.cxx
@@ -8,21 +8,22 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include <cmath>
-#include <array>
-#include <utility>
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
+#include "Framework/runDataProcessing.h"
 
 #include <TF1.h>
 
+#include <array>
+#include <cmath>
+#include <utility>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-1/PWGLF/Tasks/QC/v0assoqa.cxx b/.conflict-side-1/PWGLF/Tasks/QC/v0assoqa.cxx
index fcfd8d59b01..60030e421d5 100644
--- a/.conflict-side-1/PWGLF/Tasks/QC/v0assoqa.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/QC/v0assoqa.cxx
@@ -11,40 +11,42 @@
 //
 // Strangeness-to-collision association tests
 //
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/Utils/strangenessBuilderHelper.h"
+
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/TPCVDriftManager.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/McCollisionExtra.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/McCollisionExtra.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
-#include "PWGLF/Utils/strangenessBuilderHelper.h"
-#include "Common/Core/TPCVDriftManager.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
+#include <Math/Vector4D.h>
+#include <TDatabasePDG.h>
 #include <TFile.h>
 #include <TH2F.h>
-#include <TProfile.h>
 #include <TLorentzVector.h>
-#include <Math/Vector4D.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
-#include <cmath>
+#include <TProfile.h>
+
 #include <array>
+#include <cmath>
 #include <cstdlib>
-#include "Framework/ASoAHelpers.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/Tasks/QC/v0cascadesqa.cxx b/.conflict-side-1/PWGLF/Tasks/QC/v0cascadesqa.cxx
index 5be2b6d4ba5..a75a9b22959 100644
--- a/.conflict-side-1/PWGLF/Tasks/QC/v0cascadesqa.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/QC/v0cascadesqa.cxx
@@ -18,20 +18,22 @@
 
 #include <cmath>
 // #include <cstdlib>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/trackUtilities.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/Tasks/QC/vertexQA.cxx b/.conflict-side-1/PWGLF/Tasks/QC/vertexQA.cxx
index 66ae298813d..844c9f8df81 100644
--- a/.conflict-side-1/PWGLF/Tasks/QC/vertexQA.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/QC/vertexQA.cxx
@@ -9,19 +9,20 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <algorithm>
-#include <cmath>
-#include <deque>
-#include <string>
-#include <vector>
-#include <utility>
+#include "Common/CCDB/ctpRateFetcher.h"
 
 #include "CCDB/BasicCCDBManager.h"
-#include "Common/CCDB/ctpRateFetcher.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
 
+#include <algorithm>
+#include <cmath>
+#include <deque>
+#include <string>
+#include <utility>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-1/PWGLF/Tasks/Resonances/chargedkstaranalysis.cxx b/.conflict-side-1/PWGLF/Tasks/Resonances/chargedkstaranalysis.cxx
index 8286f876bc8..7b729dcee7b 100644
--- a/.conflict-side-1/PWGLF/Tasks/Resonances/chargedkstaranalysis.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/Resonances/chargedkstaranalysis.cxx
@@ -17,23 +17,8 @@
 
 #include "TF1.h"
 // #include <TDatabasePDG.h>
-#include <TDirectory.h>
-#include <TFile.h>
-#include <TH1F.h>
-#include <TH2F.h>
-#include <THn.h>
-#include <TLorentzVector.h>
-#include <TMath.h>
-#include <TObjArray.h>
-#include <TPDGCode.h>
-#include <string>
-
-#include <array>
-#include <cmath>
-#include <cstdlib>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "CCDB/BasicCCDBManager.h"
-#include "CCDB/CcdbApi.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
@@ -41,6 +26,9 @@
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
 #include "CommonConstants/PhysicsConstants.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
@@ -48,9 +36,23 @@
 #include "Framework/HistogramRegistry.h"
 #include "Framework/StepTHn.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "ReconstructionDataFormats/Track.h"
 
+#include <TDirectory.h>
+#include <TFile.h>
+#include <TH1F.h>
+#include <TH2F.h>
+#include <THn.h>
+#include <TLorentzVector.h>
+#include <TMath.h>
+#include <TObjArray.h>
+#include <TPDGCode.h>
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <string>
+
 // For charged kstarpp analysis
 #include "PWGLF/DataModel/LFResonanceTables.h"
 
diff --git a/.conflict-side-1/PWGLF/Tasks/Resonances/chk892Flow.cxx b/.conflict-side-1/PWGLF/Tasks/Resonances/chk892Flow.cxx
index 2c616d81406..f0dadbcdb7a 100644
--- a/.conflict-side-1/PWGLF/Tasks/Resonances/chk892Flow.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/Resonances/chk892Flow.cxx
@@ -14,64 +14,58 @@
 /// \author Su-Jeong Ji <su-jeong.ji@cern.ch>, Bong-Hwi Lim <Bong-Hwi.Lim@cern.ch>
 ///
 
-#include <TH1F.h>
-#include <TH1D.h>
-#include <TDirectory.h>
-#include <THn.h>
-#include <TLorentzVector.h>
-#include <TObjArray.h>
-#include <TFile.h>
-#include <TH2F.h>
-
-#include <vector>
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <chrono>
-#include <string>
-
-#include "TRandom3.h"
-#include "TF1.h"
-#include "TVector2.h"
-#include "Math/Vector3D.h"
-#include "Math/Vector4D.h"
-#include "Math/GenVector/Boost.h"
-#include <TMath.h>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/StaticFor.h"
-#include "DCAFitter/DCAFitterN.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/Utils/collisionCuts.h"
 
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/Qvectors.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "Common/Core/trackUtilities.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/Core/RecoDecay.h"
-
-#include "CommonConstants/PhysicsConstants.h"
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
 #include "CommonConstants/MathConstants.h"
-
-#include "ReconstructionDataFormats/Track.h"
-
-#include "DataFormatsParameters/GRPObject.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "DCAFitter/DCAFitterN.h"
 #include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/StaticFor.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
-#include "CCDB/CcdbApi.h"
-#include "CCDB/BasicCCDBManager.h"
+#include "Math/GenVector/Boost.h"
+#include "Math/Vector3D.h"
+#include "Math/Vector4D.h"
+#include "TF1.h"
+#include "TRandom3.h"
+#include "TVector2.h"
+#include <TDirectory.h>
+#include <TFile.h>
+#include <TH1D.h>
+#include <TH1F.h>
+#include <TH2F.h>
+#include <THn.h>
+#include <TLorentzVector.h>
+#include <TMath.h>
+#include <TObjArray.h>
 
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/Utils/collisionCuts.h"
+#include <array>
+#include <chrono>
+#include <cmath>
+#include <cstdlib>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/Tasks/Resonances/chk892flow_pp.cxx b/.conflict-side-1/PWGLF/Tasks/Resonances/chk892flow_pp.cxx
index 7e1d65bd7e8..916deec5193 100644
--- a/.conflict-side-1/PWGLF/Tasks/Resonances/chk892flow_pp.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/Resonances/chk892flow_pp.cxx
@@ -15,65 +15,58 @@
 ///
 /// \author Su-Jeong Ji <su-jeong.ji@cern.ch>
 
-#include <TH1F.h>
-#include <TH1D.h>
-#include <TDirectory.h>
-#include <THn.h>
-#include <TLorentzVector.h>
-#include <TMath.h>
-#include <TObjArray.h>
-#include <TFile.h>
-#include <TH2F.h>
-#include <TDatabasePDG.h> // FIXME
-#include <TPDGCode.h>     // FIXME
-
-#include <vector>
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <chrono>
-#include <string>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/Utils/collisionCuts.h"
 
-#include "TRandom3.h"
-#include "TF1.h"
-#include "TVector2.h"
-#include "Math/Vector3D.h"
-#include "Math/Vector4D.h"
-#include "Math/GenVector/Boost.h"
-#include <TMath.h>
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/StepTHn.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/StaticFor.h"
-#include "DCAFitter/DCAFitterN.h"
-
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-
-#include "Common/Core/trackUtilities.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/Core/RecoDecay.h"
-
-#include "CommonConstants/PhysicsConstants.h"
-
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
 
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-
-#include "CCDB/CcdbApi.h"
-#include "CCDB/BasicCCDBManager.h"
+#include "Math/GenVector/Boost.h"
+#include "Math/Vector3D.h"
+#include "Math/Vector4D.h"
+#include "TF1.h"
+#include "TRandom3.h"
+#include "TVector2.h"
+#include <TDatabasePDG.h> // FIXME
+#include <TDirectory.h>
+#include <TFile.h>
+#include <TH1D.h>
+#include <TH1F.h>
+#include <TH2F.h>
+#include <THn.h>
+#include <TLorentzVector.h>
+#include <TMath.h>
+#include <TObjArray.h>
+#include <TPDGCode.h> // FIXME
 
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/Utils/collisionCuts.h"
+#include <array>
+#include <chrono>
+#include <cmath>
+#include <cstdlib>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/Tasks/Resonances/chk892pp.cxx b/.conflict-side-1/PWGLF/Tasks/Resonances/chk892pp.cxx
index 269e8d0845d..c4cc01298ca 100644
--- a/.conflict-side-1/PWGLF/Tasks/Resonances/chk892pp.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/Resonances/chk892pp.cxx
@@ -15,65 +15,58 @@
 ///
 /// \author Su-Jeong Ji <su-jeong.ji@cern.ch>
 
-#include <TH1F.h>
-#include <TH1D.h>
-#include <TDirectory.h>
-#include <THn.h>
-#include <TLorentzVector.h>
-#include <TMath.h>
-#include <TObjArray.h>
-#include <TFile.h>
-#include <TH2F.h>
-#include <TDatabasePDG.h> // FIXME
-#include <TPDGCode.h>     // FIXME
-
-#include <vector>
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <chrono>
-#include <string>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/Utils/collisionCuts.h"
 
-#include "TRandom3.h"
-#include "TF1.h"
-#include "TVector2.h"
-#include "Math/Vector3D.h"
-#include "Math/Vector4D.h"
-#include "Math/GenVector/Boost.h"
-#include <TMath.h>
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "DCAFitter/DCAFitterN.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/StepTHn.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/StaticFor.h"
-#include "DCAFitter/DCAFitterN.h"
-
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-
-#include "Common/Core/trackUtilities.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/Core/RecoDecay.h"
-
-#include "CommonConstants/PhysicsConstants.h"
-
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
 
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-
-#include "CCDB/CcdbApi.h"
-#include "CCDB/BasicCCDBManager.h"
+#include "Math/GenVector/Boost.h"
+#include "Math/Vector3D.h"
+#include "Math/Vector4D.h"
+#include "TF1.h"
+#include "TRandom3.h"
+#include "TVector2.h"
+#include <TDatabasePDG.h> // FIXME
+#include <TDirectory.h>
+#include <TFile.h>
+#include <TH1D.h>
+#include <TH1F.h>
+#include <TH2F.h>
+#include <THn.h>
+#include <TLorentzVector.h>
+#include <TMath.h>
+#include <TObjArray.h>
+#include <TPDGCode.h> // FIXME
 
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/Utils/collisionCuts.h"
+#include <array>
+#include <chrono>
+#include <cmath>
+#include <cstdlib>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/Tasks/Resonances/deltaanalysis.cxx b/.conflict-side-1/PWGLF/Tasks/Resonances/deltaanalysis.cxx
index 10c0d3071d2..0d52228cc8f 100644
--- a/.conflict-side-1/PWGLF/Tasks/Resonances/deltaanalysis.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/Resonances/deltaanalysis.cxx
@@ -10,44 +10,43 @@
 // or submit itself to any jurisdiction.
 // Analysis task for delta analysis
 
-#include <TH1F.h>
-#include <TDirectory.h>
-#include <THn.h>
-#include <TLorentzVector.h>
-#include <TMath.h>
-#include <TObjArray.h>
-#include <TFile.h>
-#include <TH2F.h>
-#include <TLorentzVector.h>
-#include <TPDGCode.h>
-#include <TDatabasePDG.h>
-
-#include <cmath>
-#include <array>
-#include <cstdlib>
+#include "PWGLF/DataModel/LFLithium4Tables.h"
 
 #include "Common/Core/PID/PIDTOF.h"
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/TableProducer/PID/pidTOFBase.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
+#include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsTPC/BetheBlochAleph.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/Core/trackUtilities.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/TrackSelection.h"
-#include "Framework/ASoAHelpers.h"
-#include "DataFormatsTPC/BetheBlochAleph.h"
-#include "CCDB/BasicCCDBManager.h"
 
-#include "PWGLF/DataModel/LFLithium4Tables.h"
+#include <TDatabasePDG.h>
+#include <TDirectory.h>
+#include <TFile.h>
+#include <TH1F.h>
+#include <TH2F.h>
+#include <THn.h>
+#include <TLorentzVector.h>
+#include <TMath.h>
+#include <TObjArray.h>
+#include <TPDGCode.h>
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/Tasks/Resonances/doubleResonanceScan.cxx b/.conflict-side-1/PWGLF/Tasks/Resonances/doubleResonanceScan.cxx
index 4b67171c448..48358d1b4ef 100644
--- a/.conflict-side-1/PWGLF/Tasks/Resonances/doubleResonanceScan.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/Resonances/doubleResonanceScan.cxx
@@ -15,16 +15,17 @@
 /// \since 27/03/2025
 ///
 
-#include <vector>
-#include <TLorentzVector.h>
+#include "PWGLF/DataModel/LFResonanceTables.h"
 
-#include "Framework/AnalysisTask.h"
+#include "CommonConstants/MathConstants.h"
+#include "CommonConstants/PhysicsConstants.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
 
-#include "CommonConstants/PhysicsConstants.h"
-#include "CommonConstants/MathConstants.h"
+#include <TLorentzVector.h>
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/Tasks/Resonances/doublephimeson.cxx b/.conflict-side-1/PWGLF/Tasks/Resonances/doublephimeson.cxx
index 0c8f9c2c780..07c86976f25 100644
--- a/.conflict-side-1/PWGLF/Tasks/Resonances/doublephimeson.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/Resonances/doublephimeson.cxx
@@ -13,27 +13,31 @@
 /// \author sourav kundu
 /// \since 02/11/2023
 
+#include "PWGLF/DataModel/ReducedDoublePhiTables.h"
+
+#include "Common/Core/trackUtilities.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
 #include <Framework/Configurable.h>
-#include <TLorentzVector.h>
+
 #include <Math/GenVector/Boost.h>
-#include <Math/Vector4D.h>
 #include <Math/Vector3D.h>
+#include <Math/Vector4D.h>
+#include <TLorentzVector.h>
 #include <TMath.h>
+
 #include <fairlogger/Logger.h>
+
 #include <iostream>
 #include <iterator>
 #include <string>
 #include <vector>
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/StepTHn.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/ReducedDoublePhiTables.h"
-#include "CommonConstants/PhysicsConstants.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-1/PWGLF/Tasks/Resonances/f1protoncorrelation.cxx b/.conflict-side-1/PWGLF/Tasks/Resonances/f1protoncorrelation.cxx
index af45b89b8da..23e41a8f7f9 100644
--- a/.conflict-side-1/PWGLF/Tasks/Resonances/f1protoncorrelation.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/Resonances/f1protoncorrelation.cxx
@@ -13,25 +13,29 @@
 /// \author sourav kundu
 /// \since 02/11/2023
 
+#include "PWGLF/DataModel/ReducedF1ProtonTables.h"
+
+#include "Common/Core/trackUtilities.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
 #include <Framework/Configurable.h>
-#include <TLorentzVector.h>
+
 #include <Math/GenVector/Boost.h>
 #include <Math/Vector4D.h>
+#include <TLorentzVector.h>
 #include <TMath.h>
+
 #include <fairlogger/Logger.h>
+
 #include <iostream>
 #include <iterator>
 #include <string>
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/StepTHn.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/ReducedF1ProtonTables.h"
-#include "CommonConstants/PhysicsConstants.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-1/PWGLF/Tasks/Resonances/heptaquark.cxx b/.conflict-side-1/PWGLF/Tasks/Resonances/heptaquark.cxx
index 407c3199073..4f3caaf197a 100644
--- a/.conflict-side-1/PWGLF/Tasks/Resonances/heptaquark.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/Resonances/heptaquark.cxx
@@ -12,28 +12,32 @@
 /// \brief this is a starting point for the Resonances tutorial
 /// \author junlee kim
 
+#include "PWGLF/DataModel/ReducedHeptaQuarkTables.h"
+
+#include "Common/Core/trackUtilities.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
 #include <Framework/Configurable.h>
-#include <TLorentzVector.h>
+
 #include <Math/GenVector/Boost.h>
-#include <Math/Vector4D.h>
 #include <Math/Vector3D.h>
+#include <Math/Vector4D.h>
+#include <TLorentzVector.h>
 #include <TMath.h>
 #include <TRandom3.h>
+
 #include <fairlogger/Logger.h>
+
 #include <iostream>
 #include <iterator>
 #include <string>
 #include <vector>
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/StepTHn.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/ReducedHeptaQuarkTables.h"
-#include "CommonConstants/PhysicsConstants.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-1/PWGLF/Tasks/Resonances/highmasslambda.cxx b/.conflict-side-1/PWGLF/Tasks/Resonances/highmasslambda.cxx
index c799c1d0ba7..41e3a48e48a 100644
--- a/.conflict-side-1/PWGLF/Tasks/Resonances/highmasslambda.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/Resonances/highmasslambda.cxx
@@ -11,57 +11,59 @@
 // Phi meson spin alignment task
 // sourav.kundu@cern.ch
 
-#include <TH1F.h>
+#include "PWGLF/DataModel/EPCalibrationTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/PIDResponseITS.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include "Math/GenVector/Boost.h"
+#include "Math/Vector3D.h"
+#include "Math/Vector4D.h"
+#include "TF1.h"
+#include "TRandom3.h"
+#include <TDatabasePDG.h>
 #include <TDirectory.h>
+#include <TFile.h>
+#include <TH1F.h>
+#include <TH2F.h>
 #include <THn.h>
 #include <TLorentzVector.h>
 #include <TMath.h>
 #include <TObjArray.h>
-#include <TFile.h>
-#include <TH2F.h>
-#include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
-#include <cmath>
+
 #include <array>
+#include <cmath>
 #include <cstdlib>
-#include <vector>
 #include <string>
-
-#include "TRandom3.h"
-#include "Math/Vector3D.h"
-#include "Math/Vector4D.h"
-#include "Math/GenVector/Boost.h"
-#include "TF1.h"
-
-#include "PWGLF/DataModel/EPCalibrationTables.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/Core/trackUtilities.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/TrackSelection.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "Common/DataModel/PIDResponseITS.h"
+#include <vector>
 // #include "PWGHF/Utils/utilsBfieldCCDB.h"
 #include "PWGHF/Utils/utilsEvSelHf.h"
 #include "PWGHF/Utils/utilsTrkCandHf.h"
+
+#include "DCAFitter/DCAFitterN.h"
 #include "ReconstructionDataFormats/DCA.h"
 #include "ReconstructionDataFormats/V0.h"
-#include "DCAFitter/DCAFitterN.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/Tasks/Resonances/highmasslambdasvx.cxx b/.conflict-side-1/PWGLF/Tasks/Resonances/highmasslambdasvx.cxx
index d6405483d13..d285c487e26 100644
--- a/.conflict-side-1/PWGLF/Tasks/Resonances/highmasslambdasvx.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/Resonances/highmasslambdasvx.cxx
@@ -11,55 +11,56 @@
 // Phi meson spin alignment task
 // sourav.kundu@cern.ch
 
-#include <TH1F.h>
-#include <TDirectory.h>
-#include <THn.h>
-#include <TLorentzVector.h>
-#include <TMath.h>
-#include <TObjArray.h>
-#include <TFile.h>
-#include <TH2F.h>
-#include <TLorentzVector.h>
-#include <TPDGCode.h>
-#include <TDatabasePDG.h>
-#include <cmath>
-#include <array>
-#include <cstdlib>
-
-#include "TRandom3.h"
-#include "Math/Vector3D.h"
-#include "Math/Vector4D.h"
-#include "Math/GenVector/Boost.h"
-#include "TF1.h"
+#include "PWGHF/Utils/utilsBfieldCCDB.h"
+#include "PWGHF/Utils/utilsEvSelHf.h"
+#include "PWGHF/Utils/utilsTrkCandHf.h"
+#include "PWGLF/DataModel/EPCalibrationTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Common/Core/TrackSelection.h"
 #include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/EPCalibrationTables.h"
-#include "Framework/runDataProcessing.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/TrackSelection.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "DataFormatsParameters/GRPObject.h"
+#include "DCAFitter/DCAFitterN.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGHF/Utils/utilsBfieldCCDB.h"
-#include "PWGHF/Utils/utilsEvSelHf.h"
-#include "PWGHF/Utils/utilsTrkCandHf.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/DCA.h"
+#include "ReconstructionDataFormats/Track.h"
 #include "ReconstructionDataFormats/V0.h"
 
+#include "Math/GenVector/Boost.h"
+#include "Math/Vector3D.h"
+#include "Math/Vector4D.h"
+#include "TF1.h"
+#include "TRandom3.h"
+#include <TDatabasePDG.h>
+#include <TDirectory.h>
+#include <TFile.h>
+#include <TH1F.h>
+#include <TH2F.h>
+#include <THn.h>
+#include <TLorentzVector.h>
+#include <TMath.h>
+#include <TObjArray.h>
+#include <TPDGCode.h>
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-1/PWGLF/Tasks/Resonances/k1AnalysisMicro.cxx b/.conflict-side-1/PWGLF/Tasks/Resonances/k1AnalysisMicro.cxx
index 35d6224da36..506365a642a 100644
--- a/.conflict-side-1/PWGLF/Tasks/Resonances/k1AnalysisMicro.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/Resonances/k1AnalysisMicro.cxx
@@ -14,20 +14,23 @@
 /// \author Su-Jeong Ji <su-jeong.ji@cern.ch>, Bong-Hwi Lim <bong-hwi.lim@cern.ch>
 ///
 
-#include <vector>
-#include <TLorentzVector.h>
-#include <TDatabasePDG.h> // FIXME
-#include <TPDGCode.h>     // FIXME
+#include "PWGLF/DataModel/LFResonanceTables.h"
 
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Framework/AnalysisTask.h"
+#include "Common/DataModel/PIDResponse.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "DataFormatsParameters/GRPObject.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "CommonConstants/PhysicsConstants.h"
+
+#include <TDatabasePDG.h> // FIXME
+#include <TLorentzVector.h>
+#include <TPDGCode.h> // FIXME
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/Tasks/Resonances/k1analysis.cxx b/.conflict-side-1/PWGLF/Tasks/Resonances/k1analysis.cxx
index 601227b666e..af106a29189 100644
--- a/.conflict-side-1/PWGLF/Tasks/Resonances/k1analysis.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/Resonances/k1analysis.cxx
@@ -15,20 +15,23 @@
 ///
 /// \author Bong-Hwi Lim <bong-hwi.lim@cern.ch>
 
-#include <vector>
-#include <TLorentzVector.h>
-#include <TDatabasePDG.h> // FIXME
-#include <TPDGCode.h>     // FIXME
+#include "PWGLF/DataModel/LFResonanceTables.h"
 
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Framework/AnalysisTask.h"
+#include "Common/DataModel/PIDResponse.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "DataFormatsParameters/GRPObject.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "CommonConstants/PhysicsConstants.h"
+
+#include <TDatabasePDG.h> // FIXME
+#include <TLorentzVector.h>
+#include <TPDGCode.h> // FIXME
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/Tasks/Resonances/k892SpherocityAnalysis.cxx b/.conflict-side-1/PWGLF/Tasks/Resonances/k892SpherocityAnalysis.cxx
index 7081f79c751..83f93a83134 100644
--- a/.conflict-side-1/PWGLF/Tasks/Resonances/k892SpherocityAnalysis.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/Resonances/k892SpherocityAnalysis.cxx
@@ -13,17 +13,19 @@
 /// \brief Invariant Mass Reconstruction of K*(892) Resonance
 /// \author Sayan Dhani <sayan.dhani@cern.ch>
 
-#include <TLorentzVector.h>
-#include <TRandom.h>
+#include "PWGLF/DataModel/LFResonanceTables.h"
 
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Framework/AnalysisTask.h"
+#include "Common/DataModel/PIDResponse.h"
+
+#include "CommonConstants/PhysicsConstants.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
-#include "CommonConstants/PhysicsConstants.h"
+
+#include <TLorentzVector.h>
+#include <TRandom.h>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/Tasks/Resonances/k892analysis.cxx b/.conflict-side-1/PWGLF/Tasks/Resonances/k892analysis.cxx
index 34e4cc662a0..83bca847de5 100644
--- a/.conflict-side-1/PWGLF/Tasks/Resonances/k892analysis.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/Resonances/k892analysis.cxx
@@ -15,19 +15,21 @@
 ///
 /// \author Bong-Hwi Lim <bong-hwi.lim@cern.ch>, Sawan Sawan <sawan.sawan@cern.ch>
 
-#include <TLorentzVector.h>
-#include "TF1.h"
-#include "TRandom3.h"
+#include "PWGLF/DataModel/LFResonanceTables.h"
 
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Framework/AnalysisTask.h"
+#include "Common/DataModel/PIDResponse.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "DataFormatsParameters/GRPObject.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "CommonConstants/PhysicsConstants.h"
+
+#include "TF1.h"
+#include "TRandom3.h"
+#include <TLorentzVector.h>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/Tasks/Resonances/k892analysispbpb.cxx b/.conflict-side-1/PWGLF/Tasks/Resonances/k892analysispbpb.cxx
index 303a6cd6fc9..b15bc0d7217 100644
--- a/.conflict-side-1/PWGLF/Tasks/Resonances/k892analysispbpb.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/Resonances/k892analysispbpb.cxx
@@ -13,39 +13,40 @@
 /// \brief K*0 spectra in Pb-Pb
 /// \author Marta Urioni <marta.urioni@cern.ch>
 
-#include <TH1F.h>
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <Math/Vector4D.h>
 #include <TDirectory.h>
+#include <TFile.h>
+#include <TH1F.h>
+#include <TH2F.h>
 #include <THn.h>
 #include <TLorentzVector.h>
 #include <TMath.h>
 #include <TObjArray.h>
-#include <TFile.h>
-#include <TH2F.h>
-#include <TRandom3.h>
-#include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <Math/Vector4D.h>
-#include <cmath>
+#include <TRandom3.h>
+
 #include <array>
+#include <cmath>
 #include <cstdlib>
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/StepTHn.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/Core/trackUtilities.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/TrackSelection.h"
-#include "Framework/ASoAHelpers.h"
-#include "DataFormatsParameters/GRPObject.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-1/PWGLF/Tasks/Resonances/k892pmanalysis.cxx b/.conflict-side-1/PWGLF/Tasks/Resonances/k892pmanalysis.cxx
index 16963b77e6b..dcdfba8865c 100644
--- a/.conflict-side-1/PWGLF/Tasks/Resonances/k892pmanalysis.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/Resonances/k892pmanalysis.cxx
@@ -15,17 +15,19 @@
 ///
 /// \author Bong-Hwi Lim <bong-hwi.lim@cern.ch>, Alessandro Sturniolo <a.sturniolo@cern.ch>
 
-#include <TLorentzVector.h>
+#include "PWGLF/DataModel/LFResonanceTables.h"
 
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Framework/AnalysisTask.h"
+#include "Common/DataModel/PIDResponse.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "DataFormatsParameters/GRPObject.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "CommonConstants/PhysicsConstants.h"
+
+#include <TLorentzVector.h>
 
 using namespace o2;
 using namespace o2::framework;
@@ -443,7 +445,7 @@ struct k892pmanalysis {
 
   void processMCTrue(aod::ResoMCParents& resoParents)
   {
-    for (auto& part : resoParents) {  // loop over all pre-filtered MC particles
+    for (auto& part : resoParents) {       // loop over all pre-filtered MC particles
       if (std::abs(part.pdgCode()) != 323) // K*892(pm)
         continue;
       if (std::abs(part.y()) > 0.5) // rapidity cut
diff --git a/.conflict-side-1/PWGLF/Tasks/Resonances/kshortlambda.cxx b/.conflict-side-1/PWGLF/Tasks/Resonances/kshortlambda.cxx
index 225ea15e447..304c2511bc6 100644
--- a/.conflict-side-1/PWGLF/Tasks/Resonances/kshortlambda.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/Resonances/kshortlambda.cxx
@@ -13,6 +13,29 @@
 /// \brief higher mass resonance search in non-identical V0 pairs (K0s-L)
 /// \author  dukhishyam Mallick (dukhishyam.mallick@cern.ch)
 
+#include "PWGLF/DataModel/LFStrangenessTables.h" //
+
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h" //
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h" //
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h" //
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h" //
+#include "ReconstructionDataFormats/Track.h"
+
+#include "Math/GenVector/Boost.h"
+#include "Math/Vector3D.h"
+#include "Math/Vector4D.h"
+#include "TF1.h"
+#include "TRandom3.h"
 #include <TDirectory.h>
 #include <TFile.h>
 #include <TH1F.h>
@@ -22,32 +45,11 @@
 #include <TMath.h>
 #include <TObjArray.h>
 #include <TPDGCode.h>
+
 #include <array>
 #include <cmath>
 #include <cstdlib>
 #include <vector>
-#include "TF1.h"
-#include "TRandom3.h"
-#include "Math/Vector3D.h"
-#include "Math/Vector4D.h"
-#include "Math/GenVector/Boost.h"
-
-#include "Common/Core/TrackSelection.h"
-#include "Common/Core/trackUtilities.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/StepTHn.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/EventSelection.h" //
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/PIDResponse.h" //
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/AnalysisTask.h"              //
-#include "Framework/runDataProcessing.h"         //
-#include "PWGLF/DataModel/LFStrangenessTables.h" //
 
 using namespace o2;
 using namespace o2::framework;
@@ -795,11 +797,11 @@ struct Kshortlambda {
           lv1.SetPtEtaPhiM(t1.pt(), t1.eta(), t1.phi(), massK0s);
           lvLambda.SetPtEtaPhiM(lambdaVec.pt(), lambdaVec.eta(), lambdaVec.phi(), massLambda);
           lv3 = lv1 + lvLambda;
-          fourVecDau = ROOT::Math::PxPyPzMVector(daughter1.Px(), daughter1.Py(), daughter1.Pz(), massK0s);                           // Kshort
-          fourVecMother = ROOT::Math::PxPyPzMVector(lv3.Px(), lv3.Py(), lv3.Pz(), lv3.M());                                          // mass of KshortKshort pair
-          ROOT::Math::Boost boost{fourVecMother.BoostToCM()};                                                                        // boost mother to center of mass frame
-          fourVecDauCM = boost(fourVecDau);                                                                                          // boost the frame of daughter same as mother
-          threeVecDauCM = fourVecDauCM.Vect();                                                                                       // get the 3 vector of daughter in the frame of mother
+          fourVecDau = ROOT::Math::PxPyPzMVector(daughter1.Px(), daughter1.Py(), daughter1.Pz(), massK0s); // Kshort
+          fourVecMother = ROOT::Math::PxPyPzMVector(lv3.Px(), lv3.Py(), lv3.Pz(), lv3.M());                // mass of KshortKshort pair
+          ROOT::Math::Boost boost{fourVecMother.BoostToCM()};                                              // boost mother to center of mass frame
+          fourVecDauCM = boost(fourVecDau);                                                                // boost the frame of daughter same as mother
+          threeVecDauCM = fourVecDauCM.Vect();                                                             // get the 3 vector of daughter in the frame of mother
 
           if (std::abs(lv3.Rapidity()) < 0.5) {
             if (activateTHnSparseCosThStarHelicity) {
@@ -901,11 +903,11 @@ struct Kshortlambda {
           lvLambda.SetPtEtaPhiM(lambdaVec.pt(), lambdaVec.eta(), lambdaVec.phi(), massLambda);
           lv3 = lv1 + lvLambda;
 
-          fourVecDau = ROOT::Math::PxPyPzMVector(daughter1.Px(), daughter1.Py(), daughter1.Pz(), massK0s);            // Kshort
-          fourVecMother = ROOT::Math::PxPyPzMVector(lv3.Px(), lv3.Py(), lv3.Pz(), lv3.M());                           // mass of KshortKshort pair
-          ROOT::Math::Boost boost{fourVecMother.BoostToCM()};                                                         // boost mother to center of mass frame
-          fourVecDauCM = boost(fourVecDau);                                                                           // boost the frame of daughter same as mother
-          threeVecDauCM = fourVecDauCM.Vect();                                                                        // get the 3 vector of daughter in the frame of mother
+          fourVecDau = ROOT::Math::PxPyPzMVector(daughter1.Px(), daughter1.Py(), daughter1.Pz(), massK0s); // Kshort
+          fourVecMother = ROOT::Math::PxPyPzMVector(lv3.Px(), lv3.Py(), lv3.Pz(), lv3.M());                // mass of KshortKshort pair
+          ROOT::Math::Boost boost{fourVecMother.BoostToCM()};                                              // boost mother to center of mass frame
+          fourVecDauCM = boost(fourVecDau);                                                                // boost the frame of daughter same as mother
+          threeVecDauCM = fourVecDauCM.Vect();                                                             // get the 3 vector of daughter in the frame of mother
 
           if (std::abs(lv3.Rapidity()) < 0.5) {
 
diff --git a/.conflict-side-1/PWGLF/Tasks/Resonances/kstar892analysis.cxx b/.conflict-side-1/PWGLF/Tasks/Resonances/kstar892analysis.cxx
index 0a43e73bb5b..74ee0c5496c 100644
--- a/.conflict-side-1/PWGLF/Tasks/Resonances/kstar892analysis.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/Resonances/kstar892analysis.cxx
@@ -16,20 +16,23 @@
 /// adaped from k892analysis.cxx by Bong-Hwi Lim <bong-hwi.lim@cern.ch>, Sawan Sawan <sawan.sawan@cern.ch>
 /// \author Marta Urioni <marta.urioni@cern.ch>
 
-#include <TLorentzVector.h>
-#include "TF1.h"
-#include <vector>
+#include "PWGLF/DataModel/LFResonanceTables.h"
 
 #include "Common/Core/RecoDecay.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Framework/AnalysisTask.h"
+#include "Common/DataModel/PIDResponse.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "DataFormatsParameters/GRPObject.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "CommonConstants/PhysicsConstants.h"
+
+#include "TF1.h"
+#include <TLorentzVector.h>
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/Tasks/Resonances/kstarFlowv1.cxx b/.conflict-side-1/PWGLF/Tasks/Resonances/kstarFlowv1.cxx
index 08139c3c2d2..ab860f966c4 100644
--- a/.conflict-side-1/PWGLF/Tasks/Resonances/kstarFlowv1.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/Resonances/kstarFlowv1.cxx
@@ -14,53 +14,52 @@
 /// \author  Prottay Das <prottay.das@cern.ch>, Dukhishyam Mallick <dukhishyam.mallick@cern.ch>
 ///
 
-#include <TH1F.h>
 #include <TDirectory.h>
+#include <TFile.h>
+#include <TH1F.h>
+#include <TH2F.h>
 #include <THn.h>
 #include <TLorentzVector.h>
 #include <TMath.h>
 #include <TObjArray.h>
-#include <TFile.h>
-#include <TH2F.h>
-#include <TLorentzVector.h>
 #include <TPDGCode.h>
+
 #include <string>
 #include <vector>
 // #include <TDatabasePDG.h>
-#include <cmath>
-#include <array>
-#include <cstdlib>
-
-#include "TRandom3.h"
-#include "Math/Vector3D.h"
-#include "Math/Vector4D.h"
-#include "Math/GenVector/Boost.h"
-#include "TF1.h"
+#include "PWGLF/DataModel/SPCalibrationTables.h"
 
-#include "Common/Core/trackUtilities.h"
-#include "Common/Core/TrackSelection.h"
 #include "Common/Core/RecoDecay.h"
-
-#include "PWGLF/DataModel/SPCalibrationTables.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/TrackSelection.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
+
+#include "Math/GenVector/Boost.h"
+#include "Math/Vector3D.h"
+#include "Math/Vector4D.h"
+#include "TF1.h"
+#include "TRandom3.h"
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/Tasks/Resonances/lambda1520SpherocityAnalysis.cxx b/.conflict-side-1/PWGLF/Tasks/Resonances/lambda1520SpherocityAnalysis.cxx
index b8d6cfeae29..7d53afebf5b 100644
--- a/.conflict-side-1/PWGLF/Tasks/Resonances/lambda1520SpherocityAnalysis.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/Resonances/lambda1520SpherocityAnalysis.cxx
@@ -13,19 +13,22 @@
 /// \brief Invariant Mass Reconstruction of Lambda(1520) Resonance
 /// \author Yash Patley <yash.patley@cern.ch>
 
-#include <TLorentzVector.h>
-#include <TRandom.h>
-#include <vector>
+#include "PWGLF/DataModel/LFResonanceTables.h"
 
-#include "Common/DataModel/PIDResponse.h"
+#include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Framework/AnalysisTask.h"
+#include "Common/DataModel/PIDResponse.h"
+
+#include "CommonConstants/PhysicsConstants.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/RecoDecay.h"
+
+#include <TLorentzVector.h>
+#include <TRandom.h>
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/Tasks/Resonances/lambda1520_PbPb.cxx b/.conflict-side-1/PWGLF/Tasks/Resonances/lambda1520_PbPb.cxx
index d032d0c90aa..1298ef07c4f 100644
--- a/.conflict-side-1/PWGLF/Tasks/Resonances/lambda1520_PbPb.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/Resonances/lambda1520_PbPb.cxx
@@ -15,22 +15,25 @@
 /// \author Yash Patley <yash.patley@cern.ch>
 /// \author Nasir Mehdi Malik
 
+#include "PWGLF/DataModel/LFResonanceTables.h"
+
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 #include <Framework/ASoA.h>
 #include <Framework/AnalysisDataModel.h>
 #include <Framework/HistogramRegistry.h>
 #include <Framework/HistogramSpec.h>
+
 #include <TLorentzVector.h>
 #include <TRandom.h>
-#include <fairlogger/Logger.h>
 
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
-#include "CommonConstants/PhysicsConstants.h"
+#include <fairlogger/Logger.h>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/Tasks/Resonances/lambda1520analysis.cxx b/.conflict-side-1/PWGLF/Tasks/Resonances/lambda1520analysis.cxx
index 3e6749d451d..12130bfe422 100644
--- a/.conflict-side-1/PWGLF/Tasks/Resonances/lambda1520analysis.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/Resonances/lambda1520analysis.cxx
@@ -13,13 +13,15 @@
 /// \brief This task reconstructs track-track decay lambda(1520) resonance candidate
 /// \author Hirak Kumar Koley <hirak.koley@cern.ch>
 
-#include "TLorentzVector.h"
-#include "TF1.h"
-#include "TRandom3.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "PWGLF/DataModel/LFResonanceTables.h"
+
 #include "CommonConstants/PhysicsConstants.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TF1.h"
+#include "TLorentzVector.h"
+#include "TRandom3.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/Tasks/Resonances/lambdav2.cxx b/.conflict-side-1/PWGLF/Tasks/Resonances/lambdav2.cxx
index ae8c1b6446c..3aebbb27334 100644
--- a/.conflict-side-1/PWGLF/Tasks/Resonances/lambdav2.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/Resonances/lambdav2.cxx
@@ -11,50 +11,51 @@
 // Particle flow task
 // prottay.das@cern.ch
 
-#include <TH1F.h>
+#include "Math/GenVector/Boost.h"
+#include "Math/Vector3D.h"
+#include "Math/Vector4D.h"
+#include "TF1.h"
+#include "TRandom3.h"
+#include <TDatabasePDG.h>
 #include <TDirectory.h>
+#include <TFile.h>
+#include <TH1F.h>
+#include <TH2F.h>
 #include <THn.h>
 #include <TLorentzVector.h>
 #include <TMath.h>
 #include <TObjArray.h>
-#include <TFile.h>
-#include <TH2F.h>
-#include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
-#include <cmath>
+
 #include <array>
+#include <cmath>
 #include <cstdlib>
 
-#include "TRandom3.h"
-#include "Math/Vector3D.h"
-#include "Math/Vector4D.h"
-#include "Math/GenVector/Boost.h"
-#include "TF1.h"
-
 // #include "Common/DataModel/Qvectors.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "PWGLF/DataModel/SPCalibrationTables.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
+
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/FT0Corrected.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/TrackSelection.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "Common/DataModel/FT0Corrected.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/Tasks/Resonances/lstarpbpbv2.cxx b/.conflict-side-1/PWGLF/Tasks/Resonances/lstarpbpbv2.cxx
index 4b9bdb5aede..ce6094b71ee 100644
--- a/.conflict-side-1/PWGLF/Tasks/Resonances/lstarpbpbv2.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/Resonances/lstarpbpbv2.cxx
@@ -11,50 +11,51 @@
 // L* baryon v2
 // Prottay Das (prottay.das@cern.ch)
 
-#include <TH1F.h>
+#include "PWGLF/DataModel/EPCalibrationTables.h"
+
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/PIDResponseITS.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include "Math/GenVector/Boost.h"
+#include "Math/Vector3D.h"
+#include "Math/Vector4D.h"
+#include "TF1.h"
+#include "TRandom3.h"
+#include <TDatabasePDG.h>
 #include <TDirectory.h>
+#include <TFile.h>
+#include <TH1F.h>
+#include <TH2F.h>
 #include <THn.h>
 #include <TLorentzVector.h>
 #include <TMath.h>
 #include <TObjArray.h>
-#include <TFile.h>
-#include <TH2F.h>
-#include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <string>
-#include <vector>
-#include <TDatabasePDG.h>
-#include <cmath>
+
 #include <array>
+#include <cmath>
 #include <cstdlib>
-
-#include "TRandom3.h"
-#include "Math/Vector3D.h"
-#include "Math/Vector4D.h"
-#include "Math/GenVector/Boost.h"
-#include "TF1.h"
-
-#include "PWGLF/DataModel/EPCalibrationTables.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/Core/trackUtilities.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/TrackSelection.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "Common/DataModel/PIDResponseITS.h"
-#include "CCDB/BasicCCDBManager.h"
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/Tasks/Resonances/phianalysis.cxx b/.conflict-side-1/PWGLF/Tasks/Resonances/phianalysis.cxx
index b529cc1fb81..7bbe03013c6 100644
--- a/.conflict-side-1/PWGLF/Tasks/Resonances/phianalysis.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/Resonances/phianalysis.cxx
@@ -15,17 +15,19 @@
 ///
 /// \author Bong-Hwi Lim <bong-hwi.lim@cern.ch>
 
-#include <TLorentzVector.h>
+#include "PWGLF/DataModel/LFResonanceTables.h"
 
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Framework/AnalysisTask.h"
+#include "Common/DataModel/PIDResponse.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "DataFormatsParameters/GRPObject.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "CommonConstants/PhysicsConstants.h"
+
+#include <TLorentzVector.h>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/Tasks/Resonances/phianalysisTHnSparse.cxx b/.conflict-side-1/PWGLF/Tasks/Resonances/phianalysisTHnSparse.cxx
index f9fa43c1d7f..09b6f505843 100644
--- a/.conflict-side-1/PWGLF/Tasks/Resonances/phianalysisTHnSparse.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/Resonances/phianalysisTHnSparse.cxx
@@ -13,21 +13,24 @@
 /// \brief Analysis of phi resonance using THnSparse histograms.
 /// \author Veronika Barbasova (veronika.barbasova@cern.ch)
 
-#include <TLorentzVector.h>
-#include <vector>
-#include <string>
+#include "PWGLF/Utils/rsnOutput.h"
 
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/PID.h"
-#include "PWGLF/Utils/rsnOutput.h"
+
+#include <TLorentzVector.h>
+
+#include <string>
+#include <vector>
 // #include "TDatabasePDG.h"
 
 using namespace o2;
diff --git a/.conflict-side-1/PWGLF/Tasks/Resonances/phianalysisrun3.cxx b/.conflict-side-1/PWGLF/Tasks/Resonances/phianalysisrun3.cxx
index a865482393a..05e2b0e414e 100644
--- a/.conflict-side-1/PWGLF/Tasks/Resonances/phianalysisrun3.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/Resonances/phianalysisrun3.cxx
@@ -16,38 +16,39 @@
 // (5) particle = 2 --> lambdastar
 // (6) 4 process function (a) Data same event (b) Data mixed event (c) MC generated (d) MC reconstructed
 
-#include <TH1F.h>
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <Math/Vector4D.h>
+#include <TDatabasePDG.h>
 #include <TDirectory.h>
+#include <TFile.h>
+#include <TH1F.h>
+#include <TH2F.h>
 #include <THn.h>
 #include <TLorentzVector.h>
 #include <TMath.h>
 #include <TObjArray.h>
-#include <TFile.h>
-#include <TH2F.h>
-#include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
-#include <Math/Vector4D.h>
-#include <cmath>
+
 #include <array>
+#include <cmath>
 #include <cstdlib>
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/StepTHn.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/Core/trackUtilities.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/TrackSelection.h"
-#include "Framework/ASoAHelpers.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-1/PWGLF/Tasks/Resonances/rho770analysis.cxx b/.conflict-side-1/PWGLF/Tasks/Resonances/rho770analysis.cxx
index 07531afc724..fb4d9cbf643 100644
--- a/.conflict-side-1/PWGLF/Tasks/Resonances/rho770analysis.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/Resonances/rho770analysis.cxx
@@ -14,19 +14,21 @@
 /// \author Hyunji Lim (hyunji.lim@cern.ch)
 /// \since 03/12/2025
 
-#include <Framework/Configurable.h>
-#include <TLorentzVector.h>
-#include "TVector2.h"
+#include "PWGLF/DataModel/LFResonanceTables.h"
 
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+
+#include "CommonConstants/PhysicsConstants.h"
 #include "DataFormatsParameters/GRPObject.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
-#include "CommonConstants/PhysicsConstants.h"
+#include <Framework/Configurable.h>
+
+#include "TVector2.h"
+#include <TLorentzVector.h>
 
 using namespace o2;
 using namespace o2::framework;
@@ -67,8 +69,8 @@ struct rho770analysis {
   Configurable<bool> cfgHasTOF{"cfgHasTOF", false, "Require TOF"};
 
   // PID
-  Configurable<double> cMaxTOFnSigmaPion{"cMaxTOFnSigmaPion", 3.0, "TOF nSigma cut for Pion"}; // TOF
-  Configurable<double> cMaxTPCnSigmaPion{"cMaxTPCnSigmaPion", 5.0, "TPC nSigma cut for Pion"}; // TPC
+  Configurable<double> cMaxTOFnSigmaPion{"cMaxTOFnSigmaPion", 3.0, "TOF nSigma cut for Pion"};                          // TOF
+  Configurable<double> cMaxTPCnSigmaPion{"cMaxTPCnSigmaPion", 5.0, "TPC nSigma cut for Pion"};                          // TPC
   Configurable<double> cMaxTPCnSigmaPionnoTOF{"cMaxTPCnSigmaPionnoTOF", 2.0, "TPC nSigma cut for Pion in no TOF case"}; // TPC
   Configurable<double> nsigmaCutCombinedPion{"nsigmaCutCombinedPion", 3.0, "Combined nSigma cut for Pion"};
   Configurable<int> selectType{"selectType", 0, "PID selection type"};
diff --git a/.conflict-side-1/PWGLF/Tasks/Resonances/rhoanalysis.cxx b/.conflict-side-1/PWGLF/Tasks/Resonances/rhoanalysis.cxx
index ab1112f4995..e6bfac44bf1 100644
--- a/.conflict-side-1/PWGLF/Tasks/Resonances/rhoanalysis.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/Resonances/rhoanalysis.cxx
@@ -15,23 +15,25 @@
 ///
 /// \author Nasir Mehdi Malik
 
-#include <array>
+#include "RecoDecay.h"
 
-#include <TPDGCode.h>
+#include "Common/Core/RecoDecay.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
-#include "Framework/DataProcessorSpec.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/RecoDecay.h"
+#include "Framework/DataProcessorSpec.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "RecoDecay.h"
+#include "Framework/runDataProcessing.h"
+
+#include <TPDGCode.h>
+
+#include <array>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/Tasks/Resonances/rsnanalysis.cxx b/.conflict-side-1/PWGLF/Tasks/Resonances/rsnanalysis.cxx
index 7a672fe59a8..0e662918f5d 100644
--- a/.conflict-side-1/PWGLF/Tasks/Resonances/rsnanalysis.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/Resonances/rsnanalysis.cxx
@@ -17,9 +17,11 @@
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "Framework/ASoAHelpers.h"
+
 #include "TLorentzVector.h"
 
 using namespace std;
diff --git a/.conflict-side-1/PWGLF/Tasks/Resonances/sigma.cxx b/.conflict-side-1/PWGLF/Tasks/Resonances/sigma.cxx
index 9bcad07c143..5245c2eb5ae 100644
--- a/.conflict-side-1/PWGLF/Tasks/Resonances/sigma.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/Resonances/sigma.cxx
@@ -11,23 +11,8 @@
 ///
 /// \brief sigma resonance
 /// \author sarjeeta gami (sarjeeta.gami@cern.ch)
-#include <TDatabasePDG.h>
-#include <TDirectory.h>
-#include <TFile.h>
-#include <TH1F.h>
-#include <TH2F.h>
-#include <THn.h>
-#include <TLorentzVector.h>
-#include <TMath.h>
-#include <TObjArray.h>
-#include <TPDGCode.h>
-
-#include <array>
-#include <cmath>
-#include <cstdlib>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "CCDB/BasicCCDBManager.h"
-#include "CCDB/CcdbApi.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
@@ -35,6 +20,9 @@
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
 #include "CommonConstants/PhysicsConstants.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
@@ -42,9 +30,23 @@
 #include "Framework/HistogramRegistry.h"
 #include "Framework/StepTHn.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "ReconstructionDataFormats/Track.h"
 
+#include <TDatabasePDG.h>
+#include <TDirectory.h>
+#include <TFile.h>
+#include <TH1F.h>
+#include <TH2F.h>
+#include <THn.h>
+#include <TLorentzVector.h>
+#include <TMath.h>
+#include <TObjArray.h>
+#include <TPDGCode.h>
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-1/PWGLF/Tasks/Resonances/xi1530Analysis.cxx b/.conflict-side-1/PWGLF/Tasks/Resonances/xi1530Analysis.cxx
index 73694dda058..ada855ae4fb 100644
--- a/.conflict-side-1/PWGLF/Tasks/Resonances/xi1530Analysis.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/Resonances/xi1530Analysis.cxx
@@ -13,20 +13,23 @@
 /// \brief Invariant Mass Reconstruction of Xi(1530) Resonance
 /// \author Yash Patley <yash.patley@cern.ch>
 
-#include <TLorentzVector.h>
-#include <TRandom.h>
-#include <vector>
+#include "PWGLF/DataModel/LFResonanceTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Common/DataModel/PIDResponse.h"
+#include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Framework/AnalysisTask.h"
+#include "Common/DataModel/PIDResponse.h"
+
+#include "CommonConstants/PhysicsConstants.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/RecoDecay.h"
+
+#include <TLorentzVector.h>
+#include <TRandom.h>
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/Tasks/Resonances/xi1530Analysisqa.cxx b/.conflict-side-1/PWGLF/Tasks/Resonances/xi1530Analysisqa.cxx
index 42773fa2947..0fa785a0579 100644
--- a/.conflict-side-1/PWGLF/Tasks/Resonances/xi1530Analysisqa.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/Resonances/xi1530Analysisqa.cxx
@@ -14,21 +14,23 @@
 ///
 /// \author Min-jae Kim <minjae.kim@cern.ch>, Bong-Hwi Lim <bong-hwi.lim@cern.ch>
 // #include <TLorentzVector.h>
-#include "Math/Vector4D.h"
-#include "TF1.h"
-#include "TRandom3.h"
+#include "PWGLF/DataModel/LFResonanceTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Common/DataModel/PIDResponse.h"
+#include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "Common/DataModel/PIDResponse.h"
+
 #include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/RecoDecay.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
+#include "Math/Vector4D.h"
+#include "TF1.h"
+#include "TRandom3.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/Tasks/Strangeness/cascadeanalysis.cxx b/.conflict-side-1/PWGLF/Tasks/Strangeness/cascadeanalysis.cxx
index baf37b72717..4f9de5dbb74 100644
--- a/.conflict-side-1/PWGLF/Tasks/Strangeness/cascadeanalysis.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/Strangeness/cascadeanalysis.cxx
@@ -28,31 +28,33 @@
 //    david.dobrigkeit.chinellato@cern.ch
 //
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
+#include <Math/Vector4D.h>
+#include <TDatabasePDG.h>
 #include <TFile.h>
 #include <TH2F.h>
-#include <TProfile.h>
 #include <TLorentzVector.h>
-#include <Math/Vector4D.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
-#include <cmath>
+#include <TProfile.h>
+
 #include <array>
+#include <cmath>
 #include <cstdlib>
-#include "Framework/ASoAHelpers.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/Tasks/Strangeness/cascadeanalysisMC.cxx b/.conflict-side-1/PWGLF/Tasks/Strangeness/cascadeanalysisMC.cxx
index a1947c8b6b5..e4fe51055bd 100644
--- a/.conflict-side-1/PWGLF/Tasks/Strangeness/cascadeanalysisMC.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/Strangeness/cascadeanalysisMC.cxx
@@ -31,31 +31,33 @@
 //    david.dobrigkeit.chinellato@cern.ch
 //
 
-#include <Math/Vector4D.h>
-#include <cmath>
-#include <array>
-#include <cstdlib>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
+#include <Math/Vector4D.h>
+#include <TDatabasePDG.h>
 #include <TFile.h>
 #include <TH2F.h>
-#include <TProfile.h>
 #include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
+#include <TProfile.h>
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/Tasks/Strangeness/cascpolsp.cxx b/.conflict-side-1/PWGLF/Tasks/Strangeness/cascpolsp.cxx
index 237fe8ba375..68fa15f699e 100644
--- a/.conflict-side-1/PWGLF/Tasks/Strangeness/cascpolsp.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/Strangeness/cascpolsp.cxx
@@ -11,52 +11,53 @@
 // Cascade polarisation task
 // prottay.das@cern.ch
 
-#include <TH1F.h>
+#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/DataModel/SPCalibrationTables.h"
+#include "PWGLF/DataModel/cascqaanalysis.h"
+
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/FT0Corrected.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include "Math/GenVector/Boost.h"
+#include "Math/Vector3D.h"
+#include "Math/Vector4D.h"
+#include "TF1.h"
+#include "TRandom3.h"
+#include <TDatabasePDG.h>
 #include <TDirectory.h>
+#include <TFile.h>
+#include <TH1F.h>
+#include <TH2F.h>
 #include <THn.h>
 #include <TLorentzVector.h>
 #include <TMath.h>
 #include <TObjArray.h>
-#include <TFile.h>
-#include <TH2F.h>
-#include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
-#include <cmath>
+
 #include <array>
+#include <cmath>
 #include <cstdlib>
 
-#include "TRandom3.h"
-#include "Math/Vector3D.h"
-#include "Math/Vector4D.h"
-#include "Math/GenVector/Boost.h"
-#include "TF1.h"
-
-#include "PWGLF/DataModel/SPCalibrationTables.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/Core/trackUtilities.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/TrackSelection.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
-#include "Common/DataModel/FT0Corrected.h"
-#include "PWGLF/DataModel/cascqaanalysis.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-1/PWGLF/Tasks/Strangeness/cascpostprocessing.cxx b/.conflict-side-1/PWGLF/Tasks/Strangeness/cascpostprocessing.cxx
index d92e48733b5..5d521b5348a 100644
--- a/.conflict-side-1/PWGLF/Tasks/Strangeness/cascpostprocessing.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/Strangeness/cascpostprocessing.cxx
@@ -16,14 +16,16 @@
 /// \modified by Roman Nepeivoda (roman.nepeivoda@cern.ch)
 /// \since June 1, 2023
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/DataModel/cascqaanalysis.h"
+
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGLF/DataModel/cascqaanalysis.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 
 // constants
 const float ctauxiPDG = 4.91;     // from PDG
diff --git a/.conflict-side-1/PWGLF/Tasks/Strangeness/derivedcascadeanalysis.cxx b/.conflict-side-1/PWGLF/Tasks/Strangeness/derivedcascadeanalysis.cxx
index 95a25f589e3..b49650dce88 100644
--- a/.conflict-side-1/PWGLF/Tasks/Strangeness/derivedcascadeanalysis.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/Strangeness/derivedcascadeanalysis.cxx
@@ -13,44 +13,47 @@
 /// \brief Tasks processing derived data for Cascade analysis in PbPb collisions
 /// \author Lucia Anna Tarasovicova (lucia.anna.husova@cern.ch)
 
-#include <string>
-#include <vector>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "Common/CCDB/ctpRateFetcher.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "MetadataHelper.h"
+
 #include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/CCDB/EventSelectionParams.h"
+#include "Common/CCDB/TriggerAliases.h"
+#include "Common/CCDB/ctpRateFetcher.h"
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "Framework/StaticFor.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "Framework/ConfigParamSpec.h"
-#include "Common/CCDB/EventSelectionParams.h"
-#include "Common/CCDB/TriggerAliases.h"
 #include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/LHCConstants.h"
-#include "Framework/HistogramRegistry.h"
 #include "DataFormatsFT0/Digit.h"
-#include "DataFormatsParameters/GRPLHCIFData.h"
+#include "DataFormatsParameters/AggregatedRunInfo.h"
 #include "DataFormatsParameters/GRPECSObject.h"
+#include "DataFormatsParameters/GRPLHCIFData.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/ConfigParamSpec.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
 #include "ITSMFTBase/DPLAlpideParam.h"
-#include "MetadataHelper.h"
-#include "DataFormatsParameters/AggregatedRunInfo.h"
+#include "ReconstructionDataFormats/Track.h"
 
 #include <TFile.h>
 #include <TH2F.h>
-#include <TProfile.h>
 #include <TLorentzVector.h>
 #include <TPDGCode.h>
+#include <TProfile.h>
+
+#include <string>
+#include <vector>
 
 // constants
 const float ctauxiPDG = 4.91;     // from PDG
diff --git a/.conflict-side-1/PWGLF/Tasks/Strangeness/derivedlambdakzeroanalysis.cxx b/.conflict-side-1/PWGLF/Tasks/Strangeness/derivedlambdakzeroanalysis.cxx
index 544ed23807a..97ab9a0ad53 100644
--- a/.conflict-side-1/PWGLF/Tasks/Strangeness/derivedlambdakzeroanalysis.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/Strangeness/derivedlambdakzeroanalysis.cxx
@@ -28,44 +28,45 @@
 //    david.dobrigkeit.chinellato@cern.ch
 //
 
-#include <Math/Vector4D.h>
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <string>
-#include <map>
-#include <algorithm>
-#include <vector>
-
-#include <TFile.h>
-#include <TH2D.h>
-#include <TProfile.h>
-#include <TLorentzVector.h>
-#include <TPDGCode.h>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "CommonConstants/MathConstants.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/trackUtilities.h"
-#include "Common/CCDB/ctpRateFetcher.h"
-#include "Common/DataModel/EventSelection.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "PWGLF/DataModel/LFStrangenessMLTables.h"
 #include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGUD/Core/SGSelector.h"
+
+#include "Common/CCDB/ctpRateFetcher.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/Core/SGSelector.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 #include "Tools/ML/MlResponse.h"
 #include "Tools/ML/model.h"
 
+#include "CommonConstants/MathConstants.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <Math/Vector4D.h>
+#include <TFile.h>
+#include <TH2D.h>
+#include <TLorentzVector.h>
+#include <TPDGCode.h>
+#include <TProfile.h>
+
+#include <algorithm>
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <map>
+#include <string>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-1/PWGLF/Tasks/Strangeness/derivedupcanalysis.cxx b/.conflict-side-1/PWGLF/Tasks/Strangeness/derivedupcanalysis.cxx
index b3021033d32..386a61a1e25 100644
--- a/.conflict-side-1/PWGLF/Tasks/Strangeness/derivedupcanalysis.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/Strangeness/derivedupcanalysis.cxx
@@ -13,34 +13,37 @@
 /// \brief Analysis of strangeness production in UPC collisions
 /// \author Roman Nepeivoda (roman.nepeivoda@cern.ch)
 
-#include <bitset>
-#include <TFile.h>
-#include <TH2F.h>
-#include <TProfile.h>
-#include <TPDGCode.h>
-#include <vector>
-#include <algorithm>
-#include <cmath>
-#include <string>
+#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/Utils/strangenessMasks.h"
+#include "PWGUD/Core/SGSelector.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/StaticFor.h"
-#include "PWGUD/Core/SGSelector.h"
-#include "PWGLF/Utils/strangenessMasks.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <TFile.h>
+#include <TH2F.h>
+#include <TPDGCode.h>
+#include <TProfile.h>
+
+#include <algorithm>
+#include <bitset>
+#include <cmath>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/Tasks/Strangeness/hyperon-reco-test.cxx b/.conflict-side-1/PWGLF/Tasks/Strangeness/hyperon-reco-test.cxx
index 5605730d709..85054f07f7b 100644
--- a/.conflict-side-1/PWGLF/Tasks/Strangeness/hyperon-reco-test.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/Strangeness/hyperon-reco-test.cxx
@@ -9,31 +9,31 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <cmath>
-#include <vector>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
 
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/Core/trackUtilities.h"
-#include "Common/DataModel/Centrality.h"
-#include "Framework/ASoAHelpers.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-
 #include "TMath.h"
-
 #include <TDatabasePDG.h>
 #include <TH2F.h>
 #include <TPDGCode.h>
 
+#include <cmath>
+#include <vector>
+
 using namespace std;
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/Tasks/Strangeness/k0_mixed_events.cxx b/.conflict-side-1/PWGLF/Tasks/Strangeness/k0_mixed_events.cxx
index 5de8a32c122..73fc5ac67f7 100644
--- a/.conflict-side-1/PWGLF/Tasks/Strangeness/k0_mixed_events.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/Strangeness/k0_mixed_events.cxx
@@ -14,40 +14,40 @@
 /// \author Sofia Tomassini, Gleb Romanenko, Nicolò Jacazio
 /// \since 31 May 2023
 
-#include <vector>
-#include <map>
-#include <memory>
-#include <string>
-#include <utility>
+#include "PWGCF/Femto3D/Core/femto3dPairTask.h"
+#include "PWGCF/Femto3D/DataModel/singletrackselector.h"
+#include "PWGLF/DataModel/mcCentrality.h"
+#include "PWGLF/Utils/inelGt.h"
 
-#include <TParameter.h>
-#include <TH1F.h>
-#include <TLorentzVector.h>
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
+#include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/Propagator.h"
 #include "Framework/ASoA.h"
-#include "Framework/DataTypes.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/DataTypes.h"
 #include "Framework/Expressions.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/StaticFor.h"
-
+#include "Framework/runDataProcessing.h"
 #include "MathUtils/Utils.h"
-#include "Common/DataModel/Multiplicity.h"
 
-#include "PWGCF/Femto3D/DataModel/singletrackselector.h"
-#include "PWGCF/Femto3D/Core/femto3dPairTask.h"
-#include "Common/DataModel/Centrality.h"
-#include "PWGLF/DataModel/mcCentrality.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "PWGLF/Utils/inelGt.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "DetectorsBase/Propagator.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+#include <TH1F.h>
+#include <TLorentzVector.h>
+#include <TParameter.h>
+
+#include <map>
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::soa;
diff --git a/.conflict-side-1/PWGLF/Tasks/Strangeness/lambdaJetpolarization.cxx b/.conflict-side-1/PWGLF/Tasks/Strangeness/lambdaJetpolarization.cxx
index cca1bdf193e..62420403d65 100644
--- a/.conflict-side-1/PWGLF/Tasks/Strangeness/lambdaJetpolarization.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/Strangeness/lambdaJetpolarization.cxx
@@ -11,41 +11,46 @@
 ///
 
 /// \author Youpeng Su (yousu@cern.ch)
-#include <iostream>
-#include <string>
-#include <vector>
-#include <cmath>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/EventSelection.h"
+#include "PWGLF/DataModel/lambdaJetpolarization.h"
+
+#include "PWGJE/Core/JetBkgSubUtils.h"
+#include "PWGJE/Core/JetDerivedDataUtilities.h"
+#include "PWGJE/DataModel/Jet.h"
+#include "PWGJE/DataModel/JetReducedData.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include <TLorentzVector.h>
+
 #include "Framework/ASoA.h"
 #include "Framework/AnalysisDataModel.h"
-#include <TTree.h>
-#include <TFile.h>
-#include <TMatrixD.h>
-#include "TProfile2D.h"
-#include "PWGLF/DataModel/lambdaJetpolarization.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
+#include "Math/GenVector/Boost.h"
 #include "Math/Vector3D.h"
 #include "Math/Vector4D.h"
-#include "Math/GenVector/Boost.h"
+#include "TProfile2D.h"
+#include <TFile.h>
+#include <TLorentzVector.h>
+#include <TMatrixD.h>
+#include <TTree.h>
 
+#include <fastjet/AreaDefinition.hh>
 #include <fastjet/ClusterSequence.hh>
 #include <fastjet/ClusterSequenceArea.hh>
+#include <fastjet/GhostedAreaSpec.hh>
+#include <fastjet/PseudoJet.hh>
+#include <fastjet/Selector.hh>
 #include <fastjet/tools/JetMedianBackgroundEstimator.hh>
 #include <fastjet/tools/Subtractor.hh>
-#include <fastjet/Selector.hh>
-#include <fastjet/PseudoJet.hh>
-#include <fastjet/AreaDefinition.hh>
-#include <fastjet/GhostedAreaSpec.hh>
-#include "PWGJE/Core/JetBkgSubUtils.h"
-#include "PWGJE/Core/JetDerivedDataUtilities.h"
-#include "PWGJE/DataModel/JetReducedData.h"
-#include "PWGJE/DataModel/Jet.h"
-#include "Common/Core/trackUtilities.h"
+
+#include <cmath>
+#include <iostream>
+#include <string>
+#include <vector>
 
 using std::cout;
 using std::endl;
diff --git a/.conflict-side-1/PWGLF/Tasks/Strangeness/lambdak0sflattenicity.cxx b/.conflict-side-1/PWGLF/Tasks/Strangeness/lambdak0sflattenicity.cxx
index 4114d614b90..e8fa858b0b4 100755
--- a/.conflict-side-1/PWGLF/Tasks/Strangeness/lambdak0sflattenicity.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/Strangeness/lambdak0sflattenicity.cxx
@@ -17,26 +17,27 @@
 /// \brief V0 task for production of strange hadrons as a function of flattenicity
 /// \author Suraj Prasad (suraj.prasad@cern.ch)
 
-#include <CommonConstants/MathConstants.h>
-#include <Framework/Configurable.h>
-#include <cmath>
-#include <vector>
-#include <TGraph.h>
-#include <TRandom2.h>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/Utils/inelGt.h"
+
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+#include <CommonConstants/MathConstants.h>
+#include <Framework/Configurable.h>
 
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
+#include <TGraph.h>
+#include <TRandom2.h>
 
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/Utils/inelGt.h"
+#include <cmath>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/Tasks/Strangeness/lambdakzeroanalysisMC.cxx b/.conflict-side-1/PWGLF/Tasks/Strangeness/lambdakzeroanalysisMC.cxx
index afbe1a8a061..7451c31dcf9 100644
--- a/.conflict-side-1/PWGLF/Tasks/Strangeness/lambdakzeroanalysisMC.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/Strangeness/lambdakzeroanalysisMC.cxx
@@ -22,31 +22,33 @@
 //    aimeric.landou@cern.ch (MC adaptation)
 //    david.dobrigkeit.chinellato@cern.ch (original lambdakzeroanalysis task)
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/trackUtilities.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
+#include <Math/Vector4D.h>
+#include <TDatabasePDG.h>
 #include <TFile.h>
 #include <TH2F.h>
-#include <TProfile.h>
 #include <TLorentzVector.h>
-#include <Math/Vector4D.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
-#include <cmath>
+#include <TProfile.h>
+
 #include <array>
+#include <cmath>
 #include <cstdlib>
-#include "Framework/ASoAHelpers.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/Tasks/Strangeness/lambdalambda.cxx b/.conflict-side-1/PWGLF/Tasks/Strangeness/lambdalambda.cxx
index bf8579f105d..0b43d1e85c1 100644
--- a/.conflict-side-1/PWGLF/Tasks/Strangeness/lambdalambda.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/Strangeness/lambdalambda.cxx
@@ -11,51 +11,46 @@
 
 /// \author Junlee Kim (jikim1290@gmail.com)
 
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <chrono>
-#include <string>
-#include <vector>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "TLorentzVector.h"
-#include "TRandom3.h"
-#include "TF1.h"
-#include "TVector3.h"
-#include "Math/Vector3D.h"
-#include "Math/Vector4D.h"
-#include "Math/GenVector/Boost.h"
-#include <TMath.h>
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/StepTHn.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/StaticFor.h"
-
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-
-#include "Common/Core/trackUtilities.h"
-#include "Common/Core/TrackSelection.h"
-
-#include "CommonConstants/PhysicsConstants.h"
-
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
 
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-
-#include "CCDB/CcdbApi.h"
-#include "CCDB/BasicCCDBManager.h"
+#include "Math/GenVector/Boost.h"
+#include "Math/Vector3D.h"
+#include "Math/Vector4D.h"
+#include "TF1.h"
+#include "TLorentzVector.h"
+#include "TRandom3.h"
+#include "TVector3.h"
+#include <TMath.h>
 
-#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include <array>
+#include <chrono>
+#include <cmath>
+#include <cstdlib>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/Tasks/Strangeness/lambdapolarization.cxx b/.conflict-side-1/PWGLF/Tasks/Strangeness/lambdapolarization.cxx
index 38e17ba338a..8a09414f37d 100644
--- a/.conflict-side-1/PWGLF/Tasks/Strangeness/lambdapolarization.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/Strangeness/lambdapolarization.cxx
@@ -11,54 +11,49 @@
 
 /// \author Junlee Kim (jikim1290@gmail.com)
 
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <chrono>
-#include <string>
-#include <vector>
-
-#include "TLorentzVector.h"
-#include "TRandom3.h"
-#include "TF1.h"
-#include "TVector2.h"
-#include "Math/Vector3D.h"
-#include "Math/Vector4D.h"
-#include "Math/GenVector/Boost.h"
-#include <TMath.h>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/StepTHn.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/StaticFor.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGMM/Mult/DataModel/Index.h" // for Particles2Tracks table
 
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Qvectors.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/PIDResponseITS.h"
+#include "Common/DataModel/Qvectors.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "Common/Core/trackUtilities.h"
-#include "Common/Core/TrackSelection.h"
-
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
 #include "CommonConstants/PhysicsConstants.h"
-
-#include "ReconstructionDataFormats/Track.h"
-
-#include "DataFormatsParameters/GRPObject.h"
 #include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/StaticFor.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
-#include "CCDB/CcdbApi.h"
-#include "CCDB/BasicCCDBManager.h"
+#include "Math/GenVector/Boost.h"
+#include "Math/Vector3D.h"
+#include "Math/Vector4D.h"
+#include "TF1.h"
+#include "TLorentzVector.h"
+#include "TRandom3.h"
+#include "TVector2.h"
+#include <TMath.h>
 
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGMM/Mult/DataModel/Index.h" // for Particles2Tracks table
+#include <array>
+#include <chrono>
+#include <cmath>
+#include <cstdlib>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/Tasks/Strangeness/nonPromptCascade.cxx b/.conflict-side-1/PWGLF/Tasks/Strangeness/nonPromptCascade.cxx
index 79e8ad6f4e0..ec4c573a644 100644
--- a/.conflict-side-1/PWGLF/Tasks/Strangeness/nonPromptCascade.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/Strangeness/nonPromptCascade.cxx
@@ -9,41 +9,43 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <cmath>
-#include <memory>
-#include <string>
-#include <vector>
-
-#include "Math/Vector4D.h"
-
-#include "CCDB/BasicCCDBManager.h"
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "DetectorsVertexing/PVertexer.h"
-#include "ReconstructionDataFormats/Vertex.h"
+#include "EventFiltering/Zorro.h"
+#include "EventFiltering/ZorroSummary.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "DCAFitter/DCAFitterN.h"
 #include "DataFormatsParameters/GRPMagField.h"
 #include "DataFormatsParameters/GRPObject.h"
 #include "DataFormatsTPC/BetheBlochAleph.h"
-#include "DCAFitter/DCAFitterN.h"
 #include "DetectorsBase/Propagator.h"
-#include "EventFiltering/Zorro.h"
-#include "EventFiltering/ZorroSummary.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "DetectorsVertexing/PVertexer.h"
 #include "Framework/ASoA.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Vertex.h"
+
+#include "Math/Vector4D.h"
+
+#include <cmath>
+#include <memory>
+#include <string>
+#include <vector>
 // #include "PWGHF/Core/PDG.h"
+#include "PWGLF/DataModel/LFNonPromptCascadeTables.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "ReconstructionDataFormats/DCA.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "PWGLF/DataModel/LFNonPromptCascadeTables.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/Tasks/Strangeness/sigmaanalysis.cxx b/.conflict-side-1/PWGLF/Tasks/Strangeness/sigmaanalysis.cxx
index c01a0a71cae..eb16b8f4b04 100644
--- a/.conflict-side-1/PWGLF/Tasks/Strangeness/sigmaanalysis.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/Strangeness/sigmaanalysis.cxx
@@ -19,35 +19,39 @@
 //    gianni.shigeru.setoue.liveraro@cern.ch
 //
 
-#include <Math/Vector4D.h>
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <string>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/ASoA.h"
-#include "ReconstructionDataFormats/Track.h"
+#include "PWGLF/DataModel/LFSigmaTables.h"
+#include "PWGLF/DataModel/LFStrangenessMLTables.h"
+#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
-#include "PWGLF/DataModel/LFStrangenessMLTables.h"
-#include "PWGLF/DataModel/LFSigmaTables.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
+#include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <Math/Vector4D.h>
+#include <TDatabasePDG.h>
 #include <TFile.h>
 #include <TH2F.h>
-#include <TProfile.h>
 #include <TLorentzVector.h>
 #include <TPDGCode.h>
-#include <TDatabasePDG.h>
+#include <TProfile.h>
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <string>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/Tasks/Strangeness/v0postprocessing.cxx b/.conflict-side-1/PWGLF/Tasks/Strangeness/v0postprocessing.cxx
index 4f6ab094f46..43e93b06ec6 100644
--- a/.conflict-side-1/PWGLF/Tasks/Strangeness/v0postprocessing.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/Strangeness/v0postprocessing.cxx
@@ -13,14 +13,16 @@
 /// \author Francesca Ercolessi (francesca.ercolessi@cern.ch)
 /// \since
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "PWGLF/DataModel/v0qaanalysis.h"
+
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CommonConstants/PhysicsConstants.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/Tasks/Strangeness/v0topologicalcuts.cxx b/.conflict-side-1/PWGLF/Tasks/Strangeness/v0topologicalcuts.cxx
index fd351646bee..d04a84c114d 100644
--- a/.conflict-side-1/PWGLF/Tasks/Strangeness/v0topologicalcuts.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/Strangeness/v0topologicalcuts.cxx
@@ -22,15 +22,18 @@ that are filled with the V0 invariant mass under the K0, Lambda and Antilambda m
 The cuts are passed as configurable strings for convenience.
 This analysis includes two processes, one for Real Data and one for MC Data switchable at the end of the code, only run one at a time*/
 
-#include <memory>
-#include <vector>
-#include <string>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/EventSelection.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+
 #include "CommonUtils/StringUtils.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include <memory>
+#include <string>
+#include <vector>
 
 // namespaces to be used for the plot names and topological cuts that will be given by a configurable string
 namespace cuthistoskzerosh
diff --git a/.conflict-side-1/PWGLF/Tasks/Strangeness/vzero_cascade_absorption.cxx b/.conflict-side-1/PWGLF/Tasks/Strangeness/vzero_cascade_absorption.cxx
index 6ca2e43ba69..3d83711e27b 100644
--- a/.conflict-side-1/PWGLF/Tasks/Strangeness/vzero_cascade_absorption.cxx
+++ b/.conflict-side-1/PWGLF/Tasks/Strangeness/vzero_cascade_absorption.cxx
@@ -12,25 +12,28 @@
 /// \author Alberto Caliva (alberto.caliva@cern.ch)
 /// \since September 26, 2023
 
-#include <cmath>
-#include <TMath.h>
-#include <TPDGCode.h>
-#include <TObjArray.h>
-#include <TLorentzVector.h>
-#include <TDatabasePDG.h>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "ReconstructionDataFormats/Track.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <TDatabasePDG.h>
+#include <TLorentzVector.h>
+#include <TMath.h>
+#include <TObjArray.h>
+#include <TPDGCode.h>
+
+#include <cmath>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGLF/Utils/collisionCuts.h b/.conflict-side-1/PWGLF/Utils/collisionCuts.h
index 399454e9368..c676edd995e 100644
--- a/.conflict-side-1/PWGLF/Utils/collisionCuts.h
+++ b/.conflict-side-1/PWGLF/Utils/collisionCuts.h
@@ -20,11 +20,12 @@
 #ifndef PWGLF_UTILS_COLLISIONCUTS_H_
 #define PWGLF_UTILS_COLLISIONCUTS_H_
 
-#include <vector>
+#include "Common/DataModel/EventSelection.h"
 
 #include "Framework/HistogramRegistry.h"
 #include "Framework/Logger.h"
-#include "Common/DataModel/EventSelection.h"
+
+#include <vector>
 
 namespace o2::analysis
 {
diff --git a/.conflict-side-1/PWGLF/Utils/mcParticle.h b/.conflict-side-1/PWGLF/Utils/mcParticle.h
index e85d98ca5f0..b8a9ffd5def 100644
--- a/.conflict-side-1/PWGLF/Utils/mcParticle.h
+++ b/.conflict-side-1/PWGLF/Utils/mcParticle.h
@@ -20,11 +20,11 @@
 #ifndef PWGLF_UTILS_MCPARTICLE_H_
 #define PWGLF_UTILS_MCPARTICLE_H_
 
+#include "ReconstructionDataFormats/PID.h"
+
 #include <string>
 #include <vector>
 
-#include "ReconstructionDataFormats/PID.h"
-
 namespace o2
 {
 namespace pwglf
diff --git a/.conflict-side-1/PWGLF/Utils/rsnOutput.h b/.conflict-side-1/PWGLF/Utils/rsnOutput.h
index 592eaef40cc..6915aedd052 100644
--- a/.conflict-side-1/PWGLF/Utils/rsnOutput.h
+++ b/.conflict-side-1/PWGLF/Utils/rsnOutput.h
@@ -16,13 +16,13 @@
 #ifndef PWGLF_UTILS_RSNOUTPUT_H_
 #define PWGLF_UTILS_RSNOUTPUT_H_
 
-#include <utility>
-#include <string>
-#include <vector>
-
 #include "Framework/HistogramRegistry.h"
 #include "Framework/Logger.h"
 
+#include <string>
+#include <utility>
+#include <vector>
+
 namespace o2::analysis
 {
 namespace rsn
diff --git a/.conflict-side-1/PWGLF/Utils/strangenessBuilderHelper.h b/.conflict-side-1/PWGLF/Utils/strangenessBuilderHelper.h
index 85257418e0a..5e693ab941f 100644
--- a/.conflict-side-1/PWGLF/Utils/strangenessBuilderHelper.h
+++ b/.conflict-side-1/PWGLF/Utils/strangenessBuilderHelper.h
@@ -12,25 +12,27 @@
 #ifndef PWGLF_UTILS_STRANGENESSBUILDERHELPER_H_
 #define PWGLF_UTILS_STRANGENESSBUILDERHELPER_H_
 
-#include <cstdlib>
-#include <cmath>
-#include <array>
+#include "Common/Core/trackUtilities.h"
+#include "Tools/KFparticle/KFUtilities.h"
+
+#include "CommonConstants/PhysicsConstants.h"
 #include "DCAFitter/DCAFitterN.h"
+#include "DetectorsBase/GeometryManager.h"
 #include "Framework/AnalysisDataModel.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/trackUtilities.h"
-#include "Tools/KFparticle/KFUtilities.h"
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
 
 #ifndef HomogeneousField
 #define HomogeneousField
 #endif
 
 /// includes KFParticle
-#include "KFParticle.h"
 #include "KFPTrack.h"
 #include "KFPVertex.h"
+#include "KFParticle.h"
 #include "KFParticleBase.h"
 #include "KFVertex.h"
 
diff --git a/.conflict-side-1/PWGLF/Utils/svPoolCreator.h b/.conflict-side-1/PWGLF/Utils/svPoolCreator.h
index c0b32c2574e..0a4c3c2d75a 100644
--- a/.conflict-side-1/PWGLF/Utils/svPoolCreator.h
+++ b/.conflict-side-1/PWGLF/Utils/svPoolCreator.h
@@ -12,15 +12,17 @@
 #ifndef PWGLF_UTILS_SVPOOLCREATOR_H_
 #define PWGLF_UTILS_SVPOOLCREATOR_H_
 
-#include <array>
-#include <unordered_map>
-#include <vector>
-#include <utility>
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
 #include "Common/Core/trackUtilities.h"
+
 #include "DCAFitter/DCAFitterN.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+
+#include <array>
+#include <unordered_map>
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::constants;
diff --git a/.conflict-side-1/PWGLF/Utils/v0SelectionGroup.h b/.conflict-side-1/PWGLF/Utils/v0SelectionGroup.h
index a353a86c742..298342d1076 100644
--- a/.conflict-side-1/PWGLF/Utils/v0SelectionGroup.h
+++ b/.conflict-side-1/PWGLF/Utils/v0SelectionGroup.h
@@ -12,12 +12,16 @@
 #ifndef PWGLF_UTILS_V0SELECTIONGROUP_H_
 #define PWGLF_UTILS_V0SELECTIONGROUP_H_
 
-#include <iosfwd>
-#include <Rtypes.h>
-#include <TMath.h>
 #include "v0SelectionBits.h"
-#include "Framework/Logger.h"
+
 #include "CommonConstants/PhysicsConstants.h"
+#include "Framework/Logger.h"
+
+#include <TMath.h>
+
+#include <Rtypes.h>
+
+#include <iosfwd>
 
 class v0SelectionGroup
 {
diff --git a/.conflict-side-1/PWGMM/Lumi/Tasks/LumiFDDFT0.cxx b/.conflict-side-1/PWGMM/Lumi/Tasks/LumiFDDFT0.cxx
index 878e0482f7c..c51de496afe 100644
--- a/.conflict-side-1/PWGMM/Lumi/Tasks/LumiFDDFT0.cxx
+++ b/.conflict-side-1/PWGMM/Lumi/Tasks/LumiFDDFT0.cxx
@@ -10,41 +10,38 @@
 // or submit itself to any jurisdiction.
 // author: akhuntia@cern.ch
 
-#include <array>
-#include <cmath>
-#include <iostream>
-#include <vector>
-
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "CommonUtils/NameConf.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
+#include "CommonConstants/GeomConstants.h"
+#include "CommonUtils/NameConf.h"
+#include "DataFormatsCalibration/MeanVertexObject.h"
+#include "DataFormatsFDD/Digit.h"
+#include "DataFormatsFIT/Triggers.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "DetectorsVertexing/PVertexer.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisDataModel.h"
-
-#include "DetectorsVertexing/PVertexer.h"
 #include "ReconstructionDataFormats/DCA.h"
 #include "ReconstructionDataFormats/PrimaryVertex.h"
 #include "ReconstructionDataFormats/Vertex.h"
 
-#include "DataFormatsFDD/Digit.h"
-#include "DataFormatsFIT/Triggers.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-
-#include "DetectorsBase/GeometryManager.h"
-#include "DetectorsBase/Propagator.h"
-#include "CommonConstants/GeomConstants.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "CCDB/CcdbApi.h"
-#include "DataFormatsCalibration/MeanVertexObject.h"
+#include <array>
+#include <cmath>
+#include <iostream>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGMM/Lumi/Tasks/fitLumi.cxx b/.conflict-side-1/PWGMM/Lumi/Tasks/fitLumi.cxx
index a62771cda66..54e6d0dfc74 100644
--- a/.conflict-side-1/PWGMM/Lumi/Tasks/fitLumi.cxx
+++ b/.conflict-side-1/PWGMM/Lumi/Tasks/fitLumi.cxx
@@ -11,19 +11,20 @@
 
 // author: arvind.khuntia@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Common/DataModel/EventSelection.h"
-#include "DataFormatsFDD/Digit.h"
-#include "DataFormatsFIT/Triggers.h"
 #include "Common/DataModel/FT0Corrected.h"
 
+#include "CCDB/BasicCCDBManager.h"
 #include "CCDB/CcdbApi.h"
 #include "CommonDataFormat/BunchFilling.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPObject.h"
+#include "DataFormatsFDD/Digit.h"
+#include "DataFormatsFIT/Triggers.h"
 #include "DataFormatsParameters/GRPLHCIFData.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TH1F.h"
 #include "TH2F.h"
 
@@ -111,7 +112,7 @@ struct VdMAO2D {
           registry.get<TH1>(HIST("FT0/bcVertexCollBC"))->Fill(localBC);
         }
       } // vertex
-    }   // ft0
+    } // ft0
     nTF++;
   } // process
 
@@ -174,7 +175,7 @@ struct VdMAO2D {
         }
 
       } // vertex
-    }   // fdd
+    } // fdd
   }
   PROCESS_SWITCH(VdMAO2D, processFDD, "Process FDD trigger rates for VdM", true);
 
diff --git a/.conflict-side-1/PWGMM/Lumi/Tasks/lumi.cxx b/.conflict-side-1/PWGMM/Lumi/Tasks/lumi.cxx
index cc0149dbde7..f7d873cbbff 100644
--- a/.conflict-side-1/PWGMM/Lumi/Tasks/lumi.cxx
+++ b/.conflict-side-1/PWGMM/Lumi/Tasks/lumi.cxx
@@ -15,43 +15,35 @@
 // o2-analysis-trackselection -b --isRun3 0 | o2-analysis-mm-lumi -b
 // --configuration json://./config.json
 
-#include <array>
-#include <cmath>
-#include <iostream>
-#include <vector>
-
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
+#include "CommonConstants/GeomConstants.h"
 #include "CommonUtils/NameConf.h"
-
+#include "DataFormatsCalibration/MeanVertexObject.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "DetectorsVertexing/PVertexer.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/runDataProcessing.h"
-
-#include "DetectorsVertexing/PVertexer.h"
-
 #include "ReconstructionDataFormats/DCA.h"
 #include "ReconstructionDataFormats/PrimaryVertex.h"
 #include "ReconstructionDataFormats/Vertex.h"
 
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-
-#include "DetectorsBase/GeometryManager.h"
-#include "DetectorsBase/Propagator.h"
-
-#include "CommonConstants/GeomConstants.h"
-
-#include "CCDB/BasicCCDBManager.h"
-#include "CCDB/CcdbApi.h"
-
-#include "DataFormatsCalibration/MeanVertexObject.h"
+#include <array>
+#include <cmath>
+#include <iostream>
+#include <vector>
 
 namespace o2::aod
 {
diff --git a/.conflict-side-1/PWGMM/Lumi/Tasks/lumiStability.cxx b/.conflict-side-1/PWGMM/Lumi/Tasks/lumiStability.cxx
index 5938ec42cdd..3d57896d080 100644
--- a/.conflict-side-1/PWGMM/Lumi/Tasks/lumiStability.cxx
+++ b/.conflict-side-1/PWGMM/Lumi/Tasks/lumiStability.cxx
@@ -14,26 +14,27 @@
 ///
 /// \author Josue Martinez Garcia, josuem@cern.ch
 
-#include <utility>
-#include <map>
-#include <string>
-#include <vector>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "Common/CCDB/EventSelectionParams.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Framework/ASoAHelpers.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonDataFormat/BunchFilling.h"
 #include "DataFormatsFDD/Digit.h"
 #include "DataFormatsFT0/Digit.h"
 #include "DataFormatsFV0/Digit.h"
-#include "Framework/ASoA.h"
-#include "Common/CCDB/EventSelectionParams.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "CommonDataFormat/BunchFilling.h"
-#include "DataFormatsParameters/GRPLHCIFData.h"
 #include "DataFormatsParameters/GRPECSObject.h"
+#include "DataFormatsParameters/GRPLHCIFData.h"
+#include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include <map>
+#include <string>
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGMM/Mult/Core/include/Axes.h b/.conflict-side-1/PWGMM/Mult/Core/include/Axes.h
index c215a8ba357..7cd9e1f8cc6 100644
--- a/.conflict-side-1/PWGMM/Mult/Core/include/Axes.h
+++ b/.conflict-side-1/PWGMM/Mult/Core/include/Axes.h
@@ -11,8 +11,8 @@
 
 #ifndef PWGMM_MULT_CORE_INCLUDE_AXES_H_
 #define PWGMM_MULT_CORE_INCLUDE_AXES_H_
-#include "Framework/HistogramSpec.h"
 #include "CommonConstants/MathConstants.h"
+#include "Framework/HistogramSpec.h"
 
 namespace pwgmm::mult
 {
diff --git a/.conflict-side-1/PWGMM/Mult/Core/include/Histograms.h b/.conflict-side-1/PWGMM/Mult/Core/include/Histograms.h
index 2b41c9ecefe..a173c0b9460 100644
--- a/.conflict-side-1/PWGMM/Mult/Core/include/Histograms.h
+++ b/.conflict-side-1/PWGMM/Mult/Core/include/Histograms.h
@@ -12,6 +12,7 @@
 #ifndef PWGMM_MULT_CORE_INCLUDE_HISTOGRAMS_H_
 #define PWGMM_MULT_CORE_INCLUDE_HISTOGRAMS_H_
 #include "TPDGCode.h"
+
 #include <array>
 #include <string_view>
 
diff --git a/.conflict-side-1/PWGMM/Mult/DataModel/ReducedTables.h b/.conflict-side-1/PWGMM/Mult/DataModel/ReducedTables.h
index fbdd68b89db..90ebdffbf1a 100644
--- a/.conflict-side-1/PWGMM/Mult/DataModel/ReducedTables.h
+++ b/.conflict-side-1/PWGMM/Mult/DataModel/ReducedTables.h
@@ -11,13 +11,14 @@
 
 #ifndef PWGMM_MULT_DATAMODEL_REDUCEDTABLES_H_
 #define PWGMM_MULT_DATAMODEL_REDUCEDTABLES_H_
-#include <vector>
-
-#include "Framework/AnalysisDataModel.h"
-#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+
+#include <vector>
+
 namespace o2::aod
 {
 
diff --git a/.conflict-side-1/PWGMM/Mult/TableProducer/particles2tracks.cxx b/.conflict-side-1/PWGMM/Mult/TableProducer/particles2tracks.cxx
index 6b7e7db6a17..70db2e8349b 100644
--- a/.conflict-side-1/PWGMM/Mult/TableProducer/particles2tracks.cxx
+++ b/.conflict-side-1/PWGMM/Mult/TableProducer/particles2tracks.cxx
@@ -16,11 +16,11 @@
 /// \brief  A task to create a reverse index from McParticles to Tracks
 ///
 
-#include "Framework/runDataProcessing.h"
+#include "Index.h"
+
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-
-#include "Index.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGMM/Mult/TableProducer/percentiles.cxx b/.conflict-side-1/PWGMM/Mult/TableProducer/percentiles.cxx
index c11fca858f8..1df708f4298 100644
--- a/.conflict-side-1/PWGMM/Mult/TableProducer/percentiles.cxx
+++ b/.conflict-side-1/PWGMM/Mult/TableProducer/percentiles.cxx
@@ -8,20 +8,20 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
+#include "Gencentralities.h"
 #include "Selections.h"
 
+#include "Common/DataModel/Centrality.h"
+#include <Common/DataModel/EventSelection.h>
+#include <Common/DataModel/TrackSelectionTables.h>
+
+#include <CCDB/BasicCCDBManager.h>
 #include <Framework/AnalysisDataModel.h>
 #include <Framework/AnalysisTask.h>
 #include <Framework/Configurable.h>
-#include <Common/DataModel/EventSelection.h>
-#include "Common/DataModel/Centrality.h"
-#include <Common/DataModel/TrackSelectionTables.h>
 #include <Framework/O2DatabasePDGPlugin.h>
-#include <CCDB/BasicCCDBManager.h>
 #include <Framework/runDataProcessing.h>
 
-#include "Gencentralities.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-1/PWGMM/Mult/TableProducer/reducer.cxx b/.conflict-side-1/PWGMM/Mult/TableProducer/reducer.cxx
index de9d516703b..e507ca0d2c4 100644
--- a/.conflict-side-1/PWGMM/Mult/TableProducer/reducer.cxx
+++ b/.conflict-side-1/PWGMM/Mult/TableProducer/reducer.cxx
@@ -9,15 +9,15 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <random>
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-
-#include "Selections.h"
 #include "ReducedTables.h"
+#include "Selections.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
 
+#include <random>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-1/PWGMM/Mult/TableProducer/reducerPostprocess.cxx b/.conflict-side-1/PWGMM/Mult/TableProducer/reducerPostprocess.cxx
index d05f5534eb0..9d4b33a87da 100644
--- a/.conflict-side-1/PWGMM/Mult/TableProducer/reducerPostprocess.cxx
+++ b/.conflict-side-1/PWGMM/Mult/TableProducer/reducerPostprocess.cxx
@@ -9,10 +9,9 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/AnalysisTask.h"
-
 #include "ReducedTables.h"
 
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
 
 using namespace o2;
diff --git a/.conflict-side-1/PWGMM/Mult/TableProducer/trackPropagation.cxx b/.conflict-side-1/PWGMM/Mult/TableProducer/trackPropagation.cxx
index 8eaa59e850b..707c92b324a 100644
--- a/.conflict-side-1/PWGMM/Mult/TableProducer/trackPropagation.cxx
+++ b/.conflict-side-1/PWGMM/Mult/TableProducer/trackPropagation.cxx
@@ -17,25 +17,26 @@
 // collisions to this track, picks the one with the smallest DCAxy and puts it
 // in a table
 
-#include "CCDB/BasicCCDBManager.h"
+#include "bestCollisionTable.h"
+
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/CollisionAssociationTables.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/GeomConstants.h"
 #include "DataFormatsParameters/GRPMagField.h"
 #include "DetectorsBase/Propagator.h"
+#include "Field/MagneticField.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/TrackFwd.h"
+
 #include "Math/MatrixFunctions.h"
 #include "Math/SMatrix.h"
-
-#include "Field/MagneticField.h"
 #include "TGeoGlobalMagField.h"
 
-#include "Common/DataModel/CollisionAssociationTables.h"
-#include "bestCollisionTable.h"
-
 using SMatrix55 = ROOT::Math::SMatrix<double, 5, 5, ROOT::Math::MatRepSym<double, 5>>;
 using SMatrix5 = ROOT::Math::SVector<Double_t, 5>;
 
diff --git a/.conflict-side-1/PWGMM/Mult/Tasks/assessment-mft.cxx b/.conflict-side-1/PWGMM/Mult/Tasks/assessment-mft.cxx
index 70304229e1e..eb2cbba5a22 100644
--- a/.conflict-side-1/PWGMM/Mult/Tasks/assessment-mft.cxx
+++ b/.conflict-side-1/PWGMM/Mult/Tasks/assessment-mft.cxx
@@ -15,11 +15,10 @@
 // \brief This code loops over MFT tracks and fills basic histograms
 //        close to the QC ones
 
-#include "Framework/runDataProcessing.h"
+#include "CommonConstants/LHCConstants.h"
 #include "Framework/AnalysisTask.h"
-
+#include "Framework/runDataProcessing.h"
 #include "MathUtils/Utils.h"
-#include "CommonConstants/LHCConstants.h"
 
 using namespace o2;
 using namespace o2::framework;
@@ -35,7 +34,7 @@ struct AssessmentMFT {
       {"TracksChi2", "; #chi^{2}; tracks", {HistType::kTH1F, {{600, 0, 20}}}},                             //
       {"TracksNclustersEta", "; nClusters; #eta; tracks", {HistType::kTH2F, {{7, 4, 10}, {100, -8, 8}}}},  //
       {"TracksTime", "; time; #count", {HistType::kTH1D, {{6000000, 0, 60000}}}},                          //
-    }                                                                                                      //
+    } //
   };
 
   void process(aod::Collisions::iterator const& collision, aod::MFTTracks const& tracks, aod::BCs const& bcs)
diff --git a/.conflict-side-1/PWGMM/Mult/Tasks/dndeta-hi.cxx b/.conflict-side-1/PWGMM/Mult/Tasks/dndeta-hi.cxx
index 7ac1bc49bb5..f26376eff27 100644
--- a/.conflict-side-1/PWGMM/Mult/Tasks/dndeta-hi.cxx
+++ b/.conflict-side-1/PWGMM/Mult/Tasks/dndeta-hi.cxx
@@ -9,29 +9,25 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <Math/Vector4D.h>
-#include <array>
-#include <cmath>
-#include <chrono>
-#include <cstdlib>
-#include <iostream>
-#include <TFile.h>
-#include <TH2F.h>
-#include <TProfile.h>
-#include <TPDGCode.h>
-#include <TDatabasePDG.h>
-
+#include "Index.h"
 #include "bestCollisionTable.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
+
+#include "PWGHF/Core/SelectorCuts.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "Common/CCDB/EventSelectionParams.h"
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/PIDResponse.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/MathConstants.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
@@ -41,14 +37,21 @@
 #include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/RuntimeError.h"
 #include "Framework/runDataProcessing.h"
-#include "Index.h"
 #include "ReconstructionDataFormats/GlobalTrackID.h"
 #include "ReconstructionDataFormats/Track.h"
 
-#include "PWGHF/Core/SelectorCuts.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include <Math/Vector4D.h>
+#include <TDatabasePDG.h>
+#include <TFile.h>
+#include <TH2F.h>
+#include <TPDGCode.h>
+#include <TProfile.h>
+
+#include <array>
+#include <chrono>
+#include <cmath>
+#include <cstdlib>
+#include <iostream>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGMM/Mult/Tasks/dndeta-mft.cxx b/.conflict-side-1/PWGMM/Mult/Tasks/dndeta-mft.cxx
index f70cc1d638a..e7c925f4a16 100644
--- a/.conflict-side-1/PWGMM/Mult/Tasks/dndeta-mft.cxx
+++ b/.conflict-side-1/PWGMM/Mult/Tasks/dndeta-mft.cxx
@@ -15,9 +15,14 @@
 // \brief This code loops over MFT tracks and collisions and fills histograms
 //        useful to compute dNdeta
 
-#include <chrono>
-#include <cmath>
+#include "bestCollisionTable.h"
+
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
+#include "CommonConstants/MathConstants.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
@@ -25,17 +30,13 @@
 #include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/RuntimeError.h"
 #include "Framework/runDataProcessing.h"
-
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "CommonConstants/MathConstants.h"
 #include "MathUtils/Utils.h"
 #include "ReconstructionDataFormats/GlobalTrackID.h"
+
 #include "TDatabasePDG.h"
 
-#include "bestCollisionTable.h"
+#include <chrono>
+#include <cmath>
 
 using namespace o2;
 using namespace o2::framework;
@@ -108,7 +109,7 @@ struct PseudorapidityDensityMFT {
       {"EventSelection",
        ";status;events",
        {HistType::kTH1F, {{7, 0.5, 7.5}}}}, //
-    }                                       //
+    } //
   };
 
   void init(InitContext&)
diff --git a/.conflict-side-1/PWGMM/Mult/Tasks/dndeta.cxx b/.conflict-side-1/PWGMM/Mult/Tasks/dndeta.cxx
index 220bdbdebb8..97ed3227b9b 100644
--- a/.conflict-side-1/PWGMM/Mult/Tasks/dndeta.cxx
+++ b/.conflict-side-1/PWGMM/Mult/Tasks/dndeta.cxx
@@ -9,27 +9,28 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
+#include "Axes.h"
+#include "Functions.h"
+#include "Gencentralities.h"
+#include "Histograms.h"
+#include "Index.h"
+#include "Selections.h"
+#include "bestCollisionTable.h"
+
 #include "Common/CCDB/EventSelectionParams.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Centrality.h"
+
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/Configurable.h"
 #include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/runDataProcessing.h"
+
 #include <TDatabasePDG.h>
 #include <TPDGCode.h>
 
-#include "Gencentralities.h"
-#include "Index.h"
-#include "bestCollisionTable.h"
-
-#include "Axes.h"
-#include "Functions.h"
-#include "Selections.h"
-#include "Histograms.h"
-
 using namespace o2;
 using namespace o2::aod::track;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGMM/Mult/Tasks/dndetaMFTPbPb.cxx b/.conflict-side-1/PWGMM/Mult/Tasks/dndetaMFTPbPb.cxx
index 4cc9a98d524..35da69384d7 100644
--- a/.conflict-side-1/PWGMM/Mult/Tasks/dndetaMFTPbPb.cxx
+++ b/.conflict-side-1/PWGMM/Mult/Tasks/dndetaMFTPbPb.cxx
@@ -15,15 +15,19 @@
 /// \author Gyula Bencedi, gyula.bencedi@cern.ch
 /// \since  Nov 2024
 
-#include <algorithm>
-#include <chrono>
-#include <cmath>
-#include <numeric>
-#include <vector>
-#include <string>
+#include "Functions.h"
+#include "Index.h"
+#include "bestCollisionTable.h"
 
-#include "CCDB/BasicCCDBManager.h"
+#include "Common/CCDB/ctpRateFetcher.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/CollisionAssociationTables.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonConstants/MathConstants.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
@@ -31,22 +35,17 @@
 #include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/RuntimeError.h"
 #include "Framework/runDataProcessing.h"
-
-#include "Common/CCDB/ctpRateFetcher.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/CollisionAssociationTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "CommonConstants/MathConstants.h"
-
 #include "MathUtils/Utils.h"
 #include "ReconstructionDataFormats/GlobalTrackID.h"
+
 #include "TPDGCode.h"
 
-#include "Functions.h"
-#include "Index.h"
-#include "bestCollisionTable.h"
+#include <algorithm>
+#include <chrono>
+#include <cmath>
+#include <numeric>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGMM/Mult/Tasks/effpt-mft.cxx b/.conflict-side-1/PWGMM/Mult/Tasks/effpt-mft.cxx
index 2d3a9919922..3b343e605a2 100644
--- a/.conflict-side-1/PWGMM/Mult/Tasks/effpt-mft.cxx
+++ b/.conflict-side-1/PWGMM/Mult/Tasks/effpt-mft.cxx
@@ -9,24 +9,27 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <cmath>
-#include "Framework/Configurable.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RuntimeError.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "Framework/runDataProcessing.h"
+#include "Index.h"
 
-#include "ReconstructionDataFormats/GlobalTrackID.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CommonConstants/MathConstants.h"
-#include "TDatabasePDG.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/Configurable.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/RuntimeError.h"
+#include "Framework/runDataProcessing.h"
 #include "MathUtils/Utils.h"
-#include "Index.h"
+#include "ReconstructionDataFormats/GlobalTrackID.h"
+
+#include "TDatabasePDG.h"
+
+#include <cmath>
 
 using namespace o2;
 using namespace o2::framework;
@@ -219,9 +222,9 @@ struct EffPtMFT {
             registry.fill(HIST("TracksPhiEtaGenDuplicates"), particle.phi(), particle.eta());
           }
         } // the particle has a track
-      }   // loop on particlesI
-    }     // loop on collisions
-  }       // end of processTrackEfficiencyIndexed
+      } // loop on particlesI
+    } // loop on collisions
+  } // end of processTrackEfficiencyIndexed
 
   PROCESS_SWITCH(EffPtMFT, processTrackEfficiencyIndexed, "Calculate tracking efficiency vs pt (indexed)", false);
 };
diff --git a/.conflict-side-1/PWGMM/Mult/Tasks/flatenicityFV0.cxx b/.conflict-side-1/PWGMM/Mult/Tasks/flatenicityFV0.cxx
index 3a403d9ea1b..61128107a83 100644
--- a/.conflict-side-1/PWGMM/Mult/Tasks/flatenicityFV0.cxx
+++ b/.conflict-side-1/PWGMM/Mult/Tasks/flatenicityFV0.cxx
@@ -8,8 +8,11 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include <cmath>
-#include <vector>
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
@@ -17,16 +20,13 @@
 #include "Framework/HistogramRegistry.h"
 #include "Framework/StaticFor.h"
 #include "Framework/runDataProcessing.h"
-
 #include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 
 #include <TGraph.h>
 
+#include <cmath>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-1/PWGMM/Mult/Tasks/flattenicty-chrg.cxx b/.conflict-side-1/PWGMM/Mult/Tasks/flattenicty-chrg.cxx
index fbfa4ab578d..9e49ff8918b 100644
--- a/.conflict-side-1/PWGMM/Mult/Tasks/flattenicty-chrg.cxx
+++ b/.conflict-side-1/PWGMM/Mult/Tasks/flattenicty-chrg.cxx
@@ -17,29 +17,29 @@
 //
 // \since 2024
 
-#include <cmath>
-#include <string>
-#include <string_view>
-#include <vector>
-
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 #include "EventFiltering/filterTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
+#include "DataFormatsFT0/Digit.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/StaticFor.h"
 #include "Framework/runDataProcessing.h"
-
-#include "CCDB/BasicCCDBManager.h"
-#include "CCDB/CcdbApi.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "DataFormatsFT0/Digit.h"
 #include "ReconstructionDataFormats/Track.h"
 
+#include <cmath>
+#include <string>
+#include <string_view>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-1/PWGMM/Mult/Tasks/heavy-ion-mult.cxx b/.conflict-side-1/PWGMM/Mult/Tasks/heavy-ion-mult.cxx
index bb12521502d..b6de125b7f0 100644
--- a/.conflict-side-1/PWGMM/Mult/Tasks/heavy-ion-mult.cxx
+++ b/.conflict-side-1/PWGMM/Mult/Tasks/heavy-ion-mult.cxx
@@ -18,22 +18,21 @@
 // 3. https://github.com/AliceO2Group/O2Physics/blob/master/PWGMM/Mult/Tasks/puremc-dndeta.cxx
 // 4. O2 analysis tutorial: https://indico.cern.ch/event/1267433/
 
-#include <cmath>
-#include <cstdlib>
-#include <iostream>
-#include <TPDGCode.h>
-#include <TDatabasePDG.h>
-#include <vector>
-
+#include "Index.h"
 #include "bestCollisionTable.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "Common/Core/trackUtilities.h"
+
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "Common/CCDB/EventSelectionParams.h"
 #include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/MathConstants.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
@@ -43,9 +42,14 @@
 #include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/GlobalTrackID.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "Index.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include <TDatabasePDG.h>
+#include <TPDGCode.h>
+
+#include <cmath>
+#include <cstdlib>
+#include <iostream>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGMM/Mult/Tasks/mcdata_split_test.cxx b/.conflict-side-1/PWGMM/Mult/Tasks/mcdata_split_test.cxx
index 5d5194be4be..731e8877b8a 100644
--- a/.conflict-side-1/PWGMM/Mult/Tasks/mcdata_split_test.cxx
+++ b/.conflict-side-1/PWGMM/Mult/Tasks/mcdata_split_test.cxx
@@ -13,17 +13,15 @@
 ///
 /// \author hhesouno
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
-
-#include "ReconstructionDataFormats/GlobalTrackID.h"
-
-#include "Common/DataModel/EventSelection.h"
-
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/GlobalTrackID.h"
 
 #include <TRandom.h>
 
diff --git a/.conflict-side-1/PWGMM/Mult/Tasks/multiplicityPbPb.cxx b/.conflict-side-1/PWGMM/Mult/Tasks/multiplicityPbPb.cxx
index 367b7e991a6..c3a4d1baeab 100644
--- a/.conflict-side-1/PWGMM/Mult/Tasks/multiplicityPbPb.cxx
+++ b/.conflict-side-1/PWGMM/Mult/Tasks/multiplicityPbPb.cxx
@@ -13,17 +13,15 @@
 ///
 /// \author hhesouno
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
-
-#include "ReconstructionDataFormats/GlobalTrackID.h"
-
-#include "Common/DataModel/EventSelection.h"
-
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/GlobalTrackID.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGMM/Mult/Tasks/puremc-dndeta.cxx b/.conflict-side-1/PWGMM/Mult/Tasks/puremc-dndeta.cxx
index 86e52b38850..bc033151387 100644
--- a/.conflict-side-1/PWGMM/Mult/Tasks/puremc-dndeta.cxx
+++ b/.conflict-side-1/PWGMM/Mult/Tasks/puremc-dndeta.cxx
@@ -9,17 +9,19 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
+#include "Axes.h"
+#include "Histograms.h"
+
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/runDataProcessing.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+
 #include <TDatabasePDG.h>
 #include <TPDGCode.h>
 
-#include "Axes.h"
-#include "Histograms.h"
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-1/PWGMM/Mult/Tasks/run2dndeta.cxx b/.conflict-side-1/PWGMM/Mult/Tasks/run2dndeta.cxx
index 9db9fd291d9..f3b5012010b 100644
--- a/.conflict-side-1/PWGMM/Mult/Tasks/run2dndeta.cxx
+++ b/.conflict-side-1/PWGMM/Mult/Tasks/run2dndeta.cxx
@@ -8,25 +8,26 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include <cmath>
-#include "Framework/Configurable.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonConstants/MathConstants.h"
 #include "Framework/ASoAHelpers.h"
-#include "Framework/RuntimeError.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/Configurable.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/RuntimeError.h"
 #include "Framework/runDataProcessing.h"
-
 #include "ReconstructionDataFormats/GlobalTrackID.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "CommonConstants/MathConstants.h"
-#include "TDatabasePDG.h"
 
+#include "TDatabasePDG.h"
 #include <TF1.h>
 
+#include <cmath>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
@@ -56,7 +57,7 @@ struct PseudorapidityDensity {
       {"TracksEtaZvtx_gt0", "; #eta; Z_{vtx}; tracks", {HistType::kTH2F, {{21, -2.1, 2.1}, {201, -20.1, 20.1}}}},    //
       {"TracksPhiEta", "; #varphi; #eta; tracks", {HistType::kTH2F, {{600, 0, 2 * M_PI}, {21, -2.1, 2.1}}}},         //
       {"EventSelection", ";status;events", {HistType::kTH1F, {{4, 0.5, 4.5}}}}                                       //
-    }                                                                                                                //
+    } //
   };
 
   void init(InitContext&)
diff --git a/.conflict-side-1/PWGMM/Mult/Tasks/vertexing-fwd.cxx b/.conflict-side-1/PWGMM/Mult/Tasks/vertexing-fwd.cxx
index aecb9e7cd9c..cce0162eb7e 100644
--- a/.conflict-side-1/PWGMM/Mult/Tasks/vertexing-fwd.cxx
+++ b/.conflict-side-1/PWGMM/Mult/Tasks/vertexing-fwd.cxx
@@ -16,18 +16,19 @@
 // \brief This code loops over every ambiguous MFT tracks and associates
 // them to a collision that has the smallest DCAxy
 
-#include <cmath>
+#include "CommonConstants/LHCConstants.h"
+#include "CommonConstants/MathConstants.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/Configurable.h"
+#include "Framework/runDataProcessing.h"
+#include "MathUtils/Utils.h"
 #include "ReconstructionDataFormats/TrackFwd.h"
+
 #include "Math/MatrixFunctions.h"
 #include "Math/SMatrix.h"
-#include "MathUtils/Utils.h"
-#include "Framework/Configurable.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/runDataProcessing.h"
 
-#include "CommonConstants/MathConstants.h"
-#include "CommonConstants/LHCConstants.h"
+#include <cmath>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGMM/UE/Tasks/dedx_analysys.cxx b/.conflict-side-1/PWGMM/UE/Tasks/dedx_analysys.cxx
index 13c8b32b20e..37b67cb01b6 100644
--- a/.conflict-side-1/PWGMM/UE/Tasks/dedx_analysys.cxx
+++ b/.conflict-side-1/PWGMM/UE/Tasks/dedx_analysys.cxx
@@ -12,19 +12,21 @@
 /// \author Paola Vargas
 /// \since January 8, 2025
 
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Multiplicity.h"
+
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "ReconstructionDataFormats/Track.h"
 
 using namespace o2;
diff --git a/.conflict-side-1/PWGMM/UE/Tasks/ue-zdc-analysys.cxx b/.conflict-side-1/PWGMM/UE/Tasks/ue-zdc-analysys.cxx
index ec5294f7248..9f7c48a0aaf 100644
--- a/.conflict-side-1/PWGMM/UE/Tasks/ue-zdc-analysys.cxx
+++ b/.conflict-side-1/PWGMM/UE/Tasks/ue-zdc-analysys.cxx
@@ -12,16 +12,17 @@
 /// \brief Task for ZDC
 /// \author
 /// \since
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/CCDB/EventSelectionParams.h"
 #include "Common/CCDB/TriggerAliases.h"
+#include "Common/Core/TrackSelection.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/Core/TrackSelection.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/GlobalTrackID.h"
 #include "ReconstructionDataFormats/Track.h"
 
diff --git a/.conflict-side-1/PWGMM/UE/Tasks/uecharged.cxx b/.conflict-side-1/PWGMM/UE/Tasks/uecharged.cxx
index 9cfaeb96022..8e2d6a01bc0 100644
--- a/.conflict-side-1/PWGMM/UE/Tasks/uecharged.cxx
+++ b/.conflict-side-1/PWGMM/UE/Tasks/uecharged.cxx
@@ -12,30 +12,30 @@
 /// \since November 2021
 /// \last update: July 2024
 
-#include <cmath>
-#include <vector>
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/StaticFor.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-
+#include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/Core/TrackSelectionDefaults.h"
 
 #include "TDatabasePDG.h"
+#include <TF1.h>
 #include <TH1F.h>
 #include <TH2F.h>
-#include <TF1.h>
 #include <TRandom.h>
 
+#include <cmath>
+#include <vector>
+
 // TODO: implement 50% stat for MC closure vs 50% for testing, add flag for weak decays
 
 using namespace o2;
diff --git a/.conflict-side-1/PWGUD/AQC/FITtest.cxx b/.conflict-side-1/PWGUD/AQC/FITtest.cxx
index bdeaaa34426..a522d758d4a 100644
--- a/.conflict-side-1/PWGUD/AQC/FITtest.cxx
+++ b/.conflict-side-1/PWGUD/AQC/FITtest.cxx
@@ -13,18 +13,19 @@
 /// \author Anisa Khatun, anisa.khatun@cern.ch
 /// \since  04.08.2023
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "ReconstructionDataFormats/BCRange.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/DataModel/FT0Corrected.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/DataModel/FT0Corrected.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "CommonConstants/LHCConstants.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
+#include "CommonConstants/LHCConstants.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/BCRange.h"
+
 #include "TLorentzVector.h"
 
 using namespace o2;
diff --git a/.conflict-side-1/PWGUD/AQC/udQC.cxx b/.conflict-side-1/PWGUD/AQC/udQC.cxx
index 3da67d1f683..0c1ad7dba40 100644
--- a/.conflict-side-1/PWGUD/AQC/udQC.cxx
+++ b/.conflict-side-1/PWGUD/AQC/udQC.cxx
@@ -14,18 +14,22 @@
 /// \author Paul Buehler, paul.buehler@oeaw.ac.at
 /// \since  04.05.2023
 
-#include <vector>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "ReconstructionDataFormats/BCRange.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/DataModel/FT0Corrected.h"
 #include "PWGUD/Core/UDHelpers.h"
+
+#include "Common/DataModel/FT0Corrected.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/BCRange.h"
+
 #include "TLorentzVector.h"
 #include "TMath.h"
 
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-1/PWGUD/AQC/udQCmidRap.cxx b/.conflict-side-1/PWGUD/AQC/udQCmidRap.cxx
index acb35f21f57..43643d33707 100644
--- a/.conflict-side-1/PWGUD/AQC/udQCmidRap.cxx
+++ b/.conflict-side-1/PWGUD/AQC/udQCmidRap.cxx
@@ -14,14 +14,17 @@
 /// \author Paul Buehler
 /// \since 17.01.2023
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "ReconstructionDataFormats/BCRange.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/DataModel/FT0Corrected.h"
 #include "PWGUD/Core/UDHelpers.h"
+
+#include "Common/DataModel/FT0Corrected.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/BCRange.h"
+
 #include "TLorentzVector.h"
 #include "TMath.h"
 
diff --git a/.conflict-side-1/PWGUD/Core/DGCutparHolder.h b/.conflict-side-1/PWGUD/Core/DGCutparHolder.h
index 8312d72ac32..a67aefc4080 100644
--- a/.conflict-side-1/PWGUD/Core/DGCutparHolder.h
+++ b/.conflict-side-1/PWGUD/Core/DGCutparHolder.h
@@ -13,6 +13,7 @@
 #define PWGUD_CORE_DGCUTPARHOLDER_H_
 
 #include <Rtypes.h>
+
 #include <vector>
 
 // object to hold customizable cut values
diff --git a/.conflict-side-1/PWGUD/Core/DGPIDSelector.cxx b/.conflict-side-1/PWGUD/Core/DGPIDSelector.cxx
index 04dab87ef7a..2efc0372916 100644
--- a/.conflict-side-1/PWGUD/Core/DGPIDSelector.cxx
+++ b/.conflict-side-1/PWGUD/Core/DGPIDSelector.cxx
@@ -8,11 +8,13 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include <vector>
-#include <string>
-#include "CommonConstants/PhysicsConstants.h"
 #include "DGPIDSelector.h"
 
+#include "CommonConstants/PhysicsConstants.h"
+
+#include <string>
+#include <vector>
+
 // -----------------------------------------------------------------------------
 float particleMass(TDatabasePDG* pdg, int pid)
 {
diff --git a/.conflict-side-1/PWGUD/Core/DGPIDSelector.h b/.conflict-side-1/PWGUD/Core/DGPIDSelector.h
index c130c2094ce..191396b1074 100644
--- a/.conflict-side-1/PWGUD/Core/DGPIDSelector.h
+++ b/.conflict-side-1/PWGUD/Core/DGPIDSelector.h
@@ -12,12 +12,15 @@
 #ifndef PWGUD_CORE_DGPIDSELECTOR_H_
 #define PWGUD_CORE_DGPIDSELECTOR_H_
 
-#include <gandiva/projector.h>
-#include <vector>
-#include <TVector3.h>
+#include "Framework/Logger.h"
+
 #include "TDatabasePDG.h"
 #include "TLorentzVector.h"
-#include "Framework/Logger.h"
+#include <TVector3.h>
+
+#include <gandiva/projector.h>
+
+#include <vector>
 
 const int numDGPIDCutParameters = 9;
 float particleMass(TDatabasePDG* pdg, int pid);
diff --git a/.conflict-side-1/PWGUD/Core/DGSelector.h b/.conflict-side-1/PWGUD/Core/DGSelector.h
index c9349da9247..bcf29920c5a 100644
--- a/.conflict-side-1/PWGUD/Core/DGSelector.h
+++ b/.conflict-side-1/PWGUD/Core/DGSelector.h
@@ -12,14 +12,16 @@
 #ifndef PWGUD_CORE_DGSELECTOR_H_
 #define PWGUD_CORE_DGSELECTOR_H_
 
-#include <vector>
+#include "PWGUD/Core/DGCutparHolder.h"
+#include "PWGUD/Core/UDHelpers.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/Logger.h"
 
 #include "TDatabasePDG.h"
 #include "TLorentzVector.h"
-#include "Framework/Logger.h"
-#include "Framework/AnalysisTask.h"
-#include "PWGUD/Core/UDHelpers.h"
-#include "PWGUD/Core/DGCutparHolder.h"
+
+#include <vector>
 
 // -----------------------------------------------------------------------------
 // add here Selectors for different types of diffractive events
diff --git a/.conflict-side-1/PWGUD/Core/SGCutParHolder.h b/.conflict-side-1/PWGUD/Core/SGCutParHolder.h
index 753e9f0c96f..fcee2d79703 100644
--- a/.conflict-side-1/PWGUD/Core/SGCutParHolder.h
+++ b/.conflict-side-1/PWGUD/Core/SGCutParHolder.h
@@ -13,6 +13,7 @@
 #define PWGUD_CORE_SGCUTPARHOLDER_H_
 
 #include <Rtypes.h>
+
 #include <vector>
 
 // object to hold customizable cut values
diff --git a/.conflict-side-1/PWGUD/Core/SGTrackSelector.h b/.conflict-side-1/PWGUD/Core/SGTrackSelector.h
index 4288ef89e80..11517771eac 100644
--- a/.conflict-side-1/PWGUD/Core/SGTrackSelector.h
+++ b/.conflict-side-1/PWGUD/Core/SGTrackSelector.h
@@ -16,16 +16,19 @@
 #ifndef PWGUD_CORE_SGTRACKSELECTOR_H_
 #define PWGUD_CORE_SGTRACKSELECTOR_H_
 
-#include <vector>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
+#include "PWGUD/Core/SGSelector.h"
+#include "PWGUD/DataModel/UDTables.h"
+
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include <iostream>
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/SGSelector.h"
-#include <TString.h>
+#include "Framework/runDataProcessing.h"
+
 #include "TVector3.h"
+#include <TString.h>
+
+#include <iostream>
+#include <vector>
 using namespace std;
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-side-1/PWGUD/Core/UDFSParser.cxx b/.conflict-side-1/PWGUD/Core/UDFSParser.cxx
index 8759e404f69..c7206806307 100644
--- a/.conflict-side-1/PWGUD/Core/UDFSParser.cxx
+++ b/.conflict-side-1/PWGUD/Core/UDFSParser.cxx
@@ -9,10 +9,11 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/Logger.h"
+#include "UDFSParser.h"
+
 #include "CommonConstants/LHCConstants.h"
 #include "CommonDataFormat/BunchFilling.h"
-#include "UDFSParser.h"
+#include "Framework/Logger.h"
 
 // -----------------------------------------------------------------------------
 UDFSParser::UDFSParser(const char* filename)
diff --git a/.conflict-side-1/PWGUD/Core/UDGoodRunSelector.cxx b/.conflict-side-1/PWGUD/Core/UDGoodRunSelector.cxx
index ec51580cccf..06940cd3728 100644
--- a/.conflict-side-1/PWGUD/Core/UDGoodRunSelector.cxx
+++ b/.conflict-side-1/PWGUD/Core/UDGoodRunSelector.cxx
@@ -9,11 +9,14 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <algorithm>
+#include "PWGUD/Core/UDGoodRunSelector.h"
+
 #include "Framework/Logger.h"
+
 #include "rapidjson/document.h"
 #include "rapidjson/filereadstream.h"
-#include "PWGUD/Core/UDGoodRunSelector.h"
+
+#include <algorithm>
 
 class TFile;
 
diff --git a/.conflict-side-1/PWGUD/Core/UDGoodRunSelector.h b/.conflict-side-1/PWGUD/Core/UDGoodRunSelector.h
index 4cf49330698..1b73f2c3ac4 100644
--- a/.conflict-side-1/PWGUD/Core/UDGoodRunSelector.h
+++ b/.conflict-side-1/PWGUD/Core/UDGoodRunSelector.h
@@ -12,8 +12,8 @@
 #ifndef PWGUD_CORE_UDGOODRUNSELECTOR_H_
 #define PWGUD_CORE_UDGOODRUNSELECTOR_H_
 
-#include <string>
 #include <map>
+#include <string>
 #include <vector>
 
 // A class to select good runs
diff --git a/.conflict-side-1/PWGUD/Core/UDHelpers.h b/.conflict-side-1/PWGUD/Core/UDHelpers.h
index 4b692f7c5c1..ba7dc979a18 100644
--- a/.conflict-side-1/PWGUD/Core/UDHelpers.h
+++ b/.conflict-side-1/PWGUD/Core/UDHelpers.h
@@ -16,19 +16,22 @@
 #ifndef PWGUD_CORE_UDHELPERS_H_
 #define PWGUD_CORE_UDHELPERS_H_
 
-#include <vector>
-#include <bitset>
+#include "PWGUD/Core/DGCutparHolder.h"
+#include "PWGUD/Core/UPCHelpers.h"
 
-#include "TLorentzVector.h"
-#include "Framework/Logger.h"
-#include "DataFormatsFT0/Digit.h"
-#include "DataFormatsFIT/Triggers.h"
-#include "CommonConstants/LHCConstants.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/Core/UPCHelpers.h"
-#include "PWGUD/Core/DGCutparHolder.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonConstants/LHCConstants.h"
+#include "DataFormatsFIT/Triggers.h"
+#include "DataFormatsFT0/Digit.h"
+#include "Framework/Logger.h"
+
+#include "TLorentzVector.h"
+
+#include <bitset>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGUD/Core/UPCHelpers.h b/.conflict-side-1/PWGUD/Core/UPCHelpers.h
index 03ff2475c8c..b4d0dfa8899 100644
--- a/.conflict-side-1/PWGUD/Core/UPCHelpers.h
+++ b/.conflict-side-1/PWGUD/Core/UPCHelpers.h
@@ -12,13 +12,17 @@
 #ifndef PWGUD_CORE_UPCHELPERS_H_
 #define PWGUD_CORE_UPCHELPERS_H_
 
-#include "Framework/AnalysisDataModel.h"
-#include "Common/DataModel/EventSelection.h"
+#include "UPCCutparHolder.h"
+
+#include "PWGUD/DataModel/UDTables.h"
+
 #include "Common/CCDB/EventSelectionParams.h"
+#include "Common/DataModel/EventSelection.h"
+
 #include "CommonConstants/LHCConstants.h"
+#include "Framework/AnalysisDataModel.h"
+
 #include "TLorentzVector.h"
-#include "UPCCutparHolder.h"
-#include "PWGUD/DataModel/UDTables.h"
 
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-1/PWGUD/Core/UPCJpsiCentralBarrelCorrHelper.h b/.conflict-side-1/PWGUD/Core/UPCJpsiCentralBarrelCorrHelper.h
index 955601495e6..77d3781cbc0 100644
--- a/.conflict-side-1/PWGUD/Core/UPCJpsiCentralBarrelCorrHelper.h
+++ b/.conflict-side-1/PWGUD/Core/UPCJpsiCentralBarrelCorrHelper.h
@@ -16,10 +16,11 @@
 #ifndef PWGUD_CORE_UPCJPSICENTRALBARRELCORRHELPER_H_
 #define PWGUD_CORE_UPCJPSICENTRALBARRELCORRHELPER_H_
 
-#include <vector>
-#include <algorithm>
 #include "CommonConstants/MathConstants.h"
+
+#include <algorithm>
 #include <random>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGUD/Core/UPCPairCuts.h b/.conflict-side-1/PWGUD/Core/UPCPairCuts.h
index 6b0e37adca0..f0cdf532561 100644
--- a/.conflict-side-1/PWGUD/Core/UPCPairCuts.h
+++ b/.conflict-side-1/PWGUD/Core/UPCPairCuts.h
@@ -16,14 +16,14 @@
 #ifndef PWGUD_CORE_UPCPAIRCUTS_H_
 #define PWGUD_CORE_UPCPAIRCUTS_H_
 
-#include <cmath>
+#include "PWGUD/Core/UPCTauCentralBarrelHelperRL.h"
 
-#include "Framework/Logger.h"
-#include "Framework/HistogramRegistry.h"
 #include "CommonConstants/MathConstants.h"
 #include "CommonConstants/PhysicsConstants.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/Logger.h"
 
-#include "PWGUD/Core/UPCTauCentralBarrelHelperRL.h"
+#include <cmath>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGUD/Core/decayTree.cxx b/.conflict-side-1/PWGUD/Core/decayTree.cxx
index 026c77af706..f5691c42bcd 100644
--- a/.conflict-side-1/PWGUD/Core/decayTree.cxx
+++ b/.conflict-side-1/PWGUD/Core/decayTree.cxx
@@ -9,16 +9,17 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <utility>
+#include "decayTree.h"
+
+#include "rapidjson/document.h"
+#include "rapidjson/filereadstream.h"
+
 #include <cstdio>
 #include <map>
 #include <string>
+#include <utility>
 #include <vector>
 
-#include "rapidjson/document.h"
-#include "rapidjson/filereadstream.h"
-#include "decayTree.h"
-
 using namespace rapidjson;
 
 // -----------------------------------------------------------------------------
diff --git a/.conflict-side-1/PWGUD/Core/decayTree.h b/.conflict-side-1/PWGUD/Core/decayTree.h
index 3dd4f53578b..22680126420 100644
--- a/.conflict-side-1/PWGUD/Core/decayTree.h
+++ b/.conflict-side-1/PWGUD/Core/decayTree.h
@@ -12,17 +12,18 @@
 #ifndef PWGUD_CORE_DECAYTREE_H_
 #define PWGUD_CORE_DECAYTREE_H_
 
-#include <utility>
-#include <map>
-#include <vector>
-#include <string>
-
 #include "Framework/AnalysisTask.h"
-#include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/Logger.h"
-#include "TLorentzVector.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+
 #include "TDatabasePDG.h"
+#include "TLorentzVector.h"
+
+#include <map>
+#include <string>
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGUD/DataModel/SGTables.h b/.conflict-side-1/PWGUD/DataModel/SGTables.h
index bf9ef68da96..672d8f1763f 100644
--- a/.conflict-side-1/PWGUD/DataModel/SGTables.h
+++ b/.conflict-side-1/PWGUD/DataModel/SGTables.h
@@ -12,14 +12,16 @@
 #ifndef PWGUD_DATAMODEL_SGTABLES_H_
 #define PWGUD_DATAMODEL_SGTABLES_H_
 
-#include <vector>
-#include <cmath>
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoA.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/DataTypes.h"
 #include "MathUtils/Utils.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+
+#include <cmath>
+#include <vector>
 
 namespace o2::aod
 {
diff --git a/.conflict-side-1/PWGUD/TableProducer/Converters/UDCollisionSelExtrasConverter.cxx b/.conflict-side-1/PWGUD/TableProducer/Converters/UDCollisionSelExtrasConverter.cxx
index 1fa1882e7d5..d8585bc3377 100644
--- a/.conflict-side-1/PWGUD/TableProducer/Converters/UDCollisionSelExtrasConverter.cxx
+++ b/.conflict-side-1/PWGUD/TableProducer/Converters/UDCollisionSelExtrasConverter.cxx
@@ -20,11 +20,12 @@
 
 /// \author Sasha Bylinkin <alexandr.bylinkin@cern.ch>
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "PWGUD/DataModel/UDTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-side-1/PWGUD/TableProducer/Converters/UDCollisionSelExtrasV002Converter.cxx b/.conflict-side-1/PWGUD/TableProducer/Converters/UDCollisionSelExtrasV002Converter.cxx
index b10b467ec4d..967c94a2b18 100644
--- a/.conflict-side-1/PWGUD/TableProducer/Converters/UDCollisionSelExtrasV002Converter.cxx
+++ b/.conflict-side-1/PWGUD/TableProducer/Converters/UDCollisionSelExtrasV002Converter.cxx
@@ -13,11 +13,12 @@
 /// \brief Converts UDCollisionSelExtras table from version 000 to 002 and 001 to 002
 /// \author Roman Lavicka <roman.lavicka@cern.ch>
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "PWGUD/DataModel/UDTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-side-1/PWGUD/TableProducer/Converters/UDCollisionsConverter.cxx b/.conflict-side-1/PWGUD/TableProducer/Converters/UDCollisionsConverter.cxx
index 8be7bce717b..27883d2592d 100644
--- a/.conflict-side-1/PWGUD/TableProducer/Converters/UDCollisionsConverter.cxx
+++ b/.conflict-side-1/PWGUD/TableProducer/Converters/UDCollisionsConverter.cxx
@@ -20,11 +20,12 @@
 
 /// \author Sasha Bylinkin <alexandr.bylinkin@cern.ch>
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "PWGUD/DataModel/UDTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-side-1/PWGUD/TableProducer/Converters/UDFwdTracksExtraConverter.cxx b/.conflict-side-1/PWGUD/TableProducer/Converters/UDFwdTracksExtraConverter.cxx
index f9b1f2d0d22..bf2fd2cb4da 100644
--- a/.conflict-side-1/PWGUD/TableProducer/Converters/UDFwdTracksExtraConverter.cxx
+++ b/.conflict-side-1/PWGUD/TableProducer/Converters/UDFwdTracksExtraConverter.cxx
@@ -21,11 +21,12 @@
 
 /// \author Andrea Giovanni Riffero <andrea.giovanni.riffero@cern.ch>
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "PWGUD/DataModel/UDTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-side-1/PWGUD/TableProducer/DGBCCandProducer.cxx b/.conflict-side-1/PWGUD/TableProducer/DGBCCandProducer.cxx
index 97b60c42c9e..d5a3b64214c 100644
--- a/.conflict-side-1/PWGUD/TableProducer/DGBCCandProducer.cxx
+++ b/.conflict-side-1/PWGUD/TableProducer/DGBCCandProducer.cxx
@@ -14,15 +14,18 @@
 /// \author Paul Buehler, paul.buehler@oeaw.ac.at
 /// \since  30.09.2022
 
-#include <algorithm>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "ReconstructionDataFormats/Vertex.h"
-#include "PWGUD/DataModel/UDTables.h"
+#include "DGBCCandProducer.h"
+
+#include "PWGUD/Core/DGSelector.h"
 #include "PWGUD/Core/UDHelpers.h"
 #include "PWGUD/Core/UPCHelpers.h"
-#include "PWGUD/Core/DGSelector.h"
-#include "DGBCCandProducer.h"
+#include "PWGUD/DataModel/UDTables.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Vertex.h"
+
+#include <algorithm>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGUD/TableProducer/DGBCCandProducer.h b/.conflict-side-1/PWGUD/TableProducer/DGBCCandProducer.h
index 07717afbfde..66f67b32a50 100644
--- a/.conflict-side-1/PWGUD/TableProducer/DGBCCandProducer.h
+++ b/.conflict-side-1/PWGUD/TableProducer/DGBCCandProducer.h
@@ -16,12 +16,13 @@
 #ifndef PWGUD_TABLEPRODUCER_DGBCCANDPRODUCER_H_
 #define PWGUD_TABLEPRODUCER_DGBCCANDPRODUCER_H_
 
-#include <map>
-#include <vector>
 #include "Framework/ASoA.h"
 #include "Framework/AnalysisDataModel.h"
-#include "MathUtils/Utils.h"
 #include "Framework/DataTypes.h"
+#include "MathUtils/Utils.h"
+
+#include <map>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGUD/TableProducer/fwdTrackPropagation.cxx b/.conflict-side-1/PWGUD/TableProducer/fwdTrackPropagation.cxx
index cc6ba621690..523035ad0f6 100644
--- a/.conflict-side-1/PWGUD/TableProducer/fwdTrackPropagation.cxx
+++ b/.conflict-side-1/PWGUD/TableProducer/fwdTrackPropagation.cxx
@@ -12,22 +12,22 @@
 /// \author Diana Krupova, diana.krupova@cern.ch
 /// \since 04.06.2024
 
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
+#include "PWGUD/DataModel/UDTables.h"
 
 #include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include "TGeoGlobalMagField.h"
-#include "Field/MagneticField.h"
 #include "DetectorsBase/Propagator.h"
+#include "Field/MagneticField.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 #include "GlobalTracking/MatchGlobalFwd.h"
 #include "MCHTracking/TrackExtrap.h"
 #include "MCHTracking/TrackParam.h"
-#include "Math/SMatrix.h"
 #include "ReconstructionDataFormats/TrackFwd.h"
 
-#include "PWGUD/DataModel/UDTables.h"
+#include "Math/SMatrix.h"
+#include "TGeoGlobalMagField.h"
 
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-1/PWGUD/TableProducer/tauEventTableProducer.cxx b/.conflict-side-1/PWGUD/TableProducer/tauEventTableProducer.cxx
index 548d8701689..158dabadec0 100644
--- a/.conflict-side-1/PWGUD/TableProducer/tauEventTableProducer.cxx
+++ b/.conflict-side-1/PWGUD/TableProducer/tauEventTableProducer.cxx
@@ -17,20 +17,25 @@
 //
 
 // C++ headers
+#include <algorithm>
+#include <random>
 #include <set>
 #include <utility>
-#include <algorithm>
 #include <vector>
-#include <random>
 
 // O2 headers
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/runDataProcessing.h"
 
 // O2Physics headers
+#include "PWGUD/Core/SGSelector.h"
+#include "PWGUD/Core/UPCTauCentralBarrelHelperRL.h"
+#include "PWGUD/DataModel/TauEventTables.h"
+#include "PWGUD/DataModel/UDTables.h"
+
 #include "Common/CCDB/EventSelectionParams.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
@@ -38,10 +43,6 @@
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "PWGUD/Core/UPCTauCentralBarrelHelperRL.h"
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/DataModel/TauEventTables.h"
-#include "PWGUD/Core/SGSelector.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGUD/TableProducer/udMcCollisions2udCollisions.cxx b/.conflict-side-1/PWGUD/TableProducer/udMcCollisions2udCollisions.cxx
index cea35fb70ea..2522dd65896 100644
--- a/.conflict-side-1/PWGUD/TableProducer/udMcCollisions2udCollisions.cxx
+++ b/.conflict-side-1/PWGUD/TableProducer/udMcCollisions2udCollisions.cxx
@@ -16,13 +16,14 @@
 /// \brief  A task to create a reverse index from UDMcCollisions to UDCollisions
 ///
 
-#include <vector>
+#include "PWGUD/DataModel/UDIndex.h"
+#include "PWGUD/DataModel/UDTables.h"
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/DataModel/UDIndex.h"
+#include "Framework/runDataProcessing.h"
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGUD/TableProducer/udMcParticles2udTracks.cxx b/.conflict-side-1/PWGUD/TableProducer/udMcParticles2udTracks.cxx
index 4a876a72fb3..df797f9ea3a 100644
--- a/.conflict-side-1/PWGUD/TableProducer/udMcParticles2udTracks.cxx
+++ b/.conflict-side-1/PWGUD/TableProducer/udMcParticles2udTracks.cxx
@@ -16,13 +16,14 @@
 /// \brief  A task to create a reverse index from UDMcParticles to UDTracks
 ///
 
-#include <vector>
+#include "PWGUD/DataModel/UDIndex.h"
+#include "PWGUD/DataModel/UDTables.h"
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/DataModel/UDIndex.h"
+#include "Framework/runDataProcessing.h"
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGUD/Tasks/FwdMuonsUPC.cxx b/.conflict-side-1/PWGUD/Tasks/FwdMuonsUPC.cxx
index 0c4b3d81e3b..c821c4daa1d 100644
--- a/.conflict-side-1/PWGUD/Tasks/FwdMuonsUPC.cxx
+++ b/.conflict-side-1/PWGUD/Tasks/FwdMuonsUPC.cxx
@@ -16,22 +16,23 @@
 
 /// \author Andrea Giovanni Riffero <andrea.giovanni.riffero@cern.ch>
 
-#include <vector>
-#include <unordered_map>
+#include "PWGUD/DataModel/UDTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPLHCIFData.h"
 #include "DataFormatsParameters/GRPECSObject.h"
-#include "PWGUD/DataModel/UDTables.h"
+#include "DataFormatsParameters/GRPLHCIFData.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 
 #include "TLorentzVector.h"
-#include "TSystem.h"
 #include "TMath.h"
 #include "TRandom3.h"
+#include "TSystem.h"
+
+#include <unordered_map>
+#include <vector>
 
 // table for saving tree with info on data
 namespace dimu
diff --git a/.conflict-side-1/PWGUD/Tasks/analysisMCDPMJetSGv3.cxx b/.conflict-side-1/PWGUD/Tasks/analysisMCDPMJetSGv3.cxx
index 4347871377a..6c6bfdfb3ab 100644
--- a/.conflict-side-1/PWGUD/Tasks/analysisMCDPMJetSGv3.cxx
+++ b/.conflict-side-1/PWGUD/Tasks/analysisMCDPMJetSGv3.cxx
@@ -13,10 +13,11 @@
 ///
 /// \author Simone Ragoni
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 // #include "TDatabasePDG.h"
 #include "PWGUD/Core/UPCHelpers.h"
 #include "PWGUD/DataModel/UDTables.h"
diff --git a/.conflict-side-1/PWGUD/Tasks/decayTreeAnalyzer.cxx b/.conflict-side-1/PWGUD/Tasks/decayTreeAnalyzer.cxx
index c725a2ca72a..9a379877afa 100644
--- a/.conflict-side-1/PWGUD/Tasks/decayTreeAnalyzer.cxx
+++ b/.conflict-side-1/PWGUD/Tasks/decayTreeAnalyzer.cxx
@@ -13,18 +13,18 @@
 // \author Paul Buehler, paul.buehler@oeaw.ac.at
 // \since  01.03.2024
 
-#include <string>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
+#include "PWGUD/Core/UDGoodRunSelector.h"
+#include "PWGUD/Core/UDHelpers.h"
+#include "PWGUD/Core/decayTree.h"
+#include "PWGUD/DataModel/UDTables.h"
 
 #include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPLHCIFData.h"
 #include "CommonConstants/LHCConstants.h"
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/UDHelpers.h"
-#include "PWGUD/Core/UDGoodRunSelector.h"
-#include "PWGUD/Core/decayTree.h"
+#include "DataFormatsParameters/GRPLHCIFData.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include <string>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGUD/Tasks/dgCandAnalyzer.cxx b/.conflict-side-1/PWGUD/Tasks/dgCandAnalyzer.cxx
index 93c62c567d5..7697610eb8d 100644
--- a/.conflict-side-1/PWGUD/Tasks/dgCandAnalyzer.cxx
+++ b/.conflict-side-1/PWGUD/Tasks/dgCandAnalyzer.cxx
@@ -13,20 +13,21 @@
 // \author Paul Buehler, paul.buehler@oeaw.ac.at
 // \since  06.06.2022
 
-#include <set>
-#include <string>
+#include "PWGUD/Core/DGPIDSelector.h"
+#include "PWGUD/Core/UDGoodRunSelector.h"
+#include "PWGUD/Core/UDHelpers.h"
+#include "PWGUD/DataModel/UDTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
+#include "Common/DataModel/PIDResponse.h"
 
 #include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPLHCIFData.h"
 #include "CommonConstants/LHCConstants.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/UDHelpers.h"
-#include "PWGUD/Core/DGPIDSelector.h"
-#include "PWGUD/Core/UDGoodRunSelector.h"
+#include "DataFormatsParameters/GRPLHCIFData.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include <set>
+#include <string>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGUD/Tasks/diffMCDataScanner.cxx b/.conflict-side-1/PWGUD/Tasks/diffMCDataScanner.cxx
index 8ad8d7ae853..1ee06c28b61 100644
--- a/.conflict-side-1/PWGUD/Tasks/diffMCDataScanner.cxx
+++ b/.conflict-side-1/PWGUD/Tasks/diffMCDataScanner.cxx
@@ -13,9 +13,10 @@
 /// \author Paul Buehler, paul.buehler@oeaw.ac.at
 /// \since  01.10.2021
 
-#include "Framework/AnalysisTask.h"
-#include "PWGUD/DataModel/McPIDTable.h"
 #include "PWGUD/Core/UDHelpers.h"
+#include "PWGUD/DataModel/McPIDTable.h"
+
+#include "Framework/AnalysisTask.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGUD/Tasks/diffMCQA.cxx b/.conflict-side-1/PWGUD/Tasks/diffMCQA.cxx
index 19bf3016a97..f7a3fa16500 100644
--- a/.conflict-side-1/PWGUD/Tasks/diffMCQA.cxx
+++ b/.conflict-side-1/PWGUD/Tasks/diffMCQA.cxx
@@ -13,12 +13,14 @@
 /// \author Paul Buehler, paul.buehler@oeaw.ac.at
 /// \since  01.10.2021
 
-#include "Framework/runDataProcessing.h"
+#include "PWGUD/Core/UDHelpers.h"
+
+#include "CommonConstants/PhysicsConstants.h"
 #include "Framework/AnalysisTask.h"
-#include "TLorentzVector.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/BCRange.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "PWGUD/Core/UDHelpers.h"
+
+#include "TLorentzVector.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGUD/Tasks/diffQA.cxx b/.conflict-side-1/PWGUD/Tasks/diffQA.cxx
index a1e9ec34185..6c331ca7146 100644
--- a/.conflict-side-1/PWGUD/Tasks/diffQA.cxx
+++ b/.conflict-side-1/PWGUD/Tasks/diffQA.cxx
@@ -13,13 +13,15 @@
 /// \author Paul Buehler, paul.buehler@oeaw.ac.at
 /// \since  20.05.2022
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "TLorentzVector.h"
+#include "PWGUD/Core/UDHelpers.h"
+
 #include "CommonConstants/LHCConstants.h"
-#include "ReconstructionDataFormats/BCRange.h"
 #include "CommonConstants/PhysicsConstants.h"
-#include "PWGUD/Core/UDHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/BCRange.h"
+
+#include "TLorentzVector.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGUD/Tasks/eventByevent.cxx b/.conflict-side-1/PWGUD/Tasks/eventByevent.cxx
index 072ae2d961c..ba7a512a26e 100644
--- a/.conflict-side-1/PWGUD/Tasks/eventByevent.cxx
+++ b/.conflict-side-1/PWGUD/Tasks/eventByevent.cxx
@@ -10,16 +10,19 @@
 // or submit itself to any jurisdiction.
 //
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include <iostream>
+#include "PWGUD/Core/SGSelector.h"
+#include "PWGUD/Core/SGTrackSelector.h"
 #include "PWGUD/DataModel/UDTables.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TLorentzVector.h"
 #include <TString.h>
 #include <TTree.h>
-#include "TLorentzVector.h"
-#include "PWGUD/Core/SGSelector.h"
-#include "PWGUD/Core/SGTrackSelector.h"
+
+#include <iostream>
 
 using namespace std;
 using namespace o2;
diff --git a/.conflict-side-1/PWGUD/Tasks/exclusivePentaquark.cxx b/.conflict-side-1/PWGUD/Tasks/exclusivePentaquark.cxx
index c63dc7fce68..24c7cd2b674 100644
--- a/.conflict-side-1/PWGUD/Tasks/exclusivePentaquark.cxx
+++ b/.conflict-side-1/PWGUD/Tasks/exclusivePentaquark.cxx
@@ -8,15 +8,19 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include <iostream>
+#include "PWGUD/Core/SGSelector.h"
 #include "PWGUD/DataModel/UDTables.h"
-#include <TString.h>
-#include "TLorentzVector.h"
+
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/Core/SGSelector.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TLorentzVector.h"
+#include <TString.h>
+
+#include <iostream>
 using std::array;
 using namespace std;
 using namespace o2;
diff --git a/.conflict-side-1/PWGUD/Tasks/exclusivePhi.cxx b/.conflict-side-1/PWGUD/Tasks/exclusivePhi.cxx
index 634d17a5d8e..ba639348852 100644
--- a/.conflict-side-1/PWGUD/Tasks/exclusivePhi.cxx
+++ b/.conflict-side-1/PWGUD/Tasks/exclusivePhi.cxx
@@ -9,16 +9,20 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 //
-#include <vector>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include <iostream>
 #include "PWGUD/DataModel/UDTables.h"
-#include <TString.h>
-#include "TLorentzVector.h"
+
 #include "Common/DataModel/PIDResponse.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TLorentzVector.h"
+#include <TString.h>
+
+#include <iostream>
+#include <vector>
+
 using std::array;
 using namespace std;
 using namespace o2;
@@ -648,7 +652,7 @@ struct ExclusivePhi {
         }
       }
     } // Kaon Band
-  }   // end of process
+  } // end of process
 
 }; // end of struct
 
diff --git a/.conflict-side-1/PWGUD/Tasks/exclusivePhiLeptons.cxx b/.conflict-side-1/PWGUD/Tasks/exclusivePhiLeptons.cxx
index b212dd21723..45cdeb2d450 100644
--- a/.conflict-side-1/PWGUD/Tasks/exclusivePhiLeptons.cxx
+++ b/.conflict-side-1/PWGUD/Tasks/exclusivePhiLeptons.cxx
@@ -8,16 +8,20 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include <vector>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include <iostream>
+#include "PWGUD/Core/SGSelector.h"
 #include "PWGUD/DataModel/UDTables.h"
-#include <TString.h>
-#include "TLorentzVector.h"
+
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/Core/SGSelector.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TLorentzVector.h"
+#include <TString.h>
+
+#include <iostream>
+#include <vector>
 using std::array;
 using namespace std;
 using namespace o2;
diff --git a/.conflict-side-1/PWGUD/Tasks/exclusivePhiLeptonsTrees.cxx b/.conflict-side-1/PWGUD/Tasks/exclusivePhiLeptonsTrees.cxx
index 00abada06d4..48f00ab2524 100644
--- a/.conflict-side-1/PWGUD/Tasks/exclusivePhiLeptonsTrees.cxx
+++ b/.conflict-side-1/PWGUD/Tasks/exclusivePhiLeptonsTrees.cxx
@@ -8,16 +8,20 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include <vector>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include <iostream>
+#include "PWGUD/Core/SGSelector.h"
 #include "PWGUD/DataModel/UDTables.h"
-#include <TString.h>
-#include "TLorentzVector.h"
+
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/Core/SGSelector.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TLorentzVector.h"
+#include <TString.h>
+
+#include <iostream>
+#include <vector>
 using std::array;
 using namespace std;
 using namespace o2;
diff --git a/.conflict-side-1/PWGUD/Tasks/exclusiveTwoProtons.cxx b/.conflict-side-1/PWGUD/Tasks/exclusiveTwoProtons.cxx
index b7cf9b84004..966bd2c923a 100644
--- a/.conflict-side-1/PWGUD/Tasks/exclusiveTwoProtons.cxx
+++ b/.conflict-side-1/PWGUD/Tasks/exclusiveTwoProtons.cxx
@@ -8,15 +8,19 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include <iostream>
+#include "PWGUD/Core/SGSelector.h"
 #include "PWGUD/DataModel/UDTables.h"
-#include <TString.h>
-#include "TLorentzVector.h"
+
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/Core/SGSelector.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TLorentzVector.h"
+#include <TString.h>
+
+#include <iostream>
 using std::array;
 using namespace std;
 using namespace o2;
diff --git a/.conflict-side-1/PWGUD/Tasks/exclusiveTwoProtonsSG.cxx b/.conflict-side-1/PWGUD/Tasks/exclusiveTwoProtonsSG.cxx
index 0ac54805c69..539ed887676 100644
--- a/.conflict-side-1/PWGUD/Tasks/exclusiveTwoProtonsSG.cxx
+++ b/.conflict-side-1/PWGUD/Tasks/exclusiveTwoProtonsSG.cxx
@@ -8,15 +8,19 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include <iostream>
+#include "PWGUD/Core/SGSelector.h"
 #include "PWGUD/DataModel/UDTables.h"
-#include <TString.h>
-#include "TLorentzVector.h"
+
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/Core/SGSelector.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TLorentzVector.h"
+#include <TString.h>
+
+#include <iostream>
 using std::array;
 using namespace std;
 using namespace o2;
diff --git a/.conflict-side-1/PWGUD/Tasks/flowCumulantsUpc.cxx b/.conflict-side-1/PWGUD/Tasks/flowCumulantsUpc.cxx
index 155a398cd44..9300fb8d2dd 100644
--- a/.conflict-side-1/PWGUD/Tasks/flowCumulantsUpc.cxx
+++ b/.conflict-side-1/PWGUD/Tasks/flowCumulantsUpc.cxx
@@ -14,42 +14,44 @@
 /// \since  Mar/2025
 /// \brief  jira: , task to measure flow observables with cumulant method
 
-#include <CCDB/BasicCCDBManager.h>
-#include <cmath>
-#include <vector>
-#include <array>
-#include <unordered_map>
-#include <string>
-#include <memory>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/HistogramRegistry.h"
+#include "FlowContainer.h"
+#include "GFW.h"
+#include "GFWCumulant.h"
+#include "GFWPowerArray.h"
+#include "GFWWeights.h"
 
-#include "Common/DataModel/EventSelection.h"
+#include "PWGUD/Core/SGSelector.h"
+#include "PWGUD/DataModel/UDTables.h"
+
+#include "Common/CCDB/ctpRateFetcher.h"
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/CCDB/ctpRateFetcher.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/SGSelector.h"
-#include "TVector3.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include <CCDB/BasicCCDBManager.h>
 
-#include "GFWPowerArray.h"
-#include "GFW.h"
-#include "GFWCumulant.h"
-#include "GFWWeights.h"
-#include "FlowContainer.h"
 #include "TList.h"
+#include "TVector3.h"
+#include <TF1.h>
+#include <TObjArray.h>
 #include <TProfile.h>
 #include <TRandom3.h>
-#include <TObjArray.h>
-#include <TF1.h>
+
+#include <array>
+#include <cmath>
+#include <memory>
+#include <string>
+#include <unordered_map>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGUD/Tasks/polarisationRho.cxx b/.conflict-side-1/PWGUD/Tasks/polarisationRho.cxx
index c10e86baad6..3693acbfe2a 100644
--- a/.conflict-side-1/PWGUD/Tasks/polarisationRho.cxx
+++ b/.conflict-side-1/PWGUD/Tasks/polarisationRho.cxx
@@ -8,13 +8,16 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include <iostream>
 #include "PWGUD/DataModel/UDTables.h"
-#include <TString.h>
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TLorentzVector.h"
+#include <TString.h>
+
+#include <iostream>
 using namespace std;
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-side-1/PWGUD/Tasks/sgD0Analyzer.cxx b/.conflict-side-1/PWGUD/Tasks/sgD0Analyzer.cxx
index 58b01cbe281..229b6f09a4a 100644
--- a/.conflict-side-1/PWGUD/Tasks/sgD0Analyzer.cxx
+++ b/.conflict-side-1/PWGUD/Tasks/sgD0Analyzer.cxx
@@ -13,17 +13,21 @@
 // \author Sasha Bylinkin, alexander.bylinkin@gmail.com
 // \since  April 2023
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include <iostream>
-#include "PWGUD/DataModel/UDTables.h"
 #include "PWGUD/Core/SGSelector.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "PWGUD/Core/SGTrackSelector.h"
-#include <TString.h>
+#include "PWGUD/DataModel/UDTables.h"
+
+#include "Common/DataModel/PIDResponse.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TLorentzVector.h"
+#include <TString.h>
+
+#include <iostream>
 using namespace std;
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-side-1/PWGUD/Tasks/sgExcUniverse.cxx b/.conflict-side-1/PWGUD/Tasks/sgExcUniverse.cxx
index f7dd3691c25..47369db47cc 100644
--- a/.conflict-side-1/PWGUD/Tasks/sgExcUniverse.cxx
+++ b/.conflict-side-1/PWGUD/Tasks/sgExcUniverse.cxx
@@ -13,17 +13,19 @@
 // \author Sasha Bylinkin, alexander.bylinkin@gmail.com
 // \since  April 2023
 
-#include "Framework/runDataProcessing.h"
+#include "PWGUD/Core/SGSelector.h"
+#include "PWGUD/Core/SGTrackSelector.h"
+#include "PWGUD/Core/UDHelpers.h"
+#include "PWGUD/DataModel/UDTables.h"
+
+#include "Common/DataModel/PIDResponse.h"
+
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
-#include "TVector3.h"
-#include "TTree.h"
 #include "TFile.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/UDHelpers.h"
-#include "PWGUD/Core/SGSelector.h"
-#include "PWGUD/Core/SGTrackSelector.h"
+#include "TTree.h"
+#include "TVector3.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGUD/Tasks/sgExclOmega.cxx b/.conflict-side-1/PWGUD/Tasks/sgExclOmega.cxx
index 0a816e1dc0e..4a3cf48490f 100644
--- a/.conflict-side-1/PWGUD/Tasks/sgExclOmega.cxx
+++ b/.conflict-side-1/PWGUD/Tasks/sgExclOmega.cxx
@@ -13,17 +13,21 @@
 // \author Sasha Bylinkin, alexander.bylinkin@gmail.com
 // \since  April 2023
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include <iostream>
-#include "PWGUD/DataModel/UDTables.h"
 #include "PWGUD/Core/SGSelector.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "PWGUD/Core/SGTrackSelector.h"
-#include <TString.h>
+#include "PWGUD/DataModel/UDTables.h"
+
+#include "Common/DataModel/PIDResponse.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TLorentzVector.h"
+#include <TString.h>
+
+#include <iostream>
 using namespace std;
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-side-1/PWGUD/Tasks/sgExclusivePhi.cxx b/.conflict-side-1/PWGUD/Tasks/sgExclusivePhi.cxx
index df10373e571..9bea84b6ae4 100644
--- a/.conflict-side-1/PWGUD/Tasks/sgExclusivePhi.cxx
+++ b/.conflict-side-1/PWGUD/Tasks/sgExclusivePhi.cxx
@@ -9,16 +9,20 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 //
-#include <vector>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include <iostream>
+#include "PWGUD/Core/SGSelector.h"
 #include "PWGUD/DataModel/UDTables.h"
-#include <TString.h>
-#include "TLorentzVector.h"
+
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/Core/SGSelector.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TLorentzVector.h"
+#include <TString.h>
+
+#include <iostream>
+#include <vector>
 
 using std::array;
 using namespace std;
@@ -655,7 +659,7 @@ struct sgExclusivePhi {
             }
           }
         } // end of two tracks only loop
-      }   // vertex cut
+      } // vertex cut
 
       if (allTracksAreKaonsBandPID.size() == 2) {
 
@@ -731,8 +735,8 @@ struct sgExclusivePhi {
           }
         }
       } // Kaon Band
-    }   // double gap
-  }     // end of process
+    } // double gap
+  } // end of process
 
 }; // end of struct
 
diff --git a/.conflict-side-1/PWGUD/Tasks/sgExclusivePhiITSselections.cxx b/.conflict-side-1/PWGUD/Tasks/sgExclusivePhiITSselections.cxx
index 2d8bc72c0f6..6a70d8f3a1d 100644
--- a/.conflict-side-1/PWGUD/Tasks/sgExclusivePhiITSselections.cxx
+++ b/.conflict-side-1/PWGUD/Tasks/sgExclusivePhiITSselections.cxx
@@ -9,16 +9,20 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 //
-#include <vector>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include <iostream>
+#include "PWGUD/Core/SGSelector.h"
 #include "PWGUD/DataModel/UDTables.h"
-#include <TString.h>
-#include "TLorentzVector.h"
+
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/Core/SGSelector.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TLorentzVector.h"
+#include <TString.h>
+
+#include <iostream>
+#include <vector>
 
 using std::array;
 using namespace std;
@@ -298,7 +302,7 @@ struct sgExclusivePhiITSselections {
             }
           }
         } // Mass cut
-      }   // end of two tracks only loop
+      } // end of two tracks only loop
 
       if (allTracksAreKaonsBandPID.size() == 2) {
         registry.fill(HIST("hTracksKaons"), allTracksAreKaonsBandPID.size() + 10);
@@ -357,7 +361,7 @@ struct sgExclusivePhiITSselections {
       } // Kaon Band
 
     } // double gap
-  }   // end of process
+  } // end of process
 
   void processSG(UDCollisionsFull::iterator const& collision, udtracksfull const& tracks)
   // process function subscribing to SG data
diff --git a/.conflict-side-1/PWGUD/Tasks/sgFITAnalyzer.cxx b/.conflict-side-1/PWGUD/Tasks/sgFITAnalyzer.cxx
index 73d42421b87..58889965136 100644
--- a/.conflict-side-1/PWGUD/Tasks/sgFITAnalyzer.cxx
+++ b/.conflict-side-1/PWGUD/Tasks/sgFITAnalyzer.cxx
@@ -13,18 +13,20 @@
 // \author Sasha Bylinkin, alexander.bylinkin@gmail.com
 // \since  April 2023
 
-#include "Framework/runDataProcessing.h"
+#include "PWGUD/Core/SGSelector.h"
+#include "PWGUD/Core/SGTrackSelector.h"
+#include "PWGUD/Core/UDHelpers.h"
+#include "PWGUD/DataModel/UDTables.h"
+
+#include "Common/DataModel/PIDResponse.h"
+
 #include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 
-#include "TVector3.h"
-#include "TTree.h"
 #include "TFile.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/UDHelpers.h"
-#include "PWGUD/Core/SGSelector.h"
-#include "PWGUD/Core/SGTrackSelector.h"
+#include "TTree.h"
+#include "TVector3.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGUD/Tasks/sgFourPiAnalyzer.cxx b/.conflict-side-1/PWGUD/Tasks/sgFourPiAnalyzer.cxx
index 6a6abfc4628..49f9fd42c38 100644
--- a/.conflict-side-1/PWGUD/Tasks/sgFourPiAnalyzer.cxx
+++ b/.conflict-side-1/PWGUD/Tasks/sgFourPiAnalyzer.cxx
@@ -13,21 +13,25 @@
 // \author Sasha Bylinkin, alexander.bylinkin@gmail.com
 // \since  April 2023
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include <iostream>
-#include "PWGUD/DataModel/UDTables.h"
 #include "PWGUD/Core/SGSelector.h"
 #include "PWGUD/Core/SGTrackSelector.h"
+#include "PWGUD/DataModel/UDTables.h"
+
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/DataTypes.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 #include "MathUtils/Utils.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include <TString.h>
+
 #include "TLorentzVector.h"
+#include <TString.h>
+
+#include <iostream>
 using namespace std;
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-side-1/PWGUD/Tasks/sgInclJpsi.cxx b/.conflict-side-1/PWGUD/Tasks/sgInclJpsi.cxx
index f5001af7c10..013a97cc20f 100644
--- a/.conflict-side-1/PWGUD/Tasks/sgInclJpsi.cxx
+++ b/.conflict-side-1/PWGUD/Tasks/sgInclJpsi.cxx
@@ -13,17 +13,21 @@
 // \author Sasha Bylinkin, alexander.bylinkin@gmail.com
 // \since  April 2023
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include <iostream>
-#include "PWGUD/DataModel/UDTables.h"
 #include "PWGUD/Core/SGSelector.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "PWGUD/Core/SGTrackSelector.h"
-#include <TString.h>
+#include "PWGUD/DataModel/UDTables.h"
+
+#include "Common/DataModel/PIDResponse.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TLorentzVector.h"
+#include <TString.h>
+
+#include <iostream>
 using namespace std;
 using namespace o2;
 using namespace o2::aod;
@@ -297,7 +301,7 @@ struct SGInclJpsi {
             registry.fill(HIST("sss_Ntr_mm_invm_3"), tracks.size(), v01.M(), -1);
             registry.fill(HIST("sss_mm_pt_invm_3"), v01.Pt(), v01.M(), -1);
           }
-      }
+        }
       }
       if (selectionPIDElec(t0, use_tof, nsigmatpc_cut, nsigmatof_cut) && selectionPIDElec(t1, use_tof, nsigmatpc_cut, nsigmatof_cut)) {
         // Apply pion hypothesis and create pairs
diff --git a/.conflict-side-1/PWGUD/Tasks/sgPIDAnalyzer.cxx b/.conflict-side-1/PWGUD/Tasks/sgPIDAnalyzer.cxx
index e4015417971..5edef2f187d 100644
--- a/.conflict-side-1/PWGUD/Tasks/sgPIDAnalyzer.cxx
+++ b/.conflict-side-1/PWGUD/Tasks/sgPIDAnalyzer.cxx
@@ -13,19 +13,21 @@
 // \author Sasha Bylinkin, alexander.bylinkin@gmail.com
 // \since  April 2023
 
-#include "Framework/runDataProcessing.h"
+#include "PWGUD/Core/SGSelector.h"
+#include "PWGUD/Core/SGTrackSelector.h"
+#include "PWGUD/Core/UDHelpers.h"
+#include "PWGUD/DataModel/SGTables.h"
+
+#include "Common/DataModel/PIDResponse.h"
+
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
-#include "TVector3.h"
-#include "TTree.h"
 #include "TFile.h"
+#include "TTree.h"
+#include "TVector3.h"
 #include <TH1F.h>
 #include <TH2F.h>
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/DataModel/SGTables.h"
-#include "PWGUD/Core/UDHelpers.h"
-#include "PWGUD/Core/SGSelector.h"
-#include "PWGUD/Core/SGTrackSelector.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGUD/Tasks/sgPIDSpectra.cxx b/.conflict-side-1/PWGUD/Tasks/sgPIDSpectra.cxx
index 7ecea94c66d..b873d37198d 100644
--- a/.conflict-side-1/PWGUD/Tasks/sgPIDSpectra.cxx
+++ b/.conflict-side-1/PWGUD/Tasks/sgPIDSpectra.cxx
@@ -13,17 +13,19 @@
 // \author Sasha Bylinkin, alexander.bylinkin@gmail.com
 // \since  April 2023
 
-#include "Framework/runDataProcessing.h"
+#include "PWGUD/Core/SGSelector.h"
+#include "PWGUD/Core/SGTrackSelector.h"
+#include "PWGUD/Core/UDHelpers.h"
+#include "PWGUD/DataModel/UDTables.h"
+
+#include "Common/DataModel/PIDResponse.h"
+
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
-#include "TVector3.h"
-#include "TTree.h"
 #include "TFile.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/UDHelpers.h"
-#include "PWGUD/Core/SGSelector.h"
-#include "PWGUD/Core/SGTrackSelector.h"
+#include "TTree.h"
+#include "TVector3.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGUD/Tasks/sgPIDSpectraTable.cxx b/.conflict-side-1/PWGUD/Tasks/sgPIDSpectraTable.cxx
index 9a370403a6b..f6c608a1881 100644
--- a/.conflict-side-1/PWGUD/Tasks/sgPIDSpectraTable.cxx
+++ b/.conflict-side-1/PWGUD/Tasks/sgPIDSpectraTable.cxx
@@ -12,19 +12,22 @@
 // \Single Gap Event Analyzer
 // \author Sasha Bylinkin, alexander.bylinkin@gmail.com
 // \since  April 2023
-#include <vector>
-#include "Framework/runDataProcessing.h"
+#include "PWGUD/Core/SGSelector.h"
+#include "PWGUD/Core/SGTrackSelector.h"
+#include "PWGUD/Core/UDHelpers.h"
+#include "PWGUD/DataModel/SGTables.h"
+#include "PWGUD/DataModel/UDTables.h"
+
+#include "Common/DataModel/PIDResponse.h"
+
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
-#include "TVector3.h"
-#include "TTree.h"
 #include "TFile.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/DataModel/SGTables.h"
-#include "PWGUD/Core/UDHelpers.h"
-#include "PWGUD/Core/SGSelector.h"
-#include "PWGUD/Core/SGTrackSelector.h"
+#include "TTree.h"
+#include "TVector3.h"
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGUD/Tasks/sgSixPiAnalyzer.cxx b/.conflict-side-1/PWGUD/Tasks/sgSixPiAnalyzer.cxx
index c3561ad7026..888b4325a61 100644
--- a/.conflict-side-1/PWGUD/Tasks/sgSixPiAnalyzer.cxx
+++ b/.conflict-side-1/PWGUD/Tasks/sgSixPiAnalyzer.cxx
@@ -13,22 +13,25 @@
 // \author Sasha Bylinkin, alexander.bylinkin@gmail.com
 // \since  April 2023
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include <iostream>
-#include "PWGUD/DataModel/UDTables.h"
 #include "PWGUD/Core/SGSelector.h"
 #include "PWGUD/Core/SGTrackSelector.h"
+#include "PWGUD/DataModel/UDTables.h"
+
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/DataTypes.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 #include "MathUtils/Utils.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 
-#include <TString.h>
 #include "TLorentzVector.h"
+#include <TString.h>
+
+#include <iostream>
 using namespace std;
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-side-1/PWGUD/Tasks/sgSpectraAnalyzer.cxx b/.conflict-side-1/PWGUD/Tasks/sgSpectraAnalyzer.cxx
index afd766e0992..17bd0d6db03 100644
--- a/.conflict-side-1/PWGUD/Tasks/sgSpectraAnalyzer.cxx
+++ b/.conflict-side-1/PWGUD/Tasks/sgSpectraAnalyzer.cxx
@@ -13,18 +13,20 @@
 // \author Sasha Bylinkin, alexander.bylinkin@gmail.com
 // \since  April 2023
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
+#include "PWGUD/Core/SGSelector.h"
+#include "PWGUD/Core/SGTrackSelector.h"
+#include "PWGUD/DataModel/UDTables.h"
+
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
 #include <iostream>
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/SGSelector.h"
-#include "PWGUD/Core/SGTrackSelector.h"
-//#include "Common/DataModel/PIDResponse.h"
-//#include "PWGUD/Core/RLhelper.h"
-#include <TString.h>
+// #include "Common/DataModel/PIDResponse.h"
+// #include "PWGUD/Core/RLhelper.h"
 #include "TLorentzVector.h"
+#include <TString.h>
 using namespace std;
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-side-1/PWGUD/Tasks/sgTwoPiAnalyzer.cxx b/.conflict-side-1/PWGUD/Tasks/sgTwoPiAnalyzer.cxx
index e1568bb1838..a7763f614cc 100644
--- a/.conflict-side-1/PWGUD/Tasks/sgTwoPiAnalyzer.cxx
+++ b/.conflict-side-1/PWGUD/Tasks/sgTwoPiAnalyzer.cxx
@@ -13,22 +13,25 @@
 // \author Sasha Bylinkin, alexander.bylinkin@gmail.com
 // \since  April 2023
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include <iostream>
-#include "PWGUD/DataModel/UDTables.h"
 #include "PWGUD/Core/SGSelector.h"
 #include "PWGUD/Core/SGTrackSelector.h"
+#include "PWGUD/DataModel/UDTables.h"
+
 #include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/DataTypes.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 #include "MathUtils/Utils.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 
-#include <TString.h>
 #include "TLorentzVector.h"
+#include <TString.h>
+
+#include <iostream>
 using namespace std;
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-side-1/PWGUD/Tasks/sginclusivePhiKstarSD.cxx b/.conflict-side-1/PWGUD/Tasks/sginclusivePhiKstarSD.cxx
index 628818bd553..c92293b2275 100644
--- a/.conflict-side-1/PWGUD/Tasks/sginclusivePhiKstarSD.cxx
+++ b/.conflict-side-1/PWGUD/Tasks/sginclusivePhiKstarSD.cxx
@@ -14,29 +14,30 @@
 /// \author Sandeep Dudi, sandeep.dudi3@gmail.com
 /// \since  May 2024
 
-#include <cstdlib>
-#include <vector>
-#include <TString.h>
-#include <TMath.h>
-#include "Math/Vector4D.h"
-#include "Math/Vector3D.h"
-#include "Math/GenVector/Boost.h"
-#include "TPDGCode.h"
+#include "PWGUD/Core/SGSelector.h"
+#include "PWGUD/Core/SGTrackSelector.h"
+#include "PWGUD/Core/UPCHelpers.h"
+#include "PWGUD/DataModel/UDTables.h"
+
+#include "Common/DataModel/PIDResponse.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoA.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Vertex.h"
 
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/SGSelector.h"
-#include "PWGUD/Core/SGTrackSelector.h"
-#include "PWGUD/Core/UPCHelpers.h"
+#include "Math/GenVector/Boost.h"
+#include "Math/Vector3D.h"
+#include "Math/Vector4D.h"
+#include "TPDGCode.h"
+#include <TMath.h>
+#include <TString.h>
 
-#include "Common/DataModel/PIDResponse.h"
+#include <cstdlib>
+#include <vector>
 
 using namespace std;
 using namespace o2;
diff --git a/.conflict-side-1/PWGUD/Tasks/upcAnalysis.cxx b/.conflict-side-1/PWGUD/Tasks/upcAnalysis.cxx
index 74a007314e0..533e9bbeb32 100644
--- a/.conflict-side-1/PWGUD/Tasks/upcAnalysis.cxx
+++ b/.conflict-side-1/PWGUD/Tasks/upcAnalysis.cxx
@@ -9,16 +9,16 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TLorentzVector.h"
 #include <TH1D.h>
 #include <TH2D.h>
-#include "TLorentzVector.h"
 
 using namespace o2;
 using namespace o2::aod::evsel;
diff --git a/.conflict-side-1/PWGUD/Tasks/upcCandidateAnalyzer.cxx b/.conflict-side-1/PWGUD/Tasks/upcCandidateAnalyzer.cxx
index 568ecacb872..d07f76c22ee 100644
--- a/.conflict-side-1/PWGUD/Tasks/upcCandidateAnalyzer.cxx
+++ b/.conflict-side-1/PWGUD/Tasks/upcCandidateAnalyzer.cxx
@@ -9,11 +9,12 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "PWGUD/DataModel/UDTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TLorentzVector.h"
 
 using namespace o2;
diff --git a/.conflict-side-1/PWGUD/Tasks/upcCandidateProducerQa.cpp b/.conflict-side-1/PWGUD/Tasks/upcCandidateProducerQa.cpp
index 29accce2fe4..e697941c115 100644
--- a/.conflict-side-1/PWGUD/Tasks/upcCandidateProducerQa.cpp
+++ b/.conflict-side-1/PWGUD/Tasks/upcCandidateProducerQa.cpp
@@ -9,16 +9,18 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Common/CCDB/EventSelectionParams.h"
-#include "Common/DataModel/EventSelection.h"
-#include "CommonConstants/LHCConstants.h"
 #include "PWGUD/Core/UPCCutparHolder.h"
 #include "PWGUD/Core/UPCHelpers.h"
 #include "PWGUD/DataModel/UDTables.h"
 
+#include "Common/CCDB/EventSelectionParams.h"
+#include "Common/DataModel/EventSelection.h"
+
+#include "CommonConstants/LHCConstants.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2::framework;
 using namespace o2::framework::expressions;
 
diff --git a/.conflict-side-1/PWGUD/Tasks/upcEventITSROFcounter.cxx b/.conflict-side-1/PWGUD/Tasks/upcEventITSROFcounter.cxx
index 51241be5d69..7156c8038e0 100644
--- a/.conflict-side-1/PWGUD/Tasks/upcEventITSROFcounter.cxx
+++ b/.conflict-side-1/PWGUD/Tasks/upcEventITSROFcounter.cxx
@@ -15,24 +15,24 @@
 /// \author Roman Lavicka <roman.lavicka@cern.ch>, Austrian Academy of Sciences & SMI
 /// \since  09.08.2024
 
-#include <utility>
-#include <vector>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "ITSMFTBase/DPLAlpideParam.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "ReconstructionDataFormats/Vertex.h"
+#include "PWGUD/Core/SGSelector.h"
+#include "PWGUD/DataModel/UDTables.h"
 
 #include "Common/CCDB/EventSelectionParams.h"
 #include "Common/DataModel/EventSelection.h"
 
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/SGSelector.h"
+#include "CCDB/BasicCCDBManager.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ITSMFTBase/DPLAlpideParam.h"
+#include "ReconstructionDataFormats/Vertex.h"
 
 #include <TH1D.h>
 
+#include <utility>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-1/PWGUD/Tasks/upcForward.cxx b/.conflict-side-1/PWGUD/Tasks/upcForward.cxx
index bebcf0b2be2..16571bc28ac 100644
--- a/.conflict-side-1/PWGUD/Tasks/upcForward.cxx
+++ b/.conflict-side-1/PWGUD/Tasks/upcForward.cxx
@@ -14,16 +14,19 @@ o2-analysis-timestamp| o2-analysis-upc-forward | o2-analysis-event-selection  --
 for now AO2D.root I am using is
 alien:///alice/data/2015/LHC15o/000246392/pass5_lowIR/PWGZZ/Run3_Conversion/148_20210304-0829_child_1/AOD/001/AO2D.root
 */
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "Common/CCDB/TriggerAliases.h"
 #include "Common/DataModel/EventSelection.h"
-#include <iostream>
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TLorentzVector.h"
 #include <TH1D.h>
 #include <TH2D.h>
 #include <TString.h>
-#include "TLorentzVector.h"
-#include "Common/CCDB/TriggerAliases.h"
+
+#include <iostream>
 
 using namespace std;
 using namespace o2;
diff --git a/.conflict-side-1/PWGUD/Tasks/upcJpsiCorr.cxx b/.conflict-side-1/PWGUD/Tasks/upcJpsiCorr.cxx
index 8db8746b99d..9ec14bdf12a 100644
--- a/.conflict-side-1/PWGUD/Tasks/upcJpsiCorr.cxx
+++ b/.conflict-side-1/PWGUD/Tasks/upcJpsiCorr.cxx
@@ -15,22 +15,23 @@
 /// \author Sara Haidlova, sara.haidlova@cern.ch
 /// \since March 2024
 
-#include <vector>
 #include <utility>
+#include <vector>
 
 // O2 headers
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "CommonConstants/MathConstants.h"
 #include "CommonConstants/PhysicsConstants.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 // O2Physics headers
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/RecoDecay.h"
-#include "PWGUD/DataModel/UDTables.h"
+#include "PWGUD/Core/SGSelector.h"
 #include "PWGUD/Core/UDHelpers.h"
 #include "PWGUD/Core/UPCJpsiCentralBarrelCorrHelper.h"
-#include "PWGUD/Core/SGSelector.h"
+#include "PWGUD/DataModel/UDTables.h"
+
+#include "Common/Core/RecoDecay.h"
+#include "Common/DataModel/PIDResponse.h"
 
 // ROOT headers
 #include "TLorentzVector.h"
diff --git a/.conflict-side-1/PWGUD/Tasks/upcMft.cxx b/.conflict-side-1/PWGUD/Tasks/upcMft.cxx
index a3ae2b03287..168f9c47f96 100644
--- a/.conflict-side-1/PWGUD/Tasks/upcMft.cxx
+++ b/.conflict-side-1/PWGUD/Tasks/upcMft.cxx
@@ -13,27 +13,28 @@
 #include <iostream>
 
 // root headers
+#include "TLorentzVector.h"
+#include "TMath.h"
 #include <TH1F.h>
 #include <TH2F.h>
-#include "TMath.h"
-#include "TLorentzVector.h"
 
 // framework headers
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 // for track propagation
-#include "ReconstructionDataFormats/TrackFwd.h"
-#include "Math/MatrixFunctions.h"
-#include "Math/SMatrix.h"
-#include "MathUtils/Utils.h"
 #include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsMFT/TrackMFT.h"
 #include "DataFormatsParameters/GRPMagField.h"
 #include "DetectorsBase/Propagator.h"
-#include "TGeoGlobalMagField.h"
 #include "Field/MagneticField.h"
-#include "DataFormatsMFT/TrackMFT.h"
+#include "MathUtils/Utils.h"
+#include "ReconstructionDataFormats/TrackFwd.h"
+
+#include "Math/MatrixFunctions.h"
+#include "Math/SMatrix.h"
+#include "TGeoGlobalMagField.h"
 
 // define namespaces
 using namespace o2;
diff --git a/.conflict-side-1/PWGUD/Tasks/upcPhotonuclearAnalysisJMG.cxx b/.conflict-side-1/PWGUD/Tasks/upcPhotonuclearAnalysisJMG.cxx
index d20a78429dd..7d474f26513 100644
--- a/.conflict-side-1/PWGUD/Tasks/upcPhotonuclearAnalysisJMG.cxx
+++ b/.conflict-side-1/PWGUD/Tasks/upcPhotonuclearAnalysisJMG.cxx
@@ -13,15 +13,10 @@
 /// \author Josué Martínez García, josuem@cern.ch
 /// \file   upcPhotonuclearAnalysisJMG.cxx
 
-#include <vector>
-
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "Framework/StepTHn.h"
-#include "CommonConstants/MathConstants.h"
-#include <TTree.h>
+#include "PWGCF/Core/CorrelationContainer.h"
+#include "PWGUD/Core/UPCPairCuts.h"
+#include "PWGUD/Core/UPCTauCentralBarrelHelperRL.h"
+#include "PWGUD/DataModel/UDTables.h"
 
 #include "Common/CCDB/EventSelectionParams.h"
 #include "Common/Core/TrackSelection.h"
@@ -29,12 +24,18 @@
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "PWGCF/Core/CorrelationContainer.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonConstants/MathConstants.h"
 #include "DataFormatsParameters/GRPObject.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/StepTHn.h"
+#include "Framework/runDataProcessing.h"
 
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/UPCPairCuts.h"
-#include "PWGUD/Core/UPCTauCentralBarrelHelperRL.h"
+#include <TTree.h>
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGUD/Tasks/upcPionAnalysis.cxx b/.conflict-side-1/PWGUD/Tasks/upcPionAnalysis.cxx
index fc215ea1822..4d581d5548c 100644
--- a/.conflict-side-1/PWGUD/Tasks/upcPionAnalysis.cxx
+++ b/.conflict-side-1/PWGUD/Tasks/upcPionAnalysis.cxx
@@ -9,18 +9,22 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 //
-#include <vector>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include <iostream>
-#include "PWGUD/DataModel/UDTables.h"
-#include <TString.h>
-#include <TTree.h>
-#include "TLorentzVector.h"
 #include "PWGUD/Core/SGSelector.h"
 #include "PWGUD/Core/SGTrackSelector.h"
+#include "PWGUD/DataModel/UDTables.h"
+
 #include "Common/Core/RecoDecay.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TLorentzVector.h"
+#include <TString.h>
+#include <TTree.h>
+
+#include <iostream>
+#include <vector>
 using namespace std;
 using namespace o2;
 using namespace o2::aod;
diff --git a/.conflict-side-1/PWGUD/Tasks/upcQuarkoniaCentralBarrel.cxx b/.conflict-side-1/PWGUD/Tasks/upcQuarkoniaCentralBarrel.cxx
index f195a750fa4..d029f336604 100644
--- a/.conflict-side-1/PWGUD/Tasks/upcQuarkoniaCentralBarrel.cxx
+++ b/.conflict-side-1/PWGUD/Tasks/upcQuarkoniaCentralBarrel.cxx
@@ -30,40 +30,41 @@
 //    david.dobrigkeit.chinellato@cern.ch
 //
 
-#include <Math/Vector4D.h>
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <map>
-#include <string>
-#include <vector>
-
-#include <TFile.h>
-#include <TH2F.h>
-#include <TProfile.h>
-#include <TLorentzVector.h>
-#include <TPDGCode.h>
+#include "PWGUD/Core/SGSelector.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/trackUtilities.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/Core/SGSelector.h"
-
+#include "Common/DataModel/TrackSelectionTables.h"
 #include "EventFiltering/Zorro.h"
 #include "EventFiltering/ZorroSummary.h"
 
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <Math/Vector4D.h>
+#include <TFile.h>
+#include <TH2F.h>
+#include <TLorentzVector.h>
+#include <TPDGCode.h>
+#include <TProfile.h>
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <map>
+#include <string>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-1/PWGUD/Tasks/upcRhoPrimeAnalysis.cxx b/.conflict-side-1/PWGUD/Tasks/upcRhoPrimeAnalysis.cxx
index d4048806854..6cb00abe79a 100644
--- a/.conflict-side-1/PWGUD/Tasks/upcRhoPrimeAnalysis.cxx
+++ b/.conflict-side-1/PWGUD/Tasks/upcRhoPrimeAnalysis.cxx
@@ -12,20 +12,20 @@
 /// \brief  Task for analysis of rho' in UPCs using UD tables (from SG producer).
 /// \author Cesar Ramirez, cesar.ramirez@cern.ch
 
-#include <string> // Para std::string
-#include <vector> // Para std::vector
+#include "PWGUD/Core/UPCTauCentralBarrelHelperRL.h"
+#include "PWGUD/DataModel/UDTables.h"
+
+#include "Common/DataModel/PIDResponse.h"
 
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
 
 #include "Math/Vector4D.h" // similiar to TLorentzVector (which is now legacy apparently)
-#include <random>
-
-#include "Common/DataModel/PIDResponse.h"
 
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/UPCTauCentralBarrelHelperRL.h"
+#include <random>
+#include <string> // Para std::string
+#include <vector> // Para std::vector
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/PWGUD/Tasks/upcTauRl.cxx b/.conflict-side-1/PWGUD/Tasks/upcTauRl.cxx
index c0684cec14b..8f723ac30e8 100644
--- a/.conflict-side-1/PWGUD/Tasks/upcTauRl.cxx
+++ b/.conflict-side-1/PWGUD/Tasks/upcTauRl.cxx
@@ -17,20 +17,24 @@
 //
 
 // C++ headers
+#include <algorithm>
+#include <random>
 #include <set>
 #include <utility>
-#include <algorithm>
 #include <vector>
-#include <random>
 
 // O2 headers
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/runDataProcessing.h"
 
 // O2Physics headers
+#include "PWGUD/Core/SGSelector.h"
+#include "PWGUD/Core/UPCTauCentralBarrelHelperRL.h"
+#include "PWGUD/DataModel/UDTables.h"
+
 #include "Common/CCDB/EventSelectionParams.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
@@ -38,9 +42,6 @@
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "PWGUD/Core/UPCTauCentralBarrelHelperRL.h"
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/SGSelector.h"
 
 // ROOT headers
 #include "Math/Vector4D.h"
diff --git a/.conflict-side-1/PWGUD/Tasks/upcTauTau13topo.cxx b/.conflict-side-1/PWGUD/Tasks/upcTauTau13topo.cxx
index 0d18b316b8b..e4e433ec883 100644
--- a/.conflict-side-1/PWGUD/Tasks/upcTauTau13topo.cxx
+++ b/.conflict-side-1/PWGUD/Tasks/upcTauTau13topo.cxx
@@ -17,9 +17,9 @@
 // copts="--configuration json://tautauConfig.json -b"
 // o2-analysis-ud-tautau13topo $copts > output.log
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 // #include "TDatabasePDG.h" // not recommended in o2
 #include "Framework/O2DatabasePDGPlugin.h"
@@ -28,13 +28,13 @@
 // #include "Common/DataModel/EventSelection.h"
 // #include "Common/DataModel/TrackSelectionTables.h"
 
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/UDHelpers.h"
 #include "PWGUD/Core/DGPIDSelector.h"
 #include "PWGUD/Core/SGSelector.h"
+#include "PWGUD/Core/UDHelpers.h"
+#include "PWGUD/DataModel/UDTables.h"
 
 #include "Common/Core/RecoDecay.h"
+#include "Common/DataModel/PIDResponse.h"
 // #include <CommonUtils/EnumFlags.h>
 #include "TPDGCode.h"
 
diff --git a/.conflict-side-1/PWGUD/Tasks/upcVetoAnalysis.cxx b/.conflict-side-1/PWGUD/Tasks/upcVetoAnalysis.cxx
index 45b3844ed51..84d73774439 100644
--- a/.conflict-side-1/PWGUD/Tasks/upcVetoAnalysis.cxx
+++ b/.conflict-side-1/PWGUD/Tasks/upcVetoAnalysis.cxx
@@ -8,21 +8,21 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include <map>
-#include <string>
-#include <unordered_set>
-#include <vector>
-#include <unordered_map>
-#include <memory>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-
 #include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/LHCConstants.h"
 #include "DataFormatsFIT/Triggers.h"
-#include "DataFormatsParameters/GRPLHCIFData.h"
 #include "DataFormatsParameters/GRPECSObject.h"
+#include "DataFormatsParameters/GRPLHCIFData.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include <map>
+#include <memory>
+#include <string>
+#include <unordered_map>
+#include <unordered_set>
+#include <vector>
 
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-1/Tools/KFparticle/qaKFEventTrack.cxx b/.conflict-side-1/Tools/KFparticle/qaKFEventTrack.cxx
index f3f026a8da7..ccadf3f60af 100644
--- a/.conflict-side-1/Tools/KFparticle/qaKFEventTrack.cxx
+++ b/.conflict-side-1/Tools/KFparticle/qaKFEventTrack.cxx
@@ -16,37 +16,40 @@
 ///
 
 #include "Tools/KFparticle/qaKFEventTrack.h"
-#include <CCDB/BasicCCDBManager.h>
-#include <string>
+
 #include "TableHelper.h"
+
+#include <CCDB/BasicCCDBManager.h>
+
 #include <iostream>
+#include <string>
 using namespace std;
 
 /// includes O2
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/DCA.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DetectorsBase/Propagator.h"
 
 /// includes O2Physics
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/Core/trackUtilities.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 #include "Tools/KFparticle/KFUtilities.h"
 
 /// includes KFParticle
-#include "KFParticle.h"
 #include "KFPTrack.h"
 #include "KFPVertex.h"
+#include "KFParticle.h"
 #include "KFParticleBase.h"
 #include "KFVertex.h"
 
diff --git a/.conflict-side-1/Tools/KFparticle/qaKFEventTrack.h b/.conflict-side-1/Tools/KFparticle/qaKFEventTrack.h
index 399a3139a91..3ded6f627ea 100644
--- a/.conflict-side-1/Tools/KFparticle/qaKFEventTrack.h
+++ b/.conflict-side-1/Tools/KFparticle/qaKFEventTrack.h
@@ -15,10 +15,11 @@
 #ifndef TOOLS_KFPARTICLE_QAKFEVENTTRACK_H_
 #define TOOLS_KFPARTICLE_QAKFEVENTTRACK_H_
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Common/Core/trackUtilities.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+
 enum FlagsTracks {
   kITS = BIT(0),
   kTPC = BIT(1),
diff --git a/.conflict-side-1/Tools/KFparticle/qaKFParticle.cxx b/.conflict-side-1/Tools/KFparticle/qaKFParticle.cxx
index f4ffdf58a85..a0886d647d9 100644
--- a/.conflict-side-1/Tools/KFparticle/qaKFParticle.cxx
+++ b/.conflict-side-1/Tools/KFparticle/qaKFParticle.cxx
@@ -16,38 +16,42 @@
 ///
 
 #include "Tools/KFparticle/qaKFParticle.h"
+
+#include "TableHelper.h"
+
 #include <CCDB/BasicCCDBManager.h>
-#include <string>
+
 #include <TDatabasePDG.h>
 #include <TPDGCode.h>
-#include "TableHelper.h"
+
+#include <string>
 
 /// includes O2
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/DCA.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DetectorsBase/Propagator.h"
 
 /// includes O2Physics
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/trackUtilities.h"
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/Core/RecoDecay.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 #include "Tools/KFparticle/KFUtilities.h"
 
 /// includes KFParticle
-#include "KFParticle.h"
 #include "KFPTrack.h"
 #include "KFPVertex.h"
+#include "KFParticle.h"
 #include "KFParticleBase.h"
 #include "KFVertex.h"
 
diff --git a/.conflict-side-1/Tools/KFparticle/qaKFParticle.h b/.conflict-side-1/Tools/KFparticle/qaKFParticle.h
index afb23851cb5..ddde56d6931 100644
--- a/.conflict-side-1/Tools/KFparticle/qaKFParticle.h
+++ b/.conflict-side-1/Tools/KFparticle/qaKFParticle.h
@@ -15,10 +15,11 @@
 #ifndef TOOLS_KFPARTICLE_QAKFPARTICLE_H_
 #define TOOLS_KFPARTICLE_QAKFPARTICLE_H_
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Common/Core/trackUtilities.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+
 enum Source {
   kPrompt = BIT(0),
   kNonPrompt = BIT(1),
diff --git a/.conflict-side-1/Tools/KFparticle/qaKFParticleLc.cxx b/.conflict-side-1/Tools/KFparticle/qaKFParticleLc.cxx
index 20da1eb6128..c8f0c6fe6b2 100644
--- a/.conflict-side-1/Tools/KFparticle/qaKFParticleLc.cxx
+++ b/.conflict-side-1/Tools/KFparticle/qaKFParticleLc.cxx
@@ -16,38 +16,42 @@
 ///
 
 #include "Tools/KFparticle/qaKFParticleLc.h"
+
+#include "TableHelper.h"
+
 #include <CCDB/BasicCCDBManager.h>
-#include <string>
+
 #include <TDatabasePDG.h>
 #include <TPDGCode.h>
-#include "TableHelper.h"
+
+#include <string>
 
 /// includes O2
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/DCA.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DetectorsBase/Propagator.h"
 
 /// includes O2Physics
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/trackUtilities.h"
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/Core/RecoDecay.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 #include "Tools/KFparticle/KFUtilities.h"
 
 /// includes KFParticle
-#include "KFParticle.h"
 #include "KFPTrack.h"
 #include "KFPVertex.h"
+#include "KFParticle.h"
 #include "KFParticleBase.h"
 #include "KFVertex.h"
 
diff --git a/.conflict-side-1/Tools/KFparticle/qaKFParticleLc.h b/.conflict-side-1/Tools/KFparticle/qaKFParticleLc.h
index 8c57232f99a..444b45bb5eb 100644
--- a/.conflict-side-1/Tools/KFparticle/qaKFParticleLc.h
+++ b/.conflict-side-1/Tools/KFparticle/qaKFParticleLc.h
@@ -15,10 +15,11 @@
 #ifndef TOOLS_KFPARTICLE_QAKFPARTICLELC_H_
 #define TOOLS_KFPARTICLE_QAKFPARTICLELC_H_
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Common/Core/trackUtilities.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+
 enum Source {
   kPrompt = BIT(0),
   kNonPrompt = BIT(1),
diff --git a/.conflict-side-1/Tutorials/ML/applyMlSelection.cxx b/.conflict-side-1/Tutorials/ML/applyMlSelection.cxx
index 4ca579acc44..0212c53d913 100644
--- a/.conflict-side-1/Tutorials/ML/applyMlSelection.cxx
+++ b/.conflict-side-1/Tutorials/ML/applyMlSelection.cxx
@@ -15,14 +15,15 @@
 ///
 /// \author Fabio Catalano <fabio.catalano@cern.ch>, CERN
 
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+
+#include "Tools/ML/MlResponse.h"
+
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
 
-#include "Tools/ML/MlResponse.h"
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-
 using namespace o2;
 using namespace o2::analysis;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Tutorials/ML/applyOnnxModel.cxx b/.conflict-side-1/Tutorials/ML/applyOnnxModel.cxx
index 6bf5d6ecb59..f49a315494f 100644
--- a/.conflict-side-1/Tutorials/ML/applyOnnxModel.cxx
+++ b/.conflict-side-1/Tutorials/ML/applyOnnxModel.cxx
@@ -14,10 +14,11 @@
 ///
 /// \author Christian Sonnabend <christian.sonnabend@cern.ch>, GSI
 
-#include "Framework/runDataProcessing.h"
+#include "Tools/ML/model.h"
+
 #include "Framework/AnalysisTask.h"
 #include "Framework/Logger.h"
-#include "Tools/ML/model.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Tutorials/OpenData/flowAnalysis.cxx b/.conflict-side-1/Tutorials/OpenData/flowAnalysis.cxx
index dc5e180b300..75fe73001f4 100644
--- a/.conflict-side-1/Tutorials/OpenData/flowAnalysis.cxx
+++ b/.conflict-side-1/Tutorials/OpenData/flowAnalysis.cxx
@@ -15,20 +15,22 @@
 /// \author
 /// \since
 
-#include <TF1.h>
-#include <TH3.h>
-#include <Framework/runDataProcessing.h>
-#include <Framework/AnalysisTask.h>
-#include <Framework/HistogramRegistry.h>
-#include <Framework/AnalysisDataModel.h>
-#include <Common/DataModel/EventSelection.h>
 #include <Common/CCDB/TriggerAliases.h>
 #include <Common/DataModel/Centrality.h>
+#include <Common/DataModel/EventSelection.h>
 #include <Common/DataModel/Multiplicity.h>
-#include <Common/DataModel/TrackSelectionTables.h>
 #include <Common/DataModel/PIDResponse.h>
+#include <Common/DataModel/TrackSelectionTables.h>
+
 #include <CCDB/BasicCCDBManager.h>
 #include <DataFormatsParameters/GRPObject.h>
+#include <Framework/AnalysisDataModel.h>
+#include <Framework/AnalysisTask.h>
+#include <Framework/HistogramRegistry.h>
+#include <Framework/runDataProcessing.h>
+
+#include <TF1.h>
+#include <TH3.h>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Tutorials/PWGCF/EventPlane/src/qVectorstutorial.cxx b/.conflict-side-1/Tutorials/PWGCF/EventPlane/src/qVectorstutorial.cxx
index b5b01185a49..eb02ea865ec 100644
--- a/.conflict-side-1/Tutorials/PWGCF/EventPlane/src/qVectorstutorial.cxx
+++ b/.conflict-side-1/Tutorials/PWGCF/EventPlane/src/qVectorstutorial.cxx
@@ -10,32 +10,32 @@
 // or submit itself to any jurisdiction.
 
 // C++/ROOT includes.
-#include <chrono>
-#include <string>
-#include <vector>
 #include <TComplex.h>
 #include <TH1F.h>
 #include <TH2D.h>
 #include <TMath.h>
 #include <TVector2.h>
 
+#include <chrono>
+#include <string>
+#include <vector>
+
 // o2Physics includes.
+#include "Common/Core/EventPlaneHelper.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Qvectors.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StaticFor.h"
-
-#include "Common/DataModel/Qvectors.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/Core/EventPlaneHelper.h"
-#include "Common/Core/TrackSelection.h"
-
-#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/runDataProcessing.h"
 
 // o2 includes.
 
diff --git a/.conflict-side-1/Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask1.cxx b/.conflict-side-1/Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask1.cxx
index 369e63cbdf6..246fba0e183 100644
--- a/.conflict-side-1/Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask1.cxx
+++ b/.conflict-side-1/Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask1.cxx
@@ -16,9 +16,9 @@
 #include "Framework/runDataProcessing.h"
 
 /// FemtoDream includes
+#include "PWGCF/DataModel/FemtoDerived.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamMath.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
-#include "PWGCF/DataModel/FemtoDerived.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask2.cxx b/.conflict-side-1/Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask2.cxx
index ff5fa93aa5b..303d3d8e3ef 100644
--- a/.conflict-side-1/Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask2.cxx
+++ b/.conflict-side-1/Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask2.cxx
@@ -16,9 +16,9 @@
 #include "Framework/runDataProcessing.h"
 
 /// FemtoDream includes
+#include "PWGCF/DataModel/FemtoDerived.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamMath.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
-#include "PWGCF/DataModel/FemtoDerived.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask3.cxx b/.conflict-side-1/Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask3.cxx
index ca200fd3937..69aa8baf37c 100644
--- a/.conflict-side-1/Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask3.cxx
+++ b/.conflict-side-1/Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask3.cxx
@@ -16,9 +16,9 @@
 #include "Framework/runDataProcessing.h"
 
 /// FemtoDream includes
+#include "PWGCF/DataModel/FemtoDerived.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamMath.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
-#include "PWGCF/DataModel/FemtoDerived.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask4.cxx b/.conflict-side-1/Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask4.cxx
index 90ae5168a78..a6b61304a53 100644
--- a/.conflict-side-1/Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask4.cxx
+++ b/.conflict-side-1/Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask4.cxx
@@ -16,9 +16,9 @@
 #include "Framework/runDataProcessing.h"
 
 /// FemtoDream includes
+#include "PWGCF/DataModel/FemtoDerived.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamMath.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
-#include "PWGCF/DataModel/FemtoDerived.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask5.cxx b/.conflict-side-1/Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask5.cxx
index d9159c2e3cc..3332d4ce43d 100644
--- a/.conflict-side-1/Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask5.cxx
+++ b/.conflict-side-1/Tutorials/PWGCF/FemtoFramework/src/CFTutorialTask5.cxx
@@ -14,12 +14,13 @@
 /// O2 includes
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
+
 #include "TDatabasePDG.h"
 
 /// FemtoDream includes
+#include "PWGCF/DataModel/FemtoDerived.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamMath.h"
 #include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"
-#include "PWGCF/DataModel/FemtoDerived.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Tutorials/PWGCF/FlowGenericFramework/src/flowGFWTutorial.cxx b/.conflict-side-1/Tutorials/PWGCF/FlowGenericFramework/src/flowGFWTutorial.cxx
index cfd0eca696b..8e5f096c8ac 100644
--- a/.conflict-side-1/Tutorials/PWGCF/FlowGenericFramework/src/flowGFWTutorial.cxx
+++ b/.conflict-side-1/Tutorials/PWGCF/FlowGenericFramework/src/flowGFWTutorial.cxx
@@ -9,26 +9,28 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <CCDB/BasicCCDBManager.h>
-#include <cmath>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/HistogramRegistry.h"
+#include "GFW.h"
+#include "GFWCumulant.h"
+#include "GFWPowerArray.h"
 
-#include "Common/DataModel/EventSelection.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include <CCDB/BasicCCDBManager.h>
 
-#include "GFWPowerArray.h"
-#include "GFW.h"
-#include "GFWCumulant.h"
 #include "TList.h"
 #include <TProfile.h>
 #include <TRandom3.h>
 
+#include <cmath>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-1/Tutorials/PWGCF/TwoParticleCorrelations/src/firstcfcorrelations.cxx b/.conflict-side-1/Tutorials/PWGCF/TwoParticleCorrelations/src/firstcfcorrelations.cxx
index cdec4f3ca95..ef8f6f78b32 100644
--- a/.conflict-side-1/Tutorials/PWGCF/TwoParticleCorrelations/src/firstcfcorrelations.cxx
+++ b/.conflict-side-1/Tutorials/PWGCF/TwoParticleCorrelations/src/firstcfcorrelations.cxx
@@ -13,18 +13,20 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
+#include "PWGCF/Core/CorrelationContainer.h"
+#include "PWGCF/Core/PairCuts.h"
+
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonConstants/MathConstants.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/RunningWorkflowInfo.h"
-#include "CommonConstants/MathConstants.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Centrality.h"
-#include "PWGCF/Core/CorrelationContainer.h"
-#include "PWGCF/Core/PairCuts.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Tutorials/PWGCF/TwoParticleCorrelations/src/firstcfo2physics.cxx b/.conflict-side-1/Tutorials/PWGCF/TwoParticleCorrelations/src/firstcfo2physics.cxx
index d5d1a6777d3..d6b459e43b3 100644
--- a/.conflict-side-1/Tutorials/PWGCF/TwoParticleCorrelations/src/firstcfo2physics.cxx
+++ b/.conflict-side-1/Tutorials/PWGCF/TwoParticleCorrelations/src/firstcfo2physics.cxx
@@ -13,11 +13,11 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-
 #include "Common/DataModel/Centrality.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-side-1/Tutorials/PWGEM/Cocktail/configs/ana_config.json b/.conflict-side-1/Tutorials/PWGEM/Cocktail/configs/ana_config.json
index 1b61ab3c3a8..dda7d3d0127 100644
--- a/.conflict-side-1/Tutorials/PWGEM/Cocktail/configs/ana_config.json
+++ b/.conflict-side-1/Tutorials/PWGEM/Cocktail/configs/ana_config.json
@@ -15,4 +15,4 @@
         "cfgPhotonPtFileName": "",
         "cfgPhotonPtDirName": ""
     }
-}
\ No newline at end of file
+}
diff --git a/.conflict-side-1/Tutorials/PWGEM/Cocktail/files/parametrizations/PbPb_5TeV.json b/.conflict-side-1/Tutorials/PWGEM/Cocktail/files/parametrizations/PbPb_5TeV.json
index 85e0fec1703..dee9dacae8d 100644
--- a/.conflict-side-1/Tutorials/PWGEM/Cocktail/files/parametrizations/PbPb_5TeV.json
+++ b/.conflict-side-1/Tutorials/PWGEM/Cocktail/files/parametrizations/PbPb_5TeV.json
@@ -399,4 +399,4 @@
         "221_pt": "(TMath::TwoPi()*x*(219.382*exp(-(sqrt(x*x+0.139571*0.139571)-0.139571)/0.384303)+2471.6*pow(exp(-1.12373*x-0.752507*x*x)+x/0.438343,-5.45943)))*((((x<9.445400)*(TMath::Max(TMath::Max(1.68883e-09*TMath::Power((exp(- -1.16032*sqrt(x*x+0.547*0.547-0.139*0.139)-0.435153*(x*x+0.547*0.547-0.139*0.139))+TMath::Power(0.480215/1.68883e-09,-1./16.7077)*sqrt(x*x+0.547*0.547-0.139*0.139)/0.0356546),-16.7077)/TMath::Power((exp(- -1.16032*x-0.435153*x*x)+x/0.0356546),-16.7077)+1.75797*TMath::Landau(x,2.41484,1.01421),0.00469052*TMath::Power((exp(- -0.124633*sqrt(x*x+0.547*0.547-0.139*0.139)-0.310906*(x*x+0.547*0.547-0.139*0.139))+TMath::Power(0.479677/0.00469052,-1./0.657178)*sqrt(x*x+0.547*0.547-0.139*0.139)/0.0210313),-0.657178)/TMath::Power((exp(- -0.124633*x-0.310906*x*x)+x/0.0210313),-0.657178)+1.42452*TMath::Landau(x,2.46537,0.969902)),TMath::Max(4.88363e-10*TMath::Power((exp(- -2.82354*sqrt(x*x+0.547*0.547-0.139*0.139)-0.728315*(x*x+0.547*0.547-0.139*0.139))+TMath::Power(0.483053/4.88363e-10,-1./16.2073)*sqrt(x*x+0.547*0.547-0.139*0.139)/0.0021492),-16.2073)/TMath::Power((exp(- -2.82354*x-0.728315*x*x)+x/0.0021492),-16.2073)+1.57731*TMath::Landau(x,2.40466,1.00957),0.00469052*TMath::Power((exp(- -0.124633*sqrt(x*x+0.547*0.547-0.139*0.139)-0.310906*(x*x+0.547*0.547-0.139*0.139))+TMath::Power(0.479677/0.00469052,-1./0.657178)*sqrt(x*x+0.547*0.547-0.139*0.139)/0.0210313),-0.657178)/TMath::Power((exp(- -0.124633*x-0.310906*x*x)+x/0.0210313),-0.657178)+1.42452*TMath::Landau(x,2.46537,0.969902))))+(x>=9.445400)*1.06*(((0.52091*1.)+(159.301*(-0.00307058*TMath::Power(1.+((x/1.03888)*(x/1.03888)),-(0.567478)))))/(1.+(-0.00307058*TMath::Power(1.+((x/1.03888)*(x/1.03888)),-(0.567478))))))))",
         "333_pt": "(TMath::TwoPi()*x*(219.382*exp(-(sqrt(x*x+0.139571*0.139571)-0.139571)/0.384303)+2471.6*pow(exp(-1.12373*x-0.752507*x*x)+x/0.438343,-5.45943)))*(0.1191/(1+exp(-(x- -0.316437)/0.554431))+-0.507618*TMath::Gaus(x,1.69654,1.62649)+0.494136*TMath::Gaus(x,2.56805,1.6193)+0.0789659)"
     }
-}
\ No newline at end of file
+}
diff --git a/.conflict-side-1/Tutorials/PWGEM/Cocktail/files/parametrizations/pp_13TeV.json b/.conflict-side-1/Tutorials/PWGEM/Cocktail/files/parametrizations/pp_13TeV.json
index 1f999879643..d4d5a77bf8f 100644
--- a/.conflict-side-1/Tutorials/PWGEM/Cocktail/files/parametrizations/pp_13TeV.json
+++ b/.conflict-side-1/Tutorials/PWGEM/Cocktail/files/parametrizations/pp_13TeV.json
@@ -43,4 +43,4 @@
         "113_pt": "(x*(123.313*(pow((exp((0.171351*x)-(abs(0.00418378)*(x*x)))+(x/0.919801)),-(6.29677)))))*((((0.37788/(1+exp(-((x-0.265203)/0.274547))))+(-(0.393597*TMath::Gaus(x,0.324349,0.819888))))+(-(0.230459*TMath::Gaus(x,1.23251,1.24114))))+0.412584)",
         "223_pt": "(x*(123.313*(pow((exp((0.171351*x)-(abs(0.00418378)*(x*x)))+(x/0.919801)),-(6.29677)))))*((((0.435069/(1+exp(-((x-0.302485)/0.27614))))+(-(0.258853*TMath::Gaus(x,0.42493,0.693856))))+(-(0.202117*TMath::Gaus(x,1.07795,1.09857))))+0.242026)"
     }
-}
\ No newline at end of file
+}
diff --git a/.conflict-side-1/Tutorials/PWGEM/Cocktail/plotLFCocktail.C b/.conflict-side-1/Tutorials/PWGEM/Cocktail/plotLFCocktail.C
index 8740544d66f..db095ad62f7 100644
--- a/.conflict-side-1/Tutorials/PWGEM/Cocktail/plotLFCocktail.C
+++ b/.conflict-side-1/Tutorials/PWGEM/Cocktail/plotLFCocktail.C
@@ -72,4 +72,5 @@ void plotLFCocktail(TString filename = "AnalysisResults.root", int rebin = 1)
   }
   gPad->BuildLegend(0.62, 0.9, 0.9, 0.6);
   mee[0]->SetTitle("after resolution and acceptance");
-}
\ No newline at end of file
+}
+ 
\ No newline at end of file
diff --git a/.conflict-side-1/Tutorials/PWGEM/emcclustertutorial.cxx b/.conflict-side-1/Tutorials/PWGEM/emcclustertutorial.cxx
index a047206e70d..222346a9114 100644
--- a/.conflict-side-1/Tutorials/PWGEM/emcclustertutorial.cxx
+++ b/.conflict-side-1/Tutorials/PWGEM/emcclustertutorial.cxx
@@ -9,32 +9,31 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <climits>
-#include <cstdlib>
-#include <map>
-#include <memory>
-#include <sstream>
-#include <string>
-#include <vector>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoA.h"
-#include "Framework/HistogramRegistry.h"
+#include "PWGJE/DataModel/EMCALClusters.h"
 
-#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
 
-#include "EMCALBase/Geometry.h"
-#include "EMCALCalib/BadChannelMap.h"
-#include "PWGJE/DataModel/EMCALClusters.h"
+#include "CommonDataFormat/InteractionRecord.h"
+#include "DataFormatsEMCAL/AnalysisCluster.h"
 #include "DataFormatsEMCAL/Cell.h"
 #include "DataFormatsEMCAL/Constants.h"
-#include "DataFormatsEMCAL/AnalysisCluster.h"
+#include "EMCALBase/Geometry.h"
+#include "EMCALCalib/BadChannelMap.h"
+#include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 
-#include "CommonDataFormat/InteractionRecord.h"
+#include <climits>
+#include <cstdlib>
+#include <map>
+#include <memory>
+#include <sstream>
+#include <string>
+#include <vector>
 
 // \struct ClusterTutorial
 /// \brief Skeleton task for EMCal cluster tutorial
diff --git a/.conflict-side-1/Tutorials/PWGEM/pcm/pcmtutorial.cxx b/.conflict-side-1/Tutorials/PWGEM/pcm/pcmtutorial.cxx
index c10b4251991..d31ffa85177 100644
--- a/.conflict-side-1/Tutorials/PWGEM/pcm/pcmtutorial.cxx
+++ b/.conflict-side-1/Tutorials/PWGEM/pcm/pcmtutorial.cxx
@@ -12,16 +12,18 @@
 /// \brief tutorial for pcm analysis.
 /// \author daiki.sekihata@cern.ch
 
-#include <TMath.h>
-#include <Math/Vector4D.h>
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+#include "PWGEM/PhotonMeson/Utils/PCMUtilities.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Common/Core/trackUtilities.h"
+
 #include "CommonConstants/PhysicsConstants.h"
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/PhotonMeson/Utils/PCMUtilities.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include <Math/Vector4D.h>
+#include <TMath.h>
 
 using namespace o2;
 using namespace o2::soa;
diff --git a/.conflict-side-1/Tutorials/PWGLF/Resonance/resonancesCombine.cxx b/.conflict-side-1/Tutorials/PWGLF/Resonance/resonancesCombine.cxx
index 26a28661c6c..8ff1a07b1e0 100644
--- a/.conflict-side-1/Tutorials/PWGLF/Resonance/resonancesCombine.cxx
+++ b/.conflict-side-1/Tutorials/PWGLF/Resonance/resonancesCombine.cxx
@@ -14,16 +14,18 @@
 /// \author Bong-Hwi Lim <bong-hwi.lim@cern.ch>
 /// \since 13/12/2024
 
-#include <TLorentzVector.h>
-#include <TPDGCode.h>
+#include "PWGLF/DataModel/LFResonanceTables.h"
 
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/DataModel/Qvectors.h"
 #include "Common/Core/EventPlaneHelper.h"
-#include "Framework/AnalysisTask.h"
+#include "Common/DataModel/Qvectors.h"
+
+#include "CommonConstants/PhysicsConstants.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
+
+#include <TLorentzVector.h>
+#include <TPDGCode.h>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Tutorials/PWGLF/Resonance/resonancesMicrotrack.cxx b/.conflict-side-1/Tutorials/PWGLF/Resonance/resonancesMicrotrack.cxx
index 5022d4b602d..0e0073f6e3e 100644
--- a/.conflict-side-1/Tutorials/PWGLF/Resonance/resonancesMicrotrack.cxx
+++ b/.conflict-side-1/Tutorials/PWGLF/Resonance/resonancesMicrotrack.cxx
@@ -14,15 +14,16 @@
 /// \author Bong-Hwi Lim <bong-hwi.lim@cern.ch>
 /// \since 07/03/2025
 
-#include <TLorentzVector.h>
-#include <TPDGCode.h>
+#include "PWGLF/DataModel/LFResonanceTables.h"
 
 #include "CommonConstants/MathConstants.h"
 #include "CommonConstants/PhysicsConstants.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
+
+#include <TLorentzVector.h>
+#include <TPDGCode.h>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Tutorials/PWGLF/Resonance/resonances_step0.cxx b/.conflict-side-1/Tutorials/PWGLF/Resonance/resonances_step0.cxx
index 706abc72cd2..33d64cbc34b 100644
--- a/.conflict-side-1/Tutorials/PWGLF/Resonance/resonances_step0.cxx
+++ b/.conflict-side-1/Tutorials/PWGLF/Resonance/resonances_step0.cxx
@@ -13,12 +13,13 @@
 /// \author
 /// \since 08/11/2023
 
-#include <TLorentzVector.h>
+#include "PWGLF/DataModel/LFResonanceTables.h"
 
-#include "Framework/AnalysisTask.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
+
+#include <TLorentzVector.h>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Tutorials/PWGLF/Resonance/resonances_step1.cxx b/.conflict-side-1/Tutorials/PWGLF/Resonance/resonances_step1.cxx
index 2f566ace97c..7db2098ae2f 100644
--- a/.conflict-side-1/Tutorials/PWGLF/Resonance/resonances_step1.cxx
+++ b/.conflict-side-1/Tutorials/PWGLF/Resonance/resonances_step1.cxx
@@ -13,14 +13,15 @@
 /// \author
 /// \since 08/11/2023
 
-#include <TLorentzVector.h>
-#include <TPDGCode.h>
+#include "PWGLF/DataModel/LFResonanceTables.h"
 
 #include "CommonConstants/PhysicsConstants.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
+
+#include <TLorentzVector.h>
+#include <TPDGCode.h>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Tutorials/PWGLF/Resonance/resonances_step2.cxx b/.conflict-side-1/Tutorials/PWGLF/Resonance/resonances_step2.cxx
index 000bbf1e501..ff905f82582 100644
--- a/.conflict-side-1/Tutorials/PWGLF/Resonance/resonances_step2.cxx
+++ b/.conflict-side-1/Tutorials/PWGLF/Resonance/resonances_step2.cxx
@@ -13,13 +13,14 @@
 /// \author
 /// \since 08/11/2023
 
-#include <TLorentzVector.h>
+#include "PWGLF/DataModel/LFResonanceTables.h"
 
 #include "CommonConstants/PhysicsConstants.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
+
+#include <TLorentzVector.h>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Tutorials/PWGLF/Resonance/resonances_step3.cxx b/.conflict-side-1/Tutorials/PWGLF/Resonance/resonances_step3.cxx
index f2ef8dbbe67..80d24b43b17 100644
--- a/.conflict-side-1/Tutorials/PWGLF/Resonance/resonances_step3.cxx
+++ b/.conflict-side-1/Tutorials/PWGLF/Resonance/resonances_step3.cxx
@@ -13,11 +13,12 @@
 /// \author Hirak Kumar Koley <hirak.koley@cern.ch>
 /// \since 11/10/2024
 
+#include "PWGLF/DataModel/LFResonanceTables.h"
+
 #include "CommonConstants/PhysicsConstants.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Tutorials/PWGLF/Resonance/resonances_step4.cxx b/.conflict-side-1/Tutorials/PWGLF/Resonance/resonances_step4.cxx
index 05f7b35f7cf..6c54f87a713 100644
--- a/.conflict-side-1/Tutorials/PWGLF/Resonance/resonances_step4.cxx
+++ b/.conflict-side-1/Tutorials/PWGLF/Resonance/resonances_step4.cxx
@@ -13,11 +13,12 @@
 /// \author Hirak Kumar Koley <hirak.koley@cern.ch>
 /// \since 11/10/2024
 
+#include "PWGLF/DataModel/LFResonanceTables.h"
+
 #include "CommonConstants/PhysicsConstants.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Tutorials/PWGLF/Resonance/resonances_step5.cxx b/.conflict-side-1/Tutorials/PWGLF/Resonance/resonances_step5.cxx
index 7d8463b9236..3fc33f45f81 100644
--- a/.conflict-side-1/Tutorials/PWGLF/Resonance/resonances_step5.cxx
+++ b/.conflict-side-1/Tutorials/PWGLF/Resonance/resonances_step5.cxx
@@ -13,11 +13,12 @@
 /// \author Hirak Kumar Koley
 /// \since 11/10/2024
 
+#include "PWGLF/DataModel/LFResonanceTables.h"
+
 #include "CommonConstants/PhysicsConstants.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Tutorials/PWGLF/Resonance/resonances_step6.cxx b/.conflict-side-1/Tutorials/PWGLF/Resonance/resonances_step6.cxx
index 23ccac6dfd2..723d5a64712 100644
--- a/.conflict-side-1/Tutorials/PWGLF/Resonance/resonances_step6.cxx
+++ b/.conflict-side-1/Tutorials/PWGLF/Resonance/resonances_step6.cxx
@@ -13,13 +13,14 @@
 /// \author Hirak Kumar Koley
 /// \since 11/10/2024
 
-#include <TLorentzVector.h>
+#include "PWGLF/DataModel/LFResonanceTables.h"
 
 #include "CommonConstants/PhysicsConstants.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
+
+#include <TLorentzVector.h>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_skeleton.cxx b/.conflict-side-1/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_skeleton.cxx
index 788aaead7ae..9c7265a5051 100644
--- a/.conflict-side-1/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_skeleton.cxx
+++ b/.conflict-side-1/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_skeleton.cxx
@@ -15,11 +15,13 @@
 /// \author Nepeivoda Roman (roman.nepeivoda@cern.ch)
 /// \author Chiara De Martin (chiara.de.martin@cern.ch)
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/EventSelection.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/DataModel/EventSelection.h"
+
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_step0.cxx b/.conflict-side-1/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_step0.cxx
index b0e595246d7..96c7877e130 100644
--- a/.conflict-side-1/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_step0.cxx
+++ b/.conflict-side-1/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_step0.cxx
@@ -15,11 +15,13 @@
 /// \author Nepeivoda Roman (roman.nepeivoda@cern.ch)
 /// \author Chiara De Martin (chiara.de.martin@cern.ch)
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/EventSelection.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/DataModel/EventSelection.h"
+
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_step1.cxx b/.conflict-side-1/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_step1.cxx
index 836be98b240..92da4bfb428 100644
--- a/.conflict-side-1/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_step1.cxx
+++ b/.conflict-side-1/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_step1.cxx
@@ -15,11 +15,13 @@
 /// \author Nepeivoda Roman (roman.nepeivoda@cern.ch)
 /// \author Chiara De Martin (chiara.de.martin@cern.ch)
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/EventSelection.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/DataModel/EventSelection.h"
+
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_step2.cxx b/.conflict-side-1/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_step2.cxx
index 1558bb78052..c182142fd0a 100644
--- a/.conflict-side-1/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_step2.cxx
+++ b/.conflict-side-1/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_step2.cxx
@@ -15,12 +15,14 @@
 /// \author Nepeivoda Roman (roman.nepeivoda@cern.ch)
 /// \author Chiara De Martin (chiara.de.martin@cern.ch)
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/EventSelection.h"
 #include "PWGLF/DataModel/LFStrangenessPIDTables.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/DataModel/EventSelection.h"
+
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_step3.cxx b/.conflict-side-1/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_step3.cxx
index f12a4f02560..f6491959c37 100644
--- a/.conflict-side-1/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_step3.cxx
+++ b/.conflict-side-1/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_step3.cxx
@@ -15,12 +15,14 @@
 /// \author Nepeivoda Roman (roman.nepeivoda@cern.ch)
 /// \author Chiara De Martin (chiara.de.martin@cern.ch)
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/EventSelection.h"
 #include "PWGLF/DataModel/LFStrangenessPIDTables.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/DataModel/EventSelection.h"
+
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_step4.cxx b/.conflict-side-1/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_step4.cxx
index d45ef3c26a1..706e580bcb2 100644
--- a/.conflict-side-1/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_step4.cxx
+++ b/.conflict-side-1/Tutorials/PWGLF/Strangeness/PbPb/Analysis/strangeness_pbpb_step4.cxx
@@ -15,12 +15,14 @@
 /// \author Nepeivoda Roman (roman.nepeivoda@cern.ch)
 /// \author Chiara De Martin (chiara.de.martin@cern.ch)
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/EventSelection.h"
 #include "PWGLF/DataModel/LFStrangenessPIDTables.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/DataModel/EventSelection.h"
+
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Tutorials/PWGLF/Strangeness/pp/strangeness_step0.cxx b/.conflict-side-1/Tutorials/PWGLF/Strangeness/pp/strangeness_step0.cxx
index a14b0a5aa3f..4c2b6569e09 100644
--- a/.conflict-side-1/Tutorials/PWGLF/Strangeness/pp/strangeness_step0.cxx
+++ b/.conflict-side-1/Tutorials/PWGLF/Strangeness/pp/strangeness_step0.cxx
@@ -13,11 +13,13 @@
 /// \author Nepeivoda Roman (roman.nepeivoda@cern.ch)
 /// \author Chiara De Martin (chiara.de.martin@cern.ch)
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/EventSelection.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Common/DataModel/EventSelection.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-1/Tutorials/PWGLF/Strangeness/pp/strangeness_step1.cxx b/.conflict-side-1/Tutorials/PWGLF/Strangeness/pp/strangeness_step1.cxx
index 70748658778..ca57646dc97 100644
--- a/.conflict-side-1/Tutorials/PWGLF/Strangeness/pp/strangeness_step1.cxx
+++ b/.conflict-side-1/Tutorials/PWGLF/Strangeness/pp/strangeness_step1.cxx
@@ -13,11 +13,13 @@
 /// \author Nepeivoda Roman (roman.nepeivoda@cern.ch)
 /// \author Chiara De Martin (chiara.de.martin@cern.ch)
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/EventSelection.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Common/DataModel/EventSelection.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-1/Tutorials/PWGLF/Strangeness/pp/strangeness_step2.cxx b/.conflict-side-1/Tutorials/PWGLF/Strangeness/pp/strangeness_step2.cxx
index 9701410db1b..fd863f5090a 100644
--- a/.conflict-side-1/Tutorials/PWGLF/Strangeness/pp/strangeness_step2.cxx
+++ b/.conflict-side-1/Tutorials/PWGLF/Strangeness/pp/strangeness_step2.cxx
@@ -13,12 +13,14 @@
 /// \author Nepeivoda Roman (roman.nepeivoda@cern.ch)
 /// \author Chiara De Martin (chiara.de.martin@cern.ch)
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/EventSelection.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-1/Tutorials/PWGLF/Strangeness/pp/strangeness_step3.cxx b/.conflict-side-1/Tutorials/PWGLF/Strangeness/pp/strangeness_step3.cxx
index 6121831fadb..ef06ffaded7 100644
--- a/.conflict-side-1/Tutorials/PWGLF/Strangeness/pp/strangeness_step3.cxx
+++ b/.conflict-side-1/Tutorials/PWGLF/Strangeness/pp/strangeness_step3.cxx
@@ -13,12 +13,14 @@
 /// \author Nepeivoda Roman (roman.nepeivoda@cern.ch)
 /// \author Chiara De Martin (chiara.de.martin@cern.ch)
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/EventSelection.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-1/Tutorials/PWGLF/Strangeness/pp/strangeness_step4.cxx b/.conflict-side-1/Tutorials/PWGLF/Strangeness/pp/strangeness_step4.cxx
index 544d4283932..b96601c16f8 100644
--- a/.conflict-side-1/Tutorials/PWGLF/Strangeness/pp/strangeness_step4.cxx
+++ b/.conflict-side-1/Tutorials/PWGLF/Strangeness/pp/strangeness_step4.cxx
@@ -13,12 +13,14 @@
 /// \author Nepeivoda Roman (roman.nepeivoda@cern.ch)
 /// \author Chiara De Martin (chiara.de.martin@cern.ch)
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/EventSelection.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
+
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Tutorials/PWGMM/myExampleTask.cxx b/.conflict-side-1/Tutorials/PWGMM/myExampleTask.cxx
index f7035781b6e..2de9b8c1114 100644
--- a/.conflict-side-1/Tutorials/PWGMM/myExampleTask.cxx
+++ b/.conflict-side-1/Tutorials/PWGMM/myExampleTask.cxx
@@ -13,8 +13,8 @@
 ///        it is meant to be a blank page for further developments.
 /// \author everyone
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Tutorials/PWGUD/UDTutorial_01.cxx b/.conflict-side-1/Tutorials/PWGUD/UDTutorial_01.cxx
index c2cbf7b4f13..70161203257 100644
--- a/.conflict-side-1/Tutorials/PWGUD/UDTutorial_01.cxx
+++ b/.conflict-side-1/Tutorials/PWGUD/UDTutorial_01.cxx
@@ -13,13 +13,15 @@
 // \author Paul Buehler, paul.buehler@oeaw.ac.at
 // \since  April 2023
 
-#include "Framework/runDataProcessing.h"
+#include "PWGUD/Core/UDHelpers.h"
+#include "PWGUD/DataModel/UDTables.h"
+
+#include "Common/DataModel/PIDResponse.h"
+
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 #include "TVector3.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/UDHelpers.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Tutorials/PWGUD/UDTutorial_02a.cxx b/.conflict-side-1/Tutorials/PWGUD/UDTutorial_02a.cxx
index 75aa83c87a7..f10174d8d5b 100644
--- a/.conflict-side-1/Tutorials/PWGUD/UDTutorial_02a.cxx
+++ b/.conflict-side-1/Tutorials/PWGUD/UDTutorial_02a.cxx
@@ -13,14 +13,16 @@
 // \author Paul Buehler, paul.buehler@oeaw.ac.at
 // \since  April 2023
 
-#include "Framework/runDataProcessing.h"
+#include "PWGUD/Core/UDHelpers.h"
+#include "PWGUD/DataModel/UDTables.h"
+
+#include "Common/DataModel/PIDResponse.h"
+
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 #include "TDatabasePDG.h"
 #include "TLorentzVector.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/UDHelpers.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Tutorials/PWGUD/UDTutorial_02b.cxx b/.conflict-side-1/Tutorials/PWGUD/UDTutorial_02b.cxx
index 26a76a98186..315ae0dd45a 100644
--- a/.conflict-side-1/Tutorials/PWGUD/UDTutorial_02b.cxx
+++ b/.conflict-side-1/Tutorials/PWGUD/UDTutorial_02b.cxx
@@ -13,13 +13,14 @@
 // \author Paul Buehler, paul.buehler@oeaw.ac.at
 // \since  April 2023
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
+#include "PWGUD/Core/DGPIDSelector.h"
+#include "PWGUD/Core/UDHelpers.h"
+#include "PWGUD/DataModel/UDTables.h"
 
 #include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/UDHelpers.h"
-#include "PWGUD/Core/DGPIDSelector.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Tutorials/PWGUD/UDTutorial_03a.cxx b/.conflict-side-1/Tutorials/PWGUD/UDTutorial_03a.cxx
index 9840123236b..a466ddfc1ff 100644
--- a/.conflict-side-1/Tutorials/PWGUD/UDTutorial_03a.cxx
+++ b/.conflict-side-1/Tutorials/PWGUD/UDTutorial_03a.cxx
@@ -13,15 +13,17 @@
 // \author Paul Buehler, paul.buehler@oeaw.ac.at
 // \since  October 2023
 
-#include "Framework/runDataProcessing.h"
+#include "PWGUD/Core/UDHelpers.h"
+
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 #include "TDatabasePDG.h"
 #include "TLorentzVector.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/Core/UDHelpers.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Tutorials/PWGUD/UDTutorial_03b.cxx b/.conflict-side-1/Tutorials/PWGUD/UDTutorial_03b.cxx
index 71a144f1d1e..562836e0dce 100644
--- a/.conflict-side-1/Tutorials/PWGUD/UDTutorial_03b.cxx
+++ b/.conflict-side-1/Tutorials/PWGUD/UDTutorial_03b.cxx
@@ -13,15 +13,17 @@
 // \author Paul Buehler, paul.buehler@oeaw.ac.at
 // \since  October 2023
 
-#include "Framework/runDataProcessing.h"
+#include "PWGUD/Core/UDHelpers.h"
+
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 #include "TDatabasePDG.h"
 #include "TLorentzVector.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/Core/UDHelpers.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Tutorials/PWGUD/UDTutorial_04.cxx b/.conflict-side-1/Tutorials/PWGUD/UDTutorial_04.cxx
index 94a93cb0ef4..8b16a7fde51 100644
--- a/.conflict-side-1/Tutorials/PWGUD/UDTutorial_04.cxx
+++ b/.conflict-side-1/Tutorials/PWGUD/UDTutorial_04.cxx
@@ -13,13 +13,14 @@
 // \author Paul Buehler, paul.buehler@oeaw.ac.at
 // \since  October 2023
 
-#include "Framework/runDataProcessing.h"
+#include "PWGUD/Core/UDHelpers.h"
+#include "PWGUD/DataModel/UDTables.h"
+
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 #include "TDatabasePDG.h"
 #include "TLorentzVector.h"
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/UDHelpers.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Tutorials/PWGUD/UDTutorial_05.cxx b/.conflict-side-1/Tutorials/PWGUD/UDTutorial_05.cxx
index 40375c48614..9ca8ddf62d5 100644
--- a/.conflict-side-1/Tutorials/PWGUD/UDTutorial_05.cxx
+++ b/.conflict-side-1/Tutorials/PWGUD/UDTutorial_05.cxx
@@ -10,16 +10,18 @@
 // or submit itself to any jurisdiction.
 //
 
-#include <iostream>
-#include "TLorentzVector.h"
-#include "TDatabasePDG.h"
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "PWGUD/DataModel/UDTables.h"
 #include "PWGUD/Core/SGSelector.h"
 #include "PWGUD/Core/SGTrackSelector.h"
+#include "PWGUD/DataModel/UDTables.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TDatabasePDG.h"
+#include "TLorentzVector.h"
+
+#include <iostream>
 
 // using namespace std;
 using namespace o2;
diff --git a/.conflict-side-1/Tutorials/PWGUD/UDTutorial_06.cxx b/.conflict-side-1/Tutorials/PWGUD/UDTutorial_06.cxx
index 9b1d1f55895..d7ef0273e7f 100644
--- a/.conflict-side-1/Tutorials/PWGUD/UDTutorial_06.cxx
+++ b/.conflict-side-1/Tutorials/PWGUD/UDTutorial_06.cxx
@@ -14,23 +14,23 @@
 /// \date 10.10.2024
 
 // O2 headers
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 // O2Physics headers
-#include "PWGUD/DataModel/UDTables.h"
 #include "PWGUD/Core/UDHelpers.h"
+#include "PWGUD/DataModel/UDTables.h"
+
 #include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPLHCIFData.h"
 #include "DataFormatsParameters/GRPECSObject.h"
+#include "DataFormatsParameters/GRPLHCIFData.h"
 
 // ROOT headers
-#include "TSystem.h"
 #include "TDatabasePDG.h"
 #include "TLorentzVector.h"
-#include "TLorentzVector.h"
 #include "TMath.h"
+#include "TSystem.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Tutorials/PWGUD/UDTutorial_07.cxx b/.conflict-side-1/Tutorials/PWGUD/UDTutorial_07.cxx
index 0060b68293e..cfa5dc6d27c 100644
--- a/.conflict-side-1/Tutorials/PWGUD/UDTutorial_07.cxx
+++ b/.conflict-side-1/Tutorials/PWGUD/UDTutorial_07.cxx
@@ -9,16 +9,19 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 //
-#include <iostream>
-#include <TString.h>
-#include <TTree.h>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "PWGUD/DataModel/UDTables.h"
-#include "TLorentzVector.h"
 #include "PWGUD/Core/SGSelector.h"
 #include "PWGUD/Core/SGTrackSelector.h"
+#include "PWGUD/DataModel/UDTables.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TLorentzVector.h"
+#include <TString.h>
+#include <TTree.h>
+
+#include <iostream>
 
 using namespace std;
 using namespace o2;
diff --git a/.conflict-side-1/Tutorials/Skimming/DataModel/JEDerived.h b/.conflict-side-1/Tutorials/Skimming/DataModel/JEDerived.h
index 20a8b3d076e..b0b79c2060a 100644
--- a/.conflict-side-1/Tutorials/Skimming/DataModel/JEDerived.h
+++ b/.conflict-side-1/Tutorials/Skimming/DataModel/JEDerived.h
@@ -29,7 +29,7 @@ DECLARE_SOA_COLUMN(Area, area, float);
 DECLARE_SOA_DYNAMIC_COLUMN(Px, px, [](float pt, float phi) { return pt * TMath::Cos(phi); });
 DECLARE_SOA_DYNAMIC_COLUMN(Py, py, [](float pt, float phi) { return pt * TMath::Sin(phi); });
 DECLARE_SOA_DYNAMIC_COLUMN(Pz, pz, [](float pt, float eta) { return pt * TMath::SinH(eta); });
-DECLARE_SOA_DYNAMIC_COLUMN(P, p, [](float pt, float eta) { return pt * TMath::CosH(eta); }); //absolute p
+DECLARE_SOA_DYNAMIC_COLUMN(P, p, [](float pt, float eta) { return pt * TMath::CosH(eta); }); // absolute p
 } // namespace jejet
 
 DECLARE_SOA_TABLE(JEJets, "AOD", "JEJET",
@@ -56,7 +56,7 @@ DECLARE_SOA_COLUMN(Phi, phi, float);
 DECLARE_SOA_DYNAMIC_COLUMN(Px, px, [](float pt, float phi) { return pt * TMath::Cos(phi); });
 DECLARE_SOA_DYNAMIC_COLUMN(Py, py, [](float pt, float phi) { return pt * TMath::Sin(phi); });
 DECLARE_SOA_DYNAMIC_COLUMN(Pz, pz, [](float pt, float eta) { return pt * TMath::SinH(eta); });
-DECLARE_SOA_DYNAMIC_COLUMN(P, p, [](float pt, float eta) { return pt * TMath::CosH(eta); }); //absolute p
+DECLARE_SOA_DYNAMIC_COLUMN(P, p, [](float pt, float eta) { return pt * TMath::CosH(eta); }); // absolute p
 } // namespace jeconstituent
 
 DECLARE_SOA_TABLE(JEConstituents, "AOD", "JECONSTITUENT", o2::soa::Index<>,
diff --git a/.conflict-side-1/Tutorials/Skimming/derivedBasicConsumer.cxx b/.conflict-side-1/Tutorials/Skimming/derivedBasicConsumer.cxx
index c96eeb156e7..21b06c2f9a6 100644
--- a/.conflict-side-1/Tutorials/Skimming/derivedBasicConsumer.cxx
+++ b/.conflict-side-1/Tutorials/Skimming/derivedBasicConsumer.cxx
@@ -11,13 +11,15 @@
 /// \author Nima Zardoshti <nima.zardoshti@cern.ch>, CERN
 
 // O2 includes
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "DataModel/DerivedExampleTable.h"
 
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "ReconstructionDataFormats/Track.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-1/Tutorials/Skimming/derivedBasicProvider.cxx b/.conflict-side-1/Tutorials/Skimming/derivedBasicProvider.cxx
index 93e567ecc9b..b0613b74cfd 100644
--- a/.conflict-side-1/Tutorials/Skimming/derivedBasicProvider.cxx
+++ b/.conflict-side-1/Tutorials/Skimming/derivedBasicProvider.cxx
@@ -10,13 +10,15 @@
 // or submit itself to any jurisdiction.
 
 // O2 includes
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "DataModel/DerivedExampleTable.h"
 
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "ReconstructionDataFormats/Track.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-1/Tutorials/Skimming/jetProvider.cxx b/.conflict-side-1/Tutorials/Skimming/jetProvider.cxx
index 36b985bc18d..ace25583de3 100644
--- a/.conflict-side-1/Tutorials/Skimming/jetProvider.cxx
+++ b/.conflict-side-1/Tutorials/Skimming/jetProvider.cxx
@@ -11,14 +11,17 @@
 /// \author Nima Zardoshti <nima.zardoshti@cern.ch>, CERN
 
 // O2 includes
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "DataModel/JEDerived.h"
-#include "PWGJE/DataModel/Jet.h"
+
 #include "PWGJE/Core/JetFinder.h"
+#include "PWGJE/DataModel/Jet.h"
+
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "ReconstructionDataFormats/Track.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Tutorials/Skimming/jetSpectraAnalyser.cxx b/.conflict-side-1/Tutorials/Skimming/jetSpectraAnalyser.cxx
index 6e635cd659e..2257e40086a 100644
--- a/.conflict-side-1/Tutorials/Skimming/jetSpectraAnalyser.cxx
+++ b/.conflict-side-1/Tutorials/Skimming/jetSpectraAnalyser.cxx
@@ -14,18 +14,19 @@
 // Author: Nima Zardoshti
 //
 
-#include "TH1F.h"
-#include "TTree.h"
+#include "DataModel/JEDerived.h"
+
+#include "PWGJE/Core/JetFinder.h"
+#include "PWGJE/DataModel/Jet.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 
-#include "PWGJE/DataModel/Jet.h"
-#include "PWGJE/Core/JetFinder.h"
-#include "DataModel/JEDerived.h"
+#include "TH1F.h"
+#include "TTree.h"
 
 using namespace o2;
 using namespace o2::framework;
@@ -39,7 +40,7 @@ struct JetSpectraAnalyser {
      {"hNJetConstituents", "Number of constituents;N;entries", {HistType::kTH1F, {{100, -0.5, 99.5}}}},
      {"hConstituentPt", "Constituent pT; Constituent #it{p}_{T} (GeV/#it{c});entries", {HistType::kTH1F, {{100, 0., 100.}}}}}};
 
-  //Filter jetCuts = aod::jet::pt > f_jetPtMin;
+  // Filter jetCuts = aod::jet::pt > f_jetPtMin;
 
   void process(aod::JEJet const& jet,
                aod::JEConstituents const& constituents)
@@ -55,4 +56,5 @@ WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
   return WorkflowSpec{
     adaptAnalysisTask<JetSpectraAnalyser>(cfgc, TaskName{"jetspectra-task-skim-analyser"})};
-}
\ No newline at end of file
+}
+ 
\ No newline at end of file
diff --git a/.conflict-side-1/Tutorials/Skimming/jetSpectraReference.cxx b/.conflict-side-1/Tutorials/Skimming/jetSpectraReference.cxx
index 74fb82dfc83..e73f5526dc4 100644
--- a/.conflict-side-1/Tutorials/Skimming/jetSpectraReference.cxx
+++ b/.conflict-side-1/Tutorials/Skimming/jetSpectraReference.cxx
@@ -14,17 +14,17 @@
 // Author: Nima Zardoshti
 //
 
-#include "TH1F.h"
-#include "TTree.h"
+#include "PWGJE/Core/JetFinder.h"
+#include "PWGJE/DataModel/Jet.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 
-#include "PWGJE/DataModel/Jet.h"
-#include "PWGJE/Core/JetFinder.h"
+#include "TH1F.h"
+#include "TTree.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Tutorials/Skimming/spectraNucleiAnalyser.cxx b/.conflict-side-1/Tutorials/Skimming/spectraNucleiAnalyser.cxx
index f0647db20a9..cdad3b82434 100644
--- a/.conflict-side-1/Tutorials/Skimming/spectraNucleiAnalyser.cxx
+++ b/.conflict-side-1/Tutorials/Skimming/spectraNucleiAnalyser.cxx
@@ -10,16 +10,17 @@
 // or submit itself to any jurisdiction.
 // O2 includes
 
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
+#include "DataModel/LFDerived.h"
+
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "DataModel/LFDerived.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
 #include <TLorentzVector.h>
 
diff --git a/.conflict-side-1/Tutorials/Skimming/spectraNucleiProvider.cxx b/.conflict-side-1/Tutorials/Skimming/spectraNucleiProvider.cxx
index 7a76882fd7a..66fe7b5de4d 100644
--- a/.conflict-side-1/Tutorials/Skimming/spectraNucleiProvider.cxx
+++ b/.conflict-side-1/Tutorials/Skimming/spectraNucleiProvider.cxx
@@ -11,16 +11,17 @@
 /// \author Nima Zardoshti <nima.zardoshti@cern.ch>, CERN
 
 // O2 includes
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "MathUtils/Utils.h"
 #include "DataModel/LFDerived.h"
 
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "MathUtils/Utils.h"
+#include "ReconstructionDataFormats/Track.h"
 
 #include <TLorentzVector.h>
 
diff --git a/.conflict-side-1/Tutorials/Skimming/spectraNucleiReference.cxx b/.conflict-side-1/Tutorials/Skimming/spectraNucleiReference.cxx
index 40535297fef..2af935c4339 100644
--- a/.conflict-side-1/Tutorials/Skimming/spectraNucleiReference.cxx
+++ b/.conflict-side-1/Tutorials/Skimming/spectraNucleiReference.cxx
@@ -10,18 +10,16 @@
 // or submit itself to any jurisdiction.
 // O2 includes
 
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
 #include <TLorentzVector.h>
 
diff --git a/.conflict-side-1/Tutorials/Skimming/spectraTPCAnalyser.cxx b/.conflict-side-1/Tutorials/Skimming/spectraTPCAnalyser.cxx
index 769ad0b885a..b5e42893f15 100644
--- a/.conflict-side-1/Tutorials/Skimming/spectraTPCAnalyser.cxx
+++ b/.conflict-side-1/Tutorials/Skimming/spectraTPCAnalyser.cxx
@@ -10,13 +10,15 @@
 // or submit itself to any jurisdiction.
 
 // O2 includes
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
+#include "DataModel/LFDerived.h"
+
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "DataModel/LFDerived.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "ReconstructionDataFormats/Track.h"
 
 using namespace o2;
 using namespace o2::framework;
@@ -63,7 +65,7 @@ struct TPCSpectraAnalyserTask {
     histos.fill(HIST(hpt[i]), track.pt());
   }
 
-  Filter collisionFilter = nabs(aod::collision::posZ) < cfgCutVertex; //collision filters not doing anything now?
+  Filter collisionFilter = nabs(aod::collision::posZ) < cfgCutVertex; // collision filters not doing anything now?
   Filter trackFilter = nabs(aod::lftrack::eta) < cfgCutEta;
 
   void process(soa::Filtered<aod::LFTracks>::iterator const& track)
diff --git a/.conflict-side-1/Tutorials/Skimming/spectraTPCProvider.cxx b/.conflict-side-1/Tutorials/Skimming/spectraTPCProvider.cxx
index c0bbf087fd3..12ca5c9a1ba 100644
--- a/.conflict-side-1/Tutorials/Skimming/spectraTPCProvider.cxx
+++ b/.conflict-side-1/Tutorials/Skimming/spectraTPCProvider.cxx
@@ -11,15 +11,17 @@
 /// \author Nima Zardoshti <nima.zardoshti@cern.ch>, CERN
 
 // O2 includes
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
+#include "DataModel/LFDerived.h"
+
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "MathUtils/Utils.h"
-#include "DataModel/LFDerived.h"
+#include "ReconstructionDataFormats/Track.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Tutorials/Skimming/spectraTPCReference.cxx b/.conflict-side-1/Tutorials/Skimming/spectraTPCReference.cxx
index 5d23fd202dc..7fbca871870 100644
--- a/.conflict-side-1/Tutorials/Skimming/spectraTPCReference.cxx
+++ b/.conflict-side-1/Tutorials/Skimming/spectraTPCReference.cxx
@@ -10,13 +10,14 @@
 // or submit itself to any jurisdiction.
 
 // O2 includes
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "ReconstructionDataFormats/Track.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
@@ -47,7 +48,7 @@ struct TPCSpectraReferenceTask {
     }
   }
 
-  //Defining filters and input
+  // Defining filters and input
   Configurable<float> cfgCutVertex{"cfgCutVertex", 10.0f, "Accepted z-vertex range"};
   Configurable<float> cfgCutEta{"cfgCutEta", 0.8f, "Eta range for tracks"};
   Configurable<float> cfgCutPt{"cfgCutPt", 0.0f, "Pt range for tracks"};
diff --git a/.conflict-side-1/Tutorials/Skimming/spectraUPCAnalyser.cxx b/.conflict-side-1/Tutorials/Skimming/spectraUPCAnalyser.cxx
index cdc6c9a0c4b..2c831ddc591 100644
--- a/.conflict-side-1/Tutorials/Skimming/spectraUPCAnalyser.cxx
+++ b/.conflict-side-1/Tutorials/Skimming/spectraUPCAnalyser.cxx
@@ -10,16 +10,18 @@
 // or submit itself to any jurisdiction.
 
 // O2 includes
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
+#include "DataModel/UDDerived.h"
+
 #include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "DataModel/UDDerived.h"
-#include "TLorentzVector.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include "TLorentzVector.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Tutorials/Skimming/spectraUPCProvider.cxx b/.conflict-side-1/Tutorials/Skimming/spectraUPCProvider.cxx
index 053b7437080..3d6909f88d0 100644
--- a/.conflict-side-1/Tutorials/Skimming/spectraUPCProvider.cxx
+++ b/.conflict-side-1/Tutorials/Skimming/spectraUPCProvider.cxx
@@ -10,18 +10,19 @@
 // or submit itself to any jurisdiction.
 /// \author Nima Zardoshti <nima.zardoshti@cern.ch>, CERN
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "ReconstructionDataFormats/Track.h"
+#include "DataModel/UDDerived.h"
 
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
 #include <TH1D.h>
-#include "DataModel/UDDerived.h"
 
 using namespace o2;
 using namespace o2::aod::evsel;
diff --git a/.conflict-side-1/Tutorials/Skimming/spectraUPCReference.cxx b/.conflict-side-1/Tutorials/Skimming/spectraUPCReference.cxx
index f0a26f248f8..59ba6c24ab1 100644
--- a/.conflict-side-1/Tutorials/Skimming/spectraUPCReference.cxx
+++ b/.conflict-side-1/Tutorials/Skimming/spectraUPCReference.cxx
@@ -9,17 +9,16 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
 
-#include <TH1D.h>
 #include "TLorentzVector.h"
+#include <TH1D.h>
 
 using namespace o2;
 using namespace o2::aod::evsel;
diff --git a/.conflict-side-1/Tutorials/include/configurableCut.h b/.conflict-side-1/Tutorials/include/configurableCut.h
index b690058abf1..2bbb47486fc 100644
--- a/.conflict-side-1/Tutorials/include/configurableCut.h
+++ b/.conflict-side-1/Tutorials/include/configurableCut.h
@@ -13,10 +13,13 @@
 #define CONFIGURABLECUT_H
 
 #include "Framework/Array2D.h"
-#include <iosfwd>
-#include <Rtypes.h>
+
 #include <TMath.h>
 
+#include <Rtypes.h>
+
+#include <iosfwd>
+
 static constexpr double default_matrix[3][3] = {{1.1, 1.2, 1.3}, {2.1, 2.2, 2.3}, {3.1, 3.2, 3.3}};
 
 class configurableCut
diff --git a/.conflict-side-1/Tutorials/src/ZDCVZeroIteration.cxx b/.conflict-side-1/Tutorials/src/ZDCVZeroIteration.cxx
index 10b45687213..1804fe5690f 100644
--- a/.conflict-side-1/Tutorials/src/ZDCVZeroIteration.cxx
+++ b/.conflict-side-1/Tutorials/src/ZDCVZeroIteration.cxx
@@ -17,8 +17,8 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Tutorials/src/associatedExample.cxx b/.conflict-side-1/Tutorials/src/associatedExample.cxx
index 6538104d3f5..f7abeeb604e 100644
--- a/.conflict-side-1/Tutorials/src/associatedExample.cxx
+++ b/.conflict-side-1/Tutorials/src/associatedExample.cxx
@@ -13,8 +13,8 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 namespace o2::aod
 {
@@ -140,7 +140,7 @@ struct PartitionColExtra {
 struct BuildHmpidIndex {
   // build the index table HMPIDTracksIndex
   Builds<aod::HMPIDTracksIndex> idx;
-  void init(InitContext const&){};
+  void init(InitContext const&) {};
 };
 
 struct ConsumeHmpidIndex {
diff --git a/.conflict-side-1/Tutorials/src/ccdbaccess.cxx b/.conflict-side-1/Tutorials/src/ccdbaccess.cxx
index afa5c9d4d52..69f804195d1 100644
--- a/.conflict-side-1/Tutorials/src/ccdbaccess.cxx
+++ b/.conflict-side-1/Tutorials/src/ccdbaccess.cxx
@@ -18,10 +18,10 @@
 /// \author Nicolo' Jacazio
 /// \since 2020-06-22
 
-#include "Framework/runDataProcessing.h"
+#include "CommonDataFormat/InteractionRecord.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 #include <CCDB/BasicCCDBManager.h>
-#include "CommonDataFormat/InteractionRecord.h"
 
 #include <chrono>
 
diff --git a/.conflict-side-1/Tutorials/src/collisionTracksIteration.cxx b/.conflict-side-1/Tutorials/src/collisionTracksIteration.cxx
index a2261504d3b..e7999a01455 100644
--- a/.conflict-side-1/Tutorials/src/collisionTracksIteration.cxx
+++ b/.conflict-side-1/Tutorials/src/collisionTracksIteration.cxx
@@ -15,8 +15,8 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Tutorials/src/compatibleBCs.cxx b/.conflict-side-1/Tutorials/src/compatibleBCs.cxx
index 20d38d032db..22c8b2c49be 100644
--- a/.conflict-side-1/Tutorials/src/compatibleBCs.cxx
+++ b/.conflict-side-1/Tutorials/src/compatibleBCs.cxx
@@ -15,9 +15,9 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "CommonConstants/LHCConstants.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Tutorials/src/conditionalExpressions.cxx b/.conflict-side-1/Tutorials/src/conditionalExpressions.cxx
index 07b9dbac403..5843f2b5a33 100644
--- a/.conflict-side-1/Tutorials/src/conditionalExpressions.cxx
+++ b/.conflict-side-1/Tutorials/src/conditionalExpressions.cxx
@@ -11,8 +11,8 @@
 ///
 /// \brief Demonstration of conditions in filter expressions
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Tutorials/src/configurableCut.cxx b/.conflict-side-1/Tutorials/src/configurableCut.cxx
index 62b1d1adc66..22ef7341b84 100644
--- a/.conflict-side-1/Tutorials/src/configurableCut.cxx
+++ b/.conflict-side-1/Tutorials/src/configurableCut.cxx
@@ -10,6 +10,7 @@
 // or submit itself to any jurisdiction.
 
 #include "configurableCut.h"
+
 #include <iostream>
 
 std::ostream& operator<<(std::ostream& os, configurableCut const& c)
diff --git a/.conflict-side-1/Tutorials/src/configurableCut.json b/.conflict-side-1/Tutorials/src/configurableCut.json
index 33d4294b132..be9ab281ad8 100644
--- a/.conflict-side-1/Tutorials/src/configurableCut.json
+++ b/.conflict-side-1/Tutorials/src/configurableCut.json
@@ -10,12 +10,12 @@
     "internal-dpl-aod-spawner": "",
     "configurable-demo": {
         "cut": {
-		"cut": "0.1",
-		"state": "1"
-	},
+            "cut": "0.1",
+            "state": "1"
+        },
         "mutable_cut": {
-		"cut": "0.2",
-		"state": "-1"
-	}
+            "cut": "0.2",
+            "state": "-1"
+        }
     }
 }
diff --git a/.conflict-side-1/Tutorials/src/configurableObjects.cxx b/.conflict-side-1/Tutorials/src/configurableObjects.cxx
index 210d93c0dac..0d34f8f1913 100644
--- a/.conflict-side-1/Tutorials/src/configurableObjects.cxx
+++ b/.conflict-side-1/Tutorials/src/configurableObjects.cxx
@@ -14,11 +14,12 @@
 /// \author
 /// \since
 
-#include <sstream>
-
 #include "configurableCut.h"
-#include "Framework/runDataProcessing.h"
+
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include <sstream>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Tutorials/src/consume.cxx b/.conflict-side-1/Tutorials/src/consume.cxx
index f97e65bda87..95e8a8e9a4b 100644
--- a/.conflict-side-1/Tutorials/src/consume.cxx
+++ b/.conflict-side-1/Tutorials/src/consume.cxx
@@ -14,8 +14,9 @@
 /// \since
 
 #include "IntermediateTables.h"
-#include "Framework/runDataProcessing.h"
+
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Tutorials/src/dynamicColumns.cxx b/.conflict-side-1/Tutorials/src/dynamicColumns.cxx
index 48de150b042..2e6dbcc0a15 100644
--- a/.conflict-side-1/Tutorials/src/dynamicColumns.cxx
+++ b/.conflict-side-1/Tutorials/src/dynamicColumns.cxx
@@ -13,8 +13,8 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 namespace o2::aod
 {
diff --git a/.conflict-side-1/Tutorials/src/efficiencyGlobal.cxx b/.conflict-side-1/Tutorials/src/efficiencyGlobal.cxx
index ef509cb0bac..e405c479697 100644
--- a/.conflict-side-1/Tutorials/src/efficiencyGlobal.cxx
+++ b/.conflict-side-1/Tutorials/src/efficiencyGlobal.cxx
@@ -17,9 +17,10 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 #include <CCDB/BasicCCDBManager.h>
+
 #include <chrono>
 
 using namespace o2::framework;
@@ -56,7 +57,7 @@ struct EfficiencyGlobal {
   {
     for (auto& track : tracks) {
       pt->Fill(track.pt(), efficiency->GetBinContent(efficiency->FindBin(track.pt())));
-      //LOGF(info, "Efficiency %f for pt %f", efficiency->GetBinContent(efficiency->FindBin(track.pt())), track.pt());
+      // LOGF(info, "Efficiency %f for pt %f", efficiency->GetBinContent(efficiency->FindBin(track.pt())), track.pt());
     }
   }
 };
diff --git a/.conflict-side-1/Tutorials/src/efficiencyPerRun.cxx b/.conflict-side-1/Tutorials/src/efficiencyPerRun.cxx
index c2fa7a887ca..57f28054d37 100644
--- a/.conflict-side-1/Tutorials/src/efficiencyPerRun.cxx
+++ b/.conflict-side-1/Tutorials/src/efficiencyPerRun.cxx
@@ -20,9 +20,10 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 #include <CCDB/BasicCCDBManager.h>
+
 #include <chrono>
 
 using namespace o2::framework;
@@ -58,7 +59,7 @@ struct EfficiencyPerRun {
 
     for (auto& track : tracks) {
       pt->Fill(track.pt(), efficiency->GetBinContent(efficiency->FindBin(track.pt())));
-      //LOGF(info, "Efficiency %f for pt %f", efficiency->GetBinContent(efficiency->FindBin(track.pt())), track.pt());
+      // LOGF(info, "Efficiency %f for pt %f", efficiency->GetBinContent(efficiency->FindBin(track.pt())), track.pt());
     }
   }
 };
diff --git a/.conflict-side-1/Tutorials/src/eventMixing.cxx b/.conflict-side-1/Tutorials/src/eventMixing.cxx
index a1526740886..759dfeb2ff2 100644
--- a/.conflict-side-1/Tutorials/src/eventMixing.cxx
+++ b/.conflict-side-1/Tutorials/src/eventMixing.cxx
@@ -14,15 +14,17 @@
 /// \author Karwowska Maja
 /// \since
 
-#include <vector>
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-1/Tutorials/src/eventMixingValidation.cxx b/.conflict-side-1/Tutorials/src/eventMixingValidation.cxx
index cc1933b0a25..1bfc9891ac5 100644
--- a/.conflict-side-1/Tutorials/src/eventMixingValidation.cxx
+++ b/.conflict-side-1/Tutorials/src/eventMixingValidation.cxx
@@ -14,15 +14,17 @@
 /// \author Karwowska Maja
 /// \since
 
-#include <vector>
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/SliceCache.h"
 #include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Multiplicity.h"
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
@@ -39,7 +41,7 @@ struct MixedEventsEmptyTables {
   std::vector<double> xBins{VARIABLE_WIDTH, -0.064, -0.062, -0.060, 0.066, 0.068, 0.070, 0.072};
   std::vector<double> yBins{VARIABLE_WIDTH, -0.320, -0.301, -0.300, 0.330, 0.340, 0.350, 0.360};
   using BinningType = ColumnBinningPolicy<aod::collision::PosX, aod::collision::PosY>;
-  BinningType binningOnPositions{{xBins, yBins}, true};                                 // true is for 'ignore overflows' (true by default)
+  BinningType binningOnPositions{{xBins, yBins}, true};                                         // true is for 'ignore overflows' (true by default)
   SameKindPair<aod::Collisions, MyTracks, BinningType> pair{binningOnPositions, 5, -1, &cache}; // indicates that 5 events should be mixed and under/overflow (-1) to be ignored
 
   void process(aod::Collisions const& collisions, MyTracks const& tracks)
@@ -71,7 +73,7 @@ struct MixedEventsJoinedTracks {
   std::vector<double> xBins{VARIABLE_WIDTH, -0.064, -0.062, -0.060, 0.066, 0.068, 0.070, 0.072};
   std::vector<double> yBins{VARIABLE_WIDTH, -0.320, -0.301, -0.300, 0.330, 0.340, 0.350, 0.360};
   using BinningType = ColumnBinningPolicy<aod::collision::PosX, aod::collision::PosY>;
-  BinningType binningOnPositions{{xBins, yBins}, true};                                        // true is for 'ignore overflows' (true by default)
+  BinningType binningOnPositions{{xBins, yBins}, true};                                                // true is for 'ignore overflows' (true by default)
   SameKindPair<aod::Collisions, aod::FullTracks, BinningType> pair{binningOnPositions, 5, -1, &cache}; // indicates that 5 events should be mixed and under/overflow (-1) to be ignored
 
   void process(aod::Collisions const& collisions, aod::FullTracks const& tracks)
diff --git a/.conflict-side-1/Tutorials/src/extendedColumns.cxx b/.conflict-side-1/Tutorials/src/extendedColumns.cxx
index 72bb2bb55b4..43ec8f77a7d 100644
--- a/.conflict-side-1/Tutorials/src/extendedColumns.cxx
+++ b/.conflict-side-1/Tutorials/src/extendedColumns.cxx
@@ -13,8 +13,8 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 namespace o2::aod
 {
diff --git a/.conflict-side-1/Tutorials/src/extendedTables.cxx b/.conflict-side-1/Tutorials/src/extendedTables.cxx
index 643a81e1504..4b50c4d85b0 100644
--- a/.conflict-side-1/Tutorials/src/extendedTables.cxx
+++ b/.conflict-side-1/Tutorials/src/extendedTables.cxx
@@ -13,8 +13,8 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 namespace o2::aod
 {
diff --git a/.conflict-side-1/Tutorials/src/filters.cxx b/.conflict-side-1/Tutorials/src/filters.cxx
index a3c590b8bfd..6b2d4a1aba4 100644
--- a/.conflict-side-1/Tutorials/src/filters.cxx
+++ b/.conflict-side-1/Tutorials/src/filters.cxx
@@ -13,8 +13,8 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 namespace o2::aod
 {
diff --git a/.conflict-side-1/Tutorials/src/fullTrackIteration.cxx b/.conflict-side-1/Tutorials/src/fullTrackIteration.cxx
index c88ba5b1a78..0bfa4532d55 100644
--- a/.conflict-side-1/Tutorials/src/fullTrackIteration.cxx
+++ b/.conflict-side-1/Tutorials/src/fullTrackIteration.cxx
@@ -13,8 +13,8 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Tutorials/src/hepMC.cxx b/.conflict-side-1/Tutorials/src/hepMC.cxx
index d05941eff06..10d73141b78 100644
--- a/.conflict-side-1/Tutorials/src/hepMC.cxx
+++ b/.conflict-side-1/Tutorials/src/hepMC.cxx
@@ -13,8 +13,8 @@
 /// \author jgrosseo
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Tutorials/src/histogramRegistry.cxx b/.conflict-side-1/Tutorials/src/histogramRegistry.cxx
index ddbcdd18c56..24d5899361c 100644
--- a/.conflict-side-1/Tutorials/src/histogramRegistry.cxx
+++ b/.conflict-side-1/Tutorials/src/histogramRegistry.cxx
@@ -13,12 +13,13 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include <TParameter.h>
 
+#include "Framework/AnalysisTask.h"
 #include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
+
+#include <TParameter.h>
 
 using namespace o2;
 using namespace o2::framework;
@@ -30,7 +31,7 @@ struct EtaPhiHistograms {
     {
       {"eta", "#eta", {HistType::kTH1F, {{102, -2.01, 2.01}}}},     //
       {"phi", "#varphi", {HistType::kTH1F, {{100, 0., 2. * M_PI}}}} //
-    }                                                               //
+    } //
   };
 
   void process(aod::Tracks const& tracks)
@@ -49,7 +50,7 @@ struct FilteredHistograms {
     {
       {"eta", "#eta", {HistType::kTH1F, {{102, -2.01, 2.01}}}},                            //
       {"ptToPt", "#ptToPt", {HistType::kTH2F, {{100, -0.01, 10.01}, {100, -0.01, 10.01}}}} //
-    }                                                                                      //
+    } //
   };
 
   void process(aod::Tracks const& tracks)
@@ -259,7 +260,7 @@ struct TListTest {
     {
       {"eta", "#eta", {HistType::kTH1F, {{102, -2.01, 2.01}}}},     //
       {"phi", "#varphi", {HistType::kTH1F, {{100, 0., 2. * M_PI}}}} //
-    }                                                               //
+    } //
   };
 
   void init(InitContext const&)
diff --git a/.conflict-side-1/Tutorials/src/histogramTrackSelection.cxx b/.conflict-side-1/Tutorials/src/histogramTrackSelection.cxx
index df164396b66..599aa0e0ee9 100644
--- a/.conflict-side-1/Tutorials/src/histogramTrackSelection.cxx
+++ b/.conflict-side-1/Tutorials/src/histogramTrackSelection.cxx
@@ -17,12 +17,12 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-
 #include "Common/Core/TrackSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-1/Tutorials/src/histograms.cxx b/.conflict-side-1/Tutorials/src/histograms.cxx
index 613b27d05d6..13c44fbc713 100644
--- a/.conflict-side-1/Tutorials/src/histograms.cxx
+++ b/.conflict-side-1/Tutorials/src/histograms.cxx
@@ -19,8 +19,8 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Tutorials/src/histogramsFullTracks.cxx b/.conflict-side-1/Tutorials/src/histogramsFullTracks.cxx
index 8c45e5a3927..a68e3e5a873 100644
--- a/.conflict-side-1/Tutorials/src/histogramsFullTracks.cxx
+++ b/.conflict-side-1/Tutorials/src/histogramsFullTracks.cxx
@@ -13,9 +13,11 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 #include <TH2F.h>
+
 #include <cmath>
 
 using namespace o2;
diff --git a/.conflict-side-1/Tutorials/src/jetAnalysis.cxx b/.conflict-side-1/Tutorials/src/jetAnalysis.cxx
index 8313e69f2bb..e684f645b90 100644
--- a/.conflict-side-1/Tutorials/src/jetAnalysis.cxx
+++ b/.conflict-side-1/Tutorials/src/jetAnalysis.cxx
@@ -14,10 +14,11 @@
 /// \author Jochen Klein
 /// \since
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "PWGJE/DataModel/Jet.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/.conflict-side-1/Tutorials/src/mcHistograms.cxx b/.conflict-side-1/Tutorials/src/mcHistograms.cxx
index 75c28c6c3c4..08bcb24119d 100644
--- a/.conflict-side-1/Tutorials/src/mcHistograms.cxx
+++ b/.conflict-side-1/Tutorials/src/mcHistograms.cxx
@@ -13,10 +13,11 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "CommonConstants/MathConstants.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TDatabasePDG.h"
 
 using namespace o2;
diff --git a/.conflict-side-1/Tutorials/src/mcOnly.cxx b/.conflict-side-1/Tutorials/src/mcOnly.cxx
index e72295ecb3a..293bd0a1904 100644
--- a/.conflict-side-1/Tutorials/src/mcOnly.cxx
+++ b/.conflict-side-1/Tutorials/src/mcOnly.cxx
@@ -13,10 +13,11 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "CommonConstants/MathConstants.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TDatabasePDG.h"
 
 using namespace o2;
diff --git a/.conflict-side-1/Tutorials/src/multiplicityEventTrackSelection.cxx b/.conflict-side-1/Tutorials/src/multiplicityEventTrackSelection.cxx
index c1e3714f2f3..2c0b4cce38a 100644
--- a/.conflict-side-1/Tutorials/src/multiplicityEventTrackSelection.cxx
+++ b/.conflict-side-1/Tutorials/src/multiplicityEventTrackSelection.cxx
@@ -17,12 +17,12 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-1/Tutorials/src/muonIteration.cxx b/.conflict-side-1/Tutorials/src/muonIteration.cxx
index 4b94fe77ae3..497a07cd881 100644
--- a/.conflict-side-1/Tutorials/src/muonIteration.cxx
+++ b/.conflict-side-1/Tutorials/src/muonIteration.cxx
@@ -16,8 +16,8 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
@@ -65,7 +65,7 @@ struct IterateMuonsSparse {
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
   return WorkflowSpec{
-    //adaptAnalysisTask<IterateMuonsExclusives>(cfgc), // currently does not work
+    // adaptAnalysisTask<IterateMuonsExclusives>(cfgc), // currently does not work
     adaptAnalysisTask<IterateMuons>(cfgc),
     adaptAnalysisTask<IterateMuonsSparse>(cfgc),
   };
diff --git a/.conflict-side-1/Tutorials/src/newCollections.cxx b/.conflict-side-1/Tutorials/src/newCollections.cxx
index 490782347f3..689d442314f 100644
--- a/.conflict-side-1/Tutorials/src/newCollections.cxx
+++ b/.conflict-side-1/Tutorials/src/newCollections.cxx
@@ -13,8 +13,8 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 // define columns in a sub-namespace of o2::aod
 // and tables in namespace o2::aod
diff --git a/.conflict-side-1/Tutorials/src/partitions.cxx b/.conflict-side-1/Tutorials/src/partitions.cxx
index f5b58529a80..aee5605da20 100644
--- a/.conflict-side-1/Tutorials/src/partitions.cxx
+++ b/.conflict-side-1/Tutorials/src/partitions.cxx
@@ -13,8 +13,8 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Tutorials/src/pidTpcTof.cxx b/.conflict-side-1/Tutorials/src/pidTpcTof.cxx
index 777c09c1920..b5d755cf1c0 100644
--- a/.conflict-side-1/Tutorials/src/pidTpcTof.cxx
+++ b/.conflict-side-1/Tutorials/src/pidTpcTof.cxx
@@ -17,8 +17,8 @@
 
 // O2 includes
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
 
 // O2Physics includes
 #include "Common/DataModel/PIDResponse.h"
diff --git a/.conflict-side-1/Tutorials/src/preprocess.cxx b/.conflict-side-1/Tutorials/src/preprocess.cxx
index 417bafbf744..290c040db39 100644
--- a/.conflict-side-1/Tutorials/src/preprocess.cxx
+++ b/.conflict-side-1/Tutorials/src/preprocess.cxx
@@ -16,10 +16,11 @@
 /// \since
 
 #include "IntermediateTables.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
+
 #include "Framework/AnalysisTask.h"
 #include "Framework/ConfigParamSpec.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Tutorials/src/propagatedTracks.cxx b/.conflict-side-1/Tutorials/src/propagatedTracks.cxx
index 651738de71e..097adc3ecf3 100644
--- a/.conflict-side-1/Tutorials/src/propagatedTracks.cxx
+++ b/.conflict-side-1/Tutorials/src/propagatedTracks.cxx
@@ -14,18 +14,18 @@
 // Needs o2-analysis-track-propagation
 //
 
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/Core/trackUtilities.h"
-#include "ReconstructionDataFormats/DCA.h"
-#include "DetectorsBase/Propagator.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "CommonUtils/NameConf.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
+#include "Framework/RunningWorkflowInfo.h"
 #include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/DCA.h"
 
 using namespace o2;
 using namespace o2::constants::math;
@@ -105,4 +105,5 @@ WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
     adaptAnalysisTask<PropagatedTracksQa>(cfgc),
     adaptAnalysisTask<PropagatedTracksExtra>(cfgc),
   };
-}
\ No newline at end of file
+}
+ 
\ No newline at end of file
diff --git a/.conflict-side-1/Tutorials/src/reweighting.cxx b/.conflict-side-1/Tutorials/src/reweighting.cxx
index 17a4ad4bf33..b1f0c43a22f 100644
--- a/.conflict-side-1/Tutorials/src/reweighting.cxx
+++ b/.conflict-side-1/Tutorials/src/reweighting.cxx
@@ -28,11 +28,15 @@
 // This workflow is used to create a flat tree for model training
 // Use o2-aod-merger to combine dataframes in output AnalysisResults_trees.root
 
-#include <onnxruntime_cxx_api.h>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/Multiplicity.h"
 #include "TrainingTree.h"
+
+#include "Common/DataModel/Multiplicity.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include <onnxruntime_cxx_api.h>
+
 #include <cmath>
 
 using namespace o2;
diff --git a/.conflict-side-1/Tutorials/src/schemaEvolution.cxx b/.conflict-side-1/Tutorials/src/schemaEvolution.cxx
index a15fcba6dda..04033257753 100644
--- a/.conflict-side-1/Tutorials/src/schemaEvolution.cxx
+++ b/.conflict-side-1/Tutorials/src/schemaEvolution.cxx
@@ -16,8 +16,8 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 namespace o2::aod
 {
diff --git a/.conflict-side-1/Tutorials/src/tableIOout.cxx b/.conflict-side-1/Tutorials/src/tableIOout.cxx
index 403740755d9..75678bca3b6 100644
--- a/.conflict-side-1/Tutorials/src/tableIOout.cxx
+++ b/.conflict-side-1/Tutorials/src/tableIOout.cxx
@@ -14,8 +14,8 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 namespace o2::aod
 {
diff --git a/.conflict-side-1/Tutorials/src/trackIteration.cxx b/.conflict-side-1/Tutorials/src/trackIteration.cxx
index ff3271d90c0..53b85c39ec9 100644
--- a/.conflict-side-1/Tutorials/src/trackIteration.cxx
+++ b/.conflict-side-1/Tutorials/src/trackIteration.cxx
@@ -13,8 +13,8 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/.conflict-side-1/Tutorials/src/tracksCombinations.cxx b/.conflict-side-1/Tutorials/src/tracksCombinations.cxx
index 413e8399e9b..ca5db69f0f4 100644
--- a/.conflict-side-1/Tutorials/src/tracksCombinations.cxx
+++ b/.conflict-side-1/Tutorials/src/tracksCombinations.cxx
@@ -15,11 +15,12 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
 #include "Common/DataModel/Multiplicity.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::soa;
diff --git a/.conflict-side-1/Tutorials/src/treeCreator.cxx b/.conflict-side-1/Tutorials/src/treeCreator.cxx
index 27d1f1eda21..70879497ecd 100644
--- a/.conflict-side-1/Tutorials/src/treeCreator.cxx
+++ b/.conflict-side-1/Tutorials/src/treeCreator.cxx
@@ -30,11 +30,13 @@
 // This workflow is used to create a flat tree for model training
 // Use o2-aod-merger to combine dataframes in output AnalysisResults_trees.root
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/Multiplicity.h"
 #include "TrainingTree.h"
 
+#include "Common/DataModel/Multiplicity.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/.conflict-side-1/Tutorials/src/weakDecayIteration.cxx b/.conflict-side-1/Tutorials/src/weakDecayIteration.cxx
index 0c4bc01f877..0735f5537e0 100644
--- a/.conflict-side-1/Tutorials/src/weakDecayIteration.cxx
+++ b/.conflict-side-1/Tutorials/src/weakDecayIteration.cxx
@@ -17,8 +17,8 @@
 /// \author
 /// \since
 
-#include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;