diff --git a/Gemfile.lock b/Gemfile.lock
index 3f82fb8bf..174d442f9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -95,7 +95,11 @@ GEM
     bcrypt (3.1.22)
     bigdecimal (4.1.2)
     bindex (0.8.1)
+<<<<<<< HEAD
     bootsnap (1.24.0)
+=======
+    bootsnap (1.24.1)
+>>>>>>> 36ee0f4 (Update all Bundler dependencies (2026-05-01) (#1411))
       msgpack (~> 1.2)
     brakeman (8.0.4)
       racc
@@ -211,7 +215,7 @@ GEM
     method_source (1.1.0)
     mini_mime (1.1.5)
     mini_portile2 (2.8.9)
-    minitest (6.0.5)
+    minitest (6.0.6)
       drb (~> 2.0)
       prism (~> 1.5)
     mize (0.6.1)
@@ -228,7 +232,7 @@ GEM
     net-smtp (0.5.1)
       net-protocol
     nio4r (2.7.5)
-    nokogiri (1.19.2)
+    nokogiri (1.19.3)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     ostruct (0.6.3)
@@ -352,9 +356,9 @@ GEM
     rubocop-ast (1.49.1)
       parser (>= 3.3.7.2)
       prism (~> 1.7)
-    rubocop-capybara (2.22.1)
+    rubocop-capybara (2.23.0)
       lint_roller (~> 1.1)
-      rubocop (~> 1.72, >= 1.72.1)
+      rubocop (~> 1.81)
     rubocop-factory_bot (2.28.0)
       lint_roller (~> 1.1)
       rubocop (~> 1.72, >= 1.72.1)
@@ -399,9 +403,12 @@ GEM
     stimulus-rails (1.3.4)
       railties (>= 6.0.0)
     stringio (3.2.0)
+<<<<<<< HEAD
     stripe (19.1.0)
       bigdecimal
       logger
+=======
+>>>>>>> 36ee0f4 (Update all Bundler dependencies (2026-05-01) (#1411))
     strong_migrations (2.7.0)
       activerecord (>= 7.2)
     sync (0.5.0)