Corrected conflicts

2 jobs for och in 29 minutes and 55 seconds (queued for 4 seconds)
Status Job ID Name Coverage
  Test
passed #3121
black

00:02:35

failed #3120
test

00:29:55

 
Name Stage Failure
failed
test Test There is an unknown failure, please try again

FAILED (failures=1)
Destroying test database for alias 'default'...
System check identified no issues (0 silenced).
Indexing 1 uvs
Indexing 1 uvs
Indexing 1 uvs
Indexing 1 uvs
ERROR: Job failed: exit code 1