Resolve a merged conflict - app/workers/pubsubhubbub/delivery_worker.rb
Resolve a merged conflict - app/workers/pubsubhubbub/delivery_worker.rb

pixiv/mastodon,pixiv/mastodon,pixiv/mastodon,pixiv/mastodon