Fix conflicts

1 job for develop in 1 minute and 4 seconds (queued for 1 second)
Status Job ID Name Coverage
  Test
passed test #35528
docker

00:01:04