New HolidayController After Conflict