improve i18n
resolve merge conflicts