diff --git a/server/Gemfile b/server/Gemfile
index d221ff21..0932761c 100644
--- a/server/Gemfile
+++ b/server/Gemfile
@@ -14,7 +14,11 @@ gem "interactor", "~> 3.0"
 
 gem "ruby-odbc", git: "https://github.com/Multiwoven/ruby-odbc.git"
 
+<<<<<<< HEAD
 gem "multiwoven-integrations", "~> 0.34.5"
+=======
+gem "multiwoven-integrations", "~> 0.34.7"
+>>>>>>> c03f27e5 (chore(CE): Update Server Gem 0.34.7 (#1442))
 
 gem "temporal-ruby", github: "coinbase/temporal-ruby"
 
diff --git a/server/Gemfile.lock b/server/Gemfile.lock
index 928d1d22..70db2b9f 100644
--- a/server/Gemfile.lock
+++ b/server/Gemfile.lock
@@ -1979,7 +1979,11 @@ GEM
     multi_xml (0.7.2)
       bigdecimal (~> 3.1)
     multipart-post (2.4.1)
+<<<<<<< HEAD
     multiwoven-integrations (0.34.5)
+=======
+    multiwoven-integrations (0.34.7)
+>>>>>>> c03f27e5 (chore(CE): Update Server Gem 0.34.7 (#1442))
       MailchimpMarketing
       activesupport
       async-websocket
@@ -2336,7 +2340,11 @@ DEPENDENCIES
   kaminari
   letter_opener
   liquid
+<<<<<<< HEAD
   multiwoven-integrations (~> 0.34.5)
+=======
+  multiwoven-integrations (~> 0.34.7)
+>>>>>>> c03f27e5 (chore(CE): Update Server Gem 0.34.7 (#1442))
   mysql2
   newrelic_rpm
   parallel
diff --git a/server/db/data/20251107142417_change_exist_aws_bedrock_sub_category.rb b/server/db/data/20251107142417_change_exist_aws_bedrock_sub_category.rb
new file mode 100644
index 00000000..8e5cbd12
--- /dev/null
+++ b/server/db/data/20251107142417_change_exist_aws_bedrock_sub_category.rb
@@ -0,0 +1,9 @@
+class ChangeExistAwsBedrockSubCategory < ActiveRecord::Migration[7.1]
+  def up
+    Connector.where(connector_name: "AwsBedrockModel", connector_sub_category: "AI_ML Service").update_all(connector_sub_category: "LLM")
+  end
+
+  def down
+    Connector.where(connector_name: "AwsBedrockModel", connector_sub_category: "LLM").update_all(connector_sub_category: "AI_ML Service")
+  end
+end
diff --git a/server/db/data_schema.rb b/server/db/data_schema.rb
index ecbc9dc3..7a1437dc 100644
--- a/server/db/data_schema.rb
+++ b/server/db/data_schema.rb
@@ -1,3 +1,7 @@
+<<<<<<< HEAD
 # frozen_string_literal: true
 
 DataMigrate::Data.define(version: 20250724110926)
+=======
+DataMigrate::Data.define(version: 20251107142417)
+>>>>>>> c03f27e5 (chore(CE): Update Server Gem 0.34.7 (#1442))