Resolve a merged conflict - app/javascript/mastodon/reducers/statuses.js
Resolve a merged conflict - app/javascript/mastodon/reducers/statuses.js

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