Fix conflicts

2 jobs for issue/395 in 7 minutes and 42 seconds (queued for 6 seconds)
Status Job ID Name Coverage
  Build
passed #23152
debian-packaging
build

00:00:43

 
  Test
passed #23153
ubuntu regular
test

00:06:59