diff --git a/myapp/config/initializers/sidekiq.rb b/myapp/config/initializers/sidekiq.rb
index fe183f02..66efc84f 100644
--- a/myapp/config/initializers/sidekiq.rb
+++ b/myapp/config/initializers/sidekiq.rb
@@ -1,3 +1,7 @@
+<<<<<<< HEAD
+=======
+Sidekiq.default_job_options = { queue: "something" }
+>>>>>>> 9baf9070 (Fix API change)
 Sidekiq.configure_client do |config|
   config.redis = { :size => 2 }
 end
@@ -45,4 +49,4 @@ end
 require "sidekiq/middleware/current_attributes"
 Sidekiq::CurrentAttributes.persist(Myapp::Current) # Your AS::CurrentAttributes singleton
 
-# Sidekiq.transactional_push!
\ No newline at end of file
+# Sidekiq.transactional_push!