Minor conflict in the art-description of test_trigAna_RDOtoAOD_v1MC_grid.py, otherwise merge was clean