Resolve conflict in app/helpers/sorting_helper.rb

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

app/helpers/sorting_helper.rb

@@ -29,12 +29,8 @@ module SortingHelper
       sort_value_popularity       => sort_title_popularity,
       sort_value_priority         => sort_title_priority,
       sort_value_upvotes          => sort_title_upvotes,
-<<<<<<< HEAD
       sort_value_contacted_date   => sort_title_contacted_date,
       sort_value_weight           => sort_title_weight
-=======
-      sort_value_contacted_date   => sort_title_contacted_date
->>>>>>> upstream/master
     }
   end
 
@@ -399,11 +395,8 @@ module SortingHelper
   def sort_value_contacted_date
     'contacted_asc'
   end
-<<<<<<< HEAD
 
   def sort_value_weight
     'weight'
   end
-=======
->>>>>>> upstream/master
 end