fix merge conflict
add background worker with sidekiq and redis
remove comments from controller