address conflicts

Author: dbasunag

tests/model_registry/model_catalog/conftest.py

@@ -4,7 +4,7 @@
 from kubernetes.dynamic import DynamicClient
 
 from ocp_resources.config_map import ConfigMap
-from ocp_resources.model_registry_components_platform_opendatahub_io import ModelRegistry
+from ocp_resources.model_registry_modelregistry_opendatahub_io import ModelRegistry
 from ocp_resources.resource import ResourceEditor
 
 from ocp_resources.route import Route

tests/model_registry/model_catalog/test_default_model_catalog.py

@@ -10,7 +10,7 @@
 from ocp_resources.pod import Pod
 from ocp_resources.config_map import ConfigMap
 from ocp_resources.service import Service
-from tests.model_registry.model_catalog.constants import DEFAULT_MODEL_CATALOG
+from tests.model_registry.constants import DEFAULT_MODEL_CATALOG
 from tests.model_registry.model_catalog.utils import (
     validate_model_catalog_enabled,
     execute_get_command,