fixed merge stuff
calendar not small
fixed merge conflicts