diff --git a/ruby/lib/jam_ruby.rb b/ruby/lib/jam_ruby.rb
index ab8eb59a6..0b566c55d 100755
--- a/ruby/lib/jam_ruby.rb
+++ b/ruby/lib/jam_ruby.rb
@@ -85,9 +85,7 @@ require "jam_ruby/models/mix"
 require "jam_ruby/models/claimed_recording"
 require "jam_ruby/models/crash_dump"
 require "jam_ruby/models/isp_score_batch"
-<<<<<<< HEAD
 require "jam_ruby/models/promotional"
-=======
 require "jam_ruby/models/icecast_admin_authentication"
 require "jam_ruby/models/icecast_directory"
 require "jam_ruby/models/icecast_limit"
@@ -101,7 +99,6 @@ require "jam_ruby/models/icecast_sercurity"
 require "jam_ruby/models/icecast_server"
 require "jam_ruby/models/icecast_servermisc"
 require "jam_ruby/models/icecast_user_authentication"
->>>>>>> develop
 
 include Jampb