calendar page
readme conflict