trying to set the calendar
fixing merge