# Conflicts: # packages/client/public/locales/en/CreateEditRoomDialog.json # packages/client/public/locales/en/Files.json # packages/client/src/components/dialogs/CreateEditRoomDialog/data/index.js # packages/client/src/helpers/filesUtils.js # packages/client/src/store/CreateEditRoomStore.js # public/locales/en/Common.json