From 5e581953bfd3f3d1868059e91b3ad141db93a91e Mon Sep 17 00:00:00 2001
From: TivonB-AI2 <124182151+TivonB-AI2@users.noreply.github.com>
Date: Mon, 9 Dec 2024 08:57:37 -0500
Subject: [PATCH 1/2] Resolve conflict in cherry-pick of
 b17b4848afef3dd1c0acca2814a44b3d095189c1 and change the commit message

---
 integrations/Gemfile.lock                                  | 4 ++++
 .../integrations/destination/mailchimp/config/catalog.json | 7 ++++---
 integrations/lib/multiwoven/integrations/rollout.rb        | 4 ++++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/integrations/Gemfile.lock b/integrations/Gemfile.lock
index 52c85fbc..94a5bc97 100644
--- a/integrations/Gemfile.lock
+++ b/integrations/Gemfile.lock
@@ -4,10 +4,14 @@ GIT
   specs:
     ruby-odbc (0.999992)
 
+<<<<<<< HEAD
 PATH
   remote: .
   specs:
     multiwoven-integrations (0.15.8)
+=======
+    multiwoven-integrations (0.15.10)
+>>>>>>> b17b4848 (chore(CE): Update mailchimp catalog (#688))
       MailchimpMarketing
       activesupport
       async-websocket
diff --git a/integrations/lib/multiwoven/integrations/destination/mailchimp/config/catalog.json b/integrations/lib/multiwoven/integrations/destination/mailchimp/config/catalog.json
index 58f86ccd..41686db2 100644
--- a/integrations/lib/multiwoven/integrations/destination/mailchimp/config/catalog.json
+++ b/integrations/lib/multiwoven/integrations/destination/mailchimp/config/catalog.json
@@ -9,7 +9,7 @@
       "json_schema": {
         "type": "object",
         "additionalProperties": true,
-        "required": ["email"],
+        "required": ["email", "first_name", "last_name"],
         "properties": {
           "email": {
             "type": "string",
@@ -70,7 +70,7 @@
       "supported_sync_modes": ["incremental"],
       "source_defined_cursor": true,
       "default_cursor_field": ["timestamp_opt"],
-      "source_defined_primary_key": [["email"]]
+      "source_defined_primary_key": ["email"]
     },
     {
       "name": "Tags",
@@ -94,7 +94,8 @@
       },
       "supported_sync_modes": ["incremental"],
       "source_defined_cursor": true,
-      "default_cursor_field": ["updated"]
+      "default_cursor_field": ["email"],
+      "source_defined_primary_key": ["email"]
     },
     {
       "name": "Campaigns",
diff --git a/integrations/lib/multiwoven/integrations/rollout.rb b/integrations/lib/multiwoven/integrations/rollout.rb
index ff6c24ae..9c07fd46 100644
--- a/integrations/lib/multiwoven/integrations/rollout.rb
+++ b/integrations/lib/multiwoven/integrations/rollout.rb
@@ -2,7 +2,11 @@
 
 module Multiwoven
   module Integrations
+<<<<<<< HEAD
     VERSION = "0.15.8"
+=======
+    VERSION = "0.15.10"
+>>>>>>> b17b4848 (chore(CE): Update mailchimp catalog (#688))
 
     ENABLED_SOURCES = %w[
       Snowflake

From 667b04009262f71777afa6bda9bbf292dba02927 Mon Sep 17 00:00:00 2001
From: TivonB-AI2 <tivon.brown@squared.ai>
Date: Tue, 10 Dec 2024 08:29:55 -0500
Subject: [PATCH 2/2] chore(CE): Fix gemfile.lock

---
 integrations/Gemfile.lock | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/integrations/Gemfile.lock b/integrations/Gemfile.lock
index e85a81d9..31c38bc6 100644
--- a/integrations/Gemfile.lock
+++ b/integrations/Gemfile.lock
@@ -4,6 +4,9 @@ GIT
   specs:
     ruby-odbc (0.999992)
 
+PATH
+  remote: .
+  specs:
     multiwoven-integrations (0.15.10)
       MailchimpMarketing
       activesupport
@@ -393,7 +396,7 @@ GEM
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     zeitwerk (2.6.14)
-    zendesk_api (3.0.5)
+    zendesk_api (3.1.1)
       faraday (> 2.0.0)
       faraday-multipart
       hashie (>= 3.5.2, < 6.0.0)