[rebuild] remove conflicts

1 job for master in 13 minutes and 45 seconds (queued for 1 second)
Status Job ID Name Coverage
  Test
passed #1041
philm
build

00:13:45