diff --git a/build.gradle.kts b/build.gradle.kts
index 53546a38f..2486a9479 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -48,7 +48,11 @@ allprojects {
 }
 
 group = "exchange.dydx.abacus"
+<<<<<<< HEAD
 version = "1.6.41"
+=======
+version = "1.6.40"
+>>>>>>> a330d50 (bump version)
 
 repositories {
     google()
diff --git a/v4_abacus.podspec b/v4_abacus.podspec
index 275771f2d..f42948e06 100644
--- a/v4_abacus.podspec
+++ b/v4_abacus.podspec
@@ -1,6 +1,10 @@
 Pod::Spec.new do |spec|
     spec.name                     = 'v4_abacus'
+<<<<<<< HEAD
     spec.version                  = '1.6.41'
+=======
+    spec.version                  = '1.6.40'
+>>>>>>> a330d50 (bump version)
     spec.homepage                 = 'https://github.com/dydxprotocol/v4-abacus'
     spec.source                   = { :http=> ''}
     spec.authors                  = ''