resolved conflicts for CompetitionController N2