removed sidekiq conflicts