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)