diff --git a/integration_test_project/profiles.yml b/integration_test_project/profiles.yml
index ca284b79..dad73a43 100644
--- a/integration_test_project/profiles.yml
+++ b/integration_test_project/profiles.yml
@@ -52,18 +52,6 @@ dbt_artifacts:
       dbname: postgres
       schema: public
       threads: 8
-<<<<<<< HEAD
-    redshift:
-      type: redshift
-      method: iam
-      threads: 8
-      host: "{{ env_var('DBT_ENV_SECRET_REDSHIFT_HOST') }}"
-      port: 5439
-      dbname: "{{ env_var('DBT_ENV_SECRET_REDSHIFT_DB') }}"
-      user: "{{ env_var('DBT_ENV_SECRET_REDSHIFT_USER') }}"
-      schema: dbt_artifacts_test_commit_{{ env_var('DBT_VERSION', '') }}_{{ env_var('GITHUB_SHA_OVERRIDE', '') if env_var('GITHUB_SHA_OVERRIDE', '') else env_var('GITHUB_SHA') }}
-      cluster_id: "{{ env_var('DBT_ENV_SECRET_REDSHIFT_CLUSTER_ID') }}"
-=======
     sqlserver:
       type: sqlserver
       driver: 'ODBC Driver 18 for SQL Server'
@@ -75,4 +63,13 @@ dbt_artifacts:
       trust_cert: True
       user: sa
       password: "123"
->>>>>>> upstream/main
+    redshift:
+      type: redshift
+      method: iam
+      threads: 8
+      host: "{{ env_var('DBT_ENV_SECRET_REDSHIFT_HOST') }}"
+      port: 5439
+      dbname: "{{ env_var('DBT_ENV_SECRET_REDSHIFT_DB') }}"
+      user: "{{ env_var('DBT_ENV_SECRET_REDSHIFT_USER') }}"
+      schema: dbt_artifacts_test_commit_{{ env_var('DBT_VERSION', '') }}_{{ env_var('GITHUB_SHA_OVERRIDE', '') if env_var('GITHUB_SHA_OVERRIDE', '') else env_var('GITHUB_SHA') }}
+      cluster_id: "{{ env_var('DBT_ENV_SECRET_REDSHIFT_CLUSTER_ID') }}"