fix merge conflicts

Status Job ID Name Coverage
  Build
failed #5249
build

 
  Test
skipped #5251
allowed to fail
code_quality
skipped #5250
test
 
Name Stage Failure
failed
build Build There has been a timeout failure or the job got stuck. Check your timeout limits or try again
No job log