Added calendar
Calendar added
Fixed merge conflict