fixed the merge of race_control.conf that was updated in two branches