(chore) fix conflicts i18n MR