Resolved merge conflicts for selected blocks in scripts

1 job for develop in 45 seconds (queued for 2 seconds)
latest
Status Job ID Name Coverage
  Build
passed #229914
linux
build

00:00:45