diff --git a/Gemfile.lock b/Gemfile.lock
index a314666..f879081 100755
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,11 @@
 PATH
   remote: .
   specs:
+<<<<<<< HEAD
     action_auth (1.4.1)
+=======
+    action_auth (1.4.0)
+>>>>>>> a6dbc62 (v1.4.0)
       bcrypt (~> 3.1.0)
       rails (~> 7.1)
 
diff --git a/lib/action_auth/version.rb b/lib/action_auth/version.rb
index 600e2c2..bb096af 100755
--- a/lib/action_auth/version.rb
+++ b/lib/action_auth/version.rb
@@ -1,3 +1,7 @@
 module ActionAuth
+<<<<<<< HEAD
   VERSION = "1.4.1"
+=======
+  VERSION = "1.4.0"
+>>>>>>> a6dbc62 (v1.4.0)
 end