Resolved merge conflicts for selected blocks in scripts

1 job for develop-mashiro in 43 seconds
latest
Status Job ID Name Coverage
  Build
passed #229901
linux
build

00:00:43