resolve merge conflict in locale/en.yml