fix: git conflicts

5 jobs for master
Status Job ID Name Coverage
  Build
canceled #29388
build

 
  Test
canceled #29390
allowed to fail
code_quality

canceled #29391
allowed to fail
nodejs-scan-sast

canceled #29392
secret_detection_default_branch

canceled #29389
test