Resolve merge conflict

1 job from DEV in 37 seconds (queued for 3 seconds)
Status Job ID Name Coverage
  Test
failed #1042
unittest

00:37

 
Test unittest
    from interface.storage.Volume import Volume
ModuleNotFoundError: No module named 'interface.storage.Volume'


----------------------------------------------------------------------
Ran 7 tests in 0.001s

FAILED (errors=7)
ERROR: Job failed: exit code 1