diff --git a/lib/jam_ruby/models/band.rb b/lib/jam_ruby/models/band.rb
index 3d1ae6d67..a52e5a2c5 100644
--- a/lib/jam_ruby/models/band.rb
+++ b/lib/jam_ruby/models/band.rb
@@ -30,19 +30,16 @@ module JamRuby
       @logo_url = "http://www.jamkazam.com/images/bands/logos/#{self.id}.gif"
     end
 
-<<<<<<< HEAD
     def follower_count
       return self.followers.size
     end
 
-=======
     def location
       # TODO: implement a single string version of location;
       # this will be indexed into elasticsearch and returned in search
       return "Austin, TX"
     end
     
->>>>>>> elasticsearch
     # helper method for creating / updating a Band
     def self.save(params)
       if params[:id].nil?
@@ -156,4 +153,4 @@ module JamRuby
     end
     ### Elasticsearch/Tire integration
   end
-end
\ No newline at end of file
+end