fix merge conflicts

8 jobs for master in 0 seconds (queued for 63 minutes and 8 seconds)
Status Job ID Name Coverage
  Build
failed #3696
build

 
  Test
failed #3699
allowed to fail
code_intelligence_go

failed #3698
allowed to fail
code_quality

skipped #3700
allowed to fail
eslint-sast
skipped #3701
allowed to fail
gosec-sast
skipped #3702
allowed to fail
nodejs-scan-sast
skipped #3703
allowed to fail
secret_detection_default_branch
failed #3697
test

 
Name Stage Failure
failed
code_quality Test There has been a timeout failure or the job got stuck. Check your timeout limits or try again
No job log
failed
build Build There has been a timeout failure or the job got stuck. Check your timeout limits or try again
No job log
failed
code_intelligence_go Test There has been a timeout failure or the job got stuck. Check your timeout limits or try again
No job log
failed
test Test There has been a timeout failure or the job got stuck. Check your timeout limits or try again
No job log