fix conflict in after_store

CHANGELOG.md

src/boot/after_store.js

src/components/emoji_input/emoji_input.js

src/components/settings_modal/tabs/profile_tab.js

src/components/settings_modal/tabs/profile_tab.scss

src/components/settings_modal/tabs/profile_tab.vue

src/i18n/en.json

src/i18n/it.json

src/i18n/nl.json

src/modules/users.js

test/unit/specs/modules/users.spec.js