fix: git conflicts

5 jobs for master in 35 minutes and 44 seconds (queued for 3 seconds)
Status Job ID Name Coverage
  Build
passed #29383
build

00:18:43

 
  Test
passed #29385
code_quality

00:18:43

passed #29386
nodejs-scan-sast

00:00:36

passed #29387
secret_detection_default_branch

00:00:33

failed #29384
test

00:20:09

 
Name Stage Failure
failed
test Test
No job log