Resolve merge conflicts

Author: somabhatta

PWGCF/EbyEFluctuations/Tasks/radialFlowDecorr.cxx

@@ -3121,7 +3121,7 @@ struct RadialFlowDecorr {
         float eff = getEfficiency(coll.multNTracksPV(), pt, eta, static_cast<PIDIdx>(isp), 0, cfgEff);
         if (eff <= KFloatEpsilon)
           continue;
-          
+
         float fake = getEfficiency(coll.multNTracksPV(), pt, eta, static_cast<PIDIdx>(isp), 1, cfgEff);
         float flatWeight = getFlatteningWeight(vz, sign, pt, eta, phi, static_cast<PIDIdx>(isp), cfgFlat);
         float w = flatWeight * (1.0f - fake) / eff;