Fix i18n breaking test
Merge pull request #321 from arthurnn/fix_en_local

Fix i18n breaking test
resolve conflict in locale/en.yml