add a new test for BirthdayRacers
BDRacersTest
resolving conflicts for CompetitionController.java
resolved conflicts for CompetitionController N2
resolve conflicts N3