GitLab jobs artifacts no longer stored forever as of Monday, November 4th 08:30h. Further information under https://cern.ch/otg0152576
Fixes wrong conflict resolution