fix conflict in user card content

src/boot/after_store.js

src/components/post_status_form/post_status_form.js

src/components/user_card_content/user_card_content.vue

src/components/who_to_follow_panel/who_to_follow_panel.js

src/components/who_to_follow_panel/who_to_follow_panel.vue

src/i18n/ja.json

src/lib/push_notifications_plugin.js

src/main.js

src/modules/config.js

src/modules/instance.js

src/modules/statuses.js

src/modules/users.js

src/services/api/api.service.js

src/services/push/push.js

src/services/status_poster/status_poster.service.js

static/config.json