fixed sidekiq issue
merging the changes
merging the changes