Calendar page and removal of christmas logo
layout changes
conflict change