diff --git a/Gemfile b/Gemfile
index 5c6bc11b6e..81b4ef016e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -75,6 +75,7 @@ gem 'dalli'
 gem 'figaro'
 gem 'geocoder'
 gem 'gmaps4rails'
+gem 'mimemagic', '> 0.3.5'
 gem 'paper_trail', '~> 10.3.1'
 gem 'paperclip', '~> 3.4.1'
 gem 'rack-rewrite'
diff --git a/Gemfile.lock b/Gemfile.lock
index deda1468d3..d317704b78 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -327,12 +327,8 @@ GEM
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2020.1104)
-<<<<<<< HEAD
     mini_mime (1.0.3)
-    mini_portile2 (2.5.0)
-=======
-    mimemagic (0.3.5)
-    mini_mime (1.0.2)
+    mini_portile2 (2.5.0)    mini_mime (1.0.2)
     mini_portile2 (2.4.0)
 >>>>>>> fa2cdf337... Update Rails to 5.2
     mini_racer (0.3.1)
@@ -348,16 +344,10 @@ GEM
     multipart-post (2.1.1)
     mustermann (1.1.1)
       ruby2_keywords (~> 0.0.1)
-<<<<<<< HEAD
     nio4r (2.5.2)
     nokogiri (1.11.2)
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
-=======
-    nio4r (2.5.7)
-    nokogiri (1.10.10)
-      mini_portile2 (~> 2.4.0)
->>>>>>> fa2cdf337... Update Rails to 5.2
     oauth2 (1.4.7)
       faraday (>= 0.8, < 2.0)
       jwt (>= 1.0, < 3.0)
@@ -681,6 +671,7 @@ DEPENDENCIES
   kaminari (~> 1.2.1)
   knapsack
   letter_opener (>= 1.4.1)
+  mimemagic (> 0.3.5)
   mini_racer (= 0.3.1)
   monetize (~> 1.11)
   oauth2 (~> 1.4.7)