$ git fetch upstream
$ git checkout zunda-ninja-on-heroku
$ git merge v1.3.3
Removing app/workers/application_worker.rb
Auto-merging Procfile
CONFLICT (content): Merge conflict in Procfile
Automatic merge failed; fix conflicts and then commit the result.
sidekiqの-qオプションが指定されなくなりましたね。