Remove  unexpected merge
Add 'i18n' to Gemfile