changelog conflict fix

CHANGELOG.md

src/App.scss

src/boot/after_store.js

src/components/chat/chat.js

src/components/media_modal/media_modal.vue

src/components/poll/poll_form.vue

src/components/registration/registration.js

src/components/registration/registration.vue

src/i18n/en.json

src/i18n/eo.json

src/i18n/it.json

src/i18n/ja_pedantic.json

src/i18n/ko.json

src/i18n/zh.json

src/modules/chats.js

src/services/chat_service/chat_service.js

test/unit/specs/services/chat_service/chat_service.spec.js