Conflicts: config/locales/en.yml config/locales/zh.yml
Conflicts: app/controllers/admin_controller.rb db/schema.rb