fix: git conflicts

5 jobs for master in 2 minutes and 30 seconds (queued for 13 minutes and 32 seconds)
Status Job ID Name Coverage
  Build
canceled #29393
build

00:02:30

 
  Test
canceled #29395
allowed to fail
code_quality

00:02:19

canceled #29396
allowed to fail
nodejs-scan-sast

canceled #29397
secret_detection_default_branch

canceled #29394
test

00:02:22