global calendar change
fixing merge