some calendar and conflict stuff

meep