fixing merge issue in Calendar.js