Added i18n to user show page
Fixed merge conflict