Resolved conflicts and fixed syntax errors in HolidayController