calendar updates
merge