i18n
Adjust gem dependencies to avoid conflicts