merge from upstream, fix merge conf in calendar
merge from upstream, fix merge conf in calendar

LaunchCodeEducation/cs50x-kansascity,LaunchCodeEducation/cs50x-kansascity,LaunchCodeEducation/cs50x-kansascity,LaunchCodeEducation/cs50x-kansascity,LaunchCodeEducation/cs50x-kansascity