ci: solving conflicts

6 jobs for !190 with slb/dperez50/change-repo-structure in 13 minutes and 8 seconds (queued for 6 seconds)
latest merge request