diff --git a/Gemfile.lock b/Gemfile.lock
index b8d630726..8b7dbf786 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -144,8 +144,12 @@ GEM
       dotenv (= 3.2.0)
       railties (>= 6.1)
     drb (2.2.3)
+<<<<<<< HEAD
     dumb_delegator (1.1.0)
     erb (6.0.3)
+=======
+    erb (6.0.4)
+>>>>>>> e9d6021 (Update all Bundler dependencies (2026-04-24) (#1408))
     erubi (1.13.1)
     et-orbi (1.4.0)
       tzinfo
@@ -186,7 +190,7 @@ GEM
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     io-console (0.8.2)
-    irb (1.17.0)
+    irb (1.18.0)
       pp (>= 0.6.0)
       prism (>= 1.3.0)
       rdoc (>= 4.0.0)
@@ -211,14 +215,19 @@ GEM
     method_source (1.1.0)
     mini_mime (1.1.5)
     mini_portile2 (2.8.9)
-    minitest (6.0.4)
+    minitest (6.0.5)
       drb (~> 2.0)
       prism (~> 1.5)
     mize (0.6.1)
     msgpack (1.8.0)
+<<<<<<< HEAD
     multi_xml (0.8.1)
       bigdecimal (>= 3.1, < 5)
     net-imap (0.6.3)
+=======
+    nenv (0.3.0)
+    net-imap (0.6.4)
+>>>>>>> e9d6021 (Update all Bundler dependencies (2026-04-24) (#1408))
       date
       net-protocol
     net-pop (0.1.2)
@@ -231,8 +240,15 @@ GEM
     nokogiri (1.19.2)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
+<<<<<<< HEAD
     ostruct (0.6.3)
     parallel (2.0.1)
+=======
+    notiffany (0.1.3)
+      nenv (~> 0.1)
+      shellany (~> 0.0)
+    parallel (2.1.0)
+>>>>>>> e9d6021 (Update all Bundler dependencies (2026-04-24) (#1408))
     parser (3.3.11.1)
       ast (~> 2.4.1)
       racc