merge conflicts resolved

Signed-off-by: Cryptophobia <[email protected]>

Author: Cryptophobia

Gemfile

@@ -6,7 +6,7 @@ ruby '2.7.3'
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '~> 5.2.0'
 # Use Puma as the app server
-gem 'puma', '~> 3.12'
+gem 'puma', '~> 4.3'
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
 # gem 'jbuilder', '~> 2.5'
 # Use Redis adapter to run Action Cable in production

Gemfile.lock

@@ -119,7 +119,14 @@ GEM
     nokogiri (1.11.6-x86_64-darwin)
       racc (~> 1.4)
     orm_adapter (0.5.0)
+<<<<<<< HEAD
     puma (3.12.6)
+=======
+    polyamorous (2.3.2)
+      activerecord (>= 5.2.1)
+    puma (4.3.8)
+      nio4r (~> 2.0)
+>>>>>>> b9900ad709f74935e3782407bd465928a089e07b
     racc (1.5.2)
     rack (2.2.3)
     rack-test (1.1.0)
@@ -192,7 +199,7 @@ DEPENDENCIES
   byebug
   devise
   listen (>= 3.0.5, < 3.2)
-  puma (~> 3.12)
+  puma (~> 4.3)
   rails (~> 5.2.0)
   spring
   spring-watcher-listen (~> 2.0.0)