More fixes

Author: aferrero2707

PWGDQ/Tasks/muonGlobalAlignment.cxx

@@ -158,15 +158,10 @@ struct muonGlobalAlignment { // o2-linter: disable=name/workflow-file,name/struc
 
   Configurable<uint32_t> cfgMftTracksMultiplicityMax{"cfgMftTracksMultiplicityMax", 0, "Maximum number of MFT tracks to be processed per event (zero means no limit)"};
 
-<<<<<<< HEAD
   // Magnetic field position bias
   Configurable<float> cfgFieldOriginBiasZ{"cfgFieldOriginBiasZ", 0.0f, "Bias applied to the magnetic field z position"};
-  Configurable<float> fVertexZshift{"cfgVertexZshift", 0.0f, "Correction to the vertex z position"};
-  Configurable<float> fDipoleZshift{"cfgDipoleZshift", 0.0f, "Correction to the dipole z position"};
-=======
   Configurable<float> cfgDipoleZshift{"cfgDipoleZshift", 0.0f, "Correction to the dipole z position"};
   Configurable<float> cfgVertexZshift{"cfgVertexZshift", 0.0f, "Correction to the vertex z position"};
->>>>>>> [PWGDQ] fix linter errors
 
   ////   Variables for MFT alignment corrections
   struct : ConfigurableGroup {