Fix clonflicts

1 job for v0.2.1 in 1 minute and 51 seconds (queued for 35 seconds)
latest
Status Job ID Name Coverage
  Test
passed #28605
docker
test

00:01:51