added full calendar
resolved conflicts