From 71a9b7f32a84b33c644f09127f642a64ba3fd88b Mon Sep 17 00:00:00 2001
From: Holly Evans <39742776+holly-evans@users.noreply.github.com>
Date: Mon, 26 Feb 2024 09:46:36 -0600
Subject: [PATCH] Fix merge conflict

---
 .../adapter/materialized_view_tests/test_materialized_views.py  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/functional/adapter/materialized_view_tests/test_materialized_views.py b/tests/functional/adapter/materialized_view_tests/test_materialized_views.py
index 648df81a3..64f697e77 100644
--- a/tests/functional/adapter/materialized_view_tests/test_materialized_views.py
+++ b/tests/functional/adapter/materialized_view_tests/test_materialized_views.py
@@ -3,7 +3,7 @@
 import pytest
 
 from dbt.adapters.base.relation import BaseRelation
-from dbt_common.contracts.config.materialization import OnConfigurationChangeOption
+from dbt.adapters.contracts.relation import OnConfigurationChangeOption
 
 from dbt.tests.adapter.materialized_view.basic import MaterializedViewBasic
 from dbt.tests.adapter.materialized_view.changes import (