collect auto merge of app/models/race.rb