add calender
resolve conflict
added calender
resolve conflict
update css