Fxing conflicts

src/App.scss

src/App.vue

src/boot/after_store.js

src/components/post_status_form/post_status_form.js

src/components/post_status_form/post_status_form.vue

src/components/settings/settings.js

src/components/settings/settings.vue

src/components/status/status.vue

src/components/tab_switcher/tab_switcher.js

src/components/user_card_content/user_card_content.js

src/components/user_card_content/user_card_content.vue

src/components/user_profile/user_profile.js

src/components/user_profile/user_profile.vue

src/components/user_settings/user_settings.js

src/components/user_settings/user_settings.vue

src/i18n/en.json

src/i18n/ru.json

src/modules/config.js

src/modules/instance.js

src/services/api/api.service.js