fixup

Author: ryanwi

Gemfile.lock

@@ -150,16 +150,12 @@ GEM
     parallel (1.21.0)
     parser (3.1.0.0)
       ast (~> 2.4.1)
-<<<<<<< HEAD
     pg (1.3.2)
-=======
-    pg (1.3.1)
     propshaft (0.6.1)
       actionpack (>= 7.0.0)
       activesupport (>= 7.0.0)
       rack
       railties (>= 7.0.0)
->>>>>>> 09f1e78 (fresh propshaft based gemfile)
     public_suffix (4.0.6)
     puma (5.6.2)
       nio4r (~> 2.0)
@@ -286,13 +282,6 @@ DEPENDENCIES
   image_processing (~> 1.2)
   importmap-rails
   jbuilder
-<<<<<<< HEAD
-  jsbundling-rails
-=======
-  net-imap
-  net-pop
-  net-smtp
->>>>>>> 09f1e78 (fresh propshaft based gemfile)
   pg (~> 1.3)
   propshaft
   puma (~> 5.6)