fixed date overflow bug in makeCalendar
fixed merge conflicts