merge calendar-autoload into calendar