chore(CE): Fix conflict

Author: TivonB-AI2

server/Gemfile

@@ -13,11 +13,7 @@ gem "interactor", "~> 3.0"
 
 gem "ruby-odbc", git: "https://github.com/Multiwoven/ruby-odbc.git"
 
-<<<<<<< HEAD
-gem "multiwoven-integrations", "~> 0.17.0"
-=======
 gem "multiwoven-integrations", "~> 0.18.2"
->>>>>>> 91382e0c (chore(CE): update server gem 0.18.2 (#764))
 
 gem "temporal-ruby", github: "coinbase/temporal-ruby"
 

server/Gemfile.lock

@@ -2249,11 +2249,7 @@ DEPENDENCIES
   jwt
   kaminari
   liquid
-<<<<<<< HEAD
-  multiwoven-integrations (~> 0.17.0)
-=======
   multiwoven-integrations (~> 0.18.2)
->>>>>>> 91382e0c (chore(CE): update server gem 0.18.2 (#764))
   mysql2
   newrelic_rpm
   parallel