diff --git a/sorter.rb b/sorter.rb
old mode 100644
new mode 100755
index b8342c3..ad0f22b
--- a/sorter.rb
+++ b/sorter.rb
@@ -130,7 +130,6 @@ def process_file (file_name, binfile, type)
   csv.each { |bin| bins[bin[0]] = bin[1..].compact } #turn the csv array into a hash, remove nils
   outfile = file_name
   outfile.slice!('.txt')
-<<<<<<< HEAD
   if type == 'iat'
     text = strip_text(text, 'PLOVEINTAKE', 'PLOVECLOSING') if type == 'iat'
     output = Hash.new #Creating the output storage object
@@ -167,16 +166,6 @@ def process_file (file_name, binfile, type)
       write_output_json(output,outfile + '-out.json')
       write_output_csv(output,outfile + '-out.csv')
     end
-=======
-  puts outfile
-  output[:filename] = outfile
-  csv.each { |bin| bins[bin[0]] = bin[1..].compact } #turn the csv array into a hash, remove nils
-  bins.each_key do |bin_number|
-    key = bin_number.to_sym
-    output[key] = Hash.new
-    output[key][:words] = bin_counter(bins[bin_number], text)
-    output[key][:total] = count_total(output[key])
->>>>>>> d40b0ae9853ecb6d5d479ea121a7a3cdba00323c
   end
 end