Resolve a merged conflict - app/views/user_mailer/password_change.en.html.erb
Resolve a merged conflict - app/views/user_mailer/password_change.en.html.erb

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