Finished the calendar page
Fixed conflicts