Conflicts: app/controllers/bids_controller.rb app/helpers/bids_helper.rb config/locales/zh.yml db/schema.rb