merge conflicts fix

dhi/config.py

dhi/datacard_tools.py

dhi/hepdata_tools.py

dhi/hooks/run2_combination.py

dhi/models/HBRscaler.py

dhi/models/HHModelPinv.py

dhi/models/HHModelPinvVHH.py

dhi/models/HHModelPinv_C2klkt.py

dhi/models/hh_model.py

dhi/models/hh_model_C2klkt.py

dhi/models/hh_model_boosted.py

dhi/plots/exclusion.py

dhi/plots/likelihoods.py

dhi/plots/limits.py

dhi/plots/postfit_shapes.py

dhi/plots/pulls_impacts.py

dhi/plots/util.py

dhi/scripts/extract_fit_result.py

dhi/scripts/plot_datacard_shapes.py

dhi/tasks/base.py