Fix merge conflicts

3 jobs for master in 7 minutes and 44 seconds (queued for 1 second)
Status Job ID Name Coverage
  Build
passed #7772
build

00:01:49

 
  Test
passed #7774
code_quality

00:05:54

passed #7773
test

00:00:55