diff --git a/Gemfile.lock b/Gemfile.lock
index d78465c8f..c41a5ad79 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -44,7 +44,7 @@ GEM
     actionpack (5.2.4.1)
       actionview (= 5.2.4.1)
       activesupport (= 5.2.4.1)
-      rack (~> 2.0, >= 2.1.2)
+      rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
@@ -789,3 +789,9 @@ DEPENDENCIES
   webmock (~> 3.8)
   webpacker (~> 4.2)
   webpush
+
+RUBY VERSION
+   ruby 2.6.5p114
+
+BUNDLED WITH
+   1.17.2
diff --git a/app/lib/user_settings_decorator.rb b/app/lib/user_settings_decorator.rb
index 94257b0f3..24518f7eb 100644
--- a/app/lib/user_settings_decorator.rb
+++ b/app/lib/user_settings_decorator.rb
@@ -129,13 +129,12 @@ class UserSettingsDecorator
     boolean_cast_setting 'setting_trends'
   end
 
-<<<<<<< HEAD
-  def crop_images_preference
-    boolean_cast_setting 'setting_crop_images'
-=======
   def strip_formatting_preference
     settings['setting_strip_formatting']
->>>>>>> asonix/changes
+  end
+
+  def crop_images_preference
+    boolean_cast_setting 'setting_crop_images'
   end
 
   def boolean_cast_setting(key)