Calendar class
fix conflicts