diff --git a/.gitignore b/.gitignore
index 158f7e1..d69677d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -59,4 +59,11 @@ Thumbs.db
 target/
 dbt_packages/
 logs/
+
+# Default .gitignore content added by dbt Cloud# you shouldn't commit these into source control
+# these are the default directory names, adjust/add to fit your needs
+target/
+dbt_packages/
+logs/
+# end dbt Cloud content
 dbt_internal_packages/
diff --git a/analyses/.gitkeep b/analyses/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/dbt_project.yml b/dbt_project.yml
index 4e73943..47dc10d 100644
--- a/dbt_project.yml
+++ b/dbt_project.yml
@@ -1,8 +1,51 @@
+<<<<<<< HEAD
+
+# Name your project! Project names should contain only lowercase characters
+# and underscores. A good package name should reflect your organization's
+# name or the intended use of these models
+name: 'my_new_project'
+=======
 name: 'flit_data_platform'
+>>>>>>> 21cfd7365d4728c068abd0631ad9f9b3eec797b3
 version: '1.0.0'
 config-version: 2
 
 # This setting configures which "profile" dbt uses for this project.
+<<<<<<< HEAD
+profile: 'default'
+
+# These configurations specify where dbt should look for different types of files.
+# The `model-paths` config, for example, states that models in this project can be
+# found in the "models/" directory. You probably won't need to change these!
+model-paths: ["models"]
+analysis-paths: ["analyses"]
+test-paths: ["tests"]
+seed-paths: ["seeds"]
+macro-paths: ["macros"]
+snapshot-paths: ["snapshots"]
+
+target-path: "target"  # directory which will store compiled SQL files
+clean-targets:         # directories to be removed by `dbt clean`
+  - "target"
+  - "dbt_packages"
+
+
+# Configuring models
+# Full documentation: https://docs.getdbt.com/docs/configuring-models
+
+# In dbt, the default materialization for a model is a view. This means, when you run 
+# dbt run or dbt build, all of your models will be built as a view in your data platform. 
+# The configuration below will override this setting for models in the example folder to 
+# instead be materialized as tables. Any models you add to the root of the models folder will 
+# continue to be built as views. These settings can be overridden in the individual model files
+# using the `{{ config(...) }}` macro.
+
+models:
+  my_new_project:
+    # Applies to all files under models/example/
+    example:
+      +materialized: table
+=======
 profile: 'flit_data_platform'
 
 # These configurations specify where dbt should look for different types of files.
@@ -59,4 +102,5 @@ vars:
   free_shipping_threshold_v1_1_1_experiment_start_date: '2024-03-01'
   free_shipping_threshold_v1_1_1_experiment_end_date: '2024-03-16'
   free_shipping_threshold_v1_1_1_baseline_start_date: '2024-01-01'
-  free_shipping_threshold_v1_1_1_baseline_end_date: '2024-03-01'
\ No newline at end of file
+  free_shipping_threshold_v1_1_1_baseline_end_date: '2024-03-01'
+>>>>>>> 21cfd7365d4728c068abd0631ad9f9b3eec797b3
diff --git a/macros/.gitkeep b/macros/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/seeds/.gitkeep b/seeds/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/snapshots/.gitkeep b/snapshots/.gitkeep
new file mode 100644
index 0000000..e69de29