fix merge conf in calendar
fix merge conf in calendar

LaunchCodeEducation/cs50x-stlouis,LaunchCodeEducation/cs50x-stlouis,LaunchCodeEducation/cs50x-stlouis,LaunchCodeEducation/cs50x-stlouis,LaunchCodeEducation/cs50x-stlouis